[evolution/wip/webkit2] Bug 761497 - Replace 'smileys' with 'emoticons' in the strings

[Milan Crha <mcrha src gnome org>]

commit 2d8afb46a122c053dc525397349e32bd1d990b01
Author: Milan Crha <mcrha redhat com>
Date:   Thu Feb 18 13:51:27 2016 +0100

    Bug 761497 - Replace 'smileys' with 'emoticons' in the strings

 composer/e-composer-actions.c                |    4 ++--
 data/org.gnome.evolution.mail.gschema.xml.in |    4 ++--
 mail/mail-config.ui                          |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index e7c5524..5995ef0 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -520,9 +520,9 @@ static GtkToggleActionEntry toggle_entries[] = {
 
        { "unicode-smileys",
          NULL,
-         N_("Unicode smileys"),
+         N_("Unicode emoticons"),
          NULL,
-         N_("Use Unicode characters for smileys."),
+         N_("Use Unicode characters for emoticons."),
          G_CALLBACK (action_unicode_smileys_cb),
          FALSE },
 
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 50b44d2..24d18e0 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -62,8 +62,8 @@
     </key>
     <key name="composer-unicode-smileys" type="b">
       <default>false</default>
-      <_summary>Unicode smileys</_summary>
-      <_description>Use Unicode characters for smileys.</_description>
+      <_summary>Unicode emoticons</_summary>
+      <_description>Use Unicode characters for emoticons.</_description>
     </key>
     <key name="composer-message-attribution" type="s">
       <default>''</default>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 733f5e7..56f108d 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -283,7 +283,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="chkUnicodeSmileys">
-                        <property name="label" translatable="yes">Use Unicode characters for 
smile_ys</property>
+                        <property name="label" translatable="yes">Use Un_icode characters for 
emoticons</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>