From 0af65954befed922cb08a1529aa3e947257db5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Br=C3=B6tzmann?= <mailtrash@posteo.de>
Date: Fri, 28 Sep 2018 14:56:17 +0200
Subject: [PATCH] Unify Emoticon and Emoji strings
---
data/org.gajim.Gajim.appdata.xml.in | 2 +-
gajim/common/config.py | 2 +-
gajim/data/gui/chat_control.ui | 2 +-
gajim/data/gui/groupchat_control.ui | 2 +-
gajim/data/gui/shortcuts_window.ui | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/org.gajim.Gajim.appdata.xml.in b/data/org.gajim.Gajim.appdata.xml.in
index 46f14e2618..9a574d5934 100644
--- a/data/org.gajim.Gajim.appdata.xml.in
+++ b/data/org.gajim.Gajim.appdata.xml.in
@@ -20,7 +20,7 @@
<ul>
<li>Tabbed chat window and single window modes</li>
<li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation</li>
- <li>Emoticons, avatars, PEP (user activity, mood and tune)</li>
+ <li>Emojis, avatars, PEP (user activity, mood and tune)</li>
<li>Audio / video conferences</li>
<li>File transfer, room bookmarks</li>
<li>Metacontacts support</li>
diff --git a/gajim/common/config.py b/gajim/common/config.py
index 263220d95b..e172618d81 100644
--- a/gajim/common/config.py
+++ b/gajim/common/config.py
@@ -116,7 +116,7 @@ class Config:
'print_time': [opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')],
'print_time_fuzzy': [opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is \'sometimes\'.')],
'emoticons_theme': [opt_str, 'noto-emoticons', '', True],
- 'ascii_emoticons': [opt_bool, True, _('When enabled, ASCII emoticons will be converted to graphical emojis.'), True],
+ 'ascii_emoticons': [opt_bool, True, _('When enabled, ASCII emojis will be converted to graphical emojis.'), True],
'ascii_formatting': [opt_bool, True,
_('Treat * / _ pairs as possible formatting characters.'), True],
'show_ascii_formatting_chars': [opt_bool, True, _('If true, do not '
diff --git a/gajim/data/gui/chat_control.ui b/gajim/data/gui/chat_control.ui
index 1f95f50d94..65bedc2cdd 100644
--- a/gajim/data/gui/chat_control.ui
+++ b/gajim/data/gui/chat_control.ui
@@ -638,7 +638,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property>
+ <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
diff --git a/gajim/data/gui/groupchat_control.ui b/gajim/data/gui/groupchat_control.ui
index 03c4118a2f..9123c06f01 100644
--- a/gajim/data/gui/groupchat_control.ui
+++ b/gajim/data/gui/groupchat_control.ui
@@ -329,7 +329,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property>
+ <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
diff --git a/gajim/data/gui/shortcuts_window.ui b/gajim/data/gui/shortcuts_window.ui
index a50fea0e24..994450a54b 100644
--- a/gajim/data/gui/shortcuts_window.ui
+++ b/gajim/data/gui/shortcuts_window.ui
@@ -28,7 +28,7 @@
<object class="GtkShortcutsShortcut">
<property name="visible">1</property>
<property name="accelerator"><alt>m</property>
- <property name="title" translatable="yes">Select an emoticon</property>
+ <property name="title" translatable="yes">Select an emoji</property>
</object>
</child>
<child>
--
GitLab