From f44ee4a41a7e29f0cb53f3a467ab58d7687d9722 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 15 May 2013 14:22:27 -0700
Subject: [PATCH] Translation updates

---
 res/values-ar/strings.xml     |   9 +-
 res/values-bo/strings.xml     |  10 +-
 res/values-de/strings.xml     |  56 ++++-
 res/values-es/strings.xml     |  12 +-
 res/values-fr/strings.xml     |  24 +-
 res/values-it/strings.xml     |   7 +-
 res/values-my/strings.xml     | 422 ++++++++++++++++++++++++++++++++++
 res/values-nl/strings.xml     |  26 ++-
 res/values-no/strings.xml     |  20 +-
 res/values-pt-rBR/strings.xml |  22 +-
 res/values-pt/strings.xml     |  32 ++-
 res/values-ru/strings.xml     | 422 ++++++++++++++++++++++++++++++++++
 res/values-sk/strings.xml     |  18 +-
 res/values-sl/strings.xml     |  24 +-
 res/values-sv/strings.xml     | 422 ++++++++++++++++++++++++++++++++++
 res/values-zh-rCN/strings.xml |   8 +-
 16 files changed, 1447 insertions(+), 87 deletions(-)
 create mode 100644 res/values-my/strings.xml
 create mode 100644 res/values-ru/strings.xml
 create mode 100644 res/values-sv/strings.xml

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fff1aeb9b..03000e68e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -90,6 +90,7 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">لم يتم العثور على مفتاح!</string>
   <!--MmsDownloader-->
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">العبارة السرية غير متطابقة!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">العبارة السرية القديمة غير صحيحة!</string>
@@ -222,6 +223,7 @@
   <string name="create_passphrase_activity__passphrase">العبارة السرية:</string>
   <string name="create_passphrase_activity__repeat">تكرار:</string>
   <!--database_migration_activity-->
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
   <!--prompt_apn_activity-->
   <!--receive_key_activity-->
@@ -274,9 +276,7 @@
   <string name="preferences__choose_identity">اختر هوية</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">اختر جهة الاتصال من القائمة</string>
   <string name="preferences__encryption_settings">اعدادات التشفير</string>
-  <string name="preferences__change_passphrase">غير العبارة السرية</string>
   <string name="preferences__change_my_passphrase">غير عبارتي السرية</string>
-  <string name="preferences__complete_key_exchanges">اكمال تبادل المفاتيح</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">أكمل تبادل المفاتيح اوتوماتيكياً لمحادثات جديدة او قديمة بنفس مفتاح الهوية</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">أضف وسم مسافة فارغة بنهاية كل رسالة غير مشفرة</string>
   <string name="preferences__include_whitespace_tag">أضف وسم مسافة فارغة</string>
@@ -287,12 +287,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">اختيار مدة حفظ العبارة السرية مؤقتاً</string>
   <string name="preferences__pref_timeout_interval_title">مدة الصلاحية</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">الوقت اللازم ليتم مسح العبارة السرية من الذاكرة</string>
-  <string name="preferences__identity_key_settings">اعدادات مفتاح الهوية</string>
   <string name="preferences__view_my_identity_key">اعرض مفتاح هويتي</string>
   <string name="preferences__export_my_identity_key">تصدير مفتاح الهوية الخاص بي</string>
-  <string name="preferences__import_contacts_key">استيراد مفتاح خاص بجهة اتصال</string>
   <string name="preferences__import_an_identity_key_from_a_contact">استيراد مفتاح هوية من جهة اتصال</string>
-  <string name="preferences__manage_identity_keys">إدارة مفاتيح الهوية</string>
   <string name="preferences__manage_configured_identity_keys">إدارة مفاتيح الهوية التي تم ضبطها</string>
   <string name="preferences__notification_settings">خيارات التنبيه</string>
   <string name="preferences__notifications">التنبيهات</string>
@@ -318,7 +315,6 @@
   <string name="preferences__normal">طبيعي</string>
   <string name="preferences__slow">بطىء</string>
   <string name="preferences__custom">مخصص</string>
-  <string name="preferences__advanced_mms_access_point_names">متقدم: نقطة اتصال رسائل الوسائط المتعددة</string>
   <string name="preferences__enable_fallback_mmsc">شغل مركز رسائل الوسائط المتعددة الاحتياطي</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">استخدم مركز رسائل الوسائط المتعددة هنا اذا لم تتوفر بيناتات اتصال النظام APN</string>
   <string name="preferences__mmsc_url_required">عنوان مركز رسائل الوسائط المتعددة (الزامي)</string>
@@ -386,6 +382,5 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">تم التحقق!</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">تكست سيكيور برنامج يقدم الحماية والامن للرسائل القصيرة. الرسائل القصيرة المرسلة لمستخدمي تكست سيكيور الآخرين ترسل مشفرة بالكامل على الشبكة، وكل الرسائل القصيرة تحفظ مشفرة بقاعدة بيانات محلية بجهازك. اذا ضاع جهازك أو تمت سرقته فإن رسائلك بأمان ولن يمكن لأحد التنصت على الرسائل القصيرة المتبادلة بينك وبين مستخدمي تكست سيكيور الآخرين.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index b914dbcb4..ab1215a96 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -96,6 +96,7 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་ཕབ་ལེན་བྱེད་ཐུབ་པའི་དྲ་འབྲེལ་མི་འདུག རྗེས་སུ་བསྐྱར་དུ་ཚོད་ལྟ་བྱོས། </string>
   <string name="MmsDownloader_error_storing_mms">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གསོག་ཉར་ལ་སྐྱོན་འདུག </string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་མཁོ་སྤྲོད་བྱེད་མཁན་ལ་འབྲེལ་ཐག་གི་སྐྱོན་འདུག </string>
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">གསང་ཚིག་མཚུངས་ཀྱི་མི་འདུག</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">གསང་ཚིག་རྙིང་པ་དེ་ནོར་འདུག </string>
@@ -194,7 +195,6 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">མཁོ་མེད་གསང་སྡོམ་བྱས་བའི་བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS </string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">སྡེ་ཚན་མི་མངོན་པ་དེའི་ཆེད་དུ་།  བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་སྡོམ་བྱས་འདུག </string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">གནས་སྐབས་རིང་ཁྱེད་ཀྱི་སྣ་མང་བརྒྱུད་ལམ་འཕྲིན་ཐུང་དེ་གཏོང་ཐུབ་པ་མི་འདུག དྲ་འབྲེལ་སླར་གསོ་བྱུང་མཚམས་གཏོང་གི་རེད། </string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
   <string name="ApplicationMigrationService_importing_text_messages">འཕྲིན་ཐུང་ཡི་གེ་ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
@@ -252,6 +252,7 @@
   <string name="database_migration_activity__import">ནང་འདྲེན། </string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">འདི་ལ་དུས་ཚོད་ཅུང་ཙམ་འགོར་སྲིད། བཟོད་སྒོམ་གནང་རོགས། ནང་འདྲེན་ལེགས་འགྲུབ་བྱུང་མཚམས་ང་ཚོས་ཁྱོད་ལ་བརྡ་གཏོང་གི་ཡིན། </string>
   <string name="database_migration_activity__importing">ནང་འདྲེན་བྱེད་བཞིན་པ། </string>
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">གཡག་འཕྲིན་གྱི་གསང་ཚིག </string>
   <string name="prompt_passphrase_activity__unlock">སྒོ་ཕྱེས། </string>
@@ -311,9 +312,7 @@
   <string name="preferences__choose_identity">ངོས་འཛིན་འདེམས། </string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">འབྲེལ་ཐོ་ནས་ཁྱེད་ཀྱིས་འབྲེལ་བ་བྱེད་ས་དེ་གདེམས། </string>
   <string name="preferences__encryption_settings">གསང་སྡོམ་སྒྲིག་བཟོ།</string>
-  <string name="preferences__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
   <string name="preferences__change_my_passphrase">ངའི་གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <string name="preferences__complete_key_exchanges">ལྡེ་མིག་བརྗེ་ལེན་ཚར་བ་བྱོས།</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">ལྡེ་མིག་གི་ངོས་འཛིན་གཅིག་པའི་ད་ཡོད་སྡེ་ཚན་ཞིག་གམ་ཡང་ན་སྡེ་ཚན་གསར་བ་ཞིག་གི་སླད་དུ། རང་བཞིན་ནས་ལྡེ་མིག་བརྗེ་ལེན་དེ་འགྲུབ་པ་བྱོས།</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">གསང་སྡོམ་མ་ཡིན་པའི་འཕྲིན་ཐུང་རེ་རེའི་རྗེས་སུ་དཀར་ངོས་ཀྱི་འཛེར་མ་རེ་སྦྱར།</string>
   <string name="preferences__include_whitespace_tag">དཀར་ངོས་ཀྱི་འཛེར་མ་དེ་མཉམ་དུ་སྦྱར།</string>
@@ -324,12 +323,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">གསང་ཚིག་དུས་ཚོད་ཡོལ་བ་འདེམས། </string>
   <string name="preferences__pref_timeout_interval_title">བར་སེང་མཚམས་ཞོག </string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">དྲན་ཐོ་ནས་གསང་ཚིག་མ་བརྗེད་གོང་སྒུག་ཡུན་དུས་ཚོད།</string>
-  <string name="preferences__identity_key_settings">ངོས་འཛིན་ལྡེ་མིག་གི་སྒྲིག་བཟོ། </string>
   <string name="preferences__view_my_identity_key">ངའི་ངོས་འཛིན་ལྡེ་མིག་ལ་ལྟོས། </string>
   <string name="preferences__export_my_identity_key">ངའི་ངོས་འཛིན་ལྡེ་མིག་དེ་ཕར་ལ་ཐོངས། </string>
-  <string name="preferences__import_contacts_key">འབྲེལ་བ་བྱེད་སའི་ལྡེ་མིག་ནང་འདྲེན་བྱོས། </string>
   <string name="preferences__import_an_identity_key_from_a_contact">འབྲེལ་བ་བྱེད་ས་ནས་ངོས་འཛིན་ལྡེ་མིག་ནང་འདྲེན་བྱོས། </string>
-  <string name="preferences__manage_identity_keys">ངོས་འཛིན་ལྡེ་མིག་དོ་དམ་བྱོས། </string>
   <string name="preferences__manage_configured_identity_keys">སྡེབ་སྒྲིག་ཟིན་པའི་ངོས་འཛིན་ལྡེ་མིག་དོ་དམ་བྱོས། </string>
   <string name="preferences__notification_settings">བརྡ་གཏོང་སྒྲིག་བཟོ།</string>
   <string name="preferences__notifications">བརྡ་གཏོང་།</string>
@@ -355,7 +351,6 @@
   <string name="preferences__normal">སྤྱིར་བཏང་། </string>
   <string name="preferences__slow">དལ་བོ། </string>
   <string name="preferences__custom">ཡུལ་སྲོལ། </string>
-  <string name="preferences__advanced_mms_access_point_names">རྒྱ་བསྐྱེད་པ། MMS Access Point ཡི་མིང་ཐོ་ཁག </string>
   <string name="preferences__enable_fallback_mmsc">Fallback MMSC དེ་བསྐྱར་དུ་བྱེད་ནུས་ཅན་བཟོས། </string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">APN ཡི་མ་ལག་གི་བརྡ་ལན་དེ་མི་རྙེད་དུས། MMSC ཡི་བརྡ་ལན་སྡེབ་སྒྲིག་བྱས་བ་དེ་བེད་སྤྱོད་ཐོངས། </string>
   <string name="preferences__mmsc_url_required">MMSC URL(དགོས་ངེས་ཅན) </string>
@@ -423,6 +418,5 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">ཁུངས་སྐྱེལ་བྱས་ཟིན།</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">གཡག་འཕྲིན་ནི། བདེ་སྲུང་ཡར་ཐོན་ཅན་གྱི་འཕྲིན་ཐུང་ཉེར་སྤྱོད་མ་ལག་ཞིག་ཡིན་ཞིང་དེས་སོར་གནས་འཕྲིན་ཐུང་ཉེར་སྤྱོད་ཀྱི་ཚབ་ལྟ་བུ་བྱེད་ཀྱི་ཡོད། གཡག་འཕྲིན་བེད་སྤྱོད་གཏོང་མཁན་ནང་ཕན་ཚུན་བར་གྱི་འཕྲིན་ཐུང་དག་གསང་སྡོམ་བྱས་ཡོད་པའི་མ་ཟད་འཕྲིན་ཡིག་ཚང་མ་མ་ལག་གི་གསང་སྡོམ་མཛོད་ཀྱི་ཁོངས་སུ་ཉར་ཡོད། གལ་སྲིད་ཁྱེད་རང་གི་ལག་འཁྱེར་ཁ་པར་བོར་བའམ་བརྐུས་བ་སོགས་བྱུང་ན། ཁྱེད་ཀྱི་འཕྲིན་ཐུང་དག་བདེ་འཇགས་ཡིན་ལ་གཡག་འཕྲིན་བེད་སྤྱོད་གཏོང་མཁན་གཞན་དེ་ཡང་དྲ་ལམ་ནས་བྱ་ར་བྱེད་མི་ཐུབ། </string>
   <!--EOF-->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ff362f55c..dd6c63e42 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,6 +29,9 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Bevor Sie Schlüssel importieren können, müssen Sie ihr Passwort eingeben...</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Bevor Sie Schlüssel verwalten können, müssen Sie ihr Passwort eingeben...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">Nachrichten pro Konversation</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Bist du dir sicher, dass du alle Konversationen auf die letzten %s Nachrichten kürzen willst?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
@@ -70,9 +73,11 @@
   <string name="ConversationActivity_group_conversation_recipients">Teilnehmer in Gruppengespräch</string>
   <string name="ConversationActivity_group_conversation">Gruppengespräch</string>
   <string name="ConversationActivity_d_recipients_in_group">%d Teilnehmer in Gruppe</string>
+  <string name="ConversationActivity_saving_draft">Entwurf speichern...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s Transport: %2$s Gesendet/Empfangen:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Absender: %1$s⏎\nTransport: %2$s⏎\nGesendet: %3$s⏎\nEmpfangen:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Nachricht löschen bestätigen</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Sind Sie sicher, dass Sie diese Nachricht unwiderruflich löschen möchten?</string>
   <!--ConversationListAdapter-->
@@ -81,18 +86,28 @@
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Unterhaltungen löschen?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Sind Sie sicher, dass Sie alle ausgewählten Unterhaltungen löschen möchten?</string>
+  <string name="ConversationListFragment_deleting">Löscht</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Löscht ausgewählte Konversationen...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch Nachricht</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Kein eingelesener Schlüssel gefunden!</string>
   <!--MmsDownloader-->
+  <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMSI</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Fehler beim Verbinden zum MMS Provider...</string>
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passwörter stimmen nicht überein!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Das eingegebene alte Passwort ist falsch!</string>
   <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Passphrasen stimmen nicht überein</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Du musst ein Passwort angeben</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ungültiges Passwort!</string>
   <!--PromptApnActivity-->
+  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du musst eine MMSC URL für deinen Anbieter angeben.</string>
+  <string name="PromptApnActivity_mms_settings_updated">MMS Einstellungen upgedatet</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kannst diese Werte jederzeit im TextSecure Einstellungsmenü ändern.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">FEHLER:\n\nSie haben einen beschädigten öffentlichen Schlüssel erhalten. Dieser Schlüssel kann nicht weiter verarbeitet werden, bitte initieren Sie eine neue sichere Sitzung.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">FEHLER:\n\nSie haben einen öffentlichen Schlüssl erhalten der eine nicht unterstütze Version des Protokolls verwendet. Dieser Schlüssel kann nicht weiter verarbeitet werden, bitte initieren Sie eine neue sichere Sitzung.</string>
@@ -180,12 +195,21 @@
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für einen nicht existierende Sitzung verschlüsselt...</string>
   <!--MmsSender-->
   <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Import in Gange</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Importiert Nachrichten</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passwort gecached</string>
   <string name="KeyCachingService_passphrase_cached">Passwort gecached</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Neue Nachrichten</string>
   <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
+  <string name="MessageNotifier_key_exchange">Key Austausch...</string>
+  <string name="MessageNotifier_encrypted_message">Verschlüsselte Nachricht...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">Korrupte Daten</string>
+  <string name="MessageNotifier_no_subject">(Kein Betreff)</string>
+  <string name="MessageNotifier_message_delivery_failed">Senden fehlgeschlagen.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Senden fehlgeschlagen.</string>
+  <string name="MessageNotifier_error_delivering_message">Senden fehlgeschlagen.</string>
   <!--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">Sie haben eine Nachricht von jemand empfangen, der verschlüsselte Sitzungen über TextSecure unterstützt. Wollen Sie jetzt eine sicher Sitzung aufbauen?</string>
@@ -217,9 +241,23 @@
   <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Bitte wählen Sie ein starkes Passwort aus, dass dazu genutzt wird ihre Daten lokal zu verschlüsseln.</string>
   <string name="create_passphrase_activity__passphrase">Passwort:</string>
   <string name="create_passphrase_activity__repeat">Wiederholen:</string>
+  <string name="create_passphrase_activity__continue">Fortsetzen</string>
+  <string name="create_passphrase_activity__generating_secrets">GENERIERT SICHERHEITSSCHLÜSSEL</string>
   <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchtest du deine vorhandenen Nachrichten in TextSecure\'s verschlüsselte Datenbank importieren?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die Standard Datenbank wird in keiner Weise verändert.</string>
+  <string name="database_migration_activity__skip">Überspringen</string>
+  <string name="database_migration_activity__import">Importieren</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Das könnte eine Weile dauern. Bitte sei geduldig, wir benachrichtigen dich, wenn der Import abgeschlossen ist.</string>
+  <string name="database_migration_activity__importing">IMPORTIERT</string>
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSPHRASE</string>
+  <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_apn_activity-->
+  <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (BENÖTIGT):</string>
+  <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONAL):</string>
+  <string name="prompt_apn_activity__mms_proxy_port_optional">MMS PROXY PORT (OPTIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__session">Sitzung</string>
   <string name="receive_key_activity__identities">Identitäten</string>
@@ -270,9 +308,7 @@
   <string name="preferences__choose_identity">Identität auswählen</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wählen Sie den Kontakt Eintrag aus der Kontakliste.</string>
   <string name="preferences__encryption_settings">Verschlüsselungs-Einstellungen</string>
-  <string name="preferences__change_passphrase">Passwort ändern</string>
   <string name="preferences__change_my_passphrase">Mein Passwort ändern</string>
-  <string name="preferences__complete_key_exchanges">Vollständiger Schlüsselaustausch</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatischer Schlüsselaustausch für neue Sitzungen und bestehende Sitzungen mit demselben persönlichen Schlüssel</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Leerzeichen am Ende jeder unverschlüsselten Nachricht einfügen</string>
   <string name="preferences__include_whitespace_tag">Leerzeichen einfügen</string>
@@ -283,12 +319,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Auswahl des Passwort-Timeouts</string>
   <string name="preferences__pref_timeout_interval_title">Timeout-Dauer</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Länge des Zeitraums, während dessen das Passwort im Speicher gehalten wird</string>
-  <string name="preferences__identity_key_settings">Einstellungen für den persönlichen Schlüssel</string>
   <string name="preferences__view_my_identity_key">Meinen persönlichen Schlüssel anzeigen</string>
   <string name="preferences__export_my_identity_key">Meinen persönlichen Schlüssel exportieren</string>
-  <string name="preferences__import_contacts_key">Schlüssel eines Kontakts importieren</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Schlüssel eines Kontakts importieren</string>
-  <string name="preferences__manage_identity_keys">Schlüssel verwalten</string>
   <string name="preferences__manage_configured_identity_keys">Konfigurierte Schlüssel verwalten</string>
   <string name="preferences__notification_settings">Benachrichtigungs-Einstellungen</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
@@ -314,6 +347,19 @@
   <string name="preferences__normal">Mittel</string>
   <string name="preferences__slow">Langsam</string>
   <string name="preferences__custom">Benutzerdefiniert</string>
+  <string name="preferences__mmsc_url_required">MMSC URL(Benötigt)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS Poxy Host (Optional)</string>
+  <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (Optional)</string>
+  <string name="preferences__delivery_reports">Zustellungsbericht</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Einen Zustellungsbericht für jede SMS beantragen</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Einen Zustellungsbericht für jede MMS beantragen</string>
+  <string name="preferences__mms_delivery_reports">MMS Zustellungsberichte</string>
+  <string name="preferences__sms_delivery_reports">SMS Zustellungsberichte</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, nachdem ein bestimmtes Limit überschritten wurde</string>
+  <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
+  <string name="preferences__storage">Speicher</string>
+  <string name="preferences__conversation_length_limit">Limit der Konversationslänge</string>
+  <string name="preferences__trim_all_threads_now">Alle Konversationen kürzen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 383b6eb6d..e16d31a1a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -96,6 +96,7 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">No hay conexiones disponibles para descargar MMS, inténtalo de nuevo más tarde...</string>
   <string name="MmsDownloader_error_storing_mms">¡Error guardando MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Error conectando al proveedor MMS...</string>
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">¡Las frases de contraseña no coinciden!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">¡Frase de contraseña anterior incorrecta!</string>
@@ -194,7 +195,6 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensaje MMS mal cifrado</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensaje MMS cifrado para sesión no existente...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Actualmente no se puede enviar tu mensaje MMS. Será enviado en cuanto el servicio esté disponible.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importación en progreso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando Mensajes de Texto</string>
@@ -252,6 +252,7 @@
   <string name="database_migration_activity__import">Importar</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Esto podría tardar un rato. Por favor, se paciente, te informaremos cuando la importación sea completada.</string>
   <string name="database_migration_activity__importing">IMPORTANDO</string>
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE DE CONTRASEÑA DE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
@@ -260,7 +261,7 @@
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Para enviar mensajes multimedia, por favor completa la información APN necesaria abajo. Los valores para tu proveedor pueden por lo general ser encontrados buscando \'&amp;lt;tu operador&amp;gt; APN\'. Solo necesitarás hacer esto una única vez.</string>
   <string name="prompt_apn_activity__mmsc_url_required">URL MMSC (REQUERIDA):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY HOST (OPCIONAL):</string>
-  <string name="prompt_apn_activity__mms_proxy_port_optional">MMS PROXY PORT (OPCIONAL):</string>
+  <string name="prompt_apn_activity__mms_proxy_port_optional">PUERTO PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__session">Sesión</string>
   <string name="receive_key_activity__identities">Identidades</string>
@@ -311,9 +312,7 @@
   <string name="preferences__choose_identity">Elegir identidad</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Elija su registro de contacto de la lista de contactos.</string>
   <string name="preferences__encryption_settings">Preferencias de cifrado</string>
-  <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 intercambios de clave</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__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Incluir una etiqueta de espacio en blanco al final de cada mensaje no cifrado</string>
   <string name="preferences__include_whitespace_tag">Incluir etiqueta de espacio en blanco</string>
@@ -324,12 +323,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar la expiración de la frase de contraseña</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiración</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">El intervalo de tiempo a esperar antes de olvidar la frase de contraseña de la memoria</string>
-  <string name="preferences__identity_key_settings">Preferencias de clave de identidad</string>
   <string name="preferences__view_my_identity_key">Ver mi clave de identidad</string>
   <string name="preferences__export_my_identity_key">Exportar mi clave de identidad</string>
-  <string name="preferences__import_contacts_key">Importar la clave del contacto</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importar una clave de identidad de un contacto</string>
-  <string name="preferences__manage_identity_keys">Gestionar las claves de identidad</string>
   <string name="preferences__manage_configured_identity_keys">Gestionar las claves de identidad configuradas</string>
   <string name="preferences__notification_settings">Preferencias de notificación</string>
   <string name="preferences__notifications">Notificaciones</string>
@@ -355,7 +351,6 @@
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Despacio</string>
   <string name="preferences__custom">Personalizado</string>
-  <string name="preferences__advanced_mms_access_point_names">Avanzado: Nombres de Puntos de Acceso MMS</string>
   <string name="preferences__enable_fallback_mmsc">Activar Fallback MMSC</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Usar la información MMSC configurada aquí cuando el sistema de información APN no está disponible.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (Requerido)</string>
@@ -423,6 +418,5 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure es una aplicacion de mensajería de texto con énfasis en la seguridad que sirve de reemplazo a la aplicación de mensajería de texto por defecto. Los mensajes enviados a otros usuarios de TextSecure están cifrados al vuelo, y todos los mensajes de texto están cifrados en una base de datos en el dispositivo. Si tu teléfono se pierde o es robado, tus mensajes estarán seguros, y la comunicación con otros usuarios de TextSecure no será monitorizada en el aire.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c22019e75..482a2fdbb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -96,6 +96,8 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Pas de connexion disponible pour le téléchargement MMS, essayez de nouveau plus tard…</string>
   <string name="MmsDownloader_error_storing_mms">Erreur d’enregistrement du MMS !</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erreur de connexion au fournisseur MMS…</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Message Multimédia</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Les phrases de passe ne correspondent pas !</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Ancienne phrase de passe incorrecte !</string>
@@ -194,7 +196,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Message MMS mal chiffré…</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Message MMS chiffré pour une session non-existante…</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Impossible d’envoyer votre message MMS pour le moment. Il sera envoyé  lorsque le service deviendra disponible.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Impossible d’envoyer votre message MMS actuellement.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importation en cours</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importation des Messages Texte</string>
@@ -252,6 +254,8 @@
   <string name="database_migration_activity__import">Importer</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Cela peut prendre un moment. Merci d’être patient, nous vous préviendrons quand l’importation sera achevée.</string>
   <string name="database_migration_activity__importing">IMPORTATION</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Mise à jour de la base de données…</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">PHRASE DE PASSE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Déverrouiller</string>
@@ -299,6 +303,7 @@
   <string name="AndroidManifest__complete_key_exchange">Finaliser l\'échange de clefs</string>
   <string name="AndroidManifest__verify_imported_identity">Vérifier l’identité importée</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Général</string>
   <string name="preferences__use_settings">Paramètres d’utilisation</string>
   <string name="preferences__pref_all_sms_title">Utiliser pour tous les SMS</string>
   <string name="preferences__pref_all_mms_title">Utiliser pour tous les MMS</string>
@@ -311,9 +316,9 @@
   <string name="preferences__choose_identity">Choisir une identité</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Choisissez votre entrée de contact dans le répertoire</string>
   <string name="preferences__encryption_settings">Paramètres de chiffrement</string>
-  <string name="preferences__change_passphrase">Modifier le Mot de Passe</string>
+  <string name="preferences__change_passphrase">Modifier la phrase de passe</string>
   <string name="preferences__change_my_passphrase">Modifier mon mot de passe</string>
-  <string name="preferences__complete_key_exchanges">Finaliser l\'échange de clefs</string>
+  <string name="preferences__complete_key_exchanges">Finaliser l’échange de clés</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Finaliser automatiquement les échanges de clés pour les sessions, nouvelles ou existantes, avec la même clef d\'identité.</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Ajouter un caractère espace vide à la fin de tous les messages en clair</string>
   <string name="preferences__include_whitespace_tag">Ajouter un caractère espace vide</string>
@@ -324,12 +329,12 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Choisir la durée de validité du mot de passe</string>
   <string name="preferences__pref_timeout_interval_title">Durée d\'expiration</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Durée avant d’oublier le mot de passe en mémoire</string>
-  <string name="preferences__identity_key_settings">Paramètres des clés d\'identité</string>
+  <string name="preferences__identity_key_settings">Clés d’identité</string>
   <string name="preferences__view_my_identity_key">Afficher ma clé d\'identité</string>
   <string name="preferences__export_my_identity_key">Exporter ma clé d\'identité</string>
   <string name="preferences__import_contacts_key">Importer la clé du contact</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importer une clé d\'identité depuis un contact</string>
-  <string name="preferences__manage_identity_keys">Gérer les clés d\'identité</string>
+  <string name="preferences__manage_identity_keys">Gérer les clés d’identité</string>
   <string name="preferences__manage_configured_identity_keys">Gérer les clés d\'identité configurées</string>
   <string name="preferences__notification_settings">Paramètres de notification</string>
   <string name="preferences__notifications">Notifications</string>
@@ -355,7 +360,9 @@
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Lent</string>
   <string name="preferences__custom">Personnalisé</string>
-  <string name="preferences__advanced_mms_access_point_names">Avancé : Noms des Points d’Accès MMS</string>
+  <string name="preferences__advanced">Avancé</string>
+  <string name="preferences__passphrase">Phrase de passe</string>
+  <string name="preferences__advanced_mms_access_point_names">MMSC par défaut</string>
   <string name="preferences__enable_fallback_mmsc">Activer le MMSC par défaut</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Utiliser les informations MMSC configurée ici lorsque les informations APN ne sont pas disponibles</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Obligatoire)</string>
@@ -407,6 +414,9 @@
   <string name="conversation__menu_delete_thread">Supprimer le fil de discussion</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Liste des destinataires</string>
+  <string name="conversation_group_options__delivery">Distribution</string>
+  <string name="conversation_group_options__conversation">Conversation</string>
+  <string name="conversation_group_options__broadcast">Diffuser</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Comparer</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Être analysé pour comparer</string>
@@ -420,9 +430,9 @@
   <string name="text_secure_normal__menu_import">Importer</string>
   <string name="text_secure_normal__menu_export">Exporter</string>
   <string name="text_secure_normal__menu_clear_passphrase">Oublier le mot de passe</string>
+  <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>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure est une application de messagerie texte avec une sécurité améliorée, qui constitue une alternative complète à l’application de messagerie texte par défaut. Les messages à d’autres utilisateurs de TextSecure sont chiffrés à la volée, et tous les messages sont stockés dans une base de données chiffrée sur l’appareil. Si votre téléphone est perdu ou volé, vos messages seront en sécurité, et les communications avec d’autres utilisateurs de TextSecure ne peuvent pas être espionnées à la volée.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 38596f93c..7879532be 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -77,6 +77,7 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nessuna chiave scansionata trovata!</string>
   <!--MmsDownloader-->
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Le passwords non corrispondono!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Vecchia password errata!</string>
@@ -205,6 +206,7 @@
   <string name="create_passphrase_activity__passphrase">Password:</string>
   <string name="create_passphrase_activity__repeat">Ripeti:</string>
   <!--database_migration_activity-->
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
   <!--prompt_apn_activity-->
   <!--receive_key_activity-->
@@ -257,9 +259,7 @@
   <string name="preferences__choose_identity">Scegli un\'identità</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Scegli il tuo contatto dalla rubrica.</string>
   <string name="preferences__encryption_settings">Impostazioni di cifratura</string>
-  <string name="preferences__change_passphrase">Cambia password</string>
   <string name="preferences__change_my_passphrase">Cambia la mia password</string>
-  <string name="preferences__complete_key_exchanges">Scambio della chiave completato</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completa lo scambio della chiave automaticamente per le nuove sessione con la stessa chiave di identità</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Includi un tag \'spazio\' al termine di ogni messaggio non cifrato</string>
   <string name="preferences__include_whitespace_tag">Include un tag \'spazio\'</string>
@@ -270,12 +270,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleziona un timeout per la password</string>
   <string name="preferences__pref_timeout_interval_title">Intervallo di tempo</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantità di tempo prima di dimenticare la password</string>
-  <string name="preferences__identity_key_settings">Impostazioni chiave di identità</string>
   <string name="preferences__view_my_identity_key">La mia chiave di identità</string>
   <string name="preferences__export_my_identity_key">Esporta la mia chiave di identità</string>
-  <string name="preferences__import_contacts_key">Importa la chiave di un contatto</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importa una chiave di identità da un contatto</string>
-  <string name="preferences__manage_identity_keys">Controlla le chiavi di identità</string>
   <string name="preferences__manage_configured_identity_keys">Controlla le chiavi di identità configurate</string>
   <string name="preferences__notification_settings">Impostazioni notifiche</string>
   <string name="preferences__notifications">Notifiche</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
