Merge branch 'pr582'

smileys/cylgom/emoticons.xml

@@ -3,6 +3,7 @@
 
   <!-- first emoticons (9/13/14) -->
   <emoticon file="angel.png">
+    <string>😇</string>
     <string>:angel:</string>
     <string>0:)</string>
     <string>O:)</string>
@@ -11,6 +12,7 @@
   </emoticon>
   
   <emoticon file="beer.png">
+    <string>🍺</string>
     <string>:beer:</string>
   </emoticon>
   
@@ -27,12 +29,14 @@
   </emoticon>
   
   <emoticon file="crying.png">
+    <string>😢</string>
     <string>:cry:</string>
     <string>:'(</string>
 	<string>:,(</string>
   </emoticon>
   
   <emoticon file="devil.png">
+    <string>😈</string>
     <string>:devil:</string>
 	<string>:666:</string>
     <string>}:-)</string>
@@ -71,12 +75,14 @@
   </emoticon>
 
   <emoticon file="heart.png">
+    <string>❤</string>
     <string>:heart:</string>
 	<string>:love:</string>
 	<string>&lt;3</string>
   </emoticon>
   
   <emoticon file="hi.png">
+    <string>🙋</string>
     <string>:hi:</string>
   </emoticon>
   
@@ -93,6 +99,7 @@
   </emoticon>
   
   <emoticon file="tongue.png">
+    <string>😛</string>
     <string>:impertinent:</string>
     <string>:-P</string>
     <string>:-p</string>
@@ -101,16 +108,19 @@
   </emoticon>
   
   <emoticon file="inlove.png">
+    <string>😍</string>
     <string>:inlove:</string>
   </emoticon>
   
   <emoticon file="kiss.png">
+    <string>😙</string>
     <string>:kiss:</string>
 	<string>:*</string>
 	<string>:-*</string>
   </emoticon>
   
   <emoticon file="lol.png">
+    <string>😄</string>
     <string>:lol:</string>
 	<string>:D</string>
 	<string>:-D</string>
@@ -141,6 +151,7 @@
   </emoticon>
   
   <emoticon file="nospeak.png">
+    <string>🙊</string>
     <string>:silence:</string>
 	<string>:-x</string>
 	<string>:-X</string>
@@ -169,6 +180,7 @@
   </emoticon>
   
   <emoticon file="rain.png">
+    <string>🌧</string>
     <string>:rain:</string>
   </emoticon>
   
@@ -180,6 +192,7 @@
   </emoticon>
   
   <emoticon file="sad.png">
+    <string>😞</string>
     <string>:sad:</string>
 	<string>:(</string>
 	<string>:-(</string>
@@ -192,12 +205,14 @@
   </emoticon>
   
   <emoticon file="sleeping.png">
+    <string>😴</string>
     <string>:sleeping:</string>
 	<string>|-)</string>
 	<string>#)</string>
   </emoticon>
   
   <emoticon file="smile.png">
+    <string>☺</string>
     <string>:smile:</string>
 	<string>:-)</string>
 	<string>:)</string>
@@ -225,6 +240,7 @@
   </emoticon>
   
   <emoticon file="wink.png">
+    <string>😉</string>
     <string>:wink:</string>
 	<string>;-)</string>
 	<string>;)</string>
@@ -240,11 +256,13 @@
   </emoticon>
   
   <emoticon file="XD.png">
+    <string>😆</string>
 	<string>XD</string>
 	<string>xD</string>
   </emoticon>
   
   <emoticon file="XP.png">
+    <string>😝</string>
     <string>:emoticonmashup:</string>
 	<string>XP</string>
 	<string>xP</string>
@@ -256,18 +274,22 @@
   
   <!-- 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>
   
@@ -277,6 +299,7 @@
   </emoticon>
   
   <emoticon file="syringe.png">
+    <string>💉</string>
     <string>:syringe:</string>
 	<string>:injection:</string>
   </emoticon>
@@ -304,12 +327,14 @@
   </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>