diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 82f59343bb..e0b158e1eb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -107,6 +107,7 @@
   <string name="ConversationActivity_unblock_question">إلغاء الحظر؟</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">تأكيد إلغاء حظر جهة الاتصال؟</string>
   <string name="ConversationActivity_unblock">إلغاء الحظر</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">حجم المرفق تجاوز الحد المسموح بهذا النوع من الرسائل.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>
   <string name="ConversationFragment_transport_s_sent_received_s">نقل: %1$s\nSent/Received: %2$s</string>
@@ -311,6 +312,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">تسجيل تيكست سيكيور تم بنجاح.</string>
   <string name="RegistrationService_registration_error">خطأ في التسجيل</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">تسجيل تيكست سيكيور واجه مشكلة.</string>
+  <!--Slide-->
+  <string name="Slide_image">صورة</string>
+  <string name="Slide_audio">صوت</string>
+  <string name="Slide_video">فيديو</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">تم استلام رسالة تبادل مفاتيح تالفة.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -423,8 +428,8 @@
   <string name="conversation_activity__remove">إزالة</string>
   <string name="conversation_activity__window_description">محادثة مع %1$s</string>
   <string name="conversation_activity__compose_description">تكوين الرسالة</string>
-  <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح إيموجي</string>
-  <string name="conversation_activity__attachment_thumbnail"> المرفق</string>
+  <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح الرموز التعبيرية</string>
+  <string name="conversation_activity__attachment_thumbnail">المصغّرة للمرفق</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">جارٍ تنزيل رسالة الوسائط</string>
   <string name="conversation_item__mms_image_description">رسالة وسائط متعددة</string>
@@ -448,7 +453,7 @@
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة مقترنة...</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
+  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط السجلات من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
   <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
   <string name="log_submit_activity__submitting">إرسال</string>
   <string name="log_submit_activity__posting_logs">جاري نشر السجلات إلى Gist...</string>
@@ -483,8 +488,8 @@
   <string name="MmsPreferencesFragment__enabled">مفعل</string>
   <string name="MmsPreferencesFragment__disabled">معطل</string>
   <string name="MmsPreferencesFragment__not_set">لم يتم التعيين</string>
-  <string name="MmsPreferencesFragment__invalid_uri">النص  ليس معرّف موارد صحيح</string>
-  <string name="MmsPreferencesFragment__invalid_host">النص ليس خادم صحيح</string>
+  <string name="MmsPreferencesFragment__invalid_uri">النص  ليس وفقا لصيغة معرّف موارد صحيحة</string>
+  <string name="MmsPreferencesFragment__invalid_host">النص ليس وفقا لصيغة خادم صحيحة</string>
   <!--GroupUtil-->
   <string name="GroupUtil_joined_the_group">%1$s أنضم إلى المجموعة.</string>
   <string name="GroupUtil_group_updated">تم تحديث المجموعة.</string>
@@ -492,13 +497,13 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">يتطلب تيكست سيكيور إعدادات خدمة الوسائط المتعددة من أجل تسليم رسائل الوسائط المتعددة والمجموعات عبر المشغل اللاسلكي. في بعض الأحوال لا تتاح هذه المعلومات مع الهواتف المقفولة أو ذات الإعدادات المقيدة.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">يتطلب تيكست سيكيور إعدادات خدمة الوسائط المتعددة من أجل تسليم رسائل الوسائط المتعددة والمجموعات عبر شبكة الجوال. في بعض الأحوال لا تتاح هذه المعلومات مع الهواتف المقفولة أو ذات الإعدادات المقيدة.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام  بهذه الخطوة مرة واحدة.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">جهة الاتصال محظورة</string>
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">كتم المحادثة</string>
-  <string name="recipient_preferences__disable_notifications_for_this_conversation">إلغاء الإشعارات لهذه المحادثة</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">تعطيل الإشعارات لهذه المحادثة</string>
   <string name="recipient_preferences__ringtone">نغمة الرنين</string>
   <string name="recipient_preferences__vibrate">الاهتزاز</string>
   <string name="recipient_preferences__block">حظر</string>
@@ -547,7 +552,7 @@
   <string name="registration_progress_activity__connecting">الاتصال جارِ...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">انتظار رسالة التحقق...</string>
   <string name="registration_progress_activity__registering_with_server">التسجيل مع الخادم جارِ...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">هذا قد يأخذ لحظات. الرجاء التحلي بالصبر وسنقوم بإخطارك عند إتمام التحقق.</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">هذا قد يستغرق لحظات. الرجاء التحلي بالصبر وسنقوم بإخطارك عند إتمام التحقق.</string>
   <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
 انتهت مهلة تيكست سيكيور أثناء انتظار رسالة التحقق.</string>
   <string name="registration_progress_activity__sms_verification_failed">فشل التحقق بواسطة رسالة.</string>
@@ -621,7 +626,7 @@
   <string name="preferences__enable_enter_key_title">تفعيل مفتاح الإدخال</string>
   <string name="preferences__replace_smiley_with_enter_key">استبدال مفتاح الابتسامة بمفتاح الدخول</string>
   <string name="preferences__pref_enter_sends_title">مفتاح الدخول يقوم بالإرسال</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">الضغط على مفتاح الدخول سيقوم بالإرسال الرسالة</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">الضغط على مفتاح الدخول سيقوم بإرسال الرسالة</string>
   <string name="preferences__display_settings">إعدادات العرض</string>
   <string name="preferences__choose_identity">اختيار الهوية</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">اختر جهة الاتصال من القائمة</string>
@@ -681,7 +686,7 @@
   <string name="preferences__enable_manual_mms">استخدم الإعدادات اليدوية لرسائل الوسائط المتعددة</string>
   <string name="preferences__override_system_mms_settings">تغيير إعدادات رسائل الوسائط المتعددة للنظام بالمعلومات أدناه.</string>
   <string name="preferences__mmsc_url">رابط MMSC</string>
-  <string name="preferences__mms_proxy_host">مستضيف الخدمة الوسيطة MMS</string>
+  <string name="preferences__mms_proxy_host">مستضيف خدمة MMS</string>
   <string name="preferences__mms_proxy_port">منفذ الوسيط MMS</string>
   <string name="preferences__mmsc_username">اسم المستخدم MMSC</string>
   <string name="preferences__mmsc_password">كلمة السر MMSC</string>
@@ -714,6 +719,8 @@
   <string name="preferences_chats__when_roaming">عند استخدام التجوال</string>
   <string name="preferences_chats__media_auto_download">تنزلي تلقائي للوسائط</string>
   <string name="preferences_chats__message_trimming">تقليم الرسالة</string>
+  <string name="preferences_advanced__use_system_emoji">استخدام الرموز التعبيرية بالنظام</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">تعطيل الرموز التعبيرية المدمجة في تيكست سيكيور</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 43973bf1cd..9e724b58bc 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -266,6 +266,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Рэгістрацыя TextSecure выканана паспяхова.</string>
   <string name="RegistrationService_registration_error">Памылка рэгістрацыі</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Падчас рэгістрацыі TextSecure узнікла праблема.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Атрыманы пашкоджаны ключ абмену паведамленнямі!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b9ba4d74fb..fb9fb95868 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -109,6 +109,7 @@
   <string name="ConversationActivity_unblock_question">Отблокирай?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Сигурен ли си, че искаш да отблокираш този контакт?</string>
   <string name="ConversationActivity_unblock">Отблокирай</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Размерът на прикачения файл надминава допустимия лимит за типа съобщение, който изпращате.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Информация за съобщението</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Транспорт: %1$s\nИзпратени/Получени: %2$s</string>
@@ -324,6 +325,10 @@ SMS съобщенията от системната базата данни в
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure регистрацията е успешно завършена.</string>
   <string name="RegistrationService_registration_error">Грешка при регистрацията</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Регистрацията за TextSecure се натъкна на проблем.</string>
+  <!--Slide-->
+  <string name="Slide_image">Изображение</string>
+  <string name="Slide_audio">Аудио</string>
+  <string name="Slide_video">Видео</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Съобщението за обмяна на ключ
 е объркано!</string>
@@ -745,6 +750,8 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences_chats__when_roaming">Когато ползвам роуминг</string>
   <string name="preferences_chats__media_auto_download">Автоматично теглене на мултимедия</string>
   <string name="preferences_chats__message_trimming">Съкращаване на съобщенията</string>
+  <string name="preferences_advanced__use_system_emoji">Използвай вградените emoji-та</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Изключи вградена в TextSecure подръжка на emoji-та</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cdbf3ca26a..9e06474725 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -112,6 +112,7 @@ kontakt</string>
   <string name="ConversationActivity_unblock_question">Odblokovat?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Opravdu chcete odblokovat tento kontakt?</string>
   <string name="ConversationActivity_unblock">Odblokovat</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Velikost přílohy překročila limit pro typ zprávy kterou posíláte</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti zprávy</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Přenos: %1$s\nOdesláno/Přijato: %2$s</string>
@@ -318,6 +319,10 @@ telefonní číslo</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registrace TextSecure byla úspěšně dokončena</string>
   <string name="RegistrationService_registration_error">Chyba registrace</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Při registraci TextSecure došlo k potížím.</string>
+  <!--Slide-->
+  <string name="Slide_image">Obrázek</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Obdržen neplatný požadavek na výměnu klíčů.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -731,6 +736,13 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Povolit pokud vaše zařízení používá doručování SMS/MMS přes Wifi (povoleno pouze když je na zařízení povoleno \'Wifi volání\')</string>
   <string name="preferences_app_protection__blocked_contacts">Blokované kontakty</string>
   <string name="preferences_notifications__display_in_notifications">Zobrazit v upozornění</string>
+  <string name="preferences_chats__when_using_mobile_data">Při použití mobilních datových přenosů</string>
+  <string name="preferences_chats__when_using_wifi">Při použití Wfi</string>
+  <string name="preferences_chats__when_roaming">Při roamingu</string>
+  <string name="preferences_chats__media_auto_download">Automatické stahování multimedií</string>
+  <string name="preferences_chats__message_trimming">Ořezávání práv</string>
+  <string name="preferences_advanced__use_system_emoji">Použít systémové smajlíky</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Zakázat použití smajlíků integrovaných v TextSecure </string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4ce111bdcc..b9b9135a47 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -108,6 +108,7 @@ denne kontakt.</string>
   <string name="ConversationActivity_unblock_question">Stop blokering?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Er du sikker på, du vil stoppe blokering af denne kontakt?</string>
   <string name="ConversationActivity_unblock">Stop blokering</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Vedhæftet fil overskrider størrelsesbegrænsningen for den type meddelelse, du sender.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Beskeddetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Overførsel: %1$s\nSendt/Modtaget: %2$s</string>
@@ -332,6 +333,10 @@ Dobbelttjek, at dette er dit nummer! Vi er ved at verificere det med en SMS.
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure er blevet registreret.</string>
   <string name="RegistrationService_registration_error">Registreringsfejl</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Der opstod en fejl under registreringen af TextSecure.</string>
+  <!--Slide-->
+  <string name="Slide_image">Billede</string>
+  <string name="Slide_audio">Lyd</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Modtog en ugyldig
 nøgle-besked!
@@ -739,6 +744,8 @@ Gratis private beskeder til TextSecure- og Signal-brugere</string>
   <string name="preferences_chats__when_roaming">Når der roames</string>
   <string name="preferences_chats__media_auto_download">Automatisk hentning af multimedier</string>
   <string name="preferences_chats__message_trimming">Trimning af beskeder</string>
+  <string name="preferences_advanced__use_system_emoji">Anvend systemets emoji</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Deaktivér TextSecures indbyggede understøttelse af emoji</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5cc9145ac4..55874f27c7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -108,6 +108,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_unblock_question">Nicht mehr blockieren?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Diesen Kontakt nicht mehr blockieren.</string>
   <string name="ConversationActivity_unblock">Nicht mehr blockieren</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Der Anhang ist für diese Nachrichtenart zu groß.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Übertragung: %1$s\nGesendet/Empfangen: %2$s</string>
@@ -313,6 +314,10 @@ Bitte kontrollieren Sie noch einmal Ihre Rufnummer. Diese wird anschließend dur
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Die Registrierung von TextSecure wurde erfolgreich abgeschlossen.</string>
   <string name="RegistrationService_registration_error">Fehler bei der Registrierung</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Bei der TextSecure-Registrierung ist ein Fehler aufgetreten.</string>
+  <!--Slide-->
+  <string name="Slide_image">Bild</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht empfangen!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -686,7 +691,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
-  <string name="preferences__chats">Unterhaltungen und Medien</string>
+  <string name="preferences__chats">Unterhaltungen und Multimedia</string>
   <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
   <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
@@ -711,6 +716,8 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="preferences_chats__when_roaming">Bei Roaming</string>
   <string name="preferences_chats__media_auto_download">Multimediainhalte automatisch herunterladen</string>
   <string name="preferences_chats__message_trimming">Unterhaltungen kürzen</string>
+  <string name="preferences_advanced__use_system_emoji">System-Emoji verwenden</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">TextSecures integrierte Emoji-Unterstützung deaktivieren</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5e67768cf1..2505d30ac3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -300,6 +300,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Η εγγραφή TextSecure ολοκληρώθηκε επιτυχώς.</string>
   <string name="RegistrationService_registration_error">Σφάλμα εγγραφής</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Η εγγραφή TextSecure παρουσίασε ένα πρόβλημα.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ελήφθη προβληματικό μήνυμα
 ανταλλαγής κλειδιών!
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b93876322a..b4fef42650 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -113,6 +113,7 @@ este contacto.
   <string name="ConversationActivity_unblock_question">¿Desbloquear?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">¿Está seguro de que desea desbloquear este contacto?</string>
   <string name="ConversationActivity_unblock">Desbloquear</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">El adjunto excede los límites de tamaño para el tipo de mensaje que está enviando.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s
@@ -345,6 +346,10 @@ requieren una cuenta de Google, pero deben tener la aplicación Play Store insta
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">El proceso de registro de TextSecure ha finalizado con éxito.</string>
   <string name="RegistrationService_registration_error">Error al registrarse</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">El proceso de registro de TextSecure ha encontrado un problema.</string>
+  <!--Slide-->
+  <string name="Slide_image">Imagen</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Vídeo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">¡Se recibió un mensaje corrupto
 de intercambio de claves!
@@ -786,6 +791,8 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="preferences_chats__when_roaming">Al usar roaming</string>
   <string name="preferences_chats__media_auto_download">Auto-descarga de audiovisuales</string>
   <string name="preferences_chats__message_trimming">Recortado de mensaje</string>
+  <string name="preferences_advanced__use_system_emoji">Usar emoji del sistema</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Deshabilitar el soporte de emoji integrado de Textsecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bc3c838880..1a4249e50f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -258,6 +258,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">ثبت نام TextSecure با موفقیت به پایان رسید.</string>
   <string name="RegistrationService_registration_error">خطای ثبت نام</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">ثبت نام TextSecure با مشکل مواجه شده است.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">دریافت کلید خراب
 تبادل پیام!</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 278f2e6166..f2748b5ef3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -112,6 +112,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_unblock_question">Poista esto?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Haluatko varmasti poistaa eston tältä yhteystiedolta?</string>
   <string name="ConversationActivity_unblock">Poista esto</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Liitetiedosto ylittää kyseisen viestityypin kokorajoituikset.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Viestin tiedot</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Tyyppi: %1$s
@@ -332,6 +333,10 @@ Tarkista vielä, että tämä on varmasti numerosi! Aiomme seuraavaksi vahvistaa
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecuren rekisteröityminen onnistui.</string>
   <string name="RegistrationService_registration_error">Rekisteröitymisvirhe</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rekisteröitymisessä ilmeni ongelma.</string>
+  <!--Slide-->
+  <string name="Slide_image">Kuva</string>
+  <string name="Slide_audio">Äänitallenne</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Vastaanotettu avaintenvaihtoviesti 
 on viallinen!</string>
@@ -739,7 +744,9 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="preferences_chats__when_using_wifi">Wi-Fi-verkossa</string>
   <string name="preferences_chats__when_roaming">Roaming-tilassa</string>
   <string name="preferences_chats__media_auto_download">Liitetiedostojen automaattinen lataus</string>
-  <string name="preferences_chats__message_trimming">Viestien karsiminen</string>
+  <string name="preferences_chats__message_trimming">Keskustelujen karsiminen</string>
+  <string name="preferences_advanced__use_system_emoji">Käytä järjestelmän hymiöitä</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Ota TextSecuren omat hymiöt pois käytöstä</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d56520b687..40aeb3a79c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -332,6 +332,7 @@ cet appareil n\'est pas supporté pour la messagerie sur le canal de données. L
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">L\'inscription de TextSecure s\'est achevée avec succès.</string>
   <string name="RegistrationService_registration_error">Erreur lors de l\'enregistrement</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">L\'enregistrement de TextSecure a rencontré un problème.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Une clé corrompue a été reçue
 Message d\'échange!</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 28487d241b..eba1a65469 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -110,6 +110,7 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_unblock_question">Ukloni blokadu?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Jeste li sigurni da želite ukloniti blokadu ovog kontakta?</string>
   <string name="ConversationActivity_unblock">Ukloni blokadu</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Privitak prelazi ograničenje veličine za tip poruke koju šaljete.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalji poruke</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nPoslano/Primljeno: %2$s</string>
@@ -325,6 +326,10 @@ Provjerite da li je ovo vaš broj telefona! Uskoro ćemo poslati SMS poruku na n
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registracija je uspješno završena.</string>
   <string name="RegistrationService_registration_error">Greška prilikom registracije</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure registracija je naišla na problem.</string>
+  <!--Slide-->
+  <string name="Slide_image">Slika</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primljena iskvarena poruka
 razmjene ključeva!</string>
@@ -738,6 +743,8 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <string name="preferences_chats__when_roaming">Prilikom roaminga</string>
   <string name="preferences_chats__media_auto_download">Automatsko preuzimanje media sadržaja</string>
   <string name="preferences_chats__message_trimming">Skraćivanje poruke</string>
+  <string name="preferences_advanced__use_system_emoji">Koristi emotikone sustava</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Onemogući TextSecure ugrađenu podršku za emotikone</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 71888657ab..217652e079 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -115,6 +115,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_unblock_question">Tiltás feloldása?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Biztosan feloldod ennek a névjegynek a tiltását?</string>
   <string name="ConversationActivity_unblock">Tiltás feloldása</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">A melléklet meghaladja a mérethatárt ahhoz a típusú üzenethez, amit küldesz.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Üzenet részletek</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Átviteli mód: %1$s\nKüldött/Fogadott: %2$s</string>
@@ -339,6 +340,10 @@ Ellenőrizd újra, hogy ez a te számod! Hamarosan egy SMS-ben fogjuk ellenőriz
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">A TextSecure regisztráció sikeresen befejeződött.</string>
   <string name="RegistrationService_registration_error">Regisztráció hiba</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">A TextSecure regisztráció közben hiba merült fel.</string>
+  <!--Slide-->
+  <string name="Slide_image">Kép</string>
+  <string name="Slide_audio">Hang</string>
+  <string name="Slide_video">Videó</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Elrontott csere kulcs
 üzenet érkezett!
@@ -774,6 +779,8 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="preferences_chats__when_roaming">Barangoláskor</string>
   <string name="preferences_chats__media_auto_download">Média auto-letöltés</string>
   <string name="preferences_chats__message_trimming">Üzenet trimmelés</string>
+  <string name="preferences_advanced__use_system_emoji">Rendszer emoji használata</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">A TextSecure beépített emoji támogatásának letiltása</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1fe133aa26..b47c295754 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -109,6 +109,7 @@ questo contatto.</string>
   <string name="ConversationActivity_unblock_question">Sbloccare?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Vuoi davvero sbloccare questo contatto?</string>
   <string name="ConversationActivity_unblock">Sblocca</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">L\'allegato che stai cercando di inviare supera le dimensioni consentite</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Dettagli messaggio</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Trasporto: %1$s\nInviato/Ricevuto: %2$s</string>
@@ -326,6 +327,10 @@ Assicurati che questo sia il tuo numero! Stiamo per verificarlo con un SMS.</str
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">La registrazione di TextSecure è stata competata con successo.</string>
   <string name="RegistrationService_registration_error">Errore nella registrazione</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Si è verificato un problema durante la registrazione a TextSecure.</string>
+  <!--Slide-->
+  <string name="Slide_image">Immagini</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ricevuta una chiave corrotta
 scambia un altro messaggio!
@@ -753,6 +758,8 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="preferences_chats__when_roaming">In roaming</string>
   <string name="preferences_chats__media_auto_download">Download automatico file</string>
   <string name="preferences_chats__message_trimming">Cancellazione messaggi</string>
+  <string name="preferences_advanced__use_system_emoji">Usa le emoji di sistema</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Disattiva le emoji di TextSecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b92376b8c1..a2d53cbef6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -318,6 +318,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure登録が正常に完了しました。</string>
   <string name="RegistrationService_registration_error">登録エラー</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure登録中にエラーが発生しました。</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">無効な鍵交換メッセージを受信しました。</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index a555973bd4..d0f3e9e0b0 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -290,6 +290,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ನ ನೋಂದಣಿ ಯಶಸ್ವಿಯಾಗಿ ಮುಕ್ತಾಯಗೊಂಡಿದೆ.</string>
   <string name="RegistrationService_registration_error">ನೋಂದಣಿ ದೋಷ</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ಗೆ ನೋಂದಾಯಿಸುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">ಭ್ರಷ್ಟಗೊಂಡಿದೆ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 ವಿನಿಮಯ ಸಂದೇಶ!</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a06ba807b3..df0f386b79 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -105,6 +105,7 @@
   <string name="ConversationActivity_unblock_question">사용자를 차단 해제하시겠습니까?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">이 사용자를 차단 해제하시겠습니까?</string>
   <string name="ConversationActivity_unblock">차단 해제</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">첨부파일 크기 제한 초과됨</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">메시지 세부정보</string>
   <string name="ConversationFragment_transport_s_sent_received_s">전송: %1$s\n송수신: %2$s</string>
@@ -305,6 +306,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure 가입이 완료되었습니다.</string>
   <string name="RegistrationService_registration_error">가입 오류</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure 가입에 문제가 발생했습니다.</string>
+  <!--Slide-->
+  <string name="Slide_image">이미지</string>
+  <string name="Slide_audio">오디오</string>
+  <string name="Slide_video">동영상</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">받은 키 교환 메시지가 손상되었습니다.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">받은 키 교환 메시지에 프로토콜 버전이 잘못되었습니다.</string>
@@ -686,6 +691,8 @@
   <string name="preferences_chats__when_roaming">로밍할 때</string>
   <string name="preferences_chats__media_auto_download">미디어 자동 다운로드</string>
   <string name="preferences_chats__message_trimming">대화 줄이기</string>
+  <string name="preferences_advanced__use_system_emoji">시스템 이모티콘 사용</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">TextSecure 이모티콘 사용 중지</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index d2f8e1fa0b..2c871b451b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -309,6 +309,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure регистрацијата е успешно завршена.</string>
   <string name="RegistrationService_registration_error">Грешка при регистрацијата</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure регистрацијата наиде на проблем.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Примена е погрешна порака
 за размена на клучеви!</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 72def6ca15..d7add81e8f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -109,6 +109,7 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="ConversationActivity_unblock_question">Ontblokken?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Weet je zeker dat je dit contact wilt ontblokken?</string>
   <string name="ConversationActivity_unblock">Ontblokken</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Bijlage overschrijdt de maximale grootte voor het type bericht dat je wilt versturen.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Berichtdetails</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Overdracht: %1$s\nVerzonden/Ontvangen: %2$s</string>
@@ -317,6 +318,10 @@ ingevoerd (%s) is ongeldig.</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registratie bij TextSecure is succesvol afgerond.</string>
   <string name="RegistrationService_registration_error">Registratiefout</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Registratie bij TextSecure is mislukt.</string>
+  <!--Slide-->
+  <string name="Slide_image">Afbeelding</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Misvormd sleuteluitwisselingsbericht
 ontvangen!</string>
@@ -727,6 +732,8 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences_chats__when_roaming">Bij roaming</string>
   <string name="preferences_chats__media_auto_download">Media automatisch downloaden</string>
   <string name="preferences_chats__message_trimming">Bericht inkorten</string>
+  <string name="preferences_advanced__use_system_emoji">Gebruik systeem emoji</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">TextSecure\'s ingebouwde emoji ondersteuning uitschakelen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index dfbe14adc4..e5b7c52eee 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -109,6 +109,7 @@ denne kontakten.</string>
   <string name="ConversationActivity_unblock_question">Opphev blokkering?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Er du sikker på at du ønsker å oppheve blokkeringen av denne kontakten?</string>
   <string name="ConversationActivity_unblock">Opphev blokkering</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Vedlegget overstiger størrelsesbegrensningen for den typen melding du sender.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meldingsdetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSendt/Mottatt: %2$s</string>
@@ -317,6 +318,10 @@ Dobbelsjekk at dette er nummeret ditt! Vi er i ferd med å verifisere det med en
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registreringen er fullført.</string>
   <string name="RegistrationService_registration_error">Registreringsfeil</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Det oppstod en feil under registeringen til TextSecure.</string>
+  <!--Slide-->
+  <string name="Slide_image">Bilde</string>
+  <string name="Slide_audio">Lyd</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mottok korrupt nøkkelutvekslingsmelding!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -721,6 +726,8 @@ Gratis og private meldinger til TextSecure- og Signal-brukere
   <string name="preferences_chats__when_roaming">Ved roaming</string>
   <string name="preferences_chats__media_auto_download">Media auto-download</string>
   <string name="preferences_chats__message_trimming">Meldingsavkorting</string>
+  <string name="preferences_advanced__use_system_emoji">Bruk systemets smilefjes</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Deaktiver TextSecures innebygde støtte for smilefjes</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 104fe98520..3a25ffd106 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -111,6 +111,7 @@ ten kontakt.
   <string name="ConversationActivity_unblock_question">Odblokować?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Czy jesteś pewny, że chcesz odblokować ten kontakt?</string>
   <string name="ConversationActivity_unblock">Odblokuj</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Rozmiar tego załącznika przekracza limit wiadomości.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Szczegóły wiadomości</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nWysłano/Otrzymano: %2$s</string>
@@ -320,6 +321,10 @@ Upewnij się, że to jest Twój numer! Zamierzamy zweryfikować go SMSem.
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Rejestracja TextSecure została pomyślnie zakończona.</string>
   <string name="RegistrationService_registration_error">Błąd rejestracji</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rejestracja TextSecure napotkała problem.</string>
+  <!--Slide-->
+  <string name="Slide_image">Obraz</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Wideo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Otrzymano uszkodzony klucz!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -715,6 +720,13 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Włącz jeśli Twoje urządzenie używa dostarczania SMS/MMS przez WiFi (włącz tylko wtedy gdy \'Połączenia WiFi\' jest włączone na Twoim urządzeniu)</string>
   <string name="preferences_app_protection__blocked_contacts">Zablokowane kontakty</string>
   <string name="preferences_notifications__display_in_notifications">Pokaż w powiadomieniach</string>
+  <string name="preferences_chats__when_using_mobile_data">Podczas używania Danych Mobilnych</string>
+  <string name="preferences_chats__when_using_wifi">Podczas używania Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Podczas roamingu</string>
+  <string name="preferences_chats__media_auto_download">Auto-pobieranie plików mediów</string>
+  <string name="preferences_chats__message_trimming">Przycinanie wiadomości</string>
+  <string name="preferences_advanced__use_system_emoji">Używaj emoji systemu</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Wyłącz wbudowane wspomaganie emoji TextSecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 27489d6d34..8dae8f147a 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -117,6 +117,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationActivity_unblock_question">Desbloquear?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Tem certeza que deseja desbloquear este contato?</string>
   <string name="ConversationActivity_unblock">Desbloquear</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo excede os limites de tamanho para o tipo de mensagem sendo enviada.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviadas/Recebidas: %2$s</string>
@@ -343,6 +344,10 @@ Tem certeza que deseja fazer isto?</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">O cadastro em TextSecure foi completado com sucesso.</string>
   <string name="RegistrationService_registration_error">Erro de cadastro</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">O cadastro em TextSecure encontrou um problema.</string>
+  <!--Slide-->
+  <string name="Slide_image">Imagem</string>
+  <string name="Slide_audio">Áudio</string>
+  <string name="Slide_video">Vídeo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Recebida mensagem de troca
         de chaves corrompida!
@@ -774,6 +779,8 @@ falhou.</string>
   <string name="preferences_chats__when_roaming">Quando em roaming</string>
   <string name="preferences_chats__media_auto_download">Download automático de mídia</string>
   <string name="preferences_chats__message_trimming">Aparar mensagem</string>
+  <string name="preferences_advanced__use_system_emoji">Usar emoji do sistema</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Desabilitar o suporte a emoji nativo do TextSecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7efe31d9db..c23dcae4a3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -334,6 +334,7 @@ Verifique que este é o seu número! Estamos prestes a confirmá-lo com uma SMS.
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">O registo TextSecure foi completado com sucesso.</string>
   <string name="RegistrationService_registration_error">Erro de registo</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">O registo do TextSecure deparou-se com um problema.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Foi recebida uma
 chave corrompida.
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7992b7af1f..07bc775067 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -287,6 +287,7 @@ Trebuie să vă scoateţi de acolo înainte de a vă înregistra aici.</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Inregistrarea TextSecure a fost finalizata cu succes.</string>
   <string name="RegistrationService_registration_error">Eroare de inregistrare</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Inregistrarea TextSecure a intampinat o problema.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primit mesajul conform caruia
 schimbul de chei este corupt </string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a20d1235f3..9c13b319c1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -304,6 +304,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Регистрация в TextSecure успешно завершена.</string>
   <string name="RegistrationService_registration_error">Ошибка регистрации</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">При регистрации в TextSecure возникла ошибка.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Получено повреждённое
 сообщение обмена ключами!
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1ca3849b8c..a9ec298d98 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -296,6 +296,7 @@ Skontrolujte pre istotu znovu, že ste správne zadali Vaše telefónne číslo!
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registrácia bola úspešne dokončená.</string>
   <string name="RegistrationService_registration_error">Chyba pri registrácii</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pri TextSecure registrácii sa vyskytol problém.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Bola prijatá poškodená správa
 vzájomnej výmeny kľúčov.</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 06269d600a..14ef537f9a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -109,6 +109,7 @@ preveriti ta stik.</string>
   <string name="ConversationActivity_unblock_question">Odblokiram?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Ste prepričani, da želite odblokirati ta stik?</string>
   <string name="ConversationActivity_unblock">Odblokiraj</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Velikost priponke presega omejitev velikosti za ta tip sporočil.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti sporočila</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Način prenosa: %1$s\nPoslano/Prejeto: %2$s</string>
@@ -311,6 +312,10 @@ Preverite, če je to zares vaša telefonska številka! Overili jo bomo s sporoč
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registracija TextSecure je bila uspešno zaključena.</string>
   <string name="RegistrationService_registration_error">Napaka pri registraciji</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pri registraciji TextSecure je prišlo do težav.</string>
+  <!--Slide-->
+  <string name="Slide_image">Slika</string>
+  <string name="Slide_audio">Zvok</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Prejeto poškodovano
 sporočilo za izmenjavo ključev!</string>
@@ -719,6 +724,8 @@ Brezplačno zasebno sporočanje za TextSecure in Signal</string>
   <string name="preferences_chats__when_roaming">Med gostovanjem</string>
   <string name="preferences_chats__media_auto_download">Samodejen prenos priponk</string>
   <string name="preferences_chats__message_trimming">Izbris starih sporočil</string>
+  <string name="preferences_advanced__use_system_emoji">Uporabi sistemske emoji</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Onemogoči TextSecure vgrajeno podporo za emoji</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-sn/strings.xml b/res/values-sn/strings.xml
index 8282990be0..1845dc067d 100644
--- a/res/values-sn/strings.xml
+++ b/res/values-sn/strings.xml
@@ -329,6 +329,7 @@ Ongorora zvakare kuti iyi inhamba dzako! Tava pedyo nekuiongorora netsamba pfupi
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Kunyoresa paTextSecure kwabudirira kuzadziswa.</string>
   <string name="RegistrationService_registration_error">Kanganiso pakunyoresa</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Kuregisita paTextSecure kwasangana nedambudziko.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tagamuhira svumbunuro yakaworera
 tsinha tsamba!</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0223aef46c..336fc2bd21 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -28,9 +28,9 @@
   <string name="ApplicationPreferencesActivity_sms_disabled">СМС онемогућен</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Додирните да бисте поставили Сигурне поруке као подразумевану апликацију за СМС</string>
   <string name="ApplicationPreferencesActivity_on">укључена</string>
-  <string name="ApplicationPreferencesActivity_On">Укључена</string>
+  <string name="ApplicationPreferencesActivity_On">Укључено</string>
   <string name="ApplicationPreferencesActivity_off">искључена</string>
-  <string name="ApplicationPreferencesActivity_Off">Искључена</string>
+  <string name="ApplicationPreferencesActivity_Off">Искључено</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">СМС %1$s, ММС %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d минута</string>
@@ -112,6 +112,7 @@
   <string name="ConversationActivity_unblock_question">Одблокирати?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Желите ли заиста да одблокирате овај контакт?</string>
   <string name="ConversationActivity_unblock">Одблокирај</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Прилог прекорачује ограничење величине за тип поруке коју шаљете.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Детаљи поруке</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Пренос: %1$s\nПослата/примљена: %2$s</string>
@@ -143,7 +144,7 @@
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Користим посебно: %s</string>
   <string name="CustomDefaultPreference_using_default">Користим подразумевано: %s</string>
-  <string name="CustomDefaultPreference_none">Ниједна</string>
+  <string name="CustomDefaultPreference_none">ништа</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Сад</string>
   <string name="DateUtils_minutes_ago">%d минута</string>
@@ -280,8 +281,8 @@
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Одлокирати овај контакт?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Желите ли заиста да одблокирате овај контакт?</string>
   <string name="RecipientPreferenceActivity_unblock">Одблокирај</string>
-  <string name="RecipientPreferenceActivity_enabled">Омогућена</string>
-  <string name="RecipientPreferenceActivity_disabled">Онемогућена</string>
+  <string name="RecipientPreferenceActivity_enabled">Укључено</string>
+  <string name="RecipientPreferenceActivity_disabled">Искључено</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Повежите се на Сигурне поруке</string>
   <string name="RegistrationActivity_select_your_country">Изаберите вашу државу</string>
@@ -329,6 +330,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Пријава на Сигурне поруке је успешно завршена.</string>
   <string name="RegistrationService_registration_error">Грешка пријаве</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Дошло је до проблема приликом пријаве на сервер Сигурних порука.</string>
+  <!--Slide-->
+  <string name="Slide_image">Слика</string>
+  <string name="Slide_audio">Звук</string>
+  <string name="Slide_video">Видео</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Примљена је оштећена
 порука размене кључа!</string>
@@ -520,7 +525,7 @@
   <string name="recipient_preferences__mute_conversation">Утишај преписку</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">Искључи обавештења за ову преписку</string>
   <string name="recipient_preferences__ringtone">Звоно</string>
-  <string name="recipient_preferences__vibrate">Вибрирај</string>
+  <string name="recipient_preferences__vibrate">Вибрирање</string>
   <string name="recipient_preferences__block">Блокирај</string>
   <string name="recipient_preferences__color">Боја</string>
   <string name="recipient_preferences__color_for_this_contact">Боја за контакт</string>
@@ -687,8 +692,8 @@
   <string name="preferences__three_times">Три пута</string>
   <string name="preferences__five_times">5 пута</string>
   <string name="preferences__ten_times">Десет пута</string>
-  <string name="preferences__vibrate">Вибрирај</string>
-  <string name="preferences__also_vibrate_when_notified">Вибрирај при обавештењу</string>
+  <string name="preferences__vibrate">Вибрирање</string>
+  <string name="preferences__also_vibrate_when_notified">Вибрирање при обавештењу</string>
   <string name="preferences__minutes">минута</string>
   <string name="preferences__hours">сати</string>
   <string name="preferences__green">Зелена</string>
@@ -698,7 +703,7 @@
   <string name="preferences__cyan">Цијан</string>
   <string name="preferences__magenta">Магента</string>
   <string name="preferences__white">Бела</string>
-  <string name="preferences__none">Ниједна</string>
+  <string name="preferences__none">Ништа</string>
   <string name="preferences__fast">Брзо</string>
   <string name="preferences__normal">Нормално</string>
   <string name="preferences__slow">Споро</string>
@@ -727,7 +732,7 @@
   <string name="preferences__appearance">Изглед</string>
   <string name="preferences__theme">Тема</string>
   <string name="preferences__theme_summary">Тема %s</string>
-  <string name="preferences__default">Подразумеван</string>
+  <string name="preferences__default">Подразумевано</string>
   <string name="preferences__language">Језик</string>
   <string name="preferences__language_summary">Језик %s</string>
   <string name="preferences__textsecure_messages">Сигурне поруке</string>
@@ -743,6 +748,8 @@
   <string name="preferences_chats__when_roaming">У ромингу</string>
   <string name="preferences_chats__media_auto_download">Ауто-преузимање медија</string>
   <string name="preferences_chats__message_trimming">Скраћивање порука</string>
+  <string name="preferences_advanced__use_system_emoji">Користи системски емоџи</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Искључи уграђене емоџије Сигурних порука</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0617d417be..92222863cd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -112,6 +112,7 @@ verifiera denna kontakt.</string>
   <string name="ConversationActivity_unblock_question">Avblockera?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Är du säker på att du vill avblockera denna kontakt?</string>
   <string name="ConversationActivity_unblock">Avblockera</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Den bifogade filen är för stor för den typ av meddelande du försöker skicka.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meddelandedetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSkickat/Mottagits: %2$s</string>
@@ -320,6 +321,10 @@ Dubbelkolla att det här är ditt nummer! Vi ska nu verifiera det med ett SMS.</
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure-registrering har lyckats.</string>
   <string name="RegistrationService_registration_error">Registreringsfel</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure-registreringen har drabbats av ett problem.</string>
+  <!--Slide-->
+  <string name="Slide_image">Bilder</string>
+  <string name="Slide_audio">Ljud</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tog emot skadat meddelande
 för nyckelutbyte!</string>
@@ -723,6 +728,8 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <string name="preferences_chats__when_roaming">Vid roaming</string>
   <string name="preferences_chats__media_auto_download">Autonedladdning av media</string>
   <string name="preferences_chats__message_trimming">Trimma meddelanden</string>
+  <string name="preferences_advanced__use_system_emoji">Använd systemets emojis</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Stäng av TextSecures inbyggda emojistöd</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3b8f5860ef..102deb4cc6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -273,6 +273,7 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure பதிவு வெற்றிகரமாக நிறைவுபெற்றது.</string>
   <string name="RegistrationService_registration_error">பதிவுசெய்தலில்  பிழை</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure பதிவு ஒரு பிரச்சனையை சந்தித்தது.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">சிதைந்த சாவிபரிமாற்ற
  செய்தி பெறப்பட்டது!</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d0486e4083..639fc5c6ae 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -290,6 +290,7 @@ Numaranızı ikinci kez kontrol ediniz! Onu bir SMS ile doğrulamak üzereyiz.</
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure kaydı başarıyla tamamlandı.</string>
   <string name="RegistrationService_registration_error">Kayıt hatası</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure kaydı bir sorunla karşılaştı.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Bozulmuş anahtar değişim 
 mesajı alındı!</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fff9ae3788..28da92363e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -334,6 +334,7 @@ mã số quốc gia bạn</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Đăng ký TextSecure đã hoàn tất tốt đẹp.</string>
   <string name="RegistrationService_registration_error">Có lỗi đăng ký</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Đăng ký TextSecure gặp phải vấn đề.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Nhận được thông tin
 trao đổi chìa khóa bị hỏng!</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bef63e1ae7..933ad94890 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -109,6 +109,7 @@
   <string name="ConversationActivity_unblock_question">解除屏蔽？</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">您确定想要解除对此联系人的屏蔽？</string>
   <string name="ConversationActivity_unblock">解除屏蔽</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">当前信息的附件类型已经已经超过大小限制。</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">信息详情</string>
   <string name="ConversationFragment_transport_s_sent_received_s">传输：%1$s\n 发送/接收：%2$s</string>
@@ -319,6 +320,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">已经成功完成TextSecure注册。</string>
   <string name="RegistrationService_registration_error">注册出现错误</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure注册出错。</string>
+  <!--Slide-->
+  <string name="Slide_image">图片</string>
+  <string name="Slide_audio">音频</string>
+  <string name="Slide_video">视频</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">收到损坏的密钥
 交换消息！</string>
@@ -725,6 +730,13 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">如果您的设备使用WiFi发送彩信或短信，请启用此选项(仅当\"WiFi 语音呼叫\"在您的设备上启用时才可用)</string>
   <string name="preferences_app_protection__blocked_contacts">已屏蔽的联系人</string>
   <string name="preferences_notifications__display_in_notifications">在通知中显示</string>
+  <string name="preferences_chats__when_using_mobile_data">当使用移动数据时</string>
+  <string name="preferences_chats__when_using_wifi">当使用 WiFi 时</string>
+  <string name="preferences_chats__when_roaming">当漫游时</string>
+  <string name="preferences_chats__media_auto_download">媒体自动下载</string>
+  <string name="preferences_chats__message_trimming">信息整理</string>
+  <string name="preferences_advanced__use_system_emoji">使用系统表情符号</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">禁用 TextSecure 的内置表情支持</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->