new file mode 100644
index 000000000..226a07c07
--- /dev/null
+++ b/res/values-my/strings.xml
@@ -0,0 +1,422 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">ဟုတ်ကဲ့</string>
+  <string name="no">မလုပ်ပါ</string>
+  <string name="delete">ဖျက်ရန်</string>
+  <!--ApplicationExportManager-->
+  <string name="ApplicationExportManager_import_database_and_settings_title">Database နှင့် ဆက်တင်များကို တင်သွင်းမည်လား?</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">စာသားလံုခြုံမှုဆိုင်ရာ ဒေတာဘေ့၊ ကီးများ နှင့် ဆက်တင်များကို SDကဒ်မှ တင်သွင်းမည်လား၊ သတိပေးချက်၊ နဂိုရှိပြီးသား စာသား၊ ကီး၊ ဆက်တင်များကို အမှားမှားအယွင်းယွင်း ဖြစ်သွားစေနိုင်သည်။ </string>
+  <string name="ApplicationExportManager_importing_database_and_keys">ဒေတာဘေ့နှင့်ကီးများထည့်သွင်းနေ</string>
+  <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">သင်၏ SMS ဒေတာဘေ့၊ ကီးများနှင့် ဆက်တင်များ သွင်းယူးနေ...</string>
+  <string name="ApplicationExportManager_export_database_question">ဒေတာဘေ့ကိုထုတ်ယူမည်လား?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">စာသားလံုခြုံမှု ဒေတာဘေ့၊ ကီးများနှင့် ဆက်တင်များကို SD ကဒ်သို့ထုတ်ယူမည်လား?</string>
+  <string name="ApplicationExportManager_exporting_database_and_keys">ဒေတာဘေ့နှင့် ကီးများထုတ်ယူ</string>
+  <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">သင်၏ SMS ဒေတာဘေ့၊ ကီးများနှင့် ဆက်တင်များ ထုတ်ယူနေ...</string>
+  <string name="ApplicationExportManager_no_sd_card_found_exclamation">SDကဒ်ရှာမတွေ့</string>
+  <string name="ApplicationExportManager_error_exporting_to_sd_exclamation">SD သို့ထုတ်ယူနေစဉ်အမှားပေါ်ပေါက်</string>
+  <string name="ApplicationExportManager_import_successful_exclamation">သွင်းယူခြင်း အောင်မြင်!</string>
+  <string name="ApplicationExportManager_export_successful_exclamation">ထုပ်ယူခြင်း အောင်မြင်!</string>
+  <string name="ApplicationExportManager_import">သွင်းယူ</string>
+  <string name="ApplicationExportManager_export">ထုတ်ယူ</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">လက်ရှိ: %s</string>
+  <string name="ApplicationPreferenceActivity_not_found_exclamation">မတွေ့ပါ</string>
+  <string name="ApplicationPreferenceActivity_no_valid_identity_key_was_found_in_the_specified_contact">သတ်မှတ်လိုက်သောအဆက်အသွယ်တွင် မှန်ကန်သောအချက်အလက်ကီးရှာမတွေ့</string>
+  <string name="ApplicationPreferenceActivity_you_don_t_have_an_identity_key_exclamation">သင့်မှာ　အသိအမှတ်ပြုကီးမရှိ</string>
+  <string name="ApplicationPreferenceActivity_you_have_not_yet_defined_a_contact_for_yourself">သင့်ကိုယ်ပိုင်အတွက် အဆက်အသွယ် မသတ်မှတ်ရသေးပါ၊ ဆက်တင်မီနူးမှ တစ်ခုရွေးချယ်လိုက်ပါ</string>
+  <string name="ApplicationPreferenceActivity_exported_to_contacts_database">အဆက်အသွယ်ဒေတာဘေ့သို့ထုတ်ယူပြီး</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">ကီးများကိုမသွင်းမှီ သင်၏စကားဝှက်အားရိုက်ရန်လိုအပ်...</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">ကီးများကိုစီမံခန့်ခွဲခြင်းမပြုမှီ သင်၏စကားဝှက်အားရိုက်ရန်လိုအပ်...</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">စကားဝှက်မသတ်မှတ်ရသေးပါ</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">စကားစမြည်ပြောချင်းအလိုက်စာတိုများ</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">စာတိုအဟောင်းများအားလံုးဖျက်မည်လား</string>
+  <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>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">ပုံ</string>
+  <string name="AttachmentTypeSelectorAdapter_video">ဗွီဒီယို</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">အသံ</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">စာတိုအရွယ်အစား: %d KB</string>
+  <string name="ConversationItem_expires_s">သက်တမ်းကုန်: %s</string>
+  <string name="ConversationItem_error_sending_message">မှာကြားချက်ပို့ခြင်းအမှား</string>
+  <string name="ConversationItem_sending">ပို့နေသည်...</string>
+  <string name="ConversationItem_saving_attachment">ပူးတွဲပါအရာအားသိမ်းဆည်းနေ</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">ပူးတွဲပါအား SD ကဒ်သို့သိမ်းဆည်းနေ...</string>
+  <string name="ConversationItem_save_to_sd_card">SD ကဒ်သို့သိမ်းမည်လား</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">ဤမီဒီယာမှာ စာဝှက်စနစ်သံုး ဒေတာဘေ့တွင် သိမ်းဆည်းထားသည်၊ SDကဒ်သို့ သိမ်းမည့်မူကွဲတွင် စာဝှက်စနစ် မပါတော့ပါ။ ဆက်လက်လုပ်ဆောင်မည်လား။　</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">ပူးတွဲမှုအား SDကဒ်သို့ သိမ်းဆည်းနေစဉ်အမှားပေါ်ပေါက်</string>
+  <string name="ConversationItem_success_exclamation">အောင်မြင်!</string>
+  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">SDကဒ်သို့ ရေးမှတ်ခြင်းမပြုနိုင်</string>
+  <string name="ConversationItem_view_secure_media_question">လံုခြုံသောမီဒီယာကိုကြည့်မည်လား</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to disk.  Are you sure that you would like to do this?</string>
+  <string name="ConversationItem_key_exchange_message">ကီးအလဲအလှယ် စာသား</string>
+  <string name="ConversationItem_received_and_processed_key_exchange_message">ရရှိလာသော ကီးအလဲအလှယ်စာသားများကို ဆောင်ရွက်ပြီးပါပြီ။</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">ပြဿနာ၊ ရရှိလာတဲ့ ကီးအလဲအလှယ်စာသား လွဲနေပါသည်။</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">ကီးအလဲအလှယ်စာသား လက်ခံရရှိပါတယ်။ ရှေ့ဆက်ရန် ကလစ်နှိပ်ပါ။</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">လံုခြုံသောဆက်ရှင်အစပြုမည်လား</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s ဖြင့်လံုခြုံသောဆက်ရှင်အစပြုမည်လား?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">လံုခြုံသောဆက်ရှင် ဖျက်သိမ်းမှု အတည်ပြုချက်</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">လံုခြုံသောဆက်ရှင်ဖျက်သိမ်းမည်မှာ သေချာပြီလား</string>
+  <string name="ConversationActivity_delete_thread_confirmation">စကားဝိုင်းဖျက်သိမ်းမှုအတည်ပြုချက်</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">စကားစမြည်ပြောထားခြင်းကို အပြီးဖျက်မှာသေချာပြီလား</string>
+  <string name="ConversationActivity_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
+  <string name="ConversationActivity_compose_message">စာတိုရေးဖွဲ့</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">ပူးတွဲပါဖိုင်တွင် ဆက်တင်အမှားရှိ.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">ရွေးထားသော ဗွီဒီယိုသည် ကန့်သတ်ထားသော အရွယ်ကျော်နေ</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">ရွေးထားသော အသံဖိုင်သည် ကန့်သတ်ထားသော အရွယ်ကျော်နေ</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">လက်ခံသူသည်　မှန်ကန်သော SMS(သို့)အီးမေးလိပ်စာ　မဟုတ်</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">စာတိုမရှိ</string>
+  <string name="ConversationActivity_forward_message_prefix">FWD</string>
+  <string name="ConversationActivity_group_conversation_recipients">အစုအဖွဲ့ဖြင့်စကားစမြည်ပြောခြင်းလက်ခံသူများ</string>
+  <string name="ConversationActivity_group_conversation">အစုအဖွဲ့ဖြင့်စကားစမြည်ပြောခြင်း</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d အစုအဖွဲ့အလိုက်　လက်ခံသူများ</string>
+  <string name="ConversationActivity_saving_draft">အကြမ်းသိမ်း...</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">ပို့သူ: %1$s\nTransport: %2$s\nSent/Received:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">ပို့သူ: %1$s\nTransport: %2$s\nSent: %3$s\nReceived:%4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">စာတိုဖျက်ခြင်းကိုအတည်ပြု</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">စာတိုကို အပြီးဖျက်ပစ်မည်မှာ သေချာလား</string>
+  <!--ConversationListAdapter-->
+  <string name="ConversationListAdapter_encrypted_message_enter_passphrase">ဝှက်စာ စာတို, စကားဝှက်အားရိုက်ပါ...</string>
+  <string name="ConversationListAdapter_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">စကားဝိုင်းကိုဖျက်မည်လား</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">စကားဝိုင်းတွင်စကားစမည်ပြောထားသည်များကိုဖျက်မည်မှာသေချာပြီလား</string>
+  <string name="ConversationListFragment_deleting">ဖျက်နေသည်</string>
+  <string name="ConversationListFragment_deleting_selected_threads">ရွေးချယ်ထားသောစကားဝိုင်းကိုဖျက်နေသည်...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">စိစစ်ထားသောကီးရှာမတွေ့</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">MMS　အားကူးဆွဲရန်　ချိတ်ဆက်မှုမရနိုင်၊　နောက်မှထပ်ကြိုးစားပါ...</string>
+  <string name="MmsDownloader_error_storing_mms">MMS အားသိမ်းဆည်းခြင်းအမှား</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">MMS ထောက်ပံ့သူသို့ဆက်သွယ်ခြင်းအမှား...</string>
+  <!--NotificationMmsMessageRecord-->
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">စကားဝှက်များ ကိုက်ညီမှုမရှိ</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">စကားဝှက်အဟောင်းမမှန်ကန်</string>
+  <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">စကားဝှက်များ ကိုက်ညီမှုမရှိ</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">စကားဝှက်သတ်မှတ်ရန်လိုအပ်</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">စကားဝှက်မမှန်ကန်</string>
+  <!--PromptApnActivity-->
+  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">သင်၏　carrier အတွက်　MMSC URL　သတ်မှတ်သင့်</string>
+  <string name="PromptApnActivity_mms_settings_updated">MMS ဆက်တင် အဆင့်မြှင့်ပြီး</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">သင်သည်　ဤတန်ဖိုးတွေကို　စာသာလံုခြုံမှု　ဆက်တင်မီနူးမှနေ၍　အချိန်မရွေး　ပြင်ဆင်နိုင်</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ပြဿနာ\n\n ရရှိလာသော Public ကီးမှာ ပျက်ဆီးနေပါသည်။ ၎င်းကီးကို ရှေ့ဆက်ဆောင်ရွက်၍ မရပါ။ ကျေးဇူးပြုပြီး ဆက်ရှင် ပြန်စပါ။</string>
+  <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ပြဿနာ\n\nလက်ခံရရှိလာသော public ကီးမှာ ထောက်ပံထားခြင်းမရှိသည့် ပရိုတိုကောမှ ဖြစ်ပါသည်။ ၎င်းကီးကို ရှေ့ဆက်ဆောင်ရွက်၍ မရပါ။ ကျေးဇူးပြုပြီး ဆက်ရှင် ပြန်စပါ။</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_does_not_include_an_identity_signature">ဤ　ကီးပြောင်းလဲခြင်း　အကြောင်းကြားချက်တွင်　အသိအမှတ်ပြုအမှတ်အသား　မပါဝင်</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_but_you_do_not_yet_trust_it">ဤ　ကီးပြောင်းလဲခြင်း　အကြောင်းကြားချက်တွင်　အသိအမှတ်ပြုအမှတ်အသား　ပါဝင်၊　 you do not yet trust it.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_which_you_trust_for_s">ဒီကီးအလဲအလှယ်စာသားတွင် အသင်ယုံကြည်သော %S အိုင်ဒီလက်မှတ်ပါပါသည်။</string>
+  <string name="ReceiveKeyActivity_this_is_the_key_that_you_sent_to_start_your_current_encrypted_session_with_s">အသင်၏ လက်ရှိ ဝှက်စာပို့ဆက်ရှင်ကို စရန်ပို့လိုက်သောကီးမှာ %s ဖြစ်သည်။</string>
+  <string name="ReceiveKeyActivity_this_is_the_key_that_you_received_to_start_your_current_encrypted_session_with_s">အသင်၏ လက်ရှိ ဝှက်စာပို့ဆက်ရှင်ကို စရန် လက်ခံရရှိထားသော ကီးမှာ %s ဖြစ်သည်။</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_warning_you_already_have_an_encrypted_session">You have received a Key Exchange message from %s.\n\nWARNING:  You already have an encrypted session with this contact.  If you choose to accept this key exchange message, it will destroy your existing session and you will have to re-authenticate.  Would you like to complete this key exchange?</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_previously_initiated">You have received a Key Exchange message from %s.  You have previously initiated a session with this contact, and by accepting this key you will complete the key exchange.  Would you like to complete this key exchange?</string>
+  <string name="ReceiveKeyActivity_you_have_initiated_a_key_exchange_message_with_s_but_have_not_yet_received_a_reply">%S နှင့် ကီးအလဲအလှယ်လုပ်ရန် တောင်းဆိုထားသော်လည်း အကြောင်းပြန်ချက် မရသေးပါ။</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_no_existing_session">ကီးအလဲအလှယ်ပြုရန် %S ထံမှ စာလက်ခံရရှိပါတယ်။ ထိုအဆက်အသွယ်နှင့် အသင့် နဂို ရှိရှင်းစွဲ ဆက်ရှင် မရှိပါ။ ယခုကီးအလဲအလှယ် ပြီးဆုံးအောင် ဆောင်ရွက်မည်လား။</string>
+  <!--ReviewIdentitiesActivity-->
+  <string name="ReviewIdentitiesActivity_unable_to_view_corrupted_identity_key_exclamation">ပျက်စီးနေသော အသိအမှတ်ပြုကီးကို မမြင်နိုင်ပါ!</string>
+  <string name="ReviewIdentitiesActivity_delete_identity">အသိအမှတ်ပြချက်ကို　ဖျက်မည်လား</string>
+  <string name="ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key">ဒီအသိအမှတ်ပြုကီးကို　အပြီးဖျက်ပစ်မှာသေချာပြီလား</string>
+  <string name="ReviewIdentitiesActivity_invalid_identity">လက်သင့်မခံနိုင်သောအသိအမှတ်ပြုချက်</string>
+  <!--SaveIdentityActivity-->
+  <string name="SaveIdentityActivity_you_must_specify_a_name_for_this_identity_exclamation">ဒီအသိအမှတ်ပြုချက်အတွက် နာမည်သတ်မှတ်ပေးသင့်</string>
+  <string name="SaveIdentityActivity_identity_name_exists_exclamation">အသိအမှတ်ပြုချက်　နာမည်တည်ရှိနှင့်ပြီး</string>
+  <string name="SaveIdentityActivity_an_identity_key_with_the_specified_name_already_exists">သတ်မှတ်လိုက်သောအမည်နှင့် အသိအမှတ်ပြုကီးသည် တည်ရှိနှင့်ပြီး</string>
+  <string name="SaveIdentityActivity_manage_identities">အသိအမှတ်ပြုချက်များစီမံခန့်ခွဲ</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_mark_identity_verified_question">အမှန်ခြစ်ထားသောအသိအမှတ်ပြုချက်များကိုစိစစ်မည်လား</string>
+  <string name="VerifyIdentityActivity_are_you_sure_you_have_validated_the_recipients_identity_fingerprint_and_would_like_to_mark_it_as_verified">သင့်တွင် လက်ခံသူ၏ အချက်အလက်လက်ဗွေ တရားဝင်ဟု သေချာပြီလား ၊စိစစ်ပြီးဟု အမှန်ခြစ်မည်လား</string>
+  <string name="VerifyIdentityActivity_mark_verified">အမှန်ခြစ်ထားသည်များကိုအတည်ပြု</string>
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">လက်ခံသူတွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">လက်ခံသူ၌အသိအမှတ်ပြုကီးမရှိ</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">၎င်းတို့၏　ကီးများကို　နှိုင်းယှဉ်ရန်　စစ်ဆေးပါ</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">ကီးကိုစစ်ဆေးပြီးရယူရန်</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">သတိပေးချက်၊　စစ်ဆေးလိုက်သောကီးသည်　တူညီမှုမရှိ၊　ကျေးဇူးပြု၍　လက်ဗွေစာသားကို　ဂရုတစိုက်စစ်ပါ</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">မစိစစ်ရသေး</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">၎င်းတို့ကီးမှန်ကန်၊ ၎င်းတို့ကဲ့သို့　သင့်ကီးအား　အတည်ပြုစိစစ်ရန်　လိုအပ်</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">သင့်မှာ　အသိအမှတ်ပြုကီးမရှိ</string>
+  <!--VerifyImportedIdentityActivity-->
+  <string name="VerifyImportedIdentityActivity_you_must_specify_a_name_for_this_contact_exclamation">ဒီအဆက်အသွယ်အတွက် နာမည်ကို ပြဌာန်းပေးရပါမည်။</string>
+  <string name="VerifyImportedIdentityActivity_save_identity_key_question">အိုင်ဒီကီးကို သိမ်းမှာလား</string>
+  <string name="VerifyImportedIdentityActivity_error_saving_identity_key_exclamation">အိုင်ဒီကီးသိမ်းရာတွင် ပြဿနာတက်နေပါသည်</string>
+  <string name="VerifyImportedIdentityActivity_this_identity_key_or_an_identity_key_with_the_same_name_already_exists_please_edit_your_key_database">နာမည်တူသော အိုင်ဒီကီး ရှိနှင့်ပြီးသား ဖြစသည်။ ကီးဒေတာဘေ့စ်ကို ပြန်ပြင်ပါ။</string>
+  <string name="VerifyImportedIdentityActivity_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
+  <string name="VerifyImportedIdentityActivity_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
+  <string name="VerifyImportedIdentityActivity_not_verified_exclamation">မစိစစ်ရသေး</string>
+  <string name="VerifyImportedIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">သတိပေးချက်၊ ဖတ်ထားသည့် ကီးများ မကိုက်ညီပါ။</string>
+  <string name="VerifyImportedIdentityActivity_the_scanned_key_matches_exclamation">ဖတ်ထားသည့်ကီးများ ကိုက်ပါသည်။</string>
+  <string name="VerifyImportedIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
+  <string name="VerifyImportedIdentityActivity_are_you_sure_that_you_would_like_to_mark_this_as_a_valid_identity_key_for_all_future_correspondence_with_s">%s နှင့် အနာဂတ် စာပေးစာယူများ အားလုံးအတွက် ဤကီးကို မှန်ကန်သည့် အိုင်ဒီကီးအဖြစ် သတ်မှတ်မှာ သေချာလား။ အသင် ဤလက်ဗွေရာကို အတည်ပြုထားပြီးမှ ဤသို့ သတ်မှတ်ပါ။</string>
+  <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_mark_session_verified_question">ဆက်ရှင်ကို အတည်ပြုပြီးဟု မှတ်မှာလား</string>
+  <string name="VerifyKeysActivity_are_you_sure_that_you_have_validated_these_fingerprints_and_would_like_to_mark_this_session_as_verified">လက်ဗွေရာများအားလုံးကို အတည်ပြုပြီး ဒီဆက်ရှင်ကို အတည်ပြုပြီးဟု မှတ်ထားရမည်မှာ သေချာလား။</string>
+  <string name="VerifyKeysActivity_mark_verified">အမှန်ခြစ်ထားသည်များကိုအတည်ပြု</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">ကျွန်တော့်လက်ဗွေရာကို ဖတ်ရှုရန်</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">၎င်းတို့ လက်ဗွေရာကို ဖတ်ရှုရန်</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">သတိပေးချက်၊　စစ်ဆေးလိုက်သောကီးသည်　တူညီမှုမရှိ၊　ကျေးဇူးပြု၍　လက်ဗွေစာသားကို　ဂရုတစိုက်စစ်ပါ</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">မစိစစ်ရသေး</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">၎င်း၏ ကီးမှန်ပါသည်။ အသင့်၏ လက်ဗွေရာကို ဖတ်ရန်လည်း လိုအပ်ပါသည်။</string>
+  <string name="VerifyKeysActivity_verified_exclamation">အတည်ပြုပြီး</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
+  <string name="ViewIdentityActivity_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">သတိပေးချက်၊ ဖတ်ထားသည့် ကီးများ မကိုက်ညီပါ။</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">မစိစစ်ရသေး</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">ဖတ်ထားသည့်ကီးများ ကိုက်ပါသည်။</string>
+  <string name="ViewIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">နဂိုတောင်းဆိုချက် ရှိနှင့်ပြီးဖြစ်သော်လည်း ထပ်စမှလား</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">ဒီအဆက်အသွယ်ထံ ဆက်ရှင်စရန် တောင်းဆိုချက် ပို့ထားပြီးသားဖြစ်သည်။ ထပ်မံပို့မှာ သေချာလား။ ထပ်ပို့ပါက ယခင်ပို့ထားသော တောင်းဆိုချက်ကို ပယ်ဖျက်မည်ဖြစ်သည်</string>
+  <string name="KeyExchangeInitiator_send">ပို့</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">ဝှက်သိမ်းမှုလွဲမှားနေသောစာသား...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">ဝှက်စာအားဖေါ်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">စာသားများကို နဂိုမရှိသောဆက်ရှင်မားအတွက် ဝှက်သိမ်းထားပါသည်...</string>
+  <string name="MessageDisplayHelper_decryption_error_local_message_corrupted_mac_doesn_t_match_potential_tampering_question">ဝှက်စာဖြည်ခြင်း ပြဿနာ - လိုကယ်စာသားများ လွဲနေပါသည်။ MAC များ တစ်ခုနှင့်တစ်ခု မကိုက်ညီပါ။ </string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">MMS　ဆာဗာသို့ချိတ်ဆက်နေသည်...</string>
+  <string name="MmsDatabase_downloading_mms">MMS အားကူးဆွဲနေသည်...</string>
+  <string name="MmsDatabase_mms_download_failed">MMSကူးဆွဲခြင်း မအောင်မြင်!</string>
+  <string name="MmsDatabase_downloading">ကူးဆွဲနေသည်...</string>
+  <string name="MmsDatabase_anonymous">အမည်မသိ</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSမှဝှက်စာ ဖော်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">ဝှက်ထားမှုလွဲနေသော MMS စာသား....</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS စာသားများကို နဂိုမရှိသောဆက်ရှင်အတွက် ဝှက်သိမ်းလိုက်ပါသည်...</string>
+  <!--MmsSender-->
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">သွင်းယူနေ</string>
+  <string name="ApplicationMigrationService_importing_text_messages">စာသားစာတိုများသွင်းယူနေ</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure စကားဝှက် အရံသင့်သိမ်း</string>
+  <string name="KeyCachingService_passphrase_cached">စကားဝှက် အရံသင့်သိမ်း</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">စာတိုအသစ် %d</string>
+  <string name="MessageNotifier_most_recent_from_s">မကြာသေးမီက: %s</string>
+  <string name="MessageNotifier_key_exchange">ကီးပြောင်းလဲနေ...</string>
+  <string name="MessageNotifier_encrypted_message">စာဝှက်စနစ်ဖြင့်　အကြောင်းကြားချက်...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">ပျက်ဆီးသွားသောဝှက်စာ</string>
+  <string name="MessageNotifier_no_subject">(အကြောင်းအရာမရှိ)</string>
+  <string name="MessageNotifier_message_delivery_failed">အကြောင်းကြားချက်ပို့လွတ်ခြင်းမအောင်မြင်</string>
+  <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
+  <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
+  <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">လောလောဆယ် အသင့်၏ SMS စာတိုကို ပို့နိုင်ခြင်း မရှိပါ။ ဆားဗစ်ပြန်ရလာသည်နှင့် ပို့ပေးပါမည်။</string>
+  <!--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>
+  <string name="auto_initiate_activity__initiate_exchange">ပြောင်းလဲခြင်းအစပြု</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">စကားဝှက်အဟောင်း:</string>
+  <string name="change_passphrase_activity__new_passphrase">စကားဝှက်အသစ်:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">စကားဝှက်အသစ်အားနောက်တစ်ကြိမ်:</string>
+  <!--contact_selection_group_activity-->
+  <!--contact_selection_list_activity-->
+  <string name="contact_selection_group_activity__no_contacts">အဆက်အသွယ်မရှိ</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">အတွက်　ရွေးချယ်ပါ</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">မကြာသေးမှီကခေါ်ဆိုထားမှုများမရှိ</string>
+  <!--conversation_activity-->
+  <string name="conversation_activity__type_message">အကြာင်းကြားစာရိုက်</string>
+  <string name="conversation_activity__send">ပို့</string>
+  <string name="conversation_activity__remove">ဖယ်ပစ်</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">ကူးဆွဲ</string>
+  <string name="conversation_item_sent__downloading">ကူးဆွဲနေသည်</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">ကူးဆွဲ</string>
+  <string name="conversation_item_received__downloading">ကူးဆွဲနေသည်</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">အုပ်လိုက်ရွေးရန်</string>
+  <!--create_passphrase_activity-->
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">လိုကယ်ဒေတာများကို ဝှက်သိမ်းရန်သုံးမည့် စကားဝှက်ကို ရွေးပါ။ စိတ်ချရမည့် စကားဝှက် ဖြစ်ပါစေ။</string>
+  <string name="create_passphrase_activity__passphrase">စကားဝှက်:</string>
+  <string name="create_passphrase_activity__repeat">နောက်တစ်ကြိမ်:</string>
+  <string name="create_passphrase_activity__continue">ရှေ့ဆက်</string>
+  <string name="create_passphrase_activity__generating_secrets">လျှို့ဝှက်ချက်များကို ဖန်တီးနေ</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">အသင်၏ ရှိရင်းစွဲ စာသားများကို Textsecure၏ ဝှက်သိမ်းထားသော ဒေတာဘေ့စ်ထဲသို့ တင်သွင်းမည်လား။</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">စနစ်ပိုင်းဆိုင်ရာ နဂိုဒေတာဘေ့စ်ကို ပြောင်းလဲမည် မဟုတ်ပါ</string>
+  <string name="database_migration_activity__skip">ကျော်</string>
+  <string name="database_migration_activity__import">သွင်းယူ</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">ခေတ္တကြာပါလိမ့်မယ်။ တင်သွင်းမှု ပြီးဆုံးသွားရင် အကြောင်းကြားပေးပါမယ်။</string>
+  <string name="database_migration_activity__importing">သွင်းယူနေ</string>
+  <!--database_upgrade_activity-->
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">Textsecure စကားဝှက်</string>
+  <string name="prompt_passphrase_activity__unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
+  <!--prompt_apn_activity-->
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure requires APN settings to deliver media messages via your wireless carrier.  Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
+  <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">To send media messages, please complete the necessary APN information below. The values for your carrier can generally be located by searching for \'&amp;lt;your carrier&amp;gt; APN\'.  You will only need to do this once.</string>
+  <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (အရေးကြီး) - </string>
+  <string name="prompt_apn_activity__mms_proxy_host_optional">MMSC ပရောက်ဇီ အိမ်ရှင်စက် (အရေးမကြီး) -</string>
+  <string name="prompt_apn_activity__mms_proxy_port_optional">MMS ပရောက်ဇီ PORT (အရေးမကြီး)</string>
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__session">ဆက်ရှင်</string>
+  <string name="receive_key_activity__identities">အသိအမှတ်ပြုမှုများ</string>
+  <string name="receive_key_activity__complete_exchange">ပြောင်းလဲခြင်းပြီး</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to">သို့</string>
+  <!--review_identities-->
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">သင်၏စိတ်ချရသော　ဒေတာဘေ့၌　သင့်အသိအမှတ်ပြုကီး　လက်ရှိတွင်　မရှိသေး</string>
+  <!--save_identity_activity-->
+  <string name="save_identity_activity__identity_name">အသိအမှတ်ပြုအမည်:</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">သူများ အိုင်ဒီ (သူများ အမြင်) - </string>
+  <string name="verify_identity_activity__your_identity_you_read">အသင့်အိုင်ဒီ (အသင့်အမြင်) - </string>
+  <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">အသိအမှတ်ပြုမှုအမည်:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">အသိအမှတ်ပြုမှုသွင်းယူ:\\n</string>
+  <string name="verify_import_identity_activity__verified">အတည်ပြုပြီး</string>
+  <string name="verify_import_identity_activity__compare">နှိုင်းယှဉ်</string>
+  <!--verify_keys_activity-->
+  <string name="verify_keys_activity__they_read_this">သူများဖတ်သည်</string>
+  <string name="verify_keys_activity__you_read_this">အသင် ဖတ်သည်</string>
+  <!--view_identity_activity-->
+  <string name="view_identity_activity__identity">အတည်ပြုမှု:</string>
+  <string name="view_identity_activity__qr_code">QR ကုဒ်</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">စကားဝှက်ဖန်တီး</string>
+  <string name="AndroidManifest__enter_passphrase">စကားဝှက်ထည့်သွင်း</string>
+  <string name="AndroidManifest__select_contacts">အဆက်အသွယ်များရွေးချယ်</string>
+  <string name="AndroidManifest__textsecure_detected">စာသားလံုခြုံမှု သိရှိ</string>
+  <string name="AndroidManifest__public_identity_key">အများဆိုင်အသိအမှတ်ပြုကီး</string>
+  <string name="AndroidManifest__change_passphrase">စကားဝှက်ပြောင်း</string>
+  <string name="AndroidManifest__verify_session">ဆက်ရှင်အတည်ပြု</string>
+  <string name="AndroidManifest__verify_identity">အသိအမှတ်ပြုခြင်း　အတည်ပြု</string>
+  <string name="AndroidManifest__save_identity">အသိအမှတ်ပြုခြင်း　သိမ်းဆည်း</string>
+  <string name="AndroidManifest__manage_identity_keys">အသိအမှတ်ပြုထားသောကီးများစီမန်ခန့်ခွဲ</string>
+  <string name="AndroidManifest__complete_key_exchange">ကီးများပြောင်းလဲခြင်းပြီးဆုံးပါပြီ</string>
+  <string name="AndroidManifest__verify_imported_identity">သွင်းယူလိုက်သော အသိအမှတ်ပြုခြင်းအား အတည်ပြုစိစစ်ရန်</string>
+  <!--preferences.xml-->
+  <string name="preferences__use_settings">သတ်မှတ်ချက်များကိုအသုံးပြုပါ</string>
+  <string name="preferences__pref_all_sms_title">SMS အားလုံးအတွက်သုံးပါ</string>
+  <string name="preferences__pref_all_mms_title">MMS အားလုံးအတွက်သုံးပါ</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">textsecure ကိုဝင်လာသောစာတိုများကိုကြည့်ရန်/သိမ်းရန်အတွက်သုံးပါ</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">textsecure ကိုဝင်လာသောမာတီမီဒီယာစာတိုများကိုကြည့်ရန်/သိမ်းရန်အတွက်သုံးပါ</string>
+  <string name="preferences__input_settings">ကီးဘုတ်ပုံစံသတ်မှတ်ချက်များ</string>
+  <string name="preferences__pref_enter_sends_title">ပို့ရန်ကိုနှိပ်ပါ</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter နှိပ်လျှင် စာသားများကို ပို့ပါမည်</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>
+  <string name="preferences__encryption_settings">ဝှက်စာသတ်မှတ်ချက်များ</string>
+  <string name="preferences__change_my_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__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">ဝှက်စာမလုပ်ထားသောစာတိုများ၏အဆုံးတွင် Whitespace tab များထည့်သွင်းပါ</string>
+  <string name="preferences__include_whitespace_tag">whitespace tag များထည့်သွင်းပါ</string>
+  <string name="preferences__sign_key_exchange_messages_with_identity_key">ကီးအလဲအလှယ်စာတိုများကို အိုင်ဒီကီးဖြင့် လက်မှတ်ထိုးပါ</string>
+  <string name="preferences__sign_key_exchange">ပုံစံကီးအပြောင်းအလဲ</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">အချိန်တစ်ခုကြာပြီးနောက်မန်မိုရီပေါ်မှဝှက်စာကိုမေ့ပစ်ပါ</string>
+  <string name="preferences__timeout_passphrase">စကားဝှက် အချိန်လွန်</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">စကားဝှက်မှတ်ထားမည့်အချိန်ရွေးချယ်ပါ</string>
+  <string name="preferences__pref_timeout_interval_title">ကြားချိန်</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">မန်မိုရီပေါ်မှစကားဝှက်ပျောက်မသွားခင်စောင့်ရမည့်ကြာချိန်</string>
+  <string name="preferences__view_my_identity_key">ကိုယ်စားပြုကီးကိုပြပါ</string>
+  <string name="preferences__export_my_identity_key">ကိုယ်စားပြုကီးကိုထုတ်ယူရန်</string>
+  <string name="preferences__import_an_identity_key_from_a_contact">အဆက်အသွယ်မှ အိုင်ဒီကီး တင်သွင်းပါ</string>
+  <string name="preferences__manage_configured_identity_keys">သတ်မှတ်ပြီးသောကိုယ်စားပြုကီးများစီမံခံ့ခွဲရန်</string>
+  <string name="preferences__notification_settings">အသိပေးမည့်ပုံစံများပြင်ဆင်ရန်</string>
+  <string name="preferences__notifications">အသိပေးချက်များ</string>
+  <string name="preferences__display_message_notifications_in_status_bar">null</string>
+  <string name="preferences__led_color">LED အရောင်</string>
+  <string name="preferences__change_notification_led_color">အချက်ပြ LED အရောင်ပြောင်းရန်</string>
+  <string name="preferences__pref_led_blink_title">LED လင်းမည့်ပုံစံ</string>
+  <string name="preferences__change_notification_blink_pattern">အချက်ပြ LED လင်းမည့်ပုံစံကိုရွေးချယ်ပါ</string>
+  <string name="preferences__pref_led_blink_dialogtitle">LED လင်းမည့်ပုံစံရွေးချယ်ပါ</string>
+  <string name="preferences__select_led_color">LED အရောင်ရွေးချယ်ပါ</string>
+  <string name="preferences__select_ringtone">သံစဉ်ရွေးချယ်ပါ</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>
+  <string name="preferences__red">အနီ</string>
+  <string name="preferences__blue">အပြာ</string>
+  <string name="preferences__orange">လိမ္မော်</string>
+  <string name="preferences__cyan">ခရမ်း</string>
+  <string name="preferences__magenta">ခရမ်းရင့်</string>
+  <string name="preferences__fast">အမြန်</string>
+  <string name="preferences__normal">ပုံမှန်</string>
+  <string name="preferences__slow">အနှေး</string>
+  <string name="preferences__custom">စိတ်ကြိုက်</string>
+  <string name="preferences__enable_fallback_mmsc">Fallback MMSC ကို ခွင့်ပြုပါ</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">စနစ်၏ APN အချက်အလက်များကိုသုံး၍မရပါက ဤနေရာတွင်သတ်မှတ်ထားသော MMSC အချက်အလက်များကိုအသုံးပြုပါ</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (အရေးကြီး)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS ပရောက်ဇီ အိမ်ရှင်စက် (အရေးမကြီး)</string>
+  <string name="preferences__mms_proxy_port_optional">MMS ပရောက်ဇီ Port (အရေးမကြီး)</string>
+  <string name="preferences__delivery_reports">ပို့ပေးကြောင်းအသိပေးခြင်း</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS တစ်ခုပို့ပြီးတိုင်း ပို့ပြီးကြောင်း အသိပေးပါ</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">MMS တစ်ခုပို့ပြီးတိုင်း ပို့ပြီးကြောင်း အသိပေးပါ</string>
+  <string name="preferences__mms_delivery_reports">MMS ပို့ပြီးကြောင်းအသိပေးခြင်း</string>
+  <string name="preferences__sms_delivery_reports">SMS ပို့ပြီးကြောင်းအသိပေးခြင်း</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">သတ်မှတ်အရေအတွက်ထက်ကျော်လွန်ပါက စာတိုအဟောင်းများကို အလိုလျှောက်ဖျတ်ပါ</string>
+  <string name="preferences__delete_old_messages">စာတိုအဟောင်းများကိုဖျတ်ပါ</string>
+  <string name="preferences__storage">သိမ်းဆည်းရာ</string>
+  <string name="preferences__conversation_length_limit">စာလုံးရေအကန့်အသတ်</string>
+  <string name="preferences__trim_all_threads_now">စာတွဲများအာလုံး တိပစ်ပါ</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">အကြောင်းအရာများအားလုံးကိုစစ်ဆေး၍စကားလုံးအရေအတွက်ကိုကန့်သတ်ပါ</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">အားလုံးကိုရွေးချယ်ပါ</string>
+  <string name="contact_selection_list__menu_unselect_all">အားလုံးကိုမရွေးချယ်ပါနှင့်</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">ပြီးပါပြီ</string>
+  <!--conversation_button_context-->
+  <string name="conversation_button_context__menu_send_unencrypted">ဝှက်စာမလုပ်ပဲပို့ပါ</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">ခေါ်ရန်</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
+  <string name="conversation_context__menu_copy_text">စာသားကူးရန်</string>
+  <string name="conversation_context__menu_delete_message">စာတိုဖျက်ရန်</string>
+  <string name="conversation_context__menu_forward_message">စာတိုဆက်ပို့ရန်</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">လုံခြုံသောဆက်ရှင် စပါ</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">ရွေးထားသည်များကိုဖျတ်ပါ</string>
+  <string name="conversation_list_batch__menu_select_all">အားလုံးကိုရွေးချယ်ပါ</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">ရှာရန်</string>
+  <!--conversation_secure_verified-->
+  <!--conversation_secure_unverified-->
+  <string name="conversation_secure_verified__menu_security">လုံခြုံရေး</string>
+  <string name="conversation_secure_verified__menu_verify_session">ဆက်ရှင်အတည်ပြု</string>
+  <string name="conversation_secure_verified__menu_verify_recipient">လက်ခံကိုစစ်ဆေးပါ</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">လုံခြုံရေးဆက်ရှင်ကိုရပ်ဆိုင်းပါ</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
+  <string name="conversation__menu_delete_thread">စာတွဲကိုဖျက်ပါ</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">လက်ခံမည့်သူစာရင်း</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">နှိုင်းယှဉ်</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
+  <string name="key_scanning__menu_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
+  <!--text_secure_locked-->
+  <string name="text_secure_locked__menu_unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">စာတိုအသစ်</string>
+  <string name="text_secure_normal__menu_settings">ဆက်တင်</string>
+  <string name="text_secure_normal__menu_import_export">ထုတ်ယူ/တင်သွင်း</string>
+  <string name="text_secure_normal__menu_import">သွင်းယူ</string>
+  <string name="text_secure_normal__menu_export">ထုတ်ယူ</string>
+  <string name="text_secure_normal__menu_clear_passphrase">စကားဝှက်ကိုရှင်းလင်းပါ</string>
+  <!--verify_keys-->
+  <string name="verify_keys__menu_verified">စစ်ဆေးပြီး</string>
+  <!--Misc. piggybacking-->
+  <!--EOF-->
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d99539d00..03a5ff47d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -96,6 +96,8 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Geen connectie beschikbaar voor MMS download, probeer later opnieuw...</string>
   <string name="MmsDownloader_error_storing_mms">MMS opslaan mislukt!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fout bij verbinden met MMS provider...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediabericht</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Wachtwoorden komen niet overeen!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect oud wachtwoord!</string>
@@ -194,7 +196,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Verkeerd versleuteld MMS-bericht...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-bericht versleuteld voor niet bestaande sessie...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Momenteel niet in staat om uw MMS bericht te versturen. Zodra de service beschikbaar is zal het verzonden worden .</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Momenteel niet in staat  om uw MMS bericht te versturen.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Bezig met importeren</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tekstberichten aan het importeren</string>
@@ -252,6 +254,8 @@
   <string name="database_migration_activity__import">Importeer</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Dit kan een moment duren. Heb geduld, we zullen u op de hoogte stellen wanneer het importeren voltooid is.</string>
   <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>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE WACHTWOORD</string>
   <string name="prompt_passphrase_activity__unlock">Ontgrendel</string>
@@ -299,6 +303,7 @@
   <string name="AndroidManifest__complete_key_exchange">Sleuteluitwisseling Voltooien</string>
   <string name="AndroidManifest__verify_imported_identity">Geïmporteerde Identiteit Verifiëren</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Algemeen</string>
   <string name="preferences__use_settings">Gebruiksinstellingen</string>
   <string name="preferences__pref_all_sms_title">Gebruik voor alle SMS</string>
   <string name="preferences__pref_all_mms_title">Gebruik voor alle MMS</string>
@@ -311,9 +316,9 @@
   <string name="preferences__choose_identity">Kies Identiteit</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Kies uw contactinformatie uit de contactpersonenlijst.</string>
   <string name="preferences__encryption_settings">Encryptie Instellingen</string>
-  <string name="preferences__change_passphrase">Wachtwoord Veranderen</string>
+  <string name="preferences__change_passphrase">Verander wachtwoord</string>
   <string name="preferences__change_my_passphrase">Verander mijn wachtwoord</string>
-  <string name="preferences__complete_key_exchanges">Sleuteluitwisseling Voltooien</string>
+  <string name="preferences__complete_key_exchanges">Voltooi sleuteluitwisselingen</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__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Op het einde van ieder onversleuteld bericht een spatie toevoegen</string>
   <string name="preferences__include_whitespace_tag">Spatie toevoegen</string>
@@ -324,12 +329,12 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Selecteer Wachtwoord Time-out</string>
   <string name="preferences__pref_timeout_interval_title">Time-out interval</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hoe lang te wachten voor het vergeten van het wachtwoord uit het geheugen</string>
-  <string name="preferences__identity_key_settings">Identiteitssleutel Instellingen</string>
+  <string name="preferences__identity_key_settings">Identiteitssleutels</string>
   <string name="preferences__view_my_identity_key">Bekijk mijn identiteitssleutel</string>
   <string name="preferences__export_my_identity_key">Exporteer mijn identiteitssleutel</string>
-  <string name="preferences__import_contacts_key">Sleutel van contact importeren</string>
+  <string name="preferences__import_contacts_key">Importeer sleutel contactpersoon</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importeer een identiteitssleutel van een contact</string>
-  <string name="preferences__manage_identity_keys">Beheer Identiteitssleutels</string>
+  <string name="preferences__manage_identity_keys">Beheer identiteitssleutels</string>
   <string name="preferences__manage_configured_identity_keys">Beheer ingestelde identiteitssleutels</string>
   <string name="preferences__notification_settings">Notificatie instellingen</string>
   <string name="preferences__notifications">Notificaties</string>
@@ -355,7 +360,9 @@
   <string name="preferences__normal">Normaal</string>
   <string name="preferences__slow">Langzaam</string>
   <string name="preferences__custom">Aangepast</string>
-  <string name="preferences__advanced_mms_access_point_names">Geavanceerd: MMS Toegangspuntnamen</string>
+  <string name="preferences__advanced">Geavanceerd</string>
+  <string name="preferences__passphrase">Wachtwoord</string>
+  <string name="preferences__advanced_mms_access_point_names">Reserve MMSC</string>
   <string name="preferences__enable_fallback_mmsc">Fallback MMSC Activeren</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Gebruik de hier ingestelde MMSC informatie wanneer de APN informatie van het systeem niet beschikbaar is.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (Vereist)</string>
@@ -407,6 +414,9 @@
   <string name="conversation__menu_delete_thread">Verwijder gehele gesprek</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lijst met ontvangers</string>
+  <string name="conversation_group_options__delivery">Verzending</string>
+  <string name="conversation_group_options__conversation">Conversatie</string>
+  <string name="conversation_group_options__broadcast">Uitzenden</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Vergelijken</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Wordt gescand om te vergelijken</string>
@@ -420,9 +430,9 @@
   <string name="text_secure_normal__menu_import">Importeer</string>
   <string name="text_secure_normal__menu_export">Exporteer</string>
   <string name="text_secure_normal__menu_clear_passphrase">Vergrendelen</string>
+  <string name="text_secure_normal__mark_all_as_read">Markeer Alles Als Gelezen</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Geverifieerd</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure is een tekstberichtapplicatie met verbeterde beveiliging die dient als een volledige vervanger voor de standaard tekstberichtapplicatie. Berichten naar andere TextSecure gebruikers worden versleuteld en alle tekstberichten worden opgeslagen in een versleutelde database op uw telefoon. Wanneer uw telefoon kwijt of gestolen is, zijn uw berichten veilig en communicatie met andere TextSecure gebruikers kan niet afgeluisterd worden.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 5ef36af02..4eaf5969a 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -96,6 +96,8 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ingen forbindelse tilgjengelig for MMS nedlasting, prøv igjen senere...</string>
   <string name="MmsDownloader_error_storing_mms">Feil ved lagring av MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Feil ved tilkobling til MMS tjeneste...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediamelding</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passordene er ikke like!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Gammelt passord er feil!</string>
@@ -194,7 +196,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Ugyldig kryptert MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS kryptert for en ikke-eksisterende sesjon...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Det er ikke mulig å sende MMS meldingen akkurat nå. Den vil sendes når tjenesten blir tilgjengelig igjen.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Det er ikke mulig å sende MMS meldingen din akkurat nå.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerer SMS meldinger</string>
@@ -252,6 +254,8 @@
   <string name="database_migration_activity__import">Importer</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Dette kan ta litt tid. Vær tålmodig, vi sier fra når importen er ferdig.</string>
   <string name="database_migration_activity__importing">IMPORTERER</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Oppdaterer database...</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSORD</string>
   <string name="prompt_passphrase_activity__unlock">Lås opp</string>
@@ -299,6 +303,7 @@
   <string name="AndroidManifest__complete_key_exchange">Fullfør nøkkelutveksling</string>
   <string name="AndroidManifest__verify_imported_identity">Bekreft importert identitet</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Generelt</string>
   <string name="preferences__use_settings">Innstillinger for bruk</string>
   <string name="preferences__pref_all_sms_title">Benytt for all SMS</string>
   <string name="preferences__pref_all_mms_title">Benytt for all MMS</string>
@@ -311,7 +316,7 @@
   <string name="preferences__choose_identity">Velg identitet</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Velg din kontakt fra kontaktlisten.</string>
   <string name="preferences__encryption_settings">Innstillinger for kryptering</string>
-  <string name="preferences__change_passphrase">Bytt passord</string>
+  <string name="preferences__change_passphrase">Endre passord</string>
   <string name="preferences__change_my_passphrase">Endre mitt passord</string>
   <string name="preferences__complete_key_exchanges">Fullfør nøkkelutvekslinger</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatisk fullføre nøkkelutvekslinger for nye sesjoner eller sesjoner med samme ID-nøkkel</string>
@@ -324,7 +329,7 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Velg passord timeout</string>
   <string name="preferences__pref_timeout_interval_title">Timeoutintervall</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hvor lang tid det skal gå før passordet slettes fra minnet</string>
-  <string name="preferences__identity_key_settings">Innstillinger for ID-nøkkel</string>
+  <string name="preferences__identity_key_settings">ID-nøkler</string>
   <string name="preferences__view_my_identity_key">Vis min ID-nøkkel</string>
   <string name="preferences__export_my_identity_key">Eksporter min ID-nøkkel</string>
   <string name="preferences__import_contacts_key">Importer kontaktens ID-nøkkel</string>
@@ -355,7 +360,9 @@
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Sakte</string>
   <string name="preferences__custom">Tilpasset</string>
-  <string name="preferences__advanced_mms_access_point_names">Avansert: MMS Aksesspunkt navn (APN)</string>
+  <string name="preferences__advanced">Avansert</string>
+  <string name="preferences__passphrase">Passord</string>
+  <string name="preferences__advanced_mms_access_point_names">Alternativ MMSC</string>
   <string name="preferences__enable_fallback_mmsc">Aktiver alternativ MMSC</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Benytt MMSC informasjonen konfigurert her når systemets APN informasjon er utilgjengelig.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (påkrevd)</string>
@@ -407,6 +414,9 @@
   <string name="conversation__menu_delete_thread">Slett tråd</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Mottakerliste</string>
+  <string name="conversation_group_options__delivery">Levering</string>
+  <string name="conversation_group_options__conversation">Samtale</string>
+  <string name="conversation_group_options__broadcast">Kringkast</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Sammenlign</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Få den skannet for å sammenlikne</string>
@@ -420,9 +430,9 @@
   <string name="text_secure_normal__menu_import">Importer</string>
   <string name="text_secure_normal__menu_export">Eksporter</string>
   <string name="text_secure_normal__menu_clear_passphrase">Fjern passord</string>
+  <string name="text_secure_normal__mark_all_as_read">Marker alle lest</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Bekreftet</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure er en tekstmeldingsapplikasjon hvor sikkerheten er forbedret. TextSecure fungerer som en full erstatning for mobilterminalens standard SMS/MMS applikasjon. Meldinger til andre TextSecure brukere sendes kryptert, og alle meldinger lagres i en kryptert database på mobilterminalen. Dersom telefonen blir stjålet eller mistet, vil meldingene være trygge, og kommunikasjon med andre TextSecure brukere kan ikke overvåkes.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ad9573dc8..25cfca3ae 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -96,6 +96,8 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Sem conectividade para fazer download de MMS, tente mais tarde...</string>
   <string name="MmsDownloader_error_storing_mms">Erro ao armazenar MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erro na conexão com provedor de MMS...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem Multimídia</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">As frases-chave não coincidem!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase-chave anterior incorrecta!</string>
@@ -194,7 +196,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Mensagem MMS não pôde ser enviada agora. Será enviada quando o serviço estiver disponível.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Mensagem MMS não pôde ser enviada agora.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importação em andamento</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando mensagens de texto</string>
@@ -252,6 +254,8 @@
   <string name="database_migration_activity__import">Importar</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Isso pode demorar um pouco. Seja paciente, iremos notificá-lo quando a importação terminar.</string>
   <string name="database_migration_activity__importing">Importando</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Atualizando base de dados...</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">Palavra-chave do TextSecure</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
@@ -299,6 +303,7 @@
   <string name="AndroidManifest__complete_key_exchange">Completar intercâmbio de chaves</string>
   <string name="AndroidManifest__verify_imported_identity">Verificar identidade importada</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Geral</string>
   <string name="preferences__use_settings">Utilizar configurações</string>
   <string name="preferences__pref_all_sms_title">Utilizar para todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizar para todas as MMS</string>
@@ -313,7 +318,7 @@
   <string name="preferences__encryption_settings">Configurações de cifra</string>
   <string name="preferences__change_passphrase">Mudar frase-chave</string>
   <string name="preferences__change_my_passphrase">Mudar a minha frase-chave</string>
-  <string name="preferences__complete_key_exchanges">Completar intercâmbios de chaves</string>
+  <string name="preferences__complete_key_exchanges">Completar trocas de chaves</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automaticamente intercâmbios de chaves para novas sessões ou para sessões existentes com a mesma chave de identidade</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Incluir uma etiqueta de caracteres invisíveis no fim de todas as mensagens não cifradas</string>
   <string name="preferences__include_whitespace_tag">Incluir etiqueta de caracteres invisíveis</string>
@@ -324,10 +329,10 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar tempo de expiração da frase-chave</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
-  <string name="preferences__identity_key_settings">Configurações de chave de identidade</string>
+  <string name="preferences__identity_key_settings">Chaves de identidade</string>
   <string name="preferences__view_my_identity_key">Visualizar a minha chave de identidade</string>
   <string name="preferences__export_my_identity_key">Exportar a minha chave de identidade</string>
-  <string name="preferences__import_contacts_key">Importar a chave do contacto</string>
+  <string name="preferences__import_contacts_key">Importar chave do contato</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importar uma chave de identidade a partir de um contacto</string>
   <string name="preferences__manage_identity_keys">Gerir chaves de identidade</string>
   <string name="preferences__manage_configured_identity_keys">Gerir chaves de identidade configuradas</string>
@@ -355,7 +360,9 @@
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Lento</string>
   <string name="preferences__custom">Personalizado</string>
-  <string name="preferences__advanced_mms_access_point_names">Avançado: APN de MMS</string>
+  <string name="preferences__advanced">Avançado</string>
+  <string name="preferences__passphrase">Frase-chave</string>
+  <string name="preferences__advanced_mms_access_point_names">MMSC Reserva</string>
   <string name="preferences__enable_fallback_mmsc">Habilitar MMSC de reseva</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Usar esta informação de MMSC quando APN do sistema estiver indisponível.</string>
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
@@ -407,6 +414,9 @@
   <string name="conversation__menu_delete_thread">Apagar conversa</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lista de destinatários</string>
+  <string name="conversation_group_options__delivery">Entrega</string>
+  <string name="conversation_group_options__conversation">Conversa</string>
+  <string name="conversation_group_options__broadcast">Broadcast</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Comparar</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Apresente o código QR para comparar</string>
@@ -420,9 +430,9 @@
   <string name="text_secure_normal__menu_import">Importar</string>
   <string name="text_secure_normal__menu_export">Exportar</string>
   <string name="text_secure_normal__menu_clear_passphrase">Limpar frase-chave</string>
+  <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure é umaaplicação de mensagens seguras que funciona como uma alternativa integral à aplicação de mensagens por omissão. Mensagens para outros utilizadores TextSecure são cifradas em trânsito e todas as mensagens são armazenadas numa base de dados cifrada no dispositivo. Se o seu telemóvel for perdido ou roubado, as suas mensages estarão seguras e comunicações com outros utilizadores TextSecure não podem ser monitorizadas em trânsito.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9b1b4f5ff..687b2bd03 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -96,6 +96,8 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Não existe conectividade disponível para transferir MMS, tente mais tarde...</string>
   <string name="MmsDownloader_error_storing_mms">Erro a armazenar MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erro na ligação com o servidor MMS...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem Multimedia</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">As frases-chave não coincidem!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase-chave anterior incorrecta!</string>
@@ -105,6 +107,9 @@
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frase-chave inválida!</string>
   <!--PromptApnActivity-->
+  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Tem de especificar uma URL MMSC para a sua operadora.</string>
+  <string name="PromptApnActivity_mms_settings_updated">Configuração MMS Actualizada</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Pode modificar estes valores a partir do menu de configuração TextSecure em qualquer altura.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ERRO:⏎ ⏎ Recebeu uma chave pública corrompida. Esta chave não pode ser processada, por favor reinicie uma sessão segura.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ERRO:⏎ ⏎ Recebeu uma chave pública de uma versão do protocolo não suportada. Esta chave não pode ser processada, por favor reinicie uma sessão segura.</string>
@@ -191,7 +196,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Presentemente não é possível remeter a mensagem MMS. Será reenviada assim que o serviço esteja disponível.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Presentemente não é possível enviar a sua mensagem MMS</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importação em progresso</string>
   <string name="ApplicationMigrationService_importing_text_messages">A importar mensages de texto</string>
@@ -249,10 +254,17 @@
   <string name="database_migration_activity__import">Importar</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Isto pode demorar um pouco. Por favor seja paciente, será notificado quanto a importação estiver completa.</string>
   <string name="database_migration_activity__importing">A IMPORTAR</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">A actualizar a base de dados...</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE-CHAVE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_apn_activity-->
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure requer configurações APN para entregar mensagens multimédia através da sua operadora sem fios. O seu dispositivo não disponibiliza esta informação, o que é ocasionalmente o caso para dispositivos bloqueados e outras configurações restritivas.</string>
+  <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Para enviar mensagens multimédia, por favor complete a informação APN requerida abaixo. Os valores para a sua operadora podem habitualmente ser encontrados procurando por \'APN &amp;lt;Operadora&amp;gt;\'. Apenas necessita de efectuar esta operação uma vez.</string>
+  <string name="prompt_apn_activity__mmsc_url_required">URL MMSC (OBRIGATÓRIO):</string>
+  <string name="prompt_apn_activity__mms_proxy_host_optional">ANFITRIÃO PROXY MMS (OPCIONAL):</string>
+  <string name="prompt_apn_activity__mms_proxy_port_optional">PORTA PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__session">Sessão</string>
   <string name="receive_key_activity__identities">Identidades</string>
@@ -291,6 +303,7 @@
   <string name="AndroidManifest__complete_key_exchange">Completar intercâmbio de chaves</string>
   <string name="AndroidManifest__verify_imported_identity">Verificar identidade importada</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Geral</string>
   <string name="preferences__use_settings">Utilizar configurações</string>
   <string name="preferences__pref_all_sms_title">Utilizar para todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizar para todas as MMS</string>
@@ -303,9 +316,9 @@
   <string name="preferences__choose_identity">Escolher identidade</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Escolha o seu próprio contacto da lista de contactos.</string>
   <string name="preferences__encryption_settings">Configurações de cifra</string>
-  <string name="preferences__change_passphrase">Mudar frase-chave</string>
+  <string name="preferences__change_passphrase">Alterar frase-chave</string>
   <string name="preferences__change_my_passphrase">Mudar a minha frase-chave</string>
-  <string name="preferences__complete_key_exchanges">Completar intercâmbios de chaves</string>
+  <string name="preferences__complete_key_exchanges">Completar troca de chaves</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automaticamente intercâmbios de chaves para novas sessões ou para sessões existentes com a mesma chave de identidade</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Incluir uma etiqueta de caracteres invisíveis no fim de todas as mensagens não cifradas</string>
   <string name="preferences__include_whitespace_tag">Incluir etiqueta de caracteres invisíveis</string>
@@ -316,10 +329,10 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar tempo de expiração da frase-chave</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
-  <string name="preferences__identity_key_settings">Configurações de chave de identidade</string>
+  <string name="preferences__identity_key_settings">Chaves de identidade</string>
   <string name="preferences__view_my_identity_key">Visualizar a minha chave de identidade</string>
   <string name="preferences__export_my_identity_key">Exportar a minha chave de identidade</string>
-  <string name="preferences__import_contacts_key">Importar a chave do contacto</string>
+  <string name="preferences__import_contacts_key">Importar chave do contacto</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importar uma chave de identidade a partir de um contacto</string>
   <string name="preferences__manage_identity_keys">Gerir chaves de identidade</string>
   <string name="preferences__manage_configured_identity_keys">Gerir chaves de identidade configuradas</string>
@@ -347,7 +360,9 @@
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Lento</string>
   <string name="preferences__custom">Personalizado</string>
-  <string name="preferences__advanced_mms_access_point_names">Avançado: APN de MMS</string>
+  <string name="preferences__advanced">Avançado</string>
+  <string name="preferences__passphrase">Frase-chave</string>
+  <string name="preferences__advanced_mms_access_point_names">MMSC de recurso</string>
   <string name="preferences__enable_fallback_mmsc">Habilitar MMSC de reseva</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Usar esta informação de MMSC quando APN do sistema estiver indisponível.</string>
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
@@ -399,6 +414,9 @@
   <string name="conversation__menu_delete_thread">Apagar conversa</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lista de destinatários</string>
+  <string name="conversation_group_options__delivery">Entrega</string>
+  <string name="conversation_group_options__conversation">Conversa</string>
+  <string name="conversation_group_options__broadcast">Emissão</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Comparar</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Apresente o código QR para comparar</string>
@@ -412,9 +430,9 @@
   <string name="text_secure_normal__menu_import">Importar</string>
   <string name="text_secure_normal__menu_export">Exportar</string>
   <string name="text_secure_normal__menu_clear_passphrase">Limpar frase-chave</string>
+  <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure é umaaplicação de mensagens seguras que funciona como uma alternativa integral à aplicação de mensagens por omissão. Mensagens para outros utilizadores TextSecure são cifradas em trânsito e todas as mensagens são armazenadas numa base de dados cifrada no dispositivo. Se o seu telemóvel for perdido ou roubado, as suas mensages estarão seguras e comunicações com outros utilizadores TextSecure não podem ser monitorizadas em trânsito.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
new file mode 100644
index 000000000..7dceed319
--- /dev/null
+++ b/res/values-ru/strings.xml
@@ -0,0 +1,422 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Да</string>
+  <string name="no">Нет</string>
+  <string name="delete">Удалить</string>
+  <!--ApplicationExportManager-->
+  <string name="ApplicationExportManager_import_database_and_settings_title">Импортировать базу данных и настройки?</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Импорт TextSecure базы данных, ключи и настройки на SD-карту ⏎ ⏎ ВНИМАНИЕ: Это сотрет любые существующие сообщения, ключи и настройки!</string>
+  <string name="ApplicationExportManager_importing_database_and_keys">Импорт ключей и базы данных</string>
+  <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Импорт базы данных СМС, ключей и настроек...</string>
+  <string name="ApplicationExportManager_export_database_question">Экспортировать базу данных?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Экспортировать базу данных TextSecure, ключей и настроек на SD карту?</string>
+  <string name="ApplicationExportManager_exporting_database_and_keys">Экспорт базы данных и ключей</string>
+  <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Экспорт базы данных СМС, ключей и настроек...</string>
+  <string name="ApplicationExportManager_no_sd_card_found_exclamation">Не найдена SD карта!</string>
+  <string name="ApplicationExportManager_error_exporting_to_sd_exclamation">Ошибка экспорта на SD карту!</string>
+  <string name="ApplicationExportManager_import_successful_exclamation">Импортирование успешно завершено!</string>
+  <string name="ApplicationExportManager_export_successful_exclamation">Экспортирование успешно завершено!</string>
+  <string name="ApplicationExportManager_import">Импорт</string>
+  <string name="ApplicationExportManager_export">Экспорт</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Сейчас: %s</string>
+  <string name="ApplicationPreferenceActivity_not_found_exclamation">Не найдено!</string>
+  <string name="ApplicationPreferenceActivity_no_valid_identity_key_was_found_in_the_specified_contact">Ни одного действительного определительного ключа не было найдено в указанном контакте.</string>
+  <string name="ApplicationPreferenceActivity_you_don_t_have_an_identity_key_exclamation">У вас нет персонального ключа!</string>
+  <string name="ApplicationPreferenceActivity_you_have_not_yet_defined_a_contact_for_yourself">Вы еще не определили контакт для себя! Выберите один в меню настроек.</string>
+  <string name="ApplicationPreferenceActivity_exported_to_contacts_database">Экспортированные в базу данных контактов!</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Вам нужно ввести ваш пароль чтобы импортировать ключи ...</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Вам нужно ввести ваш пароль чтобы управлять ключи ...</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">\t\nВы еще не установили пароль!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">количество сообщений в беседе</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Удалить все старые сообщения?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы уверены что хотите немедленно обрезать все нити разговоров до % самых последних сообщений?</string>
+  <string name="ApplicationPreferencesActivity_delete">Удалить</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">Изображение</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Видео</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Аудио</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Размер сообщения: %d KB</string>
+  <string name="ConversationItem_expires_s">Истекает: %s</string>
+  <string name="ConversationItem_error_sending_message">Ошибка при отправке сообщения</string>
+  <string name="ConversationItem_sending">Отправка...</string>
+  <string name="ConversationItem_saving_attachment">Сохранение приложения</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Сохранение приложения на SD карту</string>
+  <string name="ConversationItem_save_to_sd_card">Сохранить на SD карту?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Эта информация была сохранена в зашифрованной базе данных. Версия которую вы сохраните на карту памяти SD больше не будет зашифрованна. Хотите продолжать?</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Ошибка при сохранении приложения на SD карту!</string>
+  <string name="ConversationItem_success_exclamation">Успешно!</string>
+  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Невозможно произвести запись на SD карту!</string>
+  <string name="ConversationItem_view_secure_media_question">Посмотреть защищенную медию?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Эта медиа была сохранена в зашифрованной базе данных. К сожалению, чтобы ее увидеть через внешного зрителя, требует чтобы данные были временно расшифрованны и записанны на диск. Вы уверены что вы хотите это сделать?</string>
+  <string name="ConversationItem_key_exchange_message">Сообщение ключевого обмена</string>
+  <string name="ConversationItem_received_and_processed_key_exchange_message">Сообщение ключевого обмена получено и обработано.</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Ошибка, получили устаревшее сообщение ключевого обмена.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Сообщение ключевого обмена получено, нажмите здесь чтобы обработать.</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Включить защищенное соединение?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Включить защищенное соединение с %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Подтверждение завершения защищенного соединения</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Вы уверены, что хотите прервать защищенное соединение?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Подтверждения  Стирание Обсуждения</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Вы уверены что вы хотите удалить этот разговор?</string>
+  <string name="ConversationActivity_add_attachment">Добавить приложение</string>
+  <string name="ConversationActivity_compose_message">Написать сообщение</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Извините, произошла ошибка при настройке приложения.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Извините, выбранное видео превышает установленные размеры.</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Извините, выбранное аудио превышает установленные размеры.</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">СМС или електронный почтовый аддрес получатель не действительны.</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">Пустое сообщение!</string>
+  <string name="ConversationActivity_forward_message_prefix">FWD</string>
+  <string name="ConversationActivity_group_conversation_recipients">Получатели Разговор Группа</string>
+  <string name="ConversationActivity_group_conversation">Разговор Группа</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d получатели в группе</string>
+  <string name="ConversationActivity_saving_draft">Сохранение черновика...</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Подробности</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Отправитель: %1$s⏎ Перевозки: %2$s⏎ Отправлено/Поступило:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Отправитель: %1$s⏎\nПеревозки: %2$s⏎\nОтправлено: %3$s⏎\nПоступило: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Подтвердите Удаление Сообщения</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Вы уверены что хотите навсегда удалить это сообщение?</string>
+  <!--ConversationListAdapter-->
+  <string name="ConversationListAdapter_encrypted_message_enter_passphrase">Сообщение зашифровано, введите пароль ...</string>
+  <string name="ConversationListAdapter_key_exchange_message">Сообщениe ключевого обмена</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Стереть обсуждения?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Вы уверены что вы хотите стиреть все выбранные обсуждения?</string>
+  <string name="ConversationListFragment_deleting">Удаление</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Стираем выбранные разговоры ...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Сообщениe ключевого обмена</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Просканированный ключ не найден!</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Нет подключения для MMS загрузки, попробуйте позже ...</string>
+  <string name="MmsDownloader_error_storing_mms">Ошибка хранения MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Ошибка подключения к поставщику MMS ...</string>
+  <!--NotificationMmsMessageRecord-->
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Пароли не совпадают!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Неправильный старый пароль</string>
+  <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Пароли не совпадают!</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Вы должны указать пароль</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Неправильный пароль!</string>
+  <!--PromptApnActivity-->
+  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Вы должны указать MMSC URL для вашего оператора.</string>
+  <string name="PromptApnActivity_mms_settings_updated">Настройки MMS Обновлены</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Вы можете изменить эти значения из TextSecure меню в любое время.</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">Ошибка: Вы получили поврежденный ключ общего пользования. Этот ключ не действителен, пожалуйста, начните сессию сначала.</string>
+  <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ERROR:⏎ ⏎ You have received a public key from an unsupported version of the protocol. This key can not be processed, please re-initiate a secure session.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_does_not_include_an_identity_signature">В этом сообщении ключевого обмена отсутствует личная подпись.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_but_you_do_not_yet_trust_it">Это сообщение ключевого обмена содержит личную подпись, но вы ей еще не доверяете.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_which_you_trust_for_s">Это сообщение ключевого обмена содержит личную подпись которой вы доверяете: %s</string>
+  <string name="ReceiveKeyActivity_this_is_the_key_that_you_sent_to_start_your_current_encrypted_session_with_s">Этот ключ вы послали для того чтобы начать вашу текущую закодированную сессию с %s</string>
+  <string name="ReceiveKeyActivity_this_is_the_key_that_you_received_to_start_your_current_encrypted_session_with_s">Этот ключ вы получили для того чтобы начать вашу текущую закодированную сессию  с %s</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_warning_you_already_have_an_encrypted_session">Вы получили сообщение Ключевого Обмена от %s. Внимание: Вы уже проводите закодированную сессию с этим контактом. Если вы решите принять это сообщение,  ваша текущая сессия будет уничтожена, и вы должны будете снова подтвердить. Хотели бы вы завершить этот обмен ключами?</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_previously_initiated">Вы получили сообщение Ключевого Обмена от %s. Вы уже начали сессию с этим контактом, и, принимая этот ключ вы совершите обмен ключами. Хотели бы вы завершить этот обмен ключами?</string>
+  <string name="ReceiveKeyActivity_you_have_initiated_a_key_exchange_message_with_s_but_have_not_yet_received_a_reply">Вы инициировали сообщение Ключевого Обмена с %s, но еще не получили ответа.</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_no_existing_session">Вы получили сообщение Ключевого Обмена от %s. В настоящее время у вас нет сессии с этим контактом, хотели бы вы завершить этот обмен </string>
+  <!--ReviewIdentitiesActivity-->
+  <string name="ReviewIdentitiesActivity_unable_to_view_corrupted_identity_key_exclamation">Невозможно посмотреть поврежденный ключ личность!</string>
+  <string name="ReviewIdentitiesActivity_delete_identity">Удалить личность?</string>
+  <string name="ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key">Вы уверены что хотите навсегда удалить ключ этой личности?</string>
+  <string name="ReviewIdentitiesActivity_invalid_identity">Личность Недействительна!</string>
+  <!--SaveIdentityActivity-->
+  <string name="SaveIdentityActivity_you_must_specify_a_name_for_this_identity_exclamation">Вы должны указать имя для этой личности!</string>
+  <string name="SaveIdentityActivity_identity_name_exists_exclamation">Это имя уже существует!</string>
+  <string name="SaveIdentityActivity_an_identity_key_with_the_specified_name_already_exists">Ключ личности с таким выбранным именем уже существует.</string>
+  <string name="SaveIdentityActivity_manage_identities">Управление Личностями</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_mark_identity_verified_question">Пометить Личность как Проверенную?</string>
+  <string name="VerifyIdentityActivity_are_you_sure_you_have_validated_the_recipients_identity_fingerprint_and_would_like_to_mark_it_as_verified">Вы уверены что вы проверили личность получателя и хотите пометить её как проверенную?</string>
+  <string name="VerifyIdentityActivity_mark_verified">Пометь Kак Pроверенно</string>
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">У вас нет персонального ключа!</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Получатель не имеет персонального ключа.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Получатель не имеет персонального ключа!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Просканируй их ключи чтобы сравнить</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Просканируй мой ключ</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ОСТОРОЖНО, просканированный ключ не действителен! Пожалуйста внимательно проверьте текст.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">НЕ Подтвержден!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Их ключ правильный. И вам также необходимо подтвердить свой ключ с ними.</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Проверено!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">У вас нет персонального ключа!</string>
+  <!--VerifyImportedIdentityActivity-->
+  <string name="VerifyImportedIdentityActivity_you_must_specify_a_name_for_this_contact_exclamation">Вы должны указать имя для этот контакт!</string>
+  <string name="VerifyImportedIdentityActivity_save_identity_key_question">Сохранить Ключ Личности?</string>
+  <string name="VerifyImportedIdentityActivity_error_saving_identity_key_exclamation">Ошибка при сохранении персонального ключа!</string>
+  <string name="VerifyImportedIdentityActivity_this_identity_key_or_an_identity_key_with_the_same_name_already_exists_please_edit_your_key_database">Этот ключ личности или ключ личности с таким же именем уже существует. Пожалуйста, измените вашу базу данных ключей.</string>
+  <string name="VerifyImportedIdentityActivity_scan_to_compare">Сканируй чтобы сравнить</string>
+  <string name="VerifyImportedIdentityActivity_get_scanned_to_compare">Сканируй чтобы сравнить</string>
+  <string name="VerifyImportedIdentityActivity_not_verified_exclamation">НЕ Подтвержден!</string>
+  <string name="VerifyImportedIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ОСТОРОЖНО, просканированный ключ НЕ соответствует!</string>
+  <string name="VerifyImportedIdentityActivity_the_scanned_key_matches_exclamation">Просканированный ключ соответствует!</string>
+  <string name="VerifyImportedIdentityActivity_verified_exclamation">Проверено!</string>
+  <string name="VerifyImportedIdentityActivity_are_you_sure_that_you_would_like_to_mark_this_as_a_valid_identity_key_for_all_future_correspondence_with_s">Вы уверены, что вы хотели бы отметить это как действительный ключ идентичности для всех будущих корреспондеций с %с? Вы должны сделать это только если вы действительно проверили отпечатки пальцев.</string>
+  <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_mark_session_verified_question">Пометить Сессию как Проверенную?</string>
+  <string name="VerifyKeysActivity_are_you_sure_that_you_have_validated_these_fingerprints_and_would_like_to_mark_this_session_as_verified">Вы уверены что вы проверили эти личности и хотите пометить эту сессию как проверенную?</string>
+  <string name="VerifyKeysActivity_mark_verified">Пометить Проверено</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Просканируй мой личность.</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Просканируй их личности.</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ОСТОРОЖНО, просканированный ключ не действителен! Пожалуйста внимательно проверьте текст.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">НЕ Подтвержден!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Их ключ правильный. Вам также необходимо просканировать свой личность.</string>
+  <string name="VerifyKeysActivity_verified_exclamation">Проверено!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">У вас нет персонального ключа!</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Сканируй чтобы сравнить</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Сканируй чтобы сравнить</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ОСТОРОЖНО, просканированный ключ НЕ соответствует!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">НЕ Подтвержден!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Просканированный ключ соответствует!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Проверено!</string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Инициировать Несмотря на Существующий Запрос?</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Вы уже отправили запрос на инициирование сеанса для данного получателя. Вы уверены, что хотите отправить еще один? Это аннулирует первый запрос.</string>
+  <string name="KeyExchangeInitiator_send">Отправить</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Плохой зашифрованное сообщение ...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Расшифровка, пожалуйста, подождите ...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Сообщение зашивровано для несуществующей сессии...</string>
+  <string name="MessageDisplayHelper_decryption_error_local_message_corrupted_mac_doesn_t_match_potential_tampering_question">Ошибка в расшифровке: местное сообщение повреждено, МАС не соответствует. Возможна попытка проникновения?</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Соединение с ММС сервером...</string>
+  <string name="MmsDatabase_downloading_mms">Загрузка ММС...</string>
+  <string name="MmsDatabase_mms_download_failed">Загрузка ММС не прошла!</string>
+  <string name="MmsDatabase_downloading">Загрузка...</string>
+  <string name="MmsDatabase_anonymous">Анонимный</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Расшифровка ММС, ждите пожалуйста...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Плохо зашифрованное ММС сообщение...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">ММС сообщение зашифрованно для несуществующей сессии...</string>
+  <!--MmsSender-->
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Импорт в прогрессе</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Импорт Текстовых Сообщений</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Пароль Кэширования</string>
+  <string name="KeyCachingService_passphrase_cached">Пароль Кэширования</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d новые сообщения</string>
+  <string name="MessageNotifier_most_recent_from_s">Самые последние от: %s</string>
+  <string name="MessageNotifier_key_exchange">Обмен Ключей...</string>
+  <string name="MessageNotifier_encrypted_message">Зашифрованное сообщение ...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">Поврежденный зашифрованный текст</string>
+  <string name="MessageNotifier_no_subject">(Нет Предмета)</string>
+  <string name="MessageNotifier_message_delivery_failed">Доставка сообщения не удалась.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Не удалось доставить сообщение.</string>
+  <string name="MessageNotifier_error_delivering_message">Ошибка при доставке сообщения.</string>
+  <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Не можем сейчас отправить MMS-сообщение. Оно будет отправляться когда услуг становится доступным.</string>
+  <!--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>
+  <string name="auto_initiate_activity__initiate_exchange">Инициируй Обмен</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">СТАРЫЙ ПАРОЛЬ:</string>
+  <string name="change_passphrase_activity__new_passphrase">НОВОЙ ПАРОЛЬ:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">ПОВТОРИ НОВОЙ ПАРОЛЬ:</string>
+  <!--contact_selection_group_activity-->
+  <!--contact_selection_list_activity-->
+  <string name="contact_selection_group_activity__no_contacts">Нет контактов.</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">Выбрать для</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Нет новых вызовов.</string>
+  <!--conversation_activity-->
+  <string name="conversation_activity__type_message">Наберите сообщение</string>
+  <string name="conversation_activity__send">Отправить</string>
+  <string name="conversation_activity__remove">Удалить</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">Скачать</string>
+  <string name="conversation_item_sent__downloading">Загрузка</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Скачать</string>
+  <string name="conversation_item_received__downloading">Загрузка</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Пакетный Режим Выбора</string>
+  <!--create_passphrase_activity-->
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Пожалуйста, выберите пароль, который будет использоваться для локального шифрования ваших данных.⏎\n⏎\nЭто должнен  быть сильный пароль.</string>
+  <string name="create_passphrase_activity__passphrase">ПАРОЛЬ:</string>
+  <string name="create_passphrase_activity__repeat">ПОВТОРИ:</string>
+  <string name="create_passphrase_activity__continue">Продолжи</string>
+  <string name="create_passphrase_activity__generating_secrets">СОЗДАЕМ СЕКРЕТЫ </string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Хотели бы вы импортировать существующие текстовые сообщения в зашифрованную базу данных TextSecure?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Установленная система базы данных не будет меняться никоим образом.</string>
+  <string name="database_migration_activity__skip">Пропусти</string>
+  <string name="database_migration_activity__import">Импорт</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Это может занять какое-то время. Пожалуйста, наберитесь терпения, мы вам сообщим когда импортирование завершится.</string>
+  <string name="database_migration_activity__importing">ИМПОРТИРОВАНИЕ</string>
+  <!--database_upgrade_activity-->
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE ПАРОЛЬ</string>
+  <string name="prompt_passphrase_activity__unlock">Отпереть</string>
+  <!--prompt_apn_activity-->
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure требует настройки APN для доставки сообщений медиа через ваш беспроводной связи. Эта информация недоступна на вашем устройстве. Это может произойти, если устройство заблокировано или ограничено.</string>
+  <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Для отправки сообщений СМИ, заполните информацию APN здесь. Значения вашего оператора обычно можно находить поиске  \'&amp;lt;your carrier&amp;gt; APN\'. Это только надо сделать один раз.</string>
+  <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (ОБЯЗАТЕЛЬНО):</string>
+  <string name="prompt_apn_activity__mms_proxy_host_optional">MMS ПРОКСИ-СЕРВЕРА (НЕОБЯЗАТЕЛЬНО):</string>
+  <string name="prompt_apn_activity__mms_proxy_port_optional">MMS ПОРТА ПРОКСИ (НЕОБЯЗАТЕЛЬНО):</string>
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__session">Сессия</string>
+  <string name="receive_key_activity__identities">Личности</string>
+  <string name="receive_key_activity__complete_exchange">Завершить Обмен</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to">К</string>
+  <!--review_identities-->
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">В настоящее время вы не имеете никаких личных ключей в доверенной вам базе данных.</string>
+  <!--save_identity_activity-->
+  <string name="save_identity_activity__identity_name">Имя Личности:</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">Их личность (их прочтение):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Ваша личность (ваше прочтение):</string>
+  <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Имя личности:\⏎</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Импортированное имя личности:\⏎</string>
+  <string name="verify_import_identity_activity__verified">Проверено!</string>
+  <string name="verify_import_identity_activity__compare">Сравнивать</string>
+  <!--verify_keys_activity-->
+  <string name="verify_keys_activity__they_read_this">Они читали это:</string>
+  <string name="verify_keys_activity__you_read_this">Вы читали это:</string>
+  <!--view_identity_activity-->
+  <string name="view_identity_activity__identity">Личность:</string>
+  <string name="view_identity_activity__qr_code">QR код</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Задать пароль</string>
+  <string name="AndroidManifest__enter_passphrase">Введите пароль</string>
+  <string name="AndroidManifest__select_contacts">Выберите Контакты</string>
+  <string name="AndroidManifest__textsecure_detected">Обнаружено TextSecure</string>
+  <string name="AndroidManifest__public_identity_key">Открытый Ключ Личности</string>
+  <string name="AndroidManifest__change_passphrase">Изменить пароль</string>
+  <string name="AndroidManifest__verify_session">Проверь Сессию</string>
+  <string name="AndroidManifest__verify_identity">Проверь Личность</string>
+  <string name="AndroidManifest__save_identity">Сохрани Личность</string>
+  <string name="AndroidManifest__manage_identity_keys">Управляй Ключ Личности</string>
+  <string name="AndroidManifest__complete_key_exchange">Заверши Обмен Ключей</string>
+  <string name="AndroidManifest__verify_imported_identity">Проверь Импортированную Личность</string>
+  <!--preferences.xml-->
+  <string name="preferences__use_settings">Используйте Настройки</string>
+  <string name="preferences__pref_all_sms_title">Используй для всех СМС</string>
+  <string name="preferences__pref_all_mms_title">Используй для всех MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Используйте TextSecure для просмотра и хранения всех входящих текстовых сообщений</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Используйте TextSecure для просмотра и хранения всех входящих мультимедийных сообщений</string>
+  <string name="preferences__input_settings">Ввести Настройки</string>
+  <string name="preferences__pref_enter_sends_title">Enter посылает</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>
+  <string name="preferences__encryption_settings">Шифрование Настройки</string>
+  <string name="preferences__change_my_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__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Включите тег пробела в конце каждого незашифрованного сообщения</string>
+  <string name="preferences__include_whitespace_tag">Добавь тег пробела</string>
+  <string name="preferences__sign_key_exchange_messages_with_identity_key">Подпиши ключ обмена сообщениями с ключом личности</string>
+  <string name="preferences__sign_key_exchange">Подпиши Обмен Ключей</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Забудьте пароль из памяти после некоторого интервала</string>
+  <string name="preferences__timeout_passphrase">Тайм-аут Пароль</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Выберите Тайм-аут Пароля</string>
+  <string name="preferences__pref_timeout_interval_title">Интервал Тайм-аута</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Отрезок времени, прежде чем пароль из памяти будет забыт</string>
+  <string name="preferences__view_my_identity_key">Посмотри мой ключ личности</string>
+  <string name="preferences__export_my_identity_key">Экспортируй мой ключ личности</string>
+  <string name="preferences__import_an_identity_key_from_a_contact">Импортируй ключ личности из контакта</string>
+  <string name="preferences__manage_configured_identity_keys">Управляй настроеными ключями личности</string>
+  <string name="preferences__notification_settings">Настройки Уведомления</string>
+  <string name="preferences__notifications">Уведомления</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Показать сообщение об уведомлении в строке статуса</string>
+  <string name="preferences__led_color">Цвет Светодиода</string>
+  <string name="preferences__change_notification_led_color">Поменять Цвет Светодиода</string>
+  <string name="preferences__pref_led_blink_title">Мигания Светодиода</string>
+  <string name="preferences__change_notification_blink_pattern">Поменяй мигания светодиода</string>
+  <string name="preferences__pref_led_blink_dialogtitle">Выберите мигания светодиода</string>
+  <string name="preferences__select_led_color">Выберите Цвет светодиода</string>
+  <string name="preferences__select_ringtone">Выбор Мелодии</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>
+  <string name="preferences__red">Красный</string>
+  <string name="preferences__blue">Синий</string>
+  <string name="preferences__orange">Оранжевый</string>
+  <string name="preferences__cyan">Голубой</string>
+  <string name="preferences__magenta">Пурпурный</string>
+  <string name="preferences__fast">Быстро</string>
+  <string name="preferences__normal">Нормально</string>
+  <string name="preferences__slow">Медленно</string>
+  <string name="preferences__custom">Свой</string>
+  <string name="preferences__enable_fallback_mmsc">Включите Резервной MMSC</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Используйте установленную здесь информацию MMSC когда информационная система APN недоступна.</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (обязательно)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS Адрес Прокси (Необязательно)</string>
+  <string name="preferences__mms_proxy_port_optional"> MMS Порт Прокси (необязательно)</string>
+  <string name="preferences__delivery_reports">Отчеты о Доставке</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запроси отчет о доставке для каждого отправленного вами СМС сообщения</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Запроси отчет о доставке для каждого отправленного вами MMS сообщения</string>
+  <string name="preferences__mms_delivery_reports">Отчеты о Доставке MMS</string>
+  <string name="preferences__sms_delivery_reports">Отчеты о Доставке SMS</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматически сотри старые сообщения, когда разговор превышает заданную длину</string>
+  <string name="preferences__delete_old_messages">Удали старые сообщения</string>
+  <string name="preferences__storage">Память</string>
+  <string name="preferences__conversation_length_limit">Предел длины разговора</string>
+  <string name="preferences__trim_all_threads_now">Обрежьте все сообщения сейчас</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Просмотри все разговоры и установи ограничения их длины</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Выберите Все</string>
+  <string name="contact_selection_list__menu_unselect_all">Очисти Все</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Закончено</string>
+  <!--conversation_button_context-->
+  <string name="conversation_button_context__menu_send_unencrypted">Отправь незашифрованное</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Звонок</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Подробности</string>
+  <string name="conversation_context__menu_copy_text">Копируй текст</string>
+  <string name="conversation_context__menu_delete_message">Удали сообщение</string>
+  <string name="conversation_context__menu_forward_message">Перешли сообщение</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">Начинай Защищенный Сеанс</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Удали выбранное</string>
+  <string name="conversation_list_batch__menu_select_all">Выберите все</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Поиск</string>
+  <!--conversation_secure_verified-->
+  <!--conversation_secure_unverified-->
+  <string name="conversation_secure_verified__menu_security">Защита</string>
+  <string name="conversation_secure_verified__menu_verify_session">Проверь Сессию</string>
+  <string name="conversation_secure_verified__menu_verify_recipient">Проверь Получателя</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Прервать Защищенный Сеанс</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">Добавить приложение</string>
+  <string name="conversation__menu_delete_thread">Удалить угрозу</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Список получателей</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Сравнивать</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Сканируй чтобы сравнить</string>
+  <string name="key_scanning__menu_scan_to_compare">Сканируй чтобы сравнить</string>
+  <!--text_secure_locked-->
+  <string name="text_secure_locked__menu_unlock">Открыть</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Новое Сообщение</string>
+  <string name="text_secure_normal__menu_settings">Настройки</string>
+  <string name="text_secure_normal__menu_import_export">Импорт/экспорт</string>
+  <string name="text_secure_normal__menu_import">Импорт</string>
+  <string name="text_secure_normal__menu_export">Экспорт</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Удалить пароль</string>
+  <!--verify_keys-->
+  <string name="verify_keys__menu_verified">Проверено</string>
+  <!--Misc. piggybacking-->
+  <!--EOF-->
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e791c549f..06988fc44 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -73,6 +73,7 @@
   <string name="ConversationActivity_group_conversation_recipients">Príjemcovia skupinovej správy</string>
   <string name="ConversationActivity_group_conversation">Skupinová konverzácia</string>
   <string name="ConversationActivity_d_recipients_in_group">%d príjemcov v skupine</string>
+  <string name="ConversationActivity_saving_draft">Ukladám koncept...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detaily správy</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Odosielateľ: %1$s\nTransport: %2$s\nOdoslané/Prijaté:%3$s</string>
@@ -85,11 +86,14 @@
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Zmazať vlákna?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste si istí, že chcete zmazať VŠETKY označené vlákna konverzácií?</string>
+  <string name="ConversationListFragment_deleting">Mažem</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Mažem vybrané konverzácie...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Správa vzájomnej výmeny kľúčov...</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nenašiel som scannovaný kľúč!</string>
   <!--MmsDownloader-->
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Heslá sa nezhodujú!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Nesprávne staré heslo!</string>
@@ -190,6 +194,10 @@
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nových správ</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovšia od: %s</string>
+  <string name="MessageNotifier_key_exchange">Vzájomná výmena kľúčov...</string>
+  <string name="MessageNotifier_encrypted_message">Kryptovaná správa...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">Poškodený kryptovaný text</string>
+  <string name="MessageNotifier_no_subject">(bez predmetu)</string>
   <!--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>
@@ -222,7 +230,10 @@
   <string name="create_passphrase_activity__passphrase">Heslo:</string>
   <string name="create_passphrase_activity__repeat">Zopakujte:</string>
   <!--database_migration_activity-->
+  <string name="database_migration_activity__skip">Preskoč</string>
   <string name="database_migration_activity__import">Import</string>
+  <string name="database_migration_activity__importing">IMPORTUJEM</string>
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Odomkni</string>
   <!--prompt_apn_activity-->
@@ -276,9 +287,7 @@
   <string name="preferences__choose_identity">Vyberte totožnosť</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Vyberte Váš kontakt zo zoznamu kontaktov.</string>
   <string name="preferences__encryption_settings">Nastavenia kryptovania</string>
-  <string name="preferences__change_passphrase">Zmeniť heslo</string>
   <string name="preferences__change_my_passphrase">Zmeniť moje heslo</string>
-  <string name="preferences__complete_key_exchanges">Kompletné vzájomné výmeny kľúčov</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automaticky dokonči vzájomné výmeny kľúčov pre nové session alebo pre existujúce session s rovnakým kľúčom totožnosti.</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Na koniec každej nezakryptovanej správy vlož prázdny znak</string>
   <string name="preferences__include_whitespace_tag">Vlož prázdny znak</string>
@@ -289,12 +298,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Vyber dobu zapamätania hesla</string>
   <string name="preferences__pref_timeout_interval_title">Interval vypršania</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Časový interval po ktorom sa vymaže heslo z pamäte</string>
-  <string name="preferences__identity_key_settings">Nastavenia kľúča totožnosti</string>
   <string name="preferences__view_my_identity_key">Zobraz môj kľúč totožnosti</string>
   <string name="preferences__export_my_identity_key">Exportuj môj kľúč totožnosti</string>
-  <string name="preferences__import_contacts_key">Importuj kľúč kontaktu</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Importuj kľúč totožnosti z kontaktu</string>
-  <string name="preferences__manage_identity_keys">Spravuj kľúče totožnosti</string>
   <string name="preferences__manage_configured_identity_keys">Spravuj konfigurované kľúče totožnosti</string>
   <string name="preferences__notification_settings">Nastavenia hlásení</string>
   <string name="preferences__notifications">Hlásenia</string>
@@ -320,7 +326,6 @@
   <string name="preferences__normal">Normálne</string>
   <string name="preferences__slow">Pomaly</string>
   <string name="preferences__custom">Vlastné</string>
-  <string name="preferences__advanced_mms_access_point_names">Pokročilé: mená prístupových bodov MMS</string>
   <string name="preferences__enable_fallback_mmsc">Povoľ fallback MMSC</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Použi nastavenia MMSC ak nie sú dostupné APN informácie.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (nutné)</string>
@@ -388,6 +393,5 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overené</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure je aplikácia na bezpečné posielanie textových správ, plne nahradzujúca štandardnú aplikáciu pre prácu so správami.  Správy ostatným užívateľom TextSecure sú posielané kryptované. Všetky textové správy sú uložené v kryptovanej databáze Vášho zariadenia. V prípade straty alebo krádeže Vášho zariadenia zostávajú Vaše správy zabezpečené a komunikácia s ostatnými užívateľmi TextSecure nemôže byť počas prenosu monitorovaná.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 48f1f35e9..36ab1a6af 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -96,6 +96,8 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ni povezave za prenos MMS sporočila, poskusite kasneje...</string>
   <string name="MmsDownloader_error_storing_mms">Napaka pri shranjevanju MMS sporočila!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Napaka pri povezavi s ponudnikom MMS...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Večpredstavno sporočilo</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Gesli se ne ujemata!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Napačno staro geslo!</string>
@@ -194,7 +196,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Okvarjeno šifrirano sporočilo MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Sporočilo MMS šifrirano za neobstoječo sejo...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Sporočila MMS trenutno ni mogoče poslati. Poslano bo, takoj ko bo mogoče.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Trenutno sporočila MMS ni mogoče poslati.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Uvoz v teku</string>
   <string name="ApplicationMigrationService_importing_text_messages">Uvažanje kratkih sporočil</string>
@@ -252,6 +254,8 @@
   <string name="database_migration_activity__import">Uvoz</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">To utegne trajati trenutek ali dva. Bodite potrpežljivi; ko bo uvoz končan, boste o tem obveščeni.</string>
   <string name="database_migration_activity__importing">UVAŽANJE</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Posodabljam podatkovne zbirke...</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">GESLO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odkleni</string>
@@ -299,6 +303,7 @@
   <string name="AndroidManifest__complete_key_exchange">Dokončaj izmenjavo ključev</string>
   <string name="AndroidManifest__verify_imported_identity">Preveri uvoženo identiteto</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Splošno</string>
   <string name="preferences__use_settings">Nastavitve uporabe</string>
   <string name="preferences__pref_all_sms_title">Uporabljaj za vsa SMS sporočila</string>
   <string name="preferences__pref_all_mms_title">Uporabljaj za vsa MMS sporočila</string>
@@ -313,7 +318,7 @@
   <string name="preferences__encryption_settings">Nastavitve šifriranja</string>
   <string name="preferences__change_passphrase">Zamenjaj geslo</string>
   <string name="preferences__change_my_passphrase">Zamenjaj geslo</string>
-  <string name="preferences__complete_key_exchanges">Dokončane izmenjave ključev</string>
+  <string name="preferences__complete_key_exchanges">Zaključi izmenjavo ključev</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Avtomatično dokončaj izmenjavo ključev za vse nove seje ali seje z istim identifikacijskim ključem </string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Dodaj prazno oznako na koncu vsakega nešifriranega sporočila</string>
   <string name="preferences__include_whitespace_tag">Dodaj prazno oznako</string>
@@ -324,12 +329,12 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Izberi čas pomnenja gesla</string>
   <string name="preferences__pref_timeout_interval_title">Čas pomnjenja</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Koliko časa naj bo geslo v pomnilniku, preden bo pozabljeno</string>
-  <string name="preferences__identity_key_settings">Nastavitve identifikacijskega ključa</string>
+  <string name="preferences__identity_key_settings">Identifikacijski ključi</string>
   <string name="preferences__view_my_identity_key">Ogled mojega identifikacijskega ključa</string>
   <string name="preferences__export_my_identity_key">Izvoz mojega identifikacijskega ključa</string>
-  <string name="preferences__import_contacts_key">Uvoz ključa iz stika</string>
+  <string name="preferences__import_contacts_key">Uvoz ključa stika</string>
   <string name="preferences__import_an_identity_key_from_a_contact">Uvoz identifikacijskega ključa iz stika</string>
-  <string name="preferences__manage_identity_keys">Upravljanje identifikacijskih ključev</string>
+  <string name="preferences__manage_identity_keys">Upravljanje ključev identitete</string>
   <string name="preferences__manage_configured_identity_keys">Upravljanje nastavljenih identifikacijskih ključev</string>
   <string name="preferences__notification_settings">Nastavitve obveščanja</string>
   <string name="preferences__notifications">Obvestila</string>
@@ -355,7 +360,9 @@
   <string name="preferences__normal">Normalno</string>
   <string name="preferences__slow">Počasi</string>
   <string name="preferences__custom">Po meri</string>
-  <string name="preferences__advanced_mms_access_point_names">Napredno: MMS dostopne točke</string>
+  <string name="preferences__advanced">Napredno</string>
+  <string name="preferences__passphrase">Geslo</string>
+  <string name="preferences__advanced_mms_access_point_names">Nadomestni MMSC</string>
   <string name="preferences__enable_fallback_mmsc">Omogoči nadomestni MMSC</string>
   <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Uporabi tu izbrane MMSC nastavitve kadar sistemske APN nastavitve niso na voljo.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (zahtevano)</string>
@@ -407,6 +414,9 @@
   <string name="conversation__menu_delete_thread">Izbriši pogovor</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Seznam prejemnikov</string>
+  <string name="conversation_group_options__delivery">Dostava</string>
+  <string name="conversation_group_options__conversation">Pogovor</string>
+  <string name="conversation_group_options__broadcast">Oddaja</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Primerjaj</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Skeniraj za primerjavo</string>
@@ -420,9 +430,9 @@
   <string name="text_secure_normal__menu_import">Uvoz</string>
   <string name="text_secure_normal__menu_export">Izvoz</string>
   <string name="text_secure_normal__menu_clear_passphrase">Počisti geslo</string>
+  <string name="text_secure_normal__mark_all_as_read">Označi vse kot prebrane</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overjeno</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure je varnostno napredna aplikacija za sporočila SMS in lahko popolnoma nadomesti sistemsko privzeto SMS aplikacijo.     Sporočila drugim uporabnikom TextSecure so med prenosom šifrirana, vsa prejeta in poslana sporočila so shranjena v šifrirani zbirki podatkov na napravi. Če telefon izgubite ali vam ga ukradejo, bodo vaša sporočila vseeno ostala varna. Oddaljen nadzor šifrirane komunikacije z drugimi uporabniki TextSecure ni mogoč.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
new file mode 100644
index 000000000..06357ca97
--- /dev/null
+++ b/res/values-sv/strings.xml
@@ -0,0 +1,422 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nej</string>
+  <string name="delete">Radera</string>
+  <!--ApplicationExportManager-->
+  <string name="ApplicationExportManager_import_database_and_settings_title">Importera Databas och Inställningar?</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importera TextSecure databas, nycklar, och inställningar från SD kort?\n\nVARNING: Detta kommer förstöra existerande meddelanden, nycklar, och inställningar.</string>
+  <string name="ApplicationExportManager_importing_database_and_keys">Importerar Databas och Nycklar</string>
+  <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importerar din SMS databas, nycklar, och inställningar...</string>
+  <string name="ApplicationExportManager_export_database_question">Exportera Databas?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportera TextSecure databas, nycklar, och inställningar till SD kort?</string>
+  <string name="ApplicationExportManager_exporting_database_and_keys">Exporterar Databas och Nycklar</string>
+  <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Exporterar din SMS databas, nycklar, och inställningar.</string>
+  <string name="ApplicationExportManager_no_sd_card_found_exclamation">Inget SD kort hittat!</string>
+  <string name="ApplicationExportManager_error_exporting_to_sd_exclamation">Det gick inte att exportera til SD!</string>
+  <string name="ApplicationExportManager_import_successful_exclamation">Import Lyckades!</string>
+  <string name="ApplicationExportManager_export_successful_exclamation">Export Lyckades!</string>
+  <string name="ApplicationExportManager_import">Importera</string>
+  <string name="ApplicationExportManager_export">Exportera</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Nuvarande: %s</string>
+  <string name="ApplicationPreferenceActivity_not_found_exclamation">Inte funnen!</string>
+  <string name="ApplicationPreferenceActivity_no_valid_identity_key_was_found_in_the_specified_contact">Ingen giltig identitetsnyckel funnen i den valda kontakten.</string>
+  <string name="ApplicationPreferenceActivity_you_don_t_have_an_identity_key_exclamation">Du har ingen identitetsnyckel!</string>
+  <string name="ApplicationPreferenceActivity_you_have_not_yet_defined_a_contact_for_yourself">Du har inte definierat en kontakt för dig själv! Välj en i menyn Inställningar.</string>
+  <string name="ApplicationPreferenceActivity_exported_to_contacts_database">Exporterad till kontaktens databas!</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Du behöver skriva in ditt lösenord innan du importerar nycklar...</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Du behöver skriva in ditt lösenord innan du hanterar nycklar...</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har inte valt ett lösenord än!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">meddelanden per konversation</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Radera alla gamla meddelanden nu?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Är du säker på att du omeddelbart vill trimma alla konversationstrådar till de %s senaste meddelandena?</string>
+  <string name="ApplicationPreferencesActivity_delete">Radera</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Video</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Ljud</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Meddelande storlek: %d KB</string>
+  <string name="ConversationItem_expires_s">Löper ut: %s</string>
+  <string name="ConversationItem_error_sending_message">Det gick inte att skicka meddelandet</string>
+  <string name="ConversationItem_sending">Skickar...</string>
+  <string name="ConversationItem_saving_attachment">Sparar Bilaga</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Sparar bilaga till SD kort...</string>
+  <string name="ConversationItem_save_to_sd_card">Spara till SD kort?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Denna media har lagrats i en krypterad databas. Versionen du sparar till SD kortet kommer inte längre vara krypterad. Vill du fortsätta?</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Error: Gick ej att skriva till SD kort!</string>
+  <string name="ConversationItem_success_exclamation">Framgång!</string>
+  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Kan ej skriva till SD Kort!</string>
+  <string name="ConversationItem_view_secure_media_question">Visa säker media?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denna media har lagrats i en krypterad databas. Tyvärr, för att öppna den med en extern visare behöver datan tillfälligt dekrypteras och skrivas till disken. Är du säker på att du vill göra detta?</string>
+  <string name="ConversationItem_key_exchange_message">Nyckelutbytesmeddelande</string>
+  <string name="ConversationItem_received_and_processed_key_exchange_message">Tog emot och bearbetade nyckelutbytesmeddelande.</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Fel, tog emot gammalt nyckeutbytesmeddelande.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Tog emot nyckelutbytesmeddelande, klicka för att bearbeta</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Initiera säker session?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Initiera säker session med %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Avbryt säker session bekräftelse</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Är du säker att du vill avbryta denna säkra session?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Radera tråd bekräftelse</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Är du säker att du vill permanent radera denna konversation?</string>
+  <string name="ConversationActivity_add_attachment">Bifoga fil</string>
+  <string name="ConversationActivity_compose_message">Skriv Meddelande</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ursäkta, det blev ett fel med att bifoga din fil.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Tyvärr är den valda video för stor.</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Tyvär är det valda ljudet för stort.</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottagare är inte en giltig SMS eller email adress!</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">Meddelandet är tomt!</string>
+  <string name="ConversationActivity_forward_message_prefix">FWD</string>
+  <string name="ConversationActivity_group_conversation_recipients">Mottagare för gruppkonversation</string>
+  <string name="ConversationActivity_group_conversation">Gruppkonversation</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d mottagare i grupp</string>
+  <string name="ConversationActivity_saving_draft">Sparar utkast...</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Meddelande detaljer</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Avsändare: %1$s\nTransport: %2$s\nSkickat/Mottaget: %3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Avsändare: %1$s\nTransport: %2$s\nSkickat: %3$s\nMottaget: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Bekräfta radering av meddelande</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Är du säker på att du vill ta bort detta meddelande permanent?</string>
+  <!--ConversationListAdapter-->
+  <string name="ConversationListAdapter_encrypted_message_enter_passphrase">Krypterat meddelande, skriv in lösenord...</string>
+  <string name="ConversationListAdapter_key_exchange_message">Nyckelutbytesmeddelande...</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Radera trådar?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Är du säker på att du vill radera ALLA markerade konversationstrådar?</string>
+  <string name="ConversationListFragment_deleting">Raderar</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Raderar markerade trådar...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Nyckelutbytesmeddelande...</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ingen skannad nyckel funnen!</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ingen anslutning tillgänglig för MMS nerladdning, testa igen senare...</string>
+  <string name="MmsDownloader_error_storing_mms">Fel vid lagring av MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Fel vid anslutning till MMS leverantör...</string>
+  <!--NotificationMmsMessageRecord-->
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Lösenorden Matchar Inte!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Inkorrekt gammalt lösenord!</string>
+  <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Lösenord matchar inte</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Du måste specificera ett lösenord</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Fel Lösenord!</string>
+  <!--PromptApnActivity-->
+  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du måste specificera en MMSC URL för din operatör.</string>
+  <string name="PromptApnActivity_mms_settings_updated">MMS-inställningar uppdaterade</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan modifiera dessa värden från TextSecure inställningsmenyn när du vill.</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">FEL: Du har tagit emot en korrupt publik nyckel. Denna nyckel kan inte bearbetas, var vänlig åter-initiera en säker session.</string>
+  <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">FEL:\n\nDu har tagit emot en publik nyckel från en verison av protokollet utan stöd. Denna nyckel kan inte bearbetas, var vänlig åter-initiera en säker session.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_does_not_include_an_identity_signature">Detta nyckelutbytesmeddelande inkluderar inte en identitetssignatur.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_but_you_do_not_yet_trust_it">Detta nyckelutbytesmeddelande inkluderar en meddelandesignatur, men du litar inte på den ännu.</string>
+  <string name="ReceiveKeyActivity_this_key_exchange_message_includes_an_identity_signature_which_you_trust_for_s">Detta nyckelutbytesmeddelande innehåller en identitetssignatur vilken du litar på för: %s</string>
+  <string name="ReceiveKeyActivity_this_is_the_key_that_you_sent_to_start_your_current_encrypted_session_with_s">Detta är nyckeln du skickar för att starta din säkra krypterade session med %s</string>
+  <string name="ReceiveKeyActivity_this_is_the_key_that_you_received_to_start_your_current_encrypted_session_with_s">Detta är nyckeln du tar emot för att starta din nuvarande krypterade session med %s</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_warning_you_already_have_an_encrypted_session">Du har tagit emot ett nyckelutbytesmeddelande från %s.\n\nVARNING: Du har redan en krypterad session med denna kontakt. Om du väljer att acceptera detta nyckelutbytesmeddelande kommer det förstöra din nuvarande session och du kommer behöva återbekräfta. Vill du fullfölja nyckelutbytet?</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_previously_initiated">Du har tagit emot ett nyckelutbytesmeddelande från %s. Du har tidigare initierat en session med denna kontakt, och genom att acceptera denna nyckel fullföljer du nyckelutbytet. Vill du fullfölja nyckelutbytet?</string>
+  <string name="ReceiveKeyActivity_you_have_initiated_a_key_exchange_message_with_s_but_have_not_yet_received_a_reply">Du har initierat ett nyckelutbytesmeddelande med %s men du har inte ännu fått något svar.</string>
+  <string name="ReceiveKeyActivity_you_have_received_a_key_exchange_message_from_s_you_have_no_existing_session">Du har fått ett nyckelutbytesmeddelande från %s. Du har ingen existerade session med denna kontakt, vill du fullfölja nyckelutbytet?</string>
+  <!--ReviewIdentitiesActivity-->
+  <string name="ReviewIdentitiesActivity_unable_to_view_corrupted_identity_key_exclamation">Kan ej visa korrupt identitetsnyckel!</string>
+  <string name="ReviewIdentitiesActivity_delete_identity">Radera identitet?</string>
+  <string name="ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key">Är du säker på att du vill radera denna identitetsnyckel permanent?</string>
+  <string name="ReviewIdentitiesActivity_invalid_identity">Ogiltig identitet!</string>
+  <!--SaveIdentityActivity-->
+  <string name="SaveIdentityActivity_you_must_specify_a_name_for_this_identity_exclamation">Du måste specificera ett namn för denna identitet!</string>
+  <string name="SaveIdentityActivity_identity_name_exists_exclamation">Identitetsnamn existerar!</string>
+  <string name="SaveIdentityActivity_an_identity_key_with_the_specified_name_already_exists">En identitetsnyckel med det specificerade namnet existerar redan.</string>
+  <string name="SaveIdentityActivity_manage_identities">Hantera identiteter</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_mark_identity_verified_question">Markera identitet som verifierad?</string>
+  <string name="VerifyIdentityActivity_are_you_sure_you_have_validated_the_recipients_identity_fingerprint_and_would_like_to_mark_it_as_verified">Är du säker att du har validerat mottagarens identitetsfingeravtryck och vill markera det som verifierat?</string>
+  <string name="VerifyIdentityActivity_mark_verified">Markera som verifierad</string>
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Du har ingen identitetsnyckel.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Mottagaren har ingen identitetsnyckel.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Mottagaren har ingen identitetsnyckel!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skanna deras nyckel för att jämföra</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Få min nyckel skannad</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VARNING, den skannade nyckeln matchar INTE! Var vänlig kolla fingeravtryck texten noggrant.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">INTE verifierad!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Deras nyckel är korrekt. Det är också nödvändigt att verifiera din nyckel med dom.</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Verifierad!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Du har ingen identitetsnyckel!</string>
+  <!--VerifyImportedIdentityActivity-->
+  <string name="VerifyImportedIdentityActivity_you_must_specify_a_name_for_this_contact_exclamation">Du måste specificera ett namn för denna kontakt!</string>
+  <string name="VerifyImportedIdentityActivity_save_identity_key_question">Spara identitetsnyckel?</string>
+  <string name="VerifyImportedIdentityActivity_error_saving_identity_key_exclamation">Error vid sparning av identitetsnyckel!</string>
+  <string name="VerifyImportedIdentityActivity_this_identity_key_or_an_identity_key_with_the_same_name_already_exists_please_edit_your_key_database">Denna identitetsnyckel eller en identitetsnyckel med samma namn existerar redan. Var vänlig redigera din nyckeldatabas.</string>
+  <string name="VerifyImportedIdentityActivity_scan_to_compare">Skanna för att jämföra</string>
+  <string name="VerifyImportedIdentityActivity_get_scanned_to_compare">Bli skannad för att jämföra</string>
+  <string name="VerifyImportedIdentityActivity_not_verified_exclamation">INTE verifierad!</string>
+  <string name="VerifyImportedIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">VARNING, den skannade nyckeln matchar INTE!</string>
+  <string name="VerifyImportedIdentityActivity_the_scanned_key_matches_exclamation">Den skannade nyckeln matchar!</string>
+  <string name="VerifyImportedIdentityActivity_verified_exclamation">Verifierad!</string>
+  <string name="VerifyImportedIdentityActivity_are_you_sure_that_you_would_like_to_mark_this_as_a_valid_identity_key_for_all_future_correspondence_with_s">Är du säker på att du vill markera denna som en giltig identitetsnyckel för all framtida korrespondens med %s? Du bör endast göra detta om du faktiskt verifierat fingeravtrycket.</string>
+  <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_mark_session_verified_question">Markera session som verifierad?</string>
+  <string name="VerifyKeysActivity_are_you_sure_that_you_have_validated_these_fingerprints_and_would_like_to_mark_this_session_as_verified">Är du säker på att du validerat dessa fingeravtryck och vill markera sessionen som verifierad?</string>
+  <string name="VerifyKeysActivity_mark_verified">Markera verifierad!</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Få mitt fingeravtryck skannat</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Skanna deras fingeravtryck</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">VARNING, den skannade nyckeln matchar INTE! Var vänlig kolla fingeravtryck texten noggrant.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">INTE verifierad!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Deras nyckel är korrekt. Det är också nödvändigt att få ditt fingeravtryck skannat.</string>
+  <string name="VerifyKeysActivity_verified_exclamation">Verifierad!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Du har inte någon identitetsnyckel.</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Skanna för att jämföra</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Bli skannad för att jämföra</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">VARNING, den skannade nyckeln matchar INTE!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">INTE verifierad!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannade nyckeln matchar!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Verifierad!</string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initiera trots existerade begäran?</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Du har redan skickat en sessionsinitieringsbegäran till denna mottagare, är du säker på att du vill skicka en till? Detta kommer göra din första begäran ogiltig.</string>
+  <string name="KeyExchangeInitiator_send">Skicka</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Dåligt krypterat meddelande...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Dekrypterar, var vänlig vänta...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Meddelande krypterat för icke-existerande session...</string>
+  <string name="MessageDisplayHelper_decryption_error_local_message_corrupted_mac_doesn_t_match_potential_tampering_question">Dekrypteringsfel: lokalt meddelande korrupt, MAC matchar inte. Potentiellt fiffel?</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Ansluter till MMS server...</string>
+  <string name="MmsDatabase_downloading_mms">Laddar ner MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">MMS nedladdning misslyckades!</string>
+  <string name="MmsDatabase_downloading">Laddar ner...</string>
+  <string name="MmsDatabase_anonymous">Anonym</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekrypterar MMS, var vänlig vänta...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Dåligt krypterat MMS meddelande...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS meddelande krypterat för icke-existerande session...</string>
+  <!--MmsSender-->
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Importerar textmeddelanden</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure lösenord lagrat</string>
+  <string name="KeyCachingService_passphrase_cached">Lösenord lagrat</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d nya meddelanden</string>
+  <string name="MessageNotifier_most_recent_from_s">Senaste från: %s</string>
+  <string name="MessageNotifier_key_exchange">Nyckelutbyte...</string>
+  <string name="MessageNotifier_encrypted_message">Krypterat meddelande...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">Korrupt chiffertext</string>
+  <string name="MessageNotifier_no_subject">(Inget ämne)</string>
+  <string name="MessageNotifier_message_delivery_failed">Meddelandeleverans misslyckades.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Kunde inte leverera meddelande.</string>
+  <string name="MessageNotifier_error_delivering_message">Fel vid leverans av meddelande.</string>
+  <!--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-->
+  <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">Du har fått ett meddelande från någon som stödjer TextSecure krypterade sessioner. Vill du initiera en säker session?</string>
+  <string name="auto_initiate_activity__initiate_exchange">Initiera utbyte</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">GAMMALT LÖSENORD:</string>
+  <string name="change_passphrase_activity__new_passphrase">NYTT LÖSENORD:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">UPPREPA NYTT LÖSENORD:</string>
+  <!--contact_selection_group_activity-->
+  <!--contact_selection_list_activity-->
+  <string name="contact_selection_group_activity__no_contacts">Inga kontakter.</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">Välj för</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Inga nyliga samtal.</string>
+  <!--conversation_activity-->
+  <string name="conversation_activity__type_message">Skriv meddelande</string>
+  <string name="conversation_activity__send">Skicka</string>
+  <string name="conversation_activity__remove">Ta bort</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">Ladda ner</string>
+  <string name="conversation_item_sent__downloading">Laddar ner</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Ladda ner</string>
+  <string name="conversation_item_received__downloading">Laddar ner</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Sats-markerings läge</string>
+  <!--create_passphrase_activity-->
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Var vänlig välj ett lösenord som används för att kryptera din data lokalt.\n\nDetta bör vara ett starkt lösenord.</string>
+  <string name="create_passphrase_activity__passphrase">LÖSENORD:</string>
+  <string name="create_passphrase_activity__repeat">UPPREPA:</string>
+  <string name="create_passphrase_activity__continue">Fortsätt</string>
+  <string name="create_passphrase_activity__generating_secrets">GENERERAR HEMLIGHETER</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vill du importera existerande text meddelanden till TextSecure\'s krypterade databas?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Den vanliga systemdatabasen kommer inte modifieras eller röras på något sätt.</string>
+  <string name="database_migration_activity__skip">Hoppa över</string>
+  <string name="database_migration_activity__import">Importera</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Detta kan ta en stund. Var tålmodig, vi notifierar dig när importen är klar.</string>
+  <string name="database_migration_activity__importing">IMPORTERAR</string>
+  <!--database_upgrade_activity-->
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE LÖSENORD</string>
+  <string name="prompt_passphrase_activity__unlock">Lås upp</string>
+  <!--prompt_apn_activity-->
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure kräver APN inställningar för att leverera mediemeddelanden via din mobilöperatör. Din enhet gör inte den här informationen tillgänglig, vilket ibland stämmer för låsta enheter och andra restriktiva konfigurationer.</string>
+  <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">För att skicka mediemeddelanden, var vänlig fyll i den nödvändiga APN informationen nedan. Värdena för din operatör kan generellt sett hittas genom att söka på \'&amp;lt;din operatör&amp;lt; APN\'. Du behöver bara göra detta en gång.</string>
+  <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (KRÄVS):</string>
+  <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY VÄRD (VALFRITT):</string>
+  <string name="prompt_apn_activity__mms_proxy_port_optional">MMS PROXY PORT (VALFRITT):</string>
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__session">Session</string>
+  <string name="receive_key_activity__identities">Identiteter</string>
+  <string name="receive_key_activity__complete_exchange">Fullborda utbyte</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to">Till</string>
+  <!--review_identities-->
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har för närvarande inga identitetsnycklar i din förtroendedatabas.</string>
+  <!--save_identity_activity-->
+  <string name="save_identity_activity__identity_name">Identitetsnamn:</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">Deras identitet (de läser):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Din identitet (du läser):</string>
+  <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Identitetsnamn:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Importerad identitet:\\n</string>
+  <string name="verify_import_identity_activity__verified">Verifierad!</string>
+  <string name="verify_import_identity_activity__compare">Jämför</string>
+  <!--verify_keys_activity-->
+  <string name="verify_keys_activity__they_read_this">De läser detta:</string>
+  <string name="verify_keys_activity__you_read_this">Du läser detta:</string>
+  <!--view_identity_activity-->
+  <string name="view_identity_activity__identity">Identitet:</string>
+  <string name="view_identity_activity__qr_code">QR Kod</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Skapa lösenord</string>
+  <string name="AndroidManifest__enter_passphrase">Skriv lösenord</string>
+  <string name="AndroidManifest__select_contacts">Välj kontakter</string>
+  <string name="AndroidManifest__textsecure_detected">TextSecure upptäckt</string>
+  <string name="AndroidManifest__public_identity_key">Publik identitetsnyckel</string>
+  <string name="AndroidManifest__change_passphrase">Ändra lösenord</string>
+  <string name="AndroidManifest__verify_session">Verifiera session</string>
+  <string name="AndroidManifest__verify_identity">Verifiera identitet</string>
+  <string name="AndroidManifest__save_identity">Spara identitet</string>
+  <string name="AndroidManifest__manage_identity_keys">Hantera identitetsnycklar</string>
+  <string name="AndroidManifest__complete_key_exchange">Fullborda nyckelutbyte</string>
+  <string name="AndroidManifest__verify_imported_identity">Verifiera importerad identitet</string>
+  <!--preferences.xml-->
+  <string name="preferences__use_settings">Användningsinställningar</string>
+  <string name="preferences__pref_all_sms_title">Använd för alla SMS</string>
+  <string name="preferences__pref_all_mms_title">Använd för alla MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Använd TextSecure för att läsa och lagra alla inkommande text meddelanden</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Använd TextSecure för att se och lagra alla inkommande multimedia meddelanden</string>
+  <string name="preferences__input_settings">Inputinställningar</string>
+  <string name="preferences__pref_enter_sends_title">Enter skickar</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Klick på enter-tangenten skickar text meddelanden</string>
+  <string name="preferences__display_settings">Visningsinställningar</string>
+  <string name="preferences__choose_identity">Välj identitet</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Välj din kontakt från kontakt listan.</string>
+  <string name="preferences__encryption_settings">Krypteringsinställningar</string>
+  <string name="preferences__change_my_passphrase">Ändra mitt lösenord</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Fullfölj nyckelutbyten automatiskt för nya sessioner eller för existerande sessioner med samma identitetsnyckel</string>
+  <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">Inkludera en blanksteg tagg i slutet av varje okrypterat meddelande.</string>
+  <string name="preferences__include_whitespace_tag">Inkludera blanktecken tagg</string>
+  <string name="preferences__sign_key_exchange_messages_with_identity_key">Signera nyckelutbytesmeddelanden med identitetsnyckel</string>
+  <string name="preferences__sign_key_exchange">Signera nyckelutbyte</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Glöm lösenord från minnet efter ett intervall</string>
+  <string name="preferences__timeout_passphrase">Timeout lösenord</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Välj lösenordstimeout</string>
+  <string name="preferences__pref_timeout_interval_title">Timeout intervall</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Väntetiden innan lösenordet glöms från minnet</string>
+  <string name="preferences__view_my_identity_key">Visa min identitetsnyckel</string>
+  <string name="preferences__export_my_identity_key">Exportera min identitetsnyckel</string>
+  <string name="preferences__import_an_identity_key_from_a_contact">Importera en identitetsnyckel från en kontakt</string>
+  <string name="preferences__manage_configured_identity_keys">Hantera konfigurerade identitetsnycklar</string>
+  <string name="preferences__notification_settings">Notifikationsinställningar</string>
+  <string name="preferences__notifications">Notifikationer</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Visa meddelande notifikationer i statusraden</string>
+  <string name="preferences__led_color">LED-färg</string>
+  <string name="preferences__change_notification_led_color">Ändra LED-färg för notifikationer</string>
+  <string name="preferences__pref_led_blink_title">LED-blinkmönster</string>
+  <string name="preferences__change_notification_blink_pattern">Ändra LED-blinkmönster för notifikationer</string>
+  <string name="preferences__pref_led_blink_dialogtitle">Välj LED-blinkmönster</string>
+  <string name="preferences__select_led_color">Välj LED-färg</string>
+  <string name="preferences__select_ringtone">Välj rington</string>
+  <string name="preferences__vibrate">Vibrera</string>
+  <string name="preferences__also_vibrate_when_notified">Vibrera också vid notifikation</string>
+  <string name="preferences__minutes">minuter</string>
+  <string name="preferences__hours">timmar</string>
+  <string name="preferences__green">Grön</string>
+  <string name="preferences__red">Röd</string>
+  <string name="preferences__blue">Blå</string>
+  <string name="preferences__orange">Orange</string>
+  <string name="preferences__cyan">Turkos</string>
+  <string name="preferences__magenta">Lila</string>
+  <string name="preferences__fast">Snabb</string>
+  <string name="preferences__normal">Normal</string>
+  <string name="preferences__slow">Långsam</string>
+  <string name="preferences__custom">Skräddarsydd</string>
+  <string name="preferences__enable_fallback_mmsc">Aktivera Fallback MMSC</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Använd MMSC information konfugerad här när system APN information är otillgänglig.</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (nödvändigt)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS Proxyvärd (valfritt)</string>
+  <string name="preferences__mms_proxy_port_optional">MMS proxyport (valfritt)</string>
+  <string name="preferences__delivery_reports">Leveransrapporter</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Begär en leveransrapport för varje SMS meddelande du skickar</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Begär en leveransrapport för varje MMS meddelande du skickar</string>
+  <string name="preferences__mms_delivery_reports">MMS leveransrapporter</string>
+  <string name="preferences__sms_delivery_reports">SMS leveransrapporter</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversationstråd överstiger en specificerad längd</string>
+  <string name="preferences__delete_old_messages">Radera gamla meddelanden</string>
+  <string name="preferences__storage">Lagring</string>
+  <string name="preferences__conversation_length_limit">Konversationstrådslängd</string>
+  <string name="preferences__trim_all_threads_now">Trimma alla trådar nu</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanna igenom alla konversationstrådar och framtvinga konversationstrådslängder.</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Markera alla</string>
+  <string name="contact_selection_list__menu_unselect_all">Avmarkera alla</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Färdig</string>
+  <!--conversation_button_context-->
+  <string name="conversation_button_context__menu_send_unencrypted">Skicka okrypterad</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Ring</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Meddelande detaljer</string>
+  <string name="conversation_context__menu_copy_text">Kopiera text</string>
+  <string name="conversation_context__menu_delete_message">Radera meddelande</string>
+  <string name="conversation_context__menu_forward_message">Vidarebefodra meddelande</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">Starta säker session</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Radera markerade</string>
+  <string name="conversation_list_batch__menu_select_all">Markera alla</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Sök</string>
+  <!--conversation_secure_verified-->
+  <!--conversation_secure_unverified-->
+  <string name="conversation_secure_verified__menu_security">Säkerhet</string>
+  <string name="conversation_secure_verified__menu_verify_session">Verifiera Session</string>
+  <string name="conversation_secure_verified__menu_verify_recipient">Verifiera mottagare</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Avbryt säker session</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">Bifoga fil</string>
+  <string name="conversation__menu_delete_thread">Radera tråd</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Mottagare lista</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Jämför</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Bli skannad för att jämföra</string>
+  <string name="key_scanning__menu_scan_to_compare">Skanna för att jämföra</string>
+  <!--text_secure_locked-->
+  <string name="text_secure_locked__menu_unlock">Lås upp</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Nytt meddelande</string>
+  <string name="text_secure_normal__menu_settings">Inställningar</string>
+  <string name="text_secure_normal__menu_import_export">Importera/Exportera</string>
+  <string name="text_secure_normal__menu_import">Importera</string>
+  <string name="text_secure_normal__menu_export">Exportera</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Rensa lösenord</string>
+  <!--verify_keys-->
+  <string name="verify_keys__menu_verified">Verifierad</string>
+  <!--Misc. piggybacking-->
+  <!--EOF-->
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0a7138f41..9e068884d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -85,6 +85,7 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">未找到已扫描密钥！</string>
   <!--MmsDownloader-->
+  <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">密码不匹配！</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">旧密码不正确！</string>
@@ -218,6 +219,7 @@
   <string name="create_passphrase_activity__repeat">重复：</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__import">导入</string>
+  <!--database_upgrade_activity-->
   <!--prompt_passphrase_activity-->
   <!--prompt_apn_activity-->
   <!--receive_key_activity-->
@@ -270,9 +272,7 @@
   <string name="preferences__choose_identity">选择身份</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">从联系人列表选择您的联系人条目。</string>
   <string name="preferences__encryption_settings">加密设置</string>
-  <string name="preferences__change_passphrase">更改密码</string>
   <string name="preferences__change_my_passphrase">更改我的密码</string>
-  <string name="preferences__complete_key_exchanges">完成密钥交换</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">使用同一身份密钥自动完成新会话或现有会话的密钥交换</string>
   <string name="preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message">在每个非加密消息末尾包含空白标签</string>
   <string name="preferences__include_whitespace_tag">包含空白标签</string>
@@ -283,12 +283,9 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">选择密码超时</string>
   <string name="preferences__pref_timeout_interval_title">超时间隔</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">忘记内存中的密码前等待的时间长度</string>
-  <string name="preferences__identity_key_settings">身份密钥设置</string>
   <string name="preferences__view_my_identity_key">查看我的身份密钥</string>
   <string name="preferences__export_my_identity_key">导出我的身份密钥</string>
-  <string name="preferences__import_contacts_key">导入联系人密钥</string>
   <string name="preferences__import_an_identity_key_from_a_contact">从联系人导入身份密钥</string>
-  <string name="preferences__manage_identity_keys">管理身份密钥</string>
   <string name="preferences__manage_configured_identity_keys">管理配置的身份密钥</string>
   <string name="preferences__notification_settings">通知设置</string>
   <string name="preferences__notifications">通知</string>
@@ -365,6 +362,5 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">已验证</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure 是一个安全增强文本消息应用程序，用于完全替代默认文本消息应用程序。 无线发送给其他 TextSecure 用户的消息都经过加密，同时所有文本消息都存储在设备的加密数据库中。 如果电话丢失或被盗，您的消息将保持安全，同时无法空中监控与其他 TextSecure 用户的无线通信。</string>
   <!--EOF-->
 </resources>