Commit 6975ffdf authored by Daniel Brötzmann's avatar Daniel Brötzmann

Unify Emoticon and Emoji strings

parent acf79ffe
......@@ -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>
......
......@@ -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 '
......
......@@ -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">
......
......@@ -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">
......
......@@ -28,7 +28,7 @@
<object class="GtkShortcutsShortcut">
<property name="visible">1</property>
<property name="accelerator">&lt;alt&gt;m</property>
<property name="title" translatable="yes">Select an emoticon</property>
<property name="title" translatable="yes">Select an emoji</property>
</object>
</child>
<child>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment