diff --git a/.tx/config b/.tx/config
index 9c6bf1d9b..eb6420036 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE
+lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg-rBG
 
 
 [textsecure-official.master]
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 708060f64..0b1c0dc5d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -13,6 +13,7 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من مسح كل الرسائل بالمحادثات وابقاء أحدث %s رسالة فقط؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_my">أنا</string>
+  <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">صورة</string>
   <string name="AttachmentTypeSelectorAdapter_video">فيديو</string>
@@ -90,9 +91,13 @@
   <string name="ImportFragment_import">استيراد</string>
   <string name="ImportFragment_cancel">الغاء</string>
   <string name="ImportFragment_restore_encrypted_backup">استعادة النسخ الاحتياطية المشفرة؟</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nاسترجاع نسخة احتياطية مشفرة سيمسح بالكامل أي مفاتيح حالية أو اعدادات أو رسائل. ستفقد أي معلومات موجودة الآن في تكست سيكيور ولكن غير موجودة في النسخة الاحتياطية.</string>
   <string name="ImportFragment_restore">استعادة</string>
+  <string name="ImportFragment_import_plaintext_backup">استيراد النسخة الاحتياطية الغير مشفرة؟</string>
+  <string name="ImportFragment_importing">جاري الاستيراد...</string>
   <string name="ImportFragment_import_complete">اكتمال الاستيراد!</string>
   <string name="ImportFragment_restoring">جاري الاستعادة</string>
+  <string name="ImportFragment_restoring_encrypted_backup">جاري استعادة النسخ الاحتياطية المشفرة...</string>
   <string name="ImportFragment_restore_complete">انتهاء الاستعادة</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">لم يتم العثور على مفتاح!</string>
@@ -180,6 +185,8 @@
   <string name="MessageNotifier_error_delivering_message">خطأ بالارسال</string>
   <string name="MessageNotifier_mark_all_as_read">اعتبرها جميعاً رسائل مقروءة</string>
   <string name="MessageNotifier_mark_as_read">اعتبرها مقروءة</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_cancel">الغاء</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">غير قادر على ارسال الرسالة حاليا. سيتم ارسالها عندما تتوفر الخدمة مرة أخرى.</string>
   <!--auto_initiate_activity-->
@@ -223,6 +230,10 @@
   <string name="database_migration_activity__importing">مهم!</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">تحديث قواعد البيانات</string>
+  <string name="export_fragment__export_encrypted_backup">استعادة النسخ الاحتياطية المشفرة</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">تصدير نسخة احتياطية غير مشفرة لكرت الذاكرة...</string>
+  <string name="import_fragment__import_system_sms_database">استيراد الرسائل القصيرة بالنظام</string>
+  <string name="import_fragment__import_encrypted_backup">استيراد النسخ الاحتياطية المشفرة</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">العبارة السرية لتكست سيكيور</string>
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
@@ -261,6 +272,8 @@
   <string name="AndroidManifest__manage_identity_keys">إدارة مفاتيح الهوية</string>
   <string name="AndroidManifest__complete_key_exchange">اكمال تبادل المفاتيح</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">استيراد/تصدير</string>
+  <string name="arrays__contact_keys">مفاتيح جهات الاتصال</string>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
   <string name="preferences__pref_all_sms_title">استخدام لكل الرسائل القصيرة</string>
@@ -275,6 +288,7 @@
   <string name="preferences__change_passphrase">غير العبارة السرية</string>
   <string name="preferences__change_my_passphrase">غير عبارتي السرية</string>
   <string name="preferences__complete_key_exchanges">اكمال تبادل المفاتيح</string>
+  <string name="preferences__disable_passphrase">تعطيل العبارة السرية</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">أكمل تبادل المفاتيح اوتوماتيكياً لمحادثات جديدة او قديمة بنفس مفتاح الهوية</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">انسى العبارة السرية من ذاكرة الجهاز بعد فترة</string>
   <string name="preferences__timeout_passphrase">نسيان العبارة السرية بعد فترة</string>
