Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2008-03-17 13:17:45 +0300
committerYann Leboulanger <asterix@lagaule.org>2008-03-17 13:17:45 +0300
commitcc6eb92337f0da0ab44784e7a4a28d9d34795877 (patch)
treecc7218a026e1c2f39dc7c1b16544f301f34ba9ad /data/emoticons
parent0d427eff3bf673d7653d602007815a8db03dbfe1 (diff)
additional mappings for existing emoticons. fixes #3762
Diffstat (limited to 'data/emoticons')
-rw-r--r--data/emoticons/animated/emoticons.py10
-rw-r--r--data/emoticons/static-big/emoticons.py12
-rw-r--r--data/emoticons/static/emoticons.py12
3 files changed, 17 insertions, 17 deletions
diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
index 4f07120d7..4436b86ed 100644
--- a/data/emoticons/animated/emoticons.py
+++ b/data/emoticons/animated/emoticons.py
@@ -1,11 +1,11 @@
# coding=utf-8
emoticons = {
- 'smile.png': [':)', ':-)'],
+ 'smile.png': [':)', ':-)', '^_^', '^^'],
'coolglasses.png': ['B-)', '(H)'],
'wink.gif': [';)', ';-)'],
'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
'unhappy.png': [':(', ':-('],
- 'cry.gif': [":'(", ';-(', ';(', ";'-("],
+ 'cry.gif': [":'(", ';-(', ';(', ";'-(", ';_;'],
'frowning.png': [':/', ':-/', ':S', ':-S'],
'blush.png': [':$', ':-$'],
'angry.png': [':@', ':-@'],
@@ -13,8 +13,8 @@ emoticons = {
'kiss.png': [':*', ':-*', '(K)'],
'stare.png': [':|', ':-|'],
'devil.png': ['>:)', '>:-)', '(6)'],
- 'tongue.png': [':P', ':-P'],
- 'oh.png': [':O', ':-O'],
+ 'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+ 'oh.png': [':O', ':-O', 'O.O', 'O_O'],
'heart.png': ['<3', '(L)'],
'pussy.png': ['(@)'],
'cuffs.png': ['(%)'],
@@ -30,7 +30,7 @@ emoticons = {
'photo.png': ['(P)'],
'thumbup.png': ['(Y)'],
'hugleft.png': ['(})'],
- 'brheart.png': ['(U)'],
+ 'brheart.png': ['(U)', '</3'],
'flower.png': ['(F)'],
'drink.png': ['(D)'],
'phone.png': ['(T)'],
diff --git a/data/emoticons/static-big/emoticons.py b/data/emoticons/static-big/emoticons.py
index 63cc117db..1507635c4 100644
--- a/data/emoticons/static-big/emoticons.py
+++ b/data/emoticons/static-big/emoticons.py
@@ -1,11 +1,11 @@
# coding=utf-8
emoticons = {
- 'smile.png': [':)', ':-)'],
+ 'smile.png': [':)', ':-)', '^_^', '^^'],
'coolglasses.png': ['8-)', 'B-)', '(H)'],
'wink.png': [';)', ';-)'],
'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
'unhappy.png': [':(', ':-('],
- 'cry.png': [":'(", ';-(', ';(', ";'-("],
+ 'cry.png': [":'(", ';-(', ';(', ";'-(", ';_;'],
'frowning.png': [':/', ':-/', ':S', ':-S'],
'blush.png': [':$', ':-$'],
'angry.png': [':@', ':-@'],
@@ -13,11 +13,11 @@ emoticons = {
'kiss.png': [':*', ':-*', '(K)'],
'stare.png': [':|', ':-|'],
'devil.png': ['>:)', '>:-)', '(6)'],
- 'tongue.png': [':P', ':-P'],
- 'oh.png': [':O', ':-O'],
+ 'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+ 'oh.png': [':O', ':-O', 'O.O', 'O_O'],
'heart.png': ['<3', '(L)'],
'lion.png': [':3', '>:3'],
- 'pussy.png': ['(@)'],
+ 'pussy.png': ['(@)', '=^.^='],
'cuffs.png': ['(%)'],
'moon.png': ['(S)'],
'lamp.png': ['(I)'],
@@ -31,7 +31,7 @@ emoticons = {
'photo.png': ['(P)'],
'thumbup.png': ['(Y)'],
'hugleft.png': ['(})'],
- 'brheart.png': ['(U)'],
+ 'brheart.png': ['(U)', '</3'],
'flower.png': ['(F)'],
'drink.png': ['(D)'],
'phone.png': ['(T)'],
diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
index 63cc117db..1507635c4 100644
--- a/data/emoticons/static/emoticons.py
+++ b/data/emoticons/static/emoticons.py
@@ -1,11 +1,11 @@
# coding=utf-8
emoticons = {
- 'smile.png': [':)', ':-)'],
+ 'smile.png': [':)', ':-)', '^_^', '^^'],
'coolglasses.png': ['8-)', 'B-)', '(H)'],
'wink.png': [';)', ';-)'],
'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
'unhappy.png': [':(', ':-('],
- 'cry.png': [":'(", ';-(', ';(', ";'-("],
+ 'cry.png': [":'(", ';-(', ';(', ";'-(", ';_;'],
'frowning.png': [':/', ':-/', ':S', ':-S'],
'blush.png': [':$', ':-$'],
'angry.png': [':@', ':-@'],
@@ -13,11 +13,11 @@ emoticons = {
'kiss.png': [':*', ':-*', '(K)'],
'stare.png': [':|', ':-|'],
'devil.png': ['>:)', '>:-)', '(6)'],
- 'tongue.png': [':P', ':-P'],
- 'oh.png': [':O', ':-O'],
+ 'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+ 'oh.png': [':O', ':-O', 'O.O', 'O_O'],
'heart.png': ['<3', '(L)'],
'lion.png': [':3', '>:3'],
- 'pussy.png': ['(@)'],
+ 'pussy.png': ['(@)', '=^.^='],
'cuffs.png': ['(%)'],
'moon.png': ['(S)'],
'lamp.png': ['(I)'],
@@ -31,7 +31,7 @@ emoticons = {
'photo.png': ['(P)'],
'thumbup.png': ['(Y)'],
'hugleft.png': ['(})'],
- 'brheart.png': ['(U)'],
+ 'brheart.png': ['(U)', '</3'],
'flower.png': ['(F)'],
'drink.png': ['(D)'],
'phone.png': ['(T)'],