diff --git a/INSTALL.md b/INSTALL.md index 10a51aa2f..2ad875222 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -105,7 +105,6 @@ Arch Linux: sudo pacman -S --needed opus vpx ``` -``` Debian: ```bash sudo apt-get install libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev diff --git a/smileys/TwitterEmojiSVG/1f600.svg b/smileys/TwitterEmojiSVG/1f600.svg index f9ab378be..9efb1da2e 100644 --- a/smileys/TwitterEmojiSVG/1f600.svg +++ b/smileys/TwitterEmojiSVG/1f600.svg @@ -1 +1,87 @@ - + + + +image/svg+xml \ No newline at end of file diff --git a/smileys/TwitterEmojiSVG/1f601.svg b/smileys/TwitterEmojiSVG/1f601.svg index aa13017b2..6edf59247 100644 --- a/smileys/TwitterEmojiSVG/1f601.svg +++ b/smileys/TwitterEmojiSVG/1f601.svg @@ -1 +1,54 @@ - + + + +image/svg+xml \ No newline at end of file diff --git a/smileys/TwitterEmojiSVG/emoticons.xml b/smileys/TwitterEmojiSVG/emoticons.xml index 23cdb5673..ac942e5d4 100644 --- a/smileys/TwitterEmojiSVG/emoticons.xml +++ b/smileys/TwitterEmojiSVG/emoticons.xml @@ -12,8 +12,6 @@ ๐Ÿ˜ - :-D - :D ๐Ÿ˜‚ @@ -21,6 +19,8 @@ ๐Ÿ˜ƒ + :-D + :D ๐Ÿ˜„ diff --git a/smileys/TwitterEmojiSimple/LICENSE-GRAPHICS b/smileys/TwitterEmojiSimple/LICENSE-GRAPHICS new file mode 100644 index 000000000..dc8853a70 --- /dev/null +++ b/smileys/TwitterEmojiSimple/LICENSE-GRAPHICS @@ -0,0 +1,393 @@ +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the "Licensor." Except for the limited purpose of indicating +that material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the public +licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/smileys/TwitterEmojiSimple/README.md b/smileys/TwitterEmojiSimple/README.md new file mode 100644 index 000000000..62ada9fec --- /dev/null +++ b/smileys/TwitterEmojiSimple/README.md @@ -0,0 +1,4 @@ +## License +Copyright 2014 Twitter, Inc and other contributors + +Graphics licensed under CC-BY 4.0: https://creativecommons.org/licenses/by/4.0/ diff --git a/smileys/TwitterEmojiSimple/emoticons.xml b/smileys/TwitterEmojiSimple/emoticons.xml new file mode 100644 index 000000000..ad4b3917a --- /dev/null +++ b/smileys/TwitterEmojiSimple/emoticons.xml @@ -0,0 +1,2542 @@ + + + + โ˜บ + :smile: + + + ๐Ÿ˜€ + :grinning: + + + ๐Ÿ˜ + + + ๐Ÿ˜‚ + :tearsofjoy: + + + ๐Ÿ˜ƒ + + + ๐Ÿ˜„ + :happy: + + + ๐Ÿ˜… + + + ๐Ÿ˜† + + + ๐Ÿ˜‡ + + + ๐Ÿ˜ˆ + + + ๐Ÿ˜‰ + + + ๐Ÿ˜Š + + + ๐Ÿ˜‹ + + + ๐Ÿ˜Œ + + + ๐Ÿ˜ + + + ๐Ÿ˜Ž + :cool: + + + ๐Ÿ˜ + + + ๐Ÿ˜ + :disappointed: + + + ๐Ÿ˜‘ + -_- + + + ๐Ÿ˜’ + เฒ _เฒ  + + + ๐Ÿ˜“ + + + ๐Ÿ˜” + + + ๐Ÿ˜• + + + ๐Ÿ˜– + :oops: + + + ๐Ÿ˜— + + + ๐Ÿ˜˜ + + + ๐Ÿ˜™ + + + ๐Ÿ˜š + + + ๐Ÿ˜› + + + ๐Ÿ˜œ + + + ๐Ÿ˜ + + + ๐Ÿ˜ž + :-( + :( + :sad: + + + ๐Ÿ˜Ÿ + + + ๐Ÿ˜  + :angry: + + + ๐Ÿ˜ก + + + ๐Ÿ˜ข + :cry: + + + ๐Ÿ˜ฃ + + + ๐Ÿ˜ค + + + ๐Ÿ˜ฅ + + + ๐Ÿ˜ฆ + + + ๐Ÿ˜ง + + + ๐Ÿ˜จ + + + ๐Ÿ˜ฉ + + + ๐Ÿ˜ช + + + ๐Ÿ˜ซ + + + ๐Ÿ˜ฌ + + + ๐Ÿ˜ญ + + + ๐Ÿ˜ฎ + + + ๐Ÿ˜ฏ + + + ๐Ÿ˜ฐ + + + ๐Ÿ˜ฑ + + + ๐Ÿ˜ฒ + + + ๐Ÿ˜ณ + + + ๐Ÿ˜ด + :sleep: + :sleeping: + + + ๐Ÿ˜ต + + + ๐Ÿ˜ถ + + + ๐Ÿ˜ท + + + ๐Ÿ˜ธ + + + ๐Ÿ˜น + + + ๐Ÿ˜บ + + + ๐Ÿ˜ป + + + ๐Ÿ˜ผ + + + ๐Ÿ˜ฝ + + + ๐Ÿ˜พ + + + ๐Ÿ˜ฟ + + + ๐Ÿ™€ + + + ๐Ÿ™… + + + ๐Ÿ™† + + + ๐Ÿ™‡ + + + ๐Ÿ™ˆ + + + ๐Ÿ™‰ + + + ๐Ÿ™Š + :silence: + + + ๐Ÿ™‹ + :hi: + + + ๐Ÿ™Œ + + + ๐Ÿ™ + + + ๐Ÿ™Ž + + + ๐Ÿ™ + + + ๐Ÿ’ฉ + + + ๐ŸŒ€ + + + ๐ŸŒ + + + ๐ŸŒ‚ + + + ๐ŸŒƒ + + + ๐ŸŒ„ + + + ๐ŸŒ… + + + ๐ŸŒ† + + + ๐ŸŒ‡ + + + ๐ŸŒˆ + + + ๐ŸŒ‰ + + + ๐ŸŒŠ + + + ๐ŸŒ‹ + + + ๐ŸŒŒ + + + ๐ŸŒ + + + ๐ŸŒŽ + + + ๐ŸŒ + + + ๐ŸŒ + + + ๐ŸŒ‘ + + + ๐ŸŒ’ + + + ๐ŸŒ“ + + + ๐ŸŒ” + + + ๐ŸŒ• + + + ๐ŸŒ– + + + ๐ŸŒ— + + + ๐ŸŒ˜ + + + ๐ŸŒ™ + + + ๐ŸŒš + + + ๐ŸŒ› + + + ๐ŸŒœ + + + ๐ŸŒ + + + ๐ŸŒž + + + ๐ŸŒŸ + + + ๐ŸŒ  + + + ๐ŸŒฐ + + + ๐ŸŒฑ + + + ๐ŸŒฒ + + + ๐ŸŒณ + + + ๐ŸŒด + + + ๐ŸŒต + + + ๐ŸŒท + + + ๐ŸŒธ + + + ๐ŸŒน + + + ๐ŸŒบ + + + ๐ŸŒป + + + ๐ŸŒผ + + + ๐ŸŒฝ + + + ๐ŸŒพ + + + ๐ŸŒฟ + + + ๐Ÿ€ + + + ๐Ÿ + + + ๐Ÿ‚ + + + ๐Ÿƒ + + + ๐Ÿ„ + + + ๐Ÿ… + + + ๐Ÿ† + + + ๐Ÿ‡ + + + ๐Ÿˆ + + + ๐Ÿ‰ + + + ๐ŸŠ + + + ๐Ÿ‹ + + + ๐ŸŒ + + + ๐Ÿ + + + ๐ŸŽ + + + ๐Ÿ + + + ๐Ÿ + + + ๐Ÿ‘ + + + ๐Ÿ’ + + + ๐Ÿ“ + + + ๐Ÿ” + + + ๐Ÿ• + + + ๐Ÿ– + + + ๐Ÿ— + + + ๐Ÿ˜ + + + ๐Ÿ™ + + + ๐Ÿš + + + ๐Ÿ› + + + ๐Ÿœ + + + ๐Ÿ + + + ๐Ÿž + + + ๐ŸŸ + + + ๐Ÿ  + + + ๐Ÿก + + + ๐Ÿข + + + ๐Ÿฃ + + + ๐Ÿค + + + ๐Ÿฅ + + + ๐Ÿฆ + + + ๐Ÿง + + + ๐Ÿจ + + + ๐Ÿฉ + + + ๐Ÿช + :cookie: + + + ๐Ÿซ + + + ๐Ÿฌ + + + ๐Ÿญ + + + ๐Ÿฎ + + + ๐Ÿฏ + + + ๐Ÿฐ + + + ๐Ÿฑ + + + ๐Ÿฒ + + + ๐Ÿณ + + + ๐Ÿด + + + ๐Ÿต + + + ๐Ÿถ + + + ๐Ÿท + + + ๐Ÿธ + + + ๐Ÿน + + + ๐Ÿบ + :beer: + + + ๐Ÿป + :beers: + + + ๐Ÿผ + + + ๐ŸŽ€ + + + ๐ŸŽ + + + ๐ŸŽ‚ + + + ๐ŸŽƒ + + + ๐ŸŽ„ + + + ๐ŸŽ… + + + ๐ŸŽ† + + + ๐ŸŽ‡ + + + ๐ŸŽˆ + + + ๐ŸŽ‰ + + + ๐ŸŽŠ + + + ๐ŸŽ‹ + + + ๐ŸŽŒ + + + ๐ŸŽ + + + ๐ŸŽŽ + + + ๐ŸŽ + + + ๐ŸŽ + + + ๐ŸŽ‘ + + + ๐ŸŽ’ + + + ๐ŸŽ“ + + + ๐ŸŽ  + + + ๐ŸŽก + + + ๐ŸŽข + + + ๐ŸŽฃ + + + ๐ŸŽค + + + ๐ŸŽฅ + + + ๐ŸŽฆ + + + ๐ŸŽง + + + ๐ŸŽจ + + + ๐ŸŽฉ + + + ๐ŸŽช + + + ๐ŸŽซ + + + ๐ŸŽฌ + + + ๐ŸŽญ + + + ๐ŸŽฎ + + + ๐ŸŽฏ + + + ๐ŸŽฐ + + + ๐ŸŽฑ + + + ๐ŸŽฒ + + + ๐ŸŽณ + + + ๐ŸŽด + + + ๐ŸŽต + + + ๐ŸŽถ + + + ๐ŸŽท + + + ๐ŸŽธ + + + ๐ŸŽน + + + ๐ŸŽบ + + + ๐ŸŽป + + + ๐ŸŽผ + + + ๐ŸŽฝ + + + ๐ŸŽพ + + + ๐ŸŽฟ + + + ๐Ÿ€ + + + ๐Ÿ + + + ๐Ÿ‚ + + + ๐Ÿƒ + + + ๐Ÿ„ + + + ๐Ÿ† + + + ๐Ÿ‡ + + + ๐Ÿˆ + + + ๐Ÿ‰ + + + ๐ŸŠ + + + ๐Ÿ  + + + ๐Ÿก + + + ๐Ÿข + + + ๐Ÿฃ + + + ๐Ÿค + + + ๐Ÿฅ + + + ๐Ÿฆ + + + ๐Ÿง + + + ๐Ÿจ + + + ๐Ÿฉ + + + ๐Ÿช + + + ๐Ÿซ + + + ๐Ÿฌ + + + ๐Ÿญ + + + ๐Ÿฎ + + + ๐Ÿฏ + + + ๐Ÿฐ + + + ๐Ÿ€ + + + ๐Ÿ + + + ๐Ÿ‚ + + + ๐Ÿƒ + + + ๐Ÿ„ + + + ๐Ÿ… + + + ๐Ÿ† + + + ๐Ÿ‡ + + + ๐Ÿˆ + + + ๐Ÿ‰ + + + ๐ŸŠ + + + ๐Ÿ‹ + + + ๐ŸŒ + + + ๐Ÿ + + + ๐ŸŽ + + + ๐Ÿ + + + ๐Ÿ + + + ๐Ÿ‘ + + + ๐Ÿ’ + + + ๐Ÿ“ + + + ๐Ÿ” + + + ๐Ÿ• + + + ๐Ÿ– + + + ๐Ÿ— + + + ๐Ÿ˜ + + + ๐Ÿ™ + + + ๐Ÿš + + + ๐Ÿ› + + + ๐Ÿœ + + + ๐Ÿ + + + ๐Ÿž + + + ๐ŸŸ + + + ๐Ÿ  + + + ๐Ÿก + + + ๐Ÿข + + + ๐Ÿฃ + + + ๐Ÿค + + + ๐Ÿฅ + + + ๐Ÿฆ + + + ๐Ÿง + + + ๐Ÿจ + + + ๐Ÿฉ + + + ๐Ÿช + + + ๐Ÿซ + + + ๐Ÿฌ + + + ๐Ÿญ + + + ๐Ÿฎ + + + ๐Ÿฏ + + + ๐Ÿฐ + + + ๐Ÿฑ + + + ๐Ÿฒ + + + ๐Ÿณ + + + ๐Ÿด + + + ๐Ÿต + + + ๐Ÿถ + + + ๐Ÿท + + + ๐Ÿธ + + + ๐Ÿน + + + ๐Ÿบ + + + ๐Ÿป + + + ๐Ÿผ + + + ๐Ÿฝ + + + ๐Ÿพ + + + ๐Ÿ‘€ + + + ๐Ÿ‘‚ + + + ๐Ÿ‘ƒ + + + ๐Ÿ‘„ + + + ๐Ÿ‘… + + + ๐Ÿ–• + :finger: + :fuck: + + + ๐Ÿ‘† + + + ๐Ÿ‘‡ + + + ๐Ÿ‘ˆ + + + ๐Ÿ‘‰ + + + ๐Ÿ‘Š + + + ๐Ÿ‘‹ + + + ๐Ÿ‘Œ + + + ๐Ÿ‘ + + + ๐Ÿ‘Ž + + + ๐Ÿ‘ + + + ๐Ÿ‘ + + + ๐Ÿ‘‘ + + + ๐Ÿ‘’ + + + ๐Ÿ‘“ + + + ๐Ÿ‘” + + + ๐Ÿ‘• + + + ๐Ÿ‘– + + + ๐Ÿ‘— + + + ๐Ÿ‘˜ + + + ๐Ÿ‘™ + + + ๐Ÿ‘š + + + ๐Ÿ‘› + + + ๐Ÿ‘œ + + + ๐Ÿ‘ + + + ๐Ÿ‘ž + + + ๐Ÿ‘Ÿ + + + ๐Ÿ‘  + + + ๐Ÿ‘ก + + + ๐Ÿ‘ข + + + ๐Ÿ‘ฃ + + + ๐Ÿ‘ค + + + ๐Ÿ‘ฅ + + + ๐Ÿ‘ฆ + + + ๐Ÿ‘ง + + + ๐Ÿ‘จ + + + ๐Ÿ‘ฉ + + + ๐Ÿ‘ช + + + ๐Ÿ‘ซ + + + ๐Ÿ‘ฌ + + + ๐Ÿ‘ญ + + + ๐Ÿ‘ฎ + + + ๐Ÿ‘ฏ + + + ๐Ÿ‘ฐ + + + ๐Ÿ‘ฑ + + + ๐Ÿ‘ฒ + + + ๐Ÿ‘ณ + + + ๐Ÿ‘ด + + + ๐Ÿ‘ต + + + ๐Ÿ‘ถ + + + ๐Ÿ‘ท + + + ๐Ÿ‘ธ + + + ๐Ÿ‘น + + + ๐Ÿ‘บ + + + ๐Ÿ‘ป + + + ๐Ÿ‘ผ + :angel: + 0:) + O:) + 0:-) + O:-) + + + ๐Ÿ‘ฝ + + + ๐Ÿ‘พ + + + ๐Ÿ‘ฟ + :devil: + :666: + }:-) + }:-> + ]:-) + ]:-> + >:-> + + + ๐Ÿ’€ + :skull: + + + ๐Ÿ’ + + + ๐Ÿ’‚ + + + ๐Ÿ’ƒ + + + ๐Ÿ’„ + + + ๐Ÿ’… + + + ๐Ÿ’† + + + ๐Ÿ’‡ + + + ๐Ÿ’ˆ + + + ๐Ÿ’‰ + :syringe: + :injection: + + + ๐Ÿ’Š + + + ๐Ÿ’‹ + + + ๐Ÿ’Œ + + + ๐Ÿ’ + + + ๐Ÿ’Ž + + + ๐Ÿ’ + + + ๐Ÿ’ + + + ๐Ÿ’‘ + + + ๐Ÿ’’ + + + ๐Ÿ’“ + + + ๐Ÿ’” + + + ๐Ÿ’• + + + ๐Ÿ’– + + + ๐Ÿ’— + + + ๐Ÿ’˜ + + + ๐Ÿ’™ + + + ๐Ÿ’š + + + ๐Ÿ’› + + + ๐Ÿ’œ + + + ๐Ÿ’ + + + ๐Ÿ’ž + + + ๐Ÿ’Ÿ + + + ๐Ÿ’  + + + ๐Ÿ’ก + + + ๐Ÿ’ข + + + ๐Ÿ’ฃ + :bomb: + + + ๐Ÿ’ค + + + ๐Ÿ’ฅ + + + ๐Ÿ’ฆ + + + ๐Ÿ’ง + + + ๐Ÿ’จ + + + ๐Ÿ’ช + + + ๐Ÿ’ซ + + + ๐Ÿ’ฌ + + + ๐Ÿ’ญ + + + ๐Ÿ’ฎ + + + ๐Ÿ’ฏ + + + ๐Ÿ’ฐ + + + ๐Ÿ’ฑ + + + ๐Ÿ’ฒ + + + ๐Ÿ’ณ + + + ๐Ÿ’ด + + + ๐Ÿ’ต + + + ๐Ÿ’ถ + + + ๐Ÿ’ท + + + ๐Ÿ’ธ + + + ๐Ÿ’น + + + ๐Ÿ’บ + + + ๐Ÿ’ป + + + ๐Ÿ’ผ + + + ๐Ÿ’ฝ + + + ๐Ÿ’พ + + + ๐Ÿ’ฟ + + + ๐Ÿ“€ + + + ๐Ÿ“ + + + ๐Ÿ“‚ + + + ๐Ÿ“ƒ + + + ๐Ÿ“„ + + + ๐Ÿ“… + + + ๐Ÿ“† + + + ๐Ÿ“‡ + + + ๐Ÿ“ˆ + + + ๐Ÿ“‰ + + + ๐Ÿ“Š + + + ๐Ÿ“‹ + + + ๐Ÿ“Œ + + + ๐Ÿ“ + + + ๐Ÿ“Ž + + + ๐Ÿ“ + + + ๐Ÿ“ + + + ๐Ÿ“‘ + + + ๐Ÿ“’ + + + ๐Ÿ““ + + + ๐Ÿ“” + + + ๐Ÿ“• + + + ๐Ÿ“– + + + ๐Ÿ“— + + + ๐Ÿ“˜ + + + ๐Ÿ“™ + + + ๐Ÿ“š + + + ๐Ÿ“› + + + ๐Ÿ“œ + + + ๐Ÿ“ + + + ๐Ÿ“ž + + + ๐Ÿ“Ÿ + + + ๐Ÿ“  + + + ๐Ÿ“ก + + + ๐Ÿ“ข + + + ๐Ÿ“ฃ + + + ๐Ÿ“ค + + + ๐Ÿ“ฅ + + + ๐Ÿ“ฆ + + + ๐Ÿ“ง + + + ๐Ÿ“จ + + + ๐Ÿ“ฉ + + + ๐Ÿ“ช + + + ๐Ÿ“ซ + + + ๐Ÿ“ฌ + + + ๐Ÿ“ญ + + + ๐Ÿ“ฎ + + + ๐Ÿ“ฏ + + + ๐Ÿ“ฐ + + + ๐Ÿ“ฑ + + + ๐Ÿ“ฒ + + + ๐Ÿ“ณ + + + ๐Ÿ“ด + + + ๐Ÿ“ต + + + ๐Ÿ“ถ + + + ๐Ÿ“ท + + + ๐Ÿ“น + + + ๐Ÿ“บ + + + ๐Ÿ“ป + + + ๐Ÿ“ผ + + + ๐Ÿ”€ + + + ๐Ÿ” + + + ๐Ÿ”‚ + + + ๐Ÿ”ƒ + + + ๐Ÿ”„ + + + ๐Ÿ”… + + + ๐Ÿ”† + + + ๐Ÿ”‡ + + + ๐Ÿ”ˆ + + + ๐Ÿ”‰ + + + ๐Ÿ”Š + + + ๐Ÿ”‹ + + + ๐Ÿ”Œ + + + ๐Ÿ” + + + ๐Ÿ”Ž + + + ๐Ÿ” + + + ๐Ÿ” + + + ๐Ÿ”‘ + + + ๐Ÿ”’ + + + ๐Ÿ”“ + + + ๐Ÿ”” + + + ๐Ÿ”• + + + ๐Ÿ”– + + + ๐Ÿ”— + + + ๐Ÿ”˜ + + + ๐Ÿ”™ + + + ๐Ÿ”š + + + ๐Ÿ”› + + + ๐Ÿ”œ + + + ๐Ÿ” + + + ๐Ÿ”ž + + + ๐Ÿ”Ÿ + + + ๐Ÿ”  + + + ๐Ÿ”ก + + + ๐Ÿ”ข + + + ๐Ÿ”ฃ + + + ๐Ÿ”ค + + + ๐Ÿ”ฅ + + + ๐Ÿ”ฆ + + + ๐Ÿ”ง + + + ๐Ÿ”จ + + + ๐Ÿ”ฉ + + + ๐Ÿ”ช + + + ๐Ÿ”ซ + + + ๐Ÿ”ฌ + + + ๐Ÿ”ญ + + + ๐Ÿ”ฎ + + + ๐Ÿ”ฏ + + + ๐Ÿ”ฐ + + + ๐Ÿ”ฑ + + + ๐Ÿ”ฒ + + + ๐Ÿ”ณ + + + ๐Ÿ”ด + + + ๐Ÿ”ต + + + ๐Ÿ”ถ + + + ๐Ÿ”ท + + + ๐Ÿ”ธ + + + ๐Ÿ”น + + + ๐Ÿ”บ + + + ๐Ÿ”ป + + + ๐Ÿ”ผ + + + ๐Ÿ”ฝ + + + ๐Ÿ• + + + ๐Ÿ•‘ + + + ๐Ÿ•’ + + + ๐Ÿ•“ + + + ๐Ÿ•” + + + ๐Ÿ•• + + + ๐Ÿ•– + + + ๐Ÿ•— + + + ๐Ÿ•˜ + + + ๐Ÿ•™ + + + ๐Ÿ•š + + + ๐Ÿ•› + + + ๐Ÿ•œ + + + ๐Ÿ• + + + ๐Ÿ•ž + + + ๐Ÿ•Ÿ + + + ๐Ÿ•  + + + ๐Ÿ•ก + + + ๐Ÿ•ข + + + ๐Ÿ•ฃ + + + ๐Ÿ•ค + + + ๐Ÿ•ฅ + + + ๐Ÿ•ฆ + + + ๐Ÿ•ง + + + ๐Ÿ—ป + + + ๐Ÿ—ผ + + + ๐Ÿ—ฝ + + + ๐Ÿ—พ + + + ๐Ÿ—ฟ + + + ๐Ÿ€„ + + + ๐Ÿƒ + + + โ˜€ + + + โ˜ + + + โ˜Ž + + + โ˜‘ + + + โ˜” + + + โ˜• + + + โ˜ + + + โ™ˆ + + + โ™‰ + + + โ™ˆ + + + โ™‰ + + + โ™Š + + + โ™‹ + + + โ™Œ + + + โ™ + + + โ™Ž + + + โ™ + + + โ™Š + + + โ™‹ + + + โ™Œ + + + โ™ + + + โ™Ž + + + โ™ + + + โ™ + + + โ™‘ + + + โ™’ + + + โ™“ + + + โ™  + + + โ™ฃ + + + โ™ฅ + + + โ™ฆ + + + โ™จ + + + โ™ป + + + โ™ฟ + + + โš“ + + + โš  + + + โšก + + + โšช + + + โšซ + + + โšฝ + + + โšพ + + + โ›„ + + + โ›… + + + โ›Ž + + + โ›” + + + โ›ช + + + โ›ฒ + + + โ›ณ + + + โ›ต + + + โ›บ + + + โ›ฝ + + + ๐Ÿš€ + + + ๐Ÿš + + + ๐Ÿš‚ + + + ๐Ÿšƒ + + + ๐Ÿš„ + + + ๐Ÿš… + + + ๐Ÿš† + + + ๐Ÿš‡ + + + ๐Ÿšˆ + + + ๐Ÿš‰ + + + ๐ŸšŠ + + + ๐Ÿš‹ + + + ๐ŸšŒ + + + ๐Ÿš + + + ๐ŸšŽ + + + ๐Ÿš + + + ๐Ÿš + + + ๐Ÿš‘ + + + ๐Ÿš’ + + + ๐Ÿš“ + + + ๐Ÿš” + + + ๐Ÿš• + + + ๐Ÿš– + + + ๐Ÿš— + + + ๐Ÿš˜ + + + ๐Ÿš™ + + + ๐Ÿšš + + + ๐Ÿš› + + + ๐Ÿšœ + + + ๐Ÿš + + + ๐Ÿšž + + + ๐ŸšŸ + + + ๐Ÿš  + + + ๐Ÿšก + + + ๐Ÿšข + + + ๐Ÿšฃ + + + ๐Ÿšค + + + ๐Ÿšฅ + + + ๐Ÿšฆ + + + ๐Ÿšง + + + ๐Ÿšจ + + + ๐Ÿšฉ + + + ๐Ÿšช + + + ๐Ÿšซ + + + ๐Ÿšฌ + + + ๐Ÿšญ + + + ๐Ÿšฎ + + + ๐Ÿšฏ + + + ๐Ÿšฐ + + + ๐Ÿšฑ + + + ๐Ÿšฒ + + + ๐Ÿšณ + + + ๐Ÿšด + + + ๐Ÿšต + + + ๐Ÿšถ + + + ๐Ÿšท + + + ๐Ÿšธ + + + ๐Ÿšน + + + ๐Ÿšบ + + + ๐Ÿšป + + + ๐Ÿšผ + + + ๐Ÿšฝ + + + ๐Ÿšพ + + + ๐Ÿšฟ + + + ๐Ÿ›€ + + + ๐Ÿ› + + + ๐Ÿ›‚ + + + ๐Ÿ›ƒ + + + ๐Ÿ›„ + + + ๐Ÿ›… + + + โœ‚ + + + โœ… + + + โœˆ + + + โœ‰ + + + โœŠ + + + โœ‹ + + + โœŒ + + + โœ + + + โœ’ + + + โœ” + + + โœ– + + + โœจ + + + โœณ + + + โœด + + + โ„ + + + โ‡ + + + โŒ + + + โŽ + + + โ“ + + + โ” + + + โ• + + + โ— + + + โค + <3 + :heart: + :love: + + + โž• + + + โž– + + + โž— + + + โžก + + + โžฐ + + + โžฟ + + + โคด + + + โคต + + + ใ€ฐ + + + ็ฅ + + + ็ง˜ + + + ยฉ + + + ยฎ + + + ๐Ÿˆš + + + ๐Ÿˆฏ + + + ๐Ÿˆบ + + + ๐Ÿˆ + + + ๐Ÿˆ‚ + + + ๐Ÿˆฒ + + + ๐Ÿˆณ + + + ๐Ÿˆด + + + ๐Ÿˆต + + + ๐Ÿˆถ + + + ๐Ÿˆท + + + ๐Ÿˆธ + + + ๐Ÿˆน + + + ๐Ÿ‰ + + + ๐Ÿ‰‘ + + + ๐Ÿ…ฐ + + + ๐Ÿ…ฑ + + + ๐Ÿ…พ + + + ๐Ÿ…ฟ + + + ๐Ÿ†Ž + + + ๐Ÿ†‘ + + + ๐Ÿ†’ + + + ๐Ÿ†“ + + + ๐Ÿ†” + + + ๐Ÿ†• + + + ๐Ÿ†– + + + ๐Ÿ†— + + + ๐Ÿ†˜ + + + ๐Ÿ†™ + + + ๐Ÿ†š + + + ๐Ÿ‡ฆ + + + ๐Ÿ‡ง + + + ๐Ÿ‡จ + + + ๐Ÿ‡ฉ + + + ๐Ÿ‡ช + + + ๐Ÿ‡ซ + + + ๐Ÿ‡ฌ + + + ๐Ÿ‡ญ + + + ๐Ÿ‡ฎ + + + ๐Ÿ‡ฏ + + + ๐Ÿ‡ฐ + + + ๐Ÿ‡ฑ + + + ๐Ÿ‡ฒ + + + ๐Ÿ‡ณ + + + ๐Ÿ‡ด + + + ๐Ÿ‡ต + + + ๐Ÿ‡ถ + + + ๐Ÿ‡ท + + + ๐Ÿ‡ธ + + + ๐Ÿ‡น + + + ๐Ÿ‡บ + + + ๐Ÿ‡ป + + + ๐Ÿ‡ผ + + + ๐Ÿ‡ฝ + + + ๐Ÿ‡พ + + + ๐Ÿ‡ฟ + + + ๐Ÿ‡จ๐Ÿ‡ณ + + + ๐Ÿ‡ฉ๐Ÿ‡ช + + + ๐Ÿ‡ช๐Ÿ‡ธ + + + ๐Ÿ‡ซ๐Ÿ‡ท + + + ๐Ÿ‡ฌ๐Ÿ‡ง + + + ๐Ÿ‡ฎ๐Ÿ‡น + + + ๐Ÿ‡ฏ๐Ÿ‡ต + + + ๐Ÿ‡ฐ๐Ÿ‡ท + + + ๐Ÿ‡ท๐Ÿ‡บ + + + ๐Ÿ‡บ๐Ÿ‡ธ + + + \ No newline at end of file diff --git a/smileys/smileys.qrc b/smileys/smileys.qrc index cc3d5bce0..dece158e0 100644 --- a/smileys/smileys.qrc +++ b/smileys/smileys.qrc @@ -897,5 +897,6 @@ TwitterEmojiSVG/1f1f7-1f1fa.svg TwitterEmojiSVG/1f1fa-1f1f8.svg TwitterEmojiSVG/emoticons.xml + TwitterEmojiSimple/emoticons.xml diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp index 96c7e1a1a..3335a7a19 100644 --- a/src/chatlog/chatmessage.cpp +++ b/src/chatlog/chatmessage.cpp @@ -39,7 +39,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt { ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage); - QString text = toHtmlChars(rawMessage); + QString text = rawMessage.toHtmlEscaped(); QString senderText = sender; const QColor actionColor = QColor("#1818FF"); // has to match the color in innerStyle.css (div.action) @@ -79,7 +79,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt ChatMessage::Ptr ChatMessage::createChatInfoMessage(const QString &rawMessage, SystemMessageType type, const QDateTime &date) { ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage); - QString text = toHtmlChars(rawMessage); + QString text = rawMessage.toHtmlEscaped(); QString img; switch(type) @@ -217,17 +217,6 @@ QString ChatMessage::detectQuotes(const QString& str) return quotedText; } -QString ChatMessage::toHtmlChars(const QString &str) -{ - static QList> replaceList = {{"&","&"}, {">",">"}, {"<","<"}}; - QString res = str; - - for (auto &it : replaceList) - res = res.replace(it.first,it.second); - - return res; -} - QString ChatMessage::wrapDiv(const QString &str, const QString &div) { return QString("
%2
").arg(div, str); diff --git a/src/chatlog/chatmessage.h b/src/chatlog/chatmessage.h index c70cba82c..8f6b58a29 100644 --- a/src/chatlog/chatmessage.h +++ b/src/chatlog/chatmessage.h @@ -60,7 +60,6 @@ public: protected: static QString detectAnchors(const QString& str); static QString detectQuotes(const QString& str); - static QString toHtmlChars(const QString& str); static QString wrapDiv(const QString& str, const QString& div); private: diff --git a/src/chatlog/customtextdocument.cpp b/src/chatlog/customtextdocument.cpp index 35955a9ef..ce46dd667 100644 --- a/src/chatlog/customtextdocument.cpp +++ b/src/chatlog/customtextdocument.cpp @@ -38,7 +38,7 @@ QVariant CustomTextDocument::loadResource(int type, const QUrl &name) if (type == QTextDocument::ImageResource && name.scheme() == "key") { QSize size = QSize(Settings::getInstance().getEmojiFontPointSize(),Settings::getInstance().getEmojiFontPointSize()); - QString fileName = name.toString().mid(4); + QString fileName = QUrl::fromPercentEncoding(name.toEncoded()).mid(4).toHtmlEscaped(); return SmileyPack::getInstance().getAsIcon(fileName).pixmap(size); } diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index 98e2e5008..b7442b91c 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -753,7 +753,7 @@ void ChatForm::onAvatarRemoved(int FriendId) void ChatForm::loadHistory(QDateTime since, bool processUndelivered) { - QDateTime now = QDateTime::currentDateTime(); + QDateTime now = historyBaselineDate.addMSecs(-1); if (since > now) return; diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 39108d51d..d4174c68e 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -331,6 +331,7 @@ void GenericChatForm::clearChatArea(bool notinform) addSystemInfoMessage(tr("Cleared"), ChatMessage::INFO, QDateTime::currentDateTime()); earliestMessage = QDateTime(); //null + historyBaselineDate = QDateTime::currentDateTime(); emit chatAreaCleared(); } diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h index 73463af76..e32a34cd3 100644 --- a/src/widget/form/genericchatform.h +++ b/src/widget/form/genericchatform.h @@ -91,6 +91,7 @@ protected: QPushButton *sendButton; ChatLog *chatWidget; QDateTime earliestMessage; + QDateTime historyBaselineDate = QDateTime::currentDateTime(); // used by HistoryKeeper to load messages from t to historyBaselineDate (excluded) bool audioInputFlag; bool audioOutputFlag; }; diff --git a/src/widget/form/settings/generalsettings.ui b/src/widget/form/settings/generalsettings.ui index c2ca8068e..ad4dad396 100644 --- a/src/widget/form/settings/generalsettings.ui +++ b/src/widget/form/settings/generalsettings.ui @@ -374,8 +374,7 @@ will be sent to them when they will appear online to you. - Your contact list will be shown in compact mode. -qTox's restart needed. + Your contact list will be shown in compact mode. Compact contact list diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 5aaa66a9a..76615b990 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -864,7 +864,7 @@ void Widget::onGroupInviteReceived(int32_t friendId, uint8_t type, QByteArray in { if (type == TOX_GROUPCHAT_TYPE_TEXT || type == TOX_GROUPCHAT_TYPE_AV) { - if (GUI::askQuestion(tr("Group invite", "popup title"), tr("%1 has invited you to a groupchat. Would you like to join?", "popup text").arg(Nexus::getCore()->getFriendUsername(friendId)))) + if (GUI::askQuestion(tr("Group invite", "popup title"), tr("%1 has invited you to a groupchat. Would you like to join?", "popup text").arg(Nexus::getCore()->getFriendUsername(friendId)), true, false)) { int groupId = Nexus::getCore()->joinGroupchat(friendId, type, (uint8_t*)invite.data(), invite.length()); if (groupId < 0) diff --git a/translations/it.ts b/translations/it.ts index 41a18b2ca..5ae179251 100644 --- a/translations/it.ts +++ b/translations/it.ts @@ -293,80 +293,93 @@ Ignorare le impostazioni del proxy e connettersi direttamente alla rete Tox? ChatForm - + Load chat history... Carica cronologia chat... - + Send a file Invia un file - - + + File not read Impossibile leggere il file - - + + qTox wasn't able to open %1 qTox non รจ riuscito ad aprire %1 - - + + Bad Idea Pessima idea - - + + You're trying to send a special (sequential) file, that's not going to work! Stai cercando di inviare un file speciale (sequenziale), questo non funzionerร ! - - %1 is calling + + %1 calling %1 ti sta chiamando - + %1 stopped calling %1 ha fermato la chiamata - + Calling to %1 Stai chiamando %1 - + Failed to send file "%1" Invio del file "%1" fallito - + Call with %1 ended. %2 Chiamata con %1 terminata. %2 - + Call duration: Durata chiamata: - - is typing... - sta scrivendo... - - - + Call rejected Chiamata rifiutata + + ChatLog + + + Copy + Copia + + + + Select all + Seleziona tutto + + + + pending + in attesa + + ChatTextEdit @@ -388,17 +401,17 @@ Ignorare le impostazioni del proxy e connettersi direttamente alla rete Tox?qTox User - + Friend is already added Questo contatto รจ giร  presente nella tua lista - + /me offers friendship. /me ti ha aggiunto come contatto. - + /me offers friendship, "%1" /me ti ha aggiunto come contatto, "%1" @@ -486,29 +499,72 @@ Disabilitando la cronologia delle chat lascerร  la cronologia criptata intatta ( - FileTransferInstance + FileTransferWidget - - Save a file - Title of the file saving dialog - Salva file + + Form + Form - + + 10Mb + 10Mb + + + + 0kb/s + 0kb/s + + + + ETA:10:10 + ETA:10:10 + + + + Filename + Nome file + + + + [preview] + [anteprima] + + + + Waiting to send... + file transfer widget + In attesa di inviare... + + + + Accept to receive this file + file transfer widget + Accetta la ricezione di questo file + + + Location not writable Title of permissions popup Errore - + You do not have permission to write that location. Choose another, or cancel the save dialog. text of permissions popup Non hai sufficienti permessi per scrivere in questa locazione. Scegli un'altra posizione, o annulla il salvataggio. - - ETA - Tempo rimanente + + paused + file transfer widget + in pausa + + + + Save a file + Title of the file saving dialog + Salva file @@ -569,47 +625,47 @@ Disabilitando la cronologia delle chat lascerร  la cronologia criptata intatta ( FriendWidget - + Copy friend ID Menu to copy the Tox ID of that friend Copia Tox ID del contatto - + Auto accept files from this friend context menu entry Accetta automaticamente i files inviati da questo contatto - + Invite to group Menu to invite a friend to a groupchat Invita nel gruppo - + Set alias... Imposta soprannome... - + Remove friend Menu to remove the friend from our friendlist Rimuovi contatto - + Choose an auto accept directory popup title Scegli dove salvare i files accettati automaticamente - + User alias Rinomina contatto - + You can also set this by clicking the chat form name. Alias: Per impostare un soprannome puoi anche cliccare sul nome direttamente dalla chat. @@ -748,11 +804,6 @@ nella traybar invece che nella taskbar. <html><head/><body><p>Start qTox on operating system startup (current profile).</p></body></html> <html><head/><body><p>Avvia automaticamente all'avvio del sistema.</p></body></html> - - - Start automatically - Avvia automaticamente - Set to 0 to disable @@ -898,6 +949,11 @@ Richiede riavvio. minutes minuti + + + Autostart + Avvia automaticamente + You can set this on a per-friend basis by right clicking them. @@ -978,53 +1034,58 @@ Richiede riavvio. GenericChatForm - + Send message Invia messaggio - + Smileys Emoticons - + Send file(s) Invia file(s) - + Audio call: RED means you're on a call Chiamata audio: ROSSO significa che la chiamata รจ in corso - + Video call: RED means you're on a call Videochiamata: ROSSO significa che la chiamata รจ in corso - + Toggle speakers volume: RED is OFF Imposta volume altoparlanti: ROSSO รจ SPENTO - + Toggle microphone: RED is OFF Imposta microfono: ROSSO รจ SPENTO - - + + Save chat log Salva il log della chat - + Clear displayed messages Rimuovi messaggi visualizzati - + + Not sent + Non inviato + + + Cleared Pulito @@ -1396,6 +1457,15 @@ I profili non contengono la cronologia messaggi. qTox Video + + Nexus + + + Images (%1) + filetype filter + Immagini (%1) + + PrivacyForm @@ -1673,6 +1743,11 @@ Verrร  installata al riavvio del programma. Incoming call... Chiamata in arrivo... + + + Busy... + Occupato... + SetPasswordDialog @@ -1819,129 +1894,141 @@ Se non sei sicuro, scegli "No", cosรฌ le informazioni inviate al serve Widget - + &Quit &Esci - + Online Button to set your status to 'Online' Online - + Away Button to set your status to 'Away' Assente - + Busy Button to set your status to 'Busy' Occupato - + Choose a profile picture Scegli un'immagine per il profilo - - - + + + Error Errore - + Unable to open this file Impossibile aprire il file - + Unable to read this image Impossibile leggere l'immagine - + This image is too big L'immagine รจ troppo grande - + Toxcore failed to start, the application will terminate after you close this message. Impossibile avviare Toxcore.\nqTox terminerร  dopo che avrai chiuso questo messaggio. - + toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart. popup text Impossibile avviare Toxcore con le tue impostazione proxy.\nqTox non puรฒ funzionare correttamente, per favore modifica le impostazioni e riavvia il programma. - + Add friend Aggiungi contatto - + File transfers Files trasferiti - + Settings Impostazioni - + Couldn't request friendship Impossibile inviare la richiesta d'amicizia - + away contact status assente - + busy contact status occupato - + offline contact status offline - + online contact status online - + %1 is now %2 e.g. "Dubslow is now online" %1 รจ ora %2 - + + Group invite + popup title + Invito chat di gruppo + + + + %1 has invited you to a groupchat. Would you like to join? + popup text + %1 ti ha invitato in una chat di gruppo. Vuoi partecipare? + + + <Unknown> Placeholder when we don't know someone's name in a group chat <Sconosciuto> - + %1 has set the title to %2 %1 ha impostato il titolo in %2 - + Message failed to send Impossibile inviare il messaggio