@@ -328,6 +342,8 @@
   <string name="preferences__dark_theme">قالب ألوان داكنة</string>
   <string name="preferences__appearance">المظهر</string>
   <string name="preferences__theme">قالب</string>
+  <string name="preferences__default">التلقائي</string>
+  <string name="preferences__language">اللغة</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index 89f8e2dea..1113361eb 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -149,6 +149,7 @@
   <string name="MessageNotifier_message_delivery_failed">འཕྲིན་ཐུང་བཏང་བ་དེ་འགྲོ་མི་འདུག </string>
   <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
   <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">གནས་སྐབས་རིང་ཁྱེད་ཀྱི་སྣ་མང་བརྒྱུད་ལམ་འཕྲིན་ཐུང་དེ་གཏོང་ཐུབ་པ་མི་འདུག དྲ་འབྲེལ་སླར་གསོ་བྱུང་མཚམས་གཏོང་གི་རེད། </string>
   <!--auto_initiate_activity-->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 63d91d705..425275f6a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -192,6 +192,8 @@
   <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_mark_all_as_read">Alle als gelesen markieren</string>
   <string name="MessageNotifier_mark_as_read">Als gelesen markieren</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_cancel">Abbruch</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">SMS kann gerade nicht gesendet werden. Sie wird gesendet, sobald der Dienst wieder verfügbar ist.</string>
   <!--auto_initiate_activity-->
@@ -356,6 +358,7 @@
   <string name="preferences__appearance">Aussehen</string>
   <string name="preferences__theme">Design</string>
   <string name="preferences__default">Voreinstellung</string>
+  <string name="preferences__language">Sprache</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +409,5 @@
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verifiziert</string>
-  <string name="preferences__language">Sprache</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1568a12f4..dc79eb760 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -57,7 +57,7 @@
   <string name="ConversationActivity_d_recipients_in_group">%d receptores en grupo</string>
   <string name="ConversationActivity_saving_draft">Guardando borrador...</string>
   <string name="ConversationActivity_invalid_recipient">Receptor inválido!</string>
-  <string name="ConversationActivity_calls_not_supported">Llamadas no compatibles</string>
+  <string name="ConversationActivity_calls_not_supported">Llamadas no soportadas</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo no es compatible con la función de realizar llamadas.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
@@ -192,6 +192,7 @@
   <string name="MessageNotifier_error_delivering_message">Error entregando mensaje.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todos como leídos</string>
   <string name="MessageNotifier_mark_as_read">Marcar como leídos</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Actualmente no se puede enviar tu mensaje SMS. Será enviado en cuanto el servicio esté disponible.</string>
   <!--auto_initiate_activity-->
@@ -300,8 +301,8 @@
   <string name="preferences__change_passphrase">Cambiar frase de contraseña</string>
   <string name="preferences__change_my_passphrase">Cambiar mi frase de contraseña</string>
   <string name="preferences__complete_key_exchanges">Completar intercambio de claves</string>
-  <string name="preferences__disable_passphrase">desactivar la frase de contraseña</string>
-  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desactive encriptación local de los mensajes y claves</string>
+  <string name="preferences__disable_passphrase">Desactivar la frase de contraseña</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desactivar el cifrado local de los mensajes y claves</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automáticamente los intercambios de clave para nuevas sesiones o para sesiones existentes con la misma clave de identidad</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Olvidar la frase de contraseña de la memoria después de un intervalo de tiempo</string>
   <string name="preferences__timeout_passphrase">Expirar la frase de contraseña</string>
@@ -356,6 +357,7 @@
   <string name="preferences__appearance">Apariencia</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Por defecto</string>
+  <string name="preferences__language">Idioma</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +408,5 @@
   <string name="text_secure_normal__mark_all_as_read">Marcar Todos Leídos</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
-  <string name="preferences__language">Idioma</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c1bed2153..f4dc6ffbd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -192,6 +192,8 @@
   <string name="MessageNotifier_error_delivering_message">Erreur lors de la distribution du message.</string>
   <string name="MessageNotifier_mark_all_as_read">Tout marquer comme lu</string>
   <string name="MessageNotifier_mark_as_read">Marquer comme lu</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_cancel">Annuler</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Impossible d’envoyer votre message SMS pour le moment. Il sera envoyé  lorsque le service deviendra disponible.</string>
   <!--auto_initiate_activity-->
@@ -356,6 +358,7 @@
   <string name="preferences__appearance">Apparence</string>
   <string name="preferences__theme">Thème</string>
   <string name="preferences__default">Par défaut</string>
+  <string name="preferences__language">Langue</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +409,5 @@
   <string name="text_secure_normal__mark_all_as_read">Tout marquer comme Lu</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Vérifié</string>
-  <string name="preferences__language">Langue</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index c953008cc..da57352a1 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -13,6 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">אתה בטוח שברצונך לקצץ מיד את כל שרשורי השיחות עד להודעות ה-%s הכי חדשות?</string>
   <string name="ApplicationPreferencesActivity_delete">מחק</string>
   <string name="ApplicationPreferencesActivity_my">שלי</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">לבטל הצפנת אחסון?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nאזהרה, פעולה זו תבטל הצפנה מקומית לכל ההודעות והמפתחות. החיבורים\nהמאובטחים שלך ימשיכו לתפקד, אבל כל אחד עם גישה פיזית למכשירך יוכל\nלגשת אליהם.\n</string>
+  <string name="ApplicationPreferencesActivity_disable">בטל</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">תמונה</string>
   <string name="AttachmentTypeSelectorAdapter_video">וידאו</string>
@@ -72,7 +75,37 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">לייצא לכרטיס ה-SD?</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">פעולה זו\nתייצא את המפתחות, ההגדרות וההודעות המוצפנות שלך לכרטיס ה-SD.\n</string>
+  <string name="ExportFragment_export">יצא</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">לייצא לכרטיס ה-SD ללא הצפנה?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">אזהרה, פעולה זו\nתייצא את תוכן הודעות ה-TextSecure שלך לכרטיס ה-SD ללא הצפנה.\n</string>
+  <string name="ExportFragment_cancel">בטל</string>
+  <string name="ExportFragment_exporting">מייצא</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">מייצא טקסט ללא הצפנה לכרטיס ה-SD...\n</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">שגיאה, לא ניתן לכתוב לכרטיס\nה-SD!\n</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">שגיאה בכתיבה לכרטיס ה-SD.\n</string>
+  <string name="ExportFragment_success">הצליח!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">מייצא מפתחות, הגדרות\nוהודעות מוצפנות...\n</string>
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">לייבא את בסיס הנתונים של ה-SMS מהמערכת?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">פעולה זו תייבא\nהודעות מבסיס הנתונים של ה-SMS ברירת המחדל של המערכת ל-TextSecure.\n אם כבר ייבאת מבסיס נתונים זה, ייבוא מחדש יגרום להודעות כפולות.</string>
+  <string name="ImportFragment_import">יבא</string>
+  <string name="ImportFragment_cancel">בטל</string>
+  <string name="ImportFragment_restore_encrypted_backup">לשחזר גיבוי מוצפן?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nשחזור גיבוי מוצפן יחליף לגמרי את המפתחות, ההגדרות וההודעות הקיימות.\nאתה \nתאבד את כל המידע שבהתקנת ה-TextSecure הנוכחית שלך אבל לא שבגיבוי.\n</string>
+  <string name="ImportFragment_restore">שחזר</string>
+  <string name="ImportFragment_import_plaintext_backup">לייבא גיבוי לא מוצפן?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">פעולה זו תייבא\nהודעות מגיבוי לא מוצפן. אם כבר ייבאת בעבר את בסיס הנתונים\nשל ה-SMS\nשל המערכת, ייבוא מחדש יגרום להודעות כפולות.\n</string>
+  <string name="ImportFragment_importing">מייבא</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">יבא גיבוי לא מוצפן...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">לא נמצא גיבוי לא מוצפן!</string>
+  <string name="ImportFragment_error_importing_backup">שגיאה בייבוא הגיבוי!</string>
+  <string name="ImportFragment_import_complete">הייבוא הסתיים!</string>
+  <string name="ImportFragment_restoring">משחזר</string>
+  <string name="ImportFragment_restoring_encrypted_backup">משחזר גיבוי מוצפן...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">לא נמצא גיבוי מוצפן!</string>
+  <string name="ImportFragment_restore_complete">השחזור הסתיים!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">לא נמצא מפתח סרוק!</string>
   <!--MmsDownloader-->
@@ -159,6 +192,7 @@
   <string name="MessageNotifier_error_delivering_message">שגיאה במסירת ההודעה.</string>
   <string name="MessageNotifier_mark_all_as_read">סמן הכל כנקרא</string>
   <string name="MessageNotifier_mark_as_read">סמן כנקרא</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">לא ניתן לשלוח כעת את הודעת ה-SMS שלך. היא תשלח כשהשירות יהיה זמין.</string>
   <!--auto_initiate_activity-->
@@ -202,6 +236,16 @@
   <string name="database_migration_activity__importing">מייבא</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">מעדכן את בסיס הנתונים...</string>
+  <string name="export_fragment__export_encrypted_backup">יצא גיבוי מוצפן</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">יצא גיבוי\nמוצפן לכרטיס ה-SD.\n</string>
+  <string name="export_fragment__export_plaintext_backup">יצא גיבוי לא מוצפן.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nיצא גיבוי לא מוצפן שתואם את האפליקציה \'SMSBackup And Restore\' לכרטיס ה-SD.</string>
+  <string name="import_fragment__import_system_sms_database">מייבא </string>
+  <string name="import_fragment__import_the_database_from_the_default_system">יבא את בסיס הנתונים\nמאפליקציית ברירת המחדל של המערכת.\n</string>
+  <string name="import_fragment__import_encrypted_backup">יבא גיבוי מוצפן</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nשחזר גיבוי מוצפן של TextSecure שיוצא בעבר.\n</string>
+  <string name="import_fragment__import_plaintext_backup">יבא גיבוי לא מוצפן</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nיבא קובץ גיבוי לא מוצפן. תואם \'SMSBackup And Restore\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">סיסמת TextSecure</string>
   <string name="prompt_passphrase_activity__unlock">פתח</string>
@@ -240,6 +284,9 @@
   <string name="AndroidManifest__manage_identity_keys">נהל מפתחות זהות</string>
   <string name="AndroidManifest__complete_key_exchange">השלם החלפת מפתח</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">יבא / יצא</string>
+  <string name="arrays__my_identity_key">מפתח הזהות שלי</string>
+  <string name="arrays__contact_keys">מפתחות אנשי קשר</string>
   <!--preferences.xml-->
   <string name="preferences__general">כללי</string>
   <string name="preferences__pref_all_sms_title">עשה שימוש לכל ה-SMS</string>
@@ -254,6 +301,8 @@
   <string name="preferences__change_passphrase">שנה סיסמה</string>
   <string name="preferences__change_my_passphrase">שנה סיסמה</string>
   <string name="preferences__complete_key_exchanges">השלם החלפות מפתח</string>
+  <string name="preferences__disable_passphrase">בטל סיסמה</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">בטל הצפנה מקומית של הודעות ומפתחות</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">השלם אוטומטית החלפות מפתח לחיבורים חדשים או קיימים עם אותו מפתח הזהות</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">שכח את הסיסמה מהזיכרון לאחר זמן מסויים </string>
   <string name="preferences__timeout_passphrase">זמן תוקף לסיסמה</string>
@@ -308,6 +357,7 @@
   <string name="preferences__appearance">מראה</string>
   <string name="preferences__theme">ערכת נושא</string>
   <string name="preferences__default">ברירת מחדל</string>
+  <string name="preferences__language">שפה</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -358,6 +408,5 @@
   <string name="text_secure_normal__mark_all_as_read">סמן הכל כנקרא</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">מאומת</string>
-  <string name="preferences__language">שפה</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 64d94cd2b..37c595645 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -162,6 +162,7 @@
   <string name="MessageNotifier_error_delivering_message">C\'e stato un errore durante l\'invio del messagio</string>
   <string name="MessageNotifier_mark_all_as_read">Segna tutti come gia\' letto</string>
   <string name="MessageNotifier_mark_as_read">Segna come gia\' letto</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">In questo momento non e\' possibile inviare il tuo messagio SMS. Sara\' inviato quando la communicazione e\' disponibile</string>
   <!--auto_initiate_activity-->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7f12bbf74..10f8fe8d6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -192,6 +192,7 @@
   <string name="MessageNotifier_error_delivering_message">メッセージ配信中にエラーがありました。</string>
   <string name="MessageNotifier_mark_all_as_read">すべて既読にする</string>
   <string name="MessageNotifier_mark_as_read">既読にする</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">現在、このSMSは送信できません。サービスが利用可能になると、すぐに送信されます。</string>
   <!--auto_initiate_activity-->
@@ -356,6 +357,7 @@
   <string name="preferences__appearance">デザイン設定</string>
   <string name="preferences__theme">テーマ</string>
   <string name="preferences__default">初期設定の言語</string>
+  <string name="preferences__language">言語</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +408,5 @@
   <string name="text_secure_normal__mark_all_as_read">すべて既読にする</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">確認済み</string>
-  <string name="preferences__language">言語</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index a9ebcac65..8f79461c7 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -146,6 +146,7 @@
   <string name="MessageNotifier_message_delivery_failed">အကြောင်းကြားချက်ပို့လွတ်ခြင်းမအောင်မြင်</string>
   <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
   <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">လောလောဆယ် အသင့်၏ SMS စာတိုကို ပို့နိုင်ခြင်း မရှိပါ။ ဆားဗစ်ပြန်ရလာသည်နှင့် ပို့ပေးပါမည်။</string>
   <!--auto_initiate_activity-->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 89c8332bc..9d38b6ffe 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -6,13 +6,16 @@
   <string name="delete">Verwijder</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momenteel: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">U moet uw wachtwoord opgegeven voor het beheren van sleutels...</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">U moet uw wachtwoord hebben ingevoerd voor het beheren van sleutels...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">U heeft nog geen wachtwoord ingesteld!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">berichten per conversatie</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Nu alle oude berichten verwijderen?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Weet u zeker dat u bij alle conversaties alleen de laatste %s berichten behouden wilt?</string>
   <string name="ApplicationPreferencesActivity_delete">Verwijderen</string>
   <string name="ApplicationPreferencesActivity_my">Mijn</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Opslagversleuteling uitschakelen?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nLet op, dit schakelt opslagversleuteling uit voor alle berichten en sleutels. Je versleutelde sessies zullen blijven werken, maar iedereen met fysieke toegang tot je apparaat zal ze kunnen benaderen.</string>
+  <string name="ApplicationPreferencesActivity_disable">Uitschakelen</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Afbeelding</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -54,6 +57,8 @@
   <string name="ConversationActivity_d_recipients_in_group">%d ontvangers in groep</string>
   <string name="ConversationActivity_saving_draft">Concept opslaan...</string>
   <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
+  <string name="ConversationActivity_calls_not_supported">Oproepen Niet Ondersteund</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dit apparaat lijkt dial-acties niet te ondersteunen.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Bericht details</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Verzender: %1$s\nTransport: %2$s\nVerstuurd/Ontvangen:%3$s</string>
@@ -84,8 +89,23 @@
   <string name="ExportFragment_exporting_keys_settings_and_messages">Keys, instellingen en berichten versleuteld naar de SD-kaart aan het exporteren...</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">SMS-berichten uit de systeemdatabase importeren?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Dit zal berichten uit de standaard SMS-database van het systeem importeren naar TextSecure. Als je de SMS-database van het systeem voorheen hebt geïmporteerd, kan opnieuw importeren resulteren in dubbele berichten.</string>
   <string name="ImportFragment_import">Importeer</string>
   <string name="ImportFragment_cancel">Annuleren</string>
+  <string name="ImportFragment_restore_encrypted_backup">Versleutelde Back-up Herstellen?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nHerstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en berichten volledig vervangen. Je zult alle informatie verliezen die wel in je huidige TextSecure-installatie zit, maar niet de back-up.</string>
+  <string name="ImportFragment_restore">Herstellen</string>
+  <string name="ImportFragment_import_plaintext_backup">Niet-versleutelde Back-up Importeren?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dit zal berichten uit een niet-versleutelde back-up importeren. Als je de SMS-database van het systeem voorheen hebt geïmporteerd, kan opnieuw importeren resulteren in dubbele berichten.</string>
+  <string name="ImportFragment_importing">Importeren</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Niet-versleutelde back-up importeren...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Geen niet-versleutelde back-up gevonden!</string>
+  <string name="ImportFragment_error_importing_backup">Fout bij het importeren van back-up!</string>
+  <string name="ImportFragment_import_complete">Importeren voltooid!</string>
+  <string name="ImportFragment_restoring">Herstellen</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Versleutelde back-up herstellen...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Geen versleutelde back-up gevonden!</string>
+  <string name="ImportFragment_restore_complete">Herstellen voltooid!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Geen gescande sleutel gevonden!</string>
   <!--MmsDownloader-->
@@ -172,6 +192,8 @@
   <string name="MessageNotifier_error_delivering_message">Fout bij afleveren bericht.</string>
   <string name="MessageNotifier_mark_all_as_read">Markeer alles als gelezen</string>
   <string name="MessageNotifier_mark_as_read">Markeer als gelezen</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_cancel">Annuleren</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Momenteel niet in staat om uw SMS bericht te versturen. Zodra de service beschikbaar is zal het verzonden worden .</string>
   <!--auto_initiate_activity-->
@@ -215,6 +237,16 @@
   <string name="database_migration_activity__importing">AAN HET IMPORTEREN</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Database aan het updaten...</string>
+  <string name="export_fragment__export_encrypted_backup">Exporteer Versleutelde Back-up</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Export een versleutelde back-up naar de SD-kaart.</string>
+  <string name="export_fragment__export_plaintext_backup">Exporteer Niet-versleutelde Back-up</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExporteer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\' naar de SD-kaart.</string>
+  <string name="import_fragment__import_system_sms_database">SMS-berichten uit de Systeemdatabase Importeren</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importeer de database uit de standaard berichtenapp van het systeem.</string>
+  <string name="import_fragment__import_encrypted_backup">Importeer Versleutelde Back-up</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nHerstel een eerder geëxporteerde versleutelde back-up van TextSecure.</string>
+  <string name="import_fragment__import_plaintext_backup">Importeer Niet-versleutelde Back-up</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImporteer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE WACHTWOORD</string>
   <string name="prompt_passphrase_activity__unlock">Ontgrendel</string>
@@ -253,6 +285,9 @@
   <string name="AndroidManifest__manage_identity_keys">Identiteitssleutels Beheren</string>
   <string name="AndroidManifest__complete_key_exchange">Sleuteluitwisseling Voltooien</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importeer / Exporteer</string>
+  <string name="arrays__my_identity_key">Mijn Identiteitssleutel</string>
+  <string name="arrays__contact_keys">Sleutels van Contacten</string>
   <!--preferences.xml-->
   <string name="preferences__general">Algemeen</string>
   <string name="preferences__pref_all_sms_title">Gebruik voor alle SMS</string>
@@ -267,6 +302,8 @@
   <string name="preferences__change_passphrase">Verander wachtwoord</string>
   <string name="preferences__change_my_passphrase">Verander mijn wachtwoord</string>
   <string name="preferences__complete_key_exchanges">Voltooi sleuteluitwisselingen</string>
+  <string name="preferences__disable_passphrase">Wachtwoord uitschakelen</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Lokale versleuteling van berichten en sleutels uitschakelen</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatisch sleuteluitwisselingen voltooien voor nieuwe sessies of voor bestaande sessies met dezelfde identiteitssleutel</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Vergeet het wachtwoord uit het geheugen na een bepaalde tijd</string>
   <string name="preferences__timeout_passphrase">Time-out wachtwoord</string>
@@ -320,6 +357,8 @@
   <string name="preferences__dark_theme">Donker Thema</string>
   <string name="preferences__appearance">Uiterlijk</string>
   <string name="preferences__theme">Thema</string>
+  <string name="preferences__default">Standaard</string>
+  <string name="preferences__language">Taal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 6aeb8648c..08522797e 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -192,6 +192,14 @@
   <string name="MessageNotifier_error_delivering_message">Feil ved levering av meldingen.</string>
   <string name="MessageNotifier_mark_all_as_read">Marker alle som lest</string>
   <string name="MessageNotifier_mark_as_read">Marker som lest</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">Regenererer...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenererer ID-nøkkel...</string>
+  <string name="ViewLocalIdentityActivity_regenerated">Regenerert!</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Nullstille ID-nøkkel?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nAdvarsel! Ved å regenerere ID-nøkkelen din vil din nåværende ID-nøkkel gå tapt og dine eksisterende kontakter vil motta advarsler når de forsøker å opprette sikre sesjoner med deg.\n\nEr du sikker på at du vil fortsette?</string>
+  <string name="ViewLocalIdentityActivity_cancel">Avbryt</string>
+  <string name="ViewLocalIdentityActivity_continue">Fortsett</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Det er ikke mulig å sende SMS meldingen akkurat nå. Den vil sendes når tjenesten blir tilgjengelig igjen.</string>
   <!--auto_initiate_activity-->
@@ -245,6 +253,7 @@
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nGjenopprett en tidligere eksportert kryptert TextSecure backup.</string>
   <string name="import_fragment__import_plaintext_backup">Importer klartekst backup</string>
   <string name="import_fragment__import_a_plaintext_backup_file">\nImporter en klartekst backup kompatibel med \'SMSBackup And Restore\'.</string>
+  <string name="local_identity__regenerate_key">Regenerer nøkkel</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSORD</string>
   <string name="prompt_passphrase_activity__unlock">Lås opp</string>
@@ -356,6 +365,7 @@
   <string name="preferences__appearance">Utseende</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Standard</string>
+  <string name="preferences__language">Språk</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +416,5 @@
   <string name="text_secure_normal__mark_all_as_read">Marker alle lest</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Bekreftet</string>
-  <string name="preferences__language">Språk</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8299262a0..7552fb910 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -192,6 +192,7 @@
   <string name="MessageNotifier_error_delivering_message">Erro ao enviar mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
   <string name="MessageNotifier_mark_as_read">Marcar como lida</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mensagem SMS não pôde ser enviada agora. Será enviada quando o serviço estiver disponível.</string>
   <!--auto_initiate_activity-->
@@ -356,6 +357,7 @@
   <string name="preferences__appearance">Aparência</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Padrão</string>
+  <string name="preferences__language">Idioma</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +408,5 @@
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
-  <string name="preferences__language">Idioma</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 561fa463c..b4a78f200 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -190,6 +190,8 @@
   <string name="MessageNotifier_error_delivering_message">Erro a remeter a mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
   <string name="MessageNotifier_mark_as_read">Marcar como lidas</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_cancel">Cancelar</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Presentemente não é possível remeter a mensagem SMS. Será reenviada assim que o serviço esteja disponível.</string>
   <!--auto_initiate_activity-->
@@ -351,6 +353,7 @@
   <string name="preferences__appearance">Aspecto</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Opção por omissão</string>
+  <string name="preferences__language">Língua</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -401,6 +404,5 @@
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
-  <string name="preferences__language">Língua</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d4b58576e..1a25c55a8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -192,6 +192,7 @@
   <string name="MessageNotifier_error_delivering_message">A aparut o eroare la trimiterea mesajului.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcheaza tot ca citit</string>
   <string name="MessageNotifier_mark_as_read">Marcheaza ca citit</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mesajul SMS nu poate fi trimis in acest moment. Va fi trimis de indata ce serviciul devine disponibil.</string>
   <!--auto_initiate_activity-->
@@ -356,6 +357,7 @@
   <string name="preferences__appearance">Aspect</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Implicit</string>
+  <string name="preferences__language">Limba</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +408,5 @@
   <string name="text_secure_normal__mark_all_as_read">Marcheaza tot ca citit</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificat</string>
