aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-29 21:50:33 +0100
committerChristian Schneppe <christian@pix-art.de>2017-11-29 21:50:33 +0100
commitb6052c82cb8463ee465226949953a7187f4096e4 (patch)
tree6347fb72ddb1928bfcaafbe914b9de795b76d633 /src/main/res/values/strings.xml
parentd03129f1301942ddc9808229c158b92f492e79f1 (diff)
add ability to use system emojis instead of integrated ones via expert settings
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e8f72f3ca..6b3f41556 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -744,4 +744,6 @@
<string name="conversation_unencrypted_hint">This chat is unencrypted, for security reasons you should activate message encryption by using the lock icon. The preferable encryption is OMEMO.</string>
<string name="pref_warn_unencrypted_chat">Warn if chat is unencrypted</string>
<string name="pref_warn_unencrypted_chat_summary">If message encryption is available, you should use it. If you don\'t use message encryption, show a warning message inside the chat.</string>
+ <string name="pref_use_bundled_emoji">Use integrated emojis</string>
+ <string name="pref_use_bundled_emoji_summary">Use the integrated emoji library instead of using your devices ones. Changes will be available after reopening the app.</string>
</resources>