mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge branch 'pr654'
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA
commit
3ad18b940f
|
|
@ -8,96 +8,96 @@
|
|||
<string>0:)</string>
|
||||
<string>O:)</string>
|
||||
<string>0:-)</string>
|
||||
<string>O:-)</string>
|
||||
<string>O:-)</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="beer.png">
|
||||
<string>🍺</string>
|
||||
<string>:beer:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="bored.png">
|
||||
<string>|-o</string>
|
||||
<string>\-o</string>
|
||||
<string>/-o</string>
|
||||
<string>:bored:</string>
|
||||
<string>|-o</string>
|
||||
<string>\-o</string>
|
||||
<string>/-o</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="crossing.png">
|
||||
<string>:yn:</string>
|
||||
<string>:crossing:</string>
|
||||
<string>:crossing:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="crying.png">
|
||||
<string>😢</string>
|
||||
<string>:cry:</string>
|
||||
<string>:'(</string>
|
||||
<string>:,(</string>
|
||||
<string>:,(</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="devil.png">
|
||||
<string>😈</string>
|
||||
<string>:devil:</string>
|
||||
<string>:666:</string>
|
||||
<string>:666:</string>
|
||||
<string>}:-)</string>
|
||||
<string>}:-></string>
|
||||
<string>]:-)</string>
|
||||
<string>]:-></string>
|
||||
<string>>:-></string>
|
||||
<string>}:-></string>
|
||||
<string>]:-)</string>
|
||||
<string>]:-></string>
|
||||
<string>>:-></string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="dho.png">
|
||||
<string>:dho:</string>
|
||||
<string>:d'ho:</string>
|
||||
<string>X.</string>
|
||||
<string>X°</string>
|
||||
<string>Xo</string>
|
||||
<string>>:.</string>
|
||||
<string>>:°</string>
|
||||
<string>>:o</string>
|
||||
<string>X°</string>
|
||||
<string>Xo</string>
|
||||
<string>>:.</string>
|
||||
<string>>:°</string>
|
||||
<string>>:o</string>
|
||||
<string>:dho:</string>
|
||||
<string>:d'ho:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="evil.png">
|
||||
<string>:evil:</string>
|
||||
<string>>:)</string>
|
||||
<string>>:-)</string>
|
||||
<string>>:D</string>
|
||||
<string>>:-D</string>
|
||||
<string>>:-)</string>
|
||||
<string>>:D</string>
|
||||
<string>>:-D</string>
|
||||
<string>:evil:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="facepalm.png">
|
||||
<string>:facepalm:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="finger.png">
|
||||
<string>:finger:</string>
|
||||
<string>:fuck:</string>
|
||||
<string>:fuck:</string>
|
||||
</emoticon>
|
||||
|
||||
<emoticon file="heart.png">
|
||||
<string>❤</string>
|
||||
<string><3</string>
|
||||
<string>:heart:</string>
|
||||
<string>:love:</string>
|
||||
<string><3</string>
|
||||
<string>:love:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="hi.png">
|
||||
<string>🙋</string>
|
||||
<string>:hi:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="highfive.png">
|
||||
<string>:highfive:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="hot.png">
|
||||
<string>(:|</string>
|
||||
<string>':|</string>
|
||||
<string>':(</string>
|
||||
<string>':)</string>
|
||||
<string>:sweating:</string>
|
||||
<string>(:|</string>
|
||||
<string>':|</string>
|
||||
<string>':(</string>
|
||||
<string>':)</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="tongue.png">
|
||||
<string>😛</string>
|
||||
<string>:impertinent:</string>
|
||||
|
|
@ -106,127 +106,127 @@
|
|||
<string>:P</string>
|
||||
<string>:p</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="inlove.png">
|
||||
<string>😍</string>
|
||||
<string>:inlove:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="kiss.png">
|
||||
<string>😙</string>
|
||||
<string>:kiss:</string>
|
||||
<string>:*</string>
|
||||
<string>:-*</string>
|
||||
<string>:*</string>
|
||||
<string>:-*</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="lol.png">
|
||||
<string>😄</string>
|
||||
<string>:lol:</string>
|
||||
<string>:D</string>
|
||||
<string>:-D</string>
|
||||
<string>:D</string>
|
||||
<string>:-D</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="moustache.png">
|
||||
<string>:-{)</string>
|
||||
<string>:-{</string>
|
||||
<string>:{)</string>
|
||||
<string>:{</string>
|
||||
<string>:moustache:</string>
|
||||
<string>:-{)</string>
|
||||
<string>:-{</string>
|
||||
<string>:{)</string>
|
||||
<string>:{</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="MrSmith.png">
|
||||
<string>:|</string>
|
||||
<string>:-|</string>
|
||||
<string>:disappointed:</string>
|
||||
<string>:|</string>
|
||||
<string>:-|</string>
|
||||
</emoticon>
|
||||
|
||||
<emoticon file="nerd.png">
|
||||
<string>8-|</string>
|
||||
<string>*8-|</string>
|
||||
<string>:-B</string>
|
||||
<string>8|</string>
|
||||
<string>*8|</string>
|
||||
<string>:B</string>
|
||||
<string>:nerd:</string>
|
||||
<string>8-|</string>
|
||||
<string>*8-|</string>
|
||||
<string>:-B</string>
|
||||
<string>8|</string>
|
||||
<string>*8|</string>
|
||||
<string>:B</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="nospeak.png">
|
||||
<string>🙊</string>
|
||||
<string>:silence:</string>
|
||||
<string>:-x</string>
|
||||
<string>:-X</string>
|
||||
<string>:x</string>
|
||||
<string>:X</string>
|
||||
<string>:-x</string>
|
||||
<string>:-X</string>
|
||||
<string>:x</string>
|
||||
<string>:X</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="oops.png">
|
||||
<string>:-s</string>
|
||||
<string>:s</string>
|
||||
<string>:oops:</string>
|
||||
<string>:-s</string>
|
||||
<string>:s</string>
|
||||
</emoticon>
|
||||
|
||||
<emoticon file="party.png">
|
||||
<string><:o)</string>
|
||||
<string><:-P</string>
|
||||
<string><:P</string>
|
||||
<string>*<:o)</string>
|
||||
<string>*<:-P</string>
|
||||
<string>*<:P</string>
|
||||
<string>:party:</string>
|
||||
<string><:o)</string>
|
||||
<string><:-P</string>
|
||||
<string><:P</string>
|
||||
<string>*<:o)</string>
|
||||
<string>*<:-P</string>
|
||||
<string>*<:P</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="pressed.png">
|
||||
<string>:waiting:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="rain.png">
|
||||
<string>🌧</string>
|
||||
<string>:rain:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="rocknroll.png">
|
||||
<string>\m/</string>
|
||||
<string>:rocknroll:</string>
|
||||
<string>:rock:</string>
|
||||
<string>:hellyeah:</string>
|
||||
<string>\m/</string>
|
||||
<string>:rock:</string>
|
||||
<string>:hellyeah:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="sad.png">
|
||||
<string>😞</string>
|
||||
<string>:sad:</string>
|
||||
<string>:(</string>
|
||||
<string>:-(</string>
|
||||
<string>:(</string>
|
||||
<string>:-(</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="shy.png">
|
||||
<string>:-$</string>
|
||||
<string>:$</string>
|
||||
<string>:shy:</string>
|
||||
<string>:-$</string>
|
||||
<string>:$</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="sleeping.png">
|
||||
<string>😴</string>
|
||||
<string>:sleeping:</string>
|
||||
<string>|-)</string>
|
||||
<string>#)</string>
|
||||
<string>|-)</string>
|
||||
<string>#)</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="smile.png">
|
||||
<string>☺</string>
|
||||
<string>:smile:</string>
|
||||
<string>:-)</string>
|
||||
<string>:)</string>
|
||||
<string>:-)</string>
|
||||
<string>:)</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="sniggering.png">
|
||||
<string>:snigger:</string>
|
||||
<string>:chuckle:</string>
|
||||
<string>:chuckle:</string>
|
||||
</emoticon>
|
||||
|
||||
<emoticon file="suspicious.png">
|
||||
<string>:smirk:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="vomit.png">
|
||||
<string>:puke:</string>
|
||||
</emoticon>
|
||||
|
|
@ -234,110 +234,111 @@
|
|||
<emoticon file="wasntme.png">
|
||||
<string>:wasntme:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="whew.png">
|
||||
<string>:whew:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="wink.png">
|
||||
<string>😉</string>
|
||||
<string>:wink:</string>
|
||||
<string>;-)</string>
|
||||
<string>;)</string>
|
||||
<string>;-)</string>
|
||||
<string>;)</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="wondering.png">
|
||||
<string>:^)</string>
|
||||
<string>:wondering:</string>
|
||||
<string>:^)</string>
|
||||
</emoticon>
|
||||
|
||||
<emoticon file="X(.png">
|
||||
<string>X(</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="XD.png">
|
||||
<string>😆</string>
|
||||
<string>XD</string>
|
||||
<string>xD</string>
|
||||
<string>XD</string>
|
||||
<string>xD</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="XP.png">
|
||||
<string>😝</string>
|
||||
<string>:emoticonmashup:</string>
|
||||
<string>XP</string>
|
||||
<string>xP</string>
|
||||
<string>XP</string>
|
||||
<string>xP</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="yawn.png">
|
||||
<string>:yawn:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<!-- new emoticons (10/26/14) -->
|
||||
<emoticon file="bomb.png">
|
||||
<string>💣</string>
|
||||
<string>:bomb:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="cookie.png">
|
||||
<string>🍪</string>
|
||||
<string>:cookie:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="diamond.png">
|
||||
<string>🔷</string>
|
||||
<string>:diamond:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="eye.png">
|
||||
<string>👁</string>
|
||||
<string>:eye:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="hacker_terminal.png">
|
||||
<string>:terminal:</string>
|
||||
<string>:hack:</string>
|
||||
<string>:hack:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="syringe.png">
|
||||
<string>💉</string>
|
||||
<string>:syringe:</string>
|
||||
<string>:injection:</string>
|
||||
<string>:injection:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="toxlocker.png">
|
||||
<string>:tox:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<!-- Preview emoticons -->
|
||||
<emoticon file="happysmile.png">
|
||||
<string>:happy:</string>
|
||||
<string>^^</string>
|
||||
<string>^_^</string>
|
||||
<string>:happy:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="impressed.png">
|
||||
<string>:wow:</string>
|
||||
<string>:O</string>
|
||||
<string>:o</string>
|
||||
<string>:0</string>
|
||||
<string>:wow:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="jealous.png">
|
||||
<string>:jealous:</string>
|
||||
<string>:envy:</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="cool.png">
|
||||
<string>😎</string>
|
||||
<string>:cool:</string>
|
||||
<string>8)</string>
|
||||
<string>8-)</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
<emoticon file="angry.png">
|
||||
<string>😠</string>
|
||||
<string>:angry:</string>
|
||||
<string>>:-(</string>
|
||||
<string>>:(</string>
|
||||
</emoticon>
|
||||
|
||||
|
||||
</messaging-emoticon-map>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user