-  <string name="preferences__language">Limba</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5f326c7bf..cbfc93401 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -147,6 +147,7 @@
   <string name="MessageNotifier_message_delivery_failed">Доставка сообщения не удалась.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Не удалось доставить сообщение.</string>
   <string name="MessageNotifier_error_delivering_message">Ошибка при доставке сообщения.</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Не можем сейчас отправить MMS-сообщение. Оно будет отправляться когда услуг становится доступным.</string>
   <!--auto_initiate_activity-->
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 27fc9ca9d..2ec034fd8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -133,6 +133,7 @@
   <string name="MessageNotifier_most_recent_from_s">Najnovšia od: %s</string>
   <string name="MessageNotifier_encrypted_message">Kryptovaná správa...</string>
   <string name="MessageNotifier_no_subject">(bez predmetu)</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostali ste správu od klienta podporujúceho TextSecure bezpečnú session.  Želáte si vytvoriť bezpečnú session?</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 943bf161e..06630ed28 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -192,6 +192,14 @@
   <string name="MessageNotifier_error_delivering_message">Napaka pri dostavi sporočila.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi vsa kot prebrana</string>
   <string name="MessageNotifier_mark_as_read">Označi kot prebrano</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">Ustvarjam nov ključ...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Ustvarjam nov identifikacijski ključ...</string>
+  <string name="ViewLocalIdentityActivity_regenerated">Nov ključ je ustvarjen!</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Ponastavim identifikacijski ključ?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">Pozor! Z generiranjem novega identifikacijskega ključa bo vaš trenutni identifikacijski ključ izgubljen, vaši stiki pa bodo pred vzpostavitvijo varne seje z vami prejeli opozorilo. Ste prepričani, da želite nadaljevati?</string>
+  <string name="ViewLocalIdentityActivity_cancel">Prekliči</string>
+  <string name="ViewLocalIdentityActivity_continue">Nadaljuj</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Sporočila SMS trenutno ni mogoče poslati. Poslano bo, takoj ko bo mogoče.</string>
   <!--auto_initiate_activity-->
@@ -245,6 +253,7 @@
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nObnovi predhodno izvoženo šifrirano varnostno kopijo Text Secure.</string>
   <string name="import_fragment__import_plaintext_backup">Uvozi nešifrirano varnostno kopijo</string>
   <string name="import_fragment__import_a_plaintext_backup_file">\nUvozi nešifrirano datoteko z varnostno kopijo. Združljivo s sistemskimi varnostnimi kopijami SMS.</string>
+  <string name="local_identity__regenerate_key">Ustvari nov ključ</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">GESLO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odkleni</string>
@@ -356,6 +365,7 @@
   <string name="preferences__appearance">Izgled</string>
   <string name="preferences__theme">Teme</string>
   <string name="preferences__default">Privzeto</string>
+  <string name="preferences__language">Jezik</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +416,5 @@
   <string name="text_secure_normal__mark_all_as_read">Označi vsa kot prebrana</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overjeno</string>
-  <string name="preferences__language">Jezik</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c87c2e47b..9f9e2c783 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -192,6 +192,7 @@
   <string name="MessageNotifier_error_delivering_message">Fel vid leverans av meddelande.</string>
   <string name="MessageNotifier_mark_all_as_read">Markera alla som lästa</string>
   <string name="MessageNotifier_mark_as_read">Markera som läst</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Kan för tillfället inte skicka ditt SMS meddelande. Det kommer skickas när service blir tillgängligt.</string>
   <!--auto_initiate_activity-->
@@ -356,6 +357,7 @@
   <string name="preferences__appearance">Utseende</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Standard</string>
+  <string name="preferences__language">Språk</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -406,6 +408,5 @@
   <string name="text_secure_normal__mark_all_as_read">Markera alla som lästa</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verifierad</string>
-  <string name="preferences__language">Språk</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 115f76cec..c7dfc0c3a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -126,6 +126,7 @@
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) 新邮件</string>
   <string name="MessageNotifier_most_recent_from_s">最新邮件来自： %s</string>
+  <!--ViewLocalIdentityActivity-->
   <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">您收到一条支持 TextSecure 加密会话的人发送的消息。  是否要启动安全会话？</string>