Update language translations.

// FREEBIE

res/values-ar/strings.xml

@@ -77,7 +77,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">عذرا، حجم ملف الصوت يتجاوز الحد المسموح (%1$skB).</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_group_conversation_recipients">المستلمون في مجموعة المحادثة</string>
   <string name="ConversationActivity_group_conversation">دردشة جماعية</string>
   <string name="ConversationActivity_unnamed_group">مجموعة غير مسماه</string>
   <string name="ConversationActivity_d_recipients_in_group">أعضاء %d </string>
@@ -92,7 +91,6 @@
   <string name="ConversationActivity_transport_insecure_mms">رسالة وسائط متعددة غير آمنة</string>
   <string name="ConversationActivity_transport_textsecure">تيكست سيكيور</string>
   <string name="ConversationActivity_get_with_it">احصل معها: %s</string>
-  <string name="ConversationActivity_install_textsecure">تثبيت تيكست سيكيور: %s</string>
   <string name="ConversationActivity_error_leaving_group">خطأ أثناء ترك المجموعة...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>

res/values-be/strings.xml

@@ -80,7 +80,7 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">На жаль, абранае аўдыё перавышае максімальны памеру паведамлення (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Атрымальнік ня ёсць дзейсным для адпраўкі SMS або email адрасам!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Паведамленне пустое!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Атрымальнікі групавой гутаркі</string>
+  <string name="ConversationActivity_group_members">Удзельнікі групы</string>
   <string name="ConversationActivity_group_conversation">Групавая гутарка</string>
   <string name="ConversationActivity_unnamed_group">Неназваная група</string>
   <string name="ConversationActivity_d_recipients_in_group">%d удзельнікаў</string>
@@ -95,7 +95,7 @@
   <string name="ConversationActivity_transport_insecure_mms">Небяспечная MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Атрымай з гэтым: %s</string>
-  <string name="ConversationActivity_install_textsecure">Усталяваць TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Выкарыстайце гэта, каб пачаць гутарку: %s</string>
   <string name="ConversationActivity_error_leaving_group">Памылка выхаду з групы...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Дэталі паведамлення</string>
@@ -210,6 +210,7 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Паролі не супадаюць!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Няправільны стары пароль!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Увядзіце новы пароль!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Прывязаць гэты дэвайс?</string>
   <string name="DeviceProvisioningActivity_cancel">АДМЕНА</string>

res/values-bg/strings.xml

@@ -26,12 +26,15 @@
 Ще се наложи да регистрираш своя номер повторно, за да използваш интернет съобщения в бъдеще.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка при свързване със сървъра!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS разрешени</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Натисни, за да зададеш SMS програма по подразбиране</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS забранени</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Натисни, за да зададеш TextSecure като SMS програма по подразбиране</string>
   <string name="ApplicationPreferencesActivity_on">вкл</string>
   <string name="ApplicationPreferencesActivity_On">Включено</string>
   <string name="ApplicationPreferencesActivity_off">изкл</string>
   <string name="ApplicationPreferencesActivity_Off">Изключено</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d минути</string>
   <!--DraftDatabase-->
@@ -79,7 +82,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">За съжеление, избраното audio надвишава допустимия максимален размер (%1$skB).</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_group_conversation_recipients">Участници в груповия разговор</string>
   <string name="ConversationActivity_group_conversation">Групов разговор</string>
   <string name="ConversationActivity_unnamed_group">Безименна група</string>
   <string name="ConversationActivity_d_recipients_in_group">%d участника</string>
@@ -94,7 +96,6 @@
   <string name="ConversationActivity_transport_insecure_mms">Некриптиран MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Започвай: %s</string>
-  <string name="ConversationActivity_install_textsecure">Инсталирай TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Грешка при напускането на група...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Информация за съобщението</string>
@@ -578,6 +579,8 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__sms_mms">SMS и MMS</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__enable_enter_key_title">Разреши клавиша Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Замени клавиша за емотикони с клавиша Enter</string>
@@ -660,6 +663,9 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__default">По подразбиране</string>
   <string name="preferences__language">Език</string>
   <string name="preferences__language_summary">Език %s</string>
+  <string name="preferences__textsecure_messages">TextSecure съобщения</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Безплатни, лични съобщебия до TextSecure и Signal потребители</string>
   <string name="preferences__submit_debug_log">Изпрати доклад</string>
   <string name="preferences__support_wifi_calling">Съвместим режим \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включете ако устройството ти използва SMS/MMS през WiFi (използвай само, когато \'WiFi Calling\' e включено на устройството ти).</string>

res/values-ca/strings.xml

@@ -20,7 +20,9 @@
 Això desactivarà els missatges push des-registran-te del servidor.
 Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els missatges push una altra vegada.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connectant amb el servidor!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Habilitats</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toca per canviar la teva app d\'SMS predeterminada</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Deshabilitats</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Toca per fer TextSecure la teva app d\'SMS predeterminada</string>
   <!--AppProtectionPreferenceFragment-->
   <!--DraftDatabase-->

res/values-cs/strings.xml

@@ -84,7 +84,7 @@ kontakt</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Omlouvám se, vybrané audio překračuje maximální povolenou velikost (%1$skB)</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Adresa příjemce není ve správném tvaru! (sms či email)</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Zpráva je prázdná!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Příjemci skupinové konverzace</string>
+  <string name="ConversationActivity_group_members">Členové skupiny</string>
   <string name="ConversationActivity_group_conversation">Skupinová konverzace</string>
   <string name="ConversationActivity_unnamed_group">Nepojmenovaná skupina</string>
   <string name="ConversationActivity_d_recipients_in_group">Počet členů: %d</string>
@@ -99,7 +99,7 @@ kontakt</string>
   <string name="ConversationActivity_transport_insecure_mms">Nezabezpečená MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Získat s ním: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instalovat TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Použít pro rozhovor: %s</string>
   <string name="ConversationActivity_error_leaving_group">Chyba při opouštění skupiny.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti zprávy</string>
@@ -212,6 +212,7 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Hesla nejsou stejná</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Chybné staré heslo!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Zadejte nové heslo!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Propojit toto zařízení?</string>
   <string name="DeviceProvisioningActivity_cancel">ZRUŠIT</string>

res/values-da/strings.xml

@@ -27,7 +27,9 @@ Dette vil deaktivere \'push\' beskeder, og afregistrerer dig fra tjenesten.
 Du skal registrere dit telefonnummer påny hvis du vil bruge \'push\' beskeder i fremtiden.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kunne ikke oprette forbindelse til serveren!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS slået til</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Brug som standard SMS program</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS slået fra</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Brug TextSecure som dit standard SMS program</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutter</string>
@@ -69,7 +71,6 @@ denne kontakt.</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Beklager, der opstod en fejl ved vedhæftning af fil.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Modtageren har ikke en gyldig SMS- eller e-mail adresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Beskeden er tom!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Modtagere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppe beskeder</string>
   <string name="ConversationActivity_unnamed_group">Navnløs gruppe</string>
   <string name="ConversationActivity_d_recipients_in_group">%d modtagere</string>
@@ -83,7 +84,6 @@ denne kontakt.</string>
   <string name="ConversationActivity_transport_insecure_sms">Usikker (ikke krypteret) SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Usikker (ikke krypteret) MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <string name="ConversationActivity_install_textsecure">Installere TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Fejl, forlader gruppen...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Besked detaljer</string>

res/values-de/strings.xml

@@ -79,7 +79,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Die ausgewählte Audiodatei überschreitet leider die maximal mögliche Nachrichtengröße (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Die Empfängeradresse ist keine gültige SMS- oder E-Mail-Adresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Die Nachricht ist leer!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Gruppenmitglieder</string>
+  <string name="ConversationActivity_group_members">Gruppenmitglieder</string>
   <string name="ConversationActivity_group_conversation">Gruppenunterhaltung</string>
   <string name="ConversationActivity_unnamed_group">Unbenannte Gruppe</string>
   <string name="ConversationActivity_d_recipients_in_group">%d Mitglieder</string>
@@ -94,7 +94,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_transport_insecure_mms">Unsichere MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Sicher kommunizieren: %s</string>
-  <string name="ConversationActivity_install_textsecure">TextSecure installieren: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Lassen Sie uns diese App zum Unterhalten verwenden: %s</string>
   <string name="ConversationActivity_error_leaving_group">Fehler beim Verlassen der Gruppe...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
@@ -209,6 +209,7 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <!--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>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Neues Passwort eingeben!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Dieses Gerät verbinden?</string>
   <string name="DeviceProvisioningActivity_cancel">ABBRECHEN</string>

res/values-el/strings.xml

@@ -28,12 +28,15 @@
 Αν θελήσετε να χρησιμοποιήσετε μηνύματα push στο μέλλον, θα πρέπει να επανεγγραφείτε.
  </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Σφάλμα κατά τη σύνδεση με τον διακομιστή!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Ενεργοποίηση SMS</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Πιέστε για να αλλάξετε την προεπιλεγμένη εφαρμογή για SMS</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Απενεργοποίηση SMS</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Πιέστε για να κάνετε το TextSecure την προεπιλεγμένη εφαρμογή για μηνύματα SMS</string>
   <string name="ApplicationPreferencesActivity_on">ενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_On">Ενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_off">απενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_Off">Απενεργοποίηση</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d λεπτά</string>
   <!--DraftDatabase-->
@@ -86,7 +89,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο αρχείο ήχου υπερβαίνει το μέγιστο μέγεθος μηνύματος (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ο παραλήπτης δεν είναι έγκυρη διεύθυνση SMS ή email!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Το μήνυμα είναι κενό!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Παραλήπτες ομαδικής συζήτησης</string>
   <string name="ConversationActivity_group_conversation">Ομαδική συζήτηση</string>
   <string name="ConversationActivity_unnamed_group">Ανώνυμη ομάδα</string>
   <string name="ConversationActivity_d_recipients_in_group">%d μέλη</string>
@@ -101,7 +103,6 @@
   <string name="ConversationActivity_transport_insecure_mms">Μη ασφαλές MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Αποκτήστε το με αυτό: %s</string>
-  <string name="ConversationActivity_install_textsecure">Εγκατάσταση του TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Σφάλμα κατα την αποχώρηση από την ομάδα...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Στοιχεία μηνύματος</string>
@@ -592,6 +593,8 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="preferences__sms_mms">SMS και MMS</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 για προβολή όλων των μηνυμάτων SMS</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__enable_enter_key_title">Ενεργοποίηση πλήκτρου Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Αντικαθιστά το πλήκτρο smiley με το πλήκτρο Enter</string>
@@ -674,6 +677,9 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="preferences__default">Προκαθορισμένη</string>
   <string name="preferences__language">Γλώσσα</string>
   <string name="preferences__language_summary">Γλώσσα %s</string>
+  <string name="preferences__textsecure_messages">TextSecure μυνηματα</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Δωρεάν ιδιωτικά μηνύματα στο TextSecure και σημάτων χρήστες</string>
   <string name="preferences__submit_debug_log">Αποστολή αρχείων καταγραφής αποσφαλμάτωσης</string>
   <string name="preferences__support_wifi_calling">Λειτουργία συμβατότητας \"WiFi Calling\' </string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ενεργοποίηση αν η συσκευή σας χρησιμοποιεί SMS/MMS παροχής μέσω WiFi (μόνο επιτρέπτο αν το «Calling WiFi» είναι ενεργοποιημένο στην συσκευή σας).</string>

res/values-es/strings.xml

@@ -85,7 +85,7 @@ este contacto.
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lo sentimos, el audio seleccionado excede las restricciones de tamaño del mensaje (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">¡El destinatario no es un número de teléfono SMS o correo electrónico válido!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">¡El mensaje está vacío!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Participantes de la conversación de grupo</string>
+  <string name="ConversationActivity_group_members">Miembros del grupo</string>
   <string name="ConversationActivity_group_conversation">Conversación de grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sin nombre</string>
   <string name="ConversationActivity_d_recipients_in_group">%d miembros</string>
@@ -100,7 +100,7 @@ este contacto.
   <string name="ConversationActivity_transport_insecure_mms">MMS no seguro</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Hágase con él: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instale TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Usemos esto para chatear: %s</string>
   <string name="ConversationActivity_error_leaving_group">Error al dejar el grupo...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
@@ -228,6 +228,7 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">¡Las claves de acceso no coinciden!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">¡Clave de acceso antigua incorrecta!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">¡Introduzca una nueva frase-contraseña!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">¿Enlazar este dispositivo?</string>
   <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>

res/values-eu/strings.xml

@@ -74,7 +74,6 @@ Zure telefono zenbakia bererregistratu beharko duzu push mezuak berriro erabili
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Barkatu, aukeratutako audioak mezuaren tamaina mugak gainditzen ditu  (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Hartzailea SMS edo email baliogabea da!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Mezua hutsik dago!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Taldeko solasaldiaren hartzaileak</string>
   <string name="ConversationActivity_group_conversation">Taldeko solasaldia</string>
   <string name="ConversationActivity_unnamed_group">Izenik gabeko taldea</string>
   <string name="ConversationActivity_d_recipients_in_group">%d partaide</string>
@@ -89,7 +88,6 @@ Zure telefono zenbakia bererregistratu beharko duzu push mezuak berriro erabili
   <string name="ConversationActivity_transport_insecure_mms">MMS ez segurua</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Ondokoa lortu: %s</string>
-  <string name="ConversationActivity_install_textsecure">TextSecure instalatu: %s</string>
   <string name="ConversationActivity_error_leaving_group">Errorea taldea uzterakoan...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Mezuaren detaileak</string>

res/values-fa/strings.xml

@@ -0,0 +1,595 @@
+<?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>
+  <string name="please_wait">لطفاً صبر کنید...</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">در حال حاضر: %s</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">شما هنوز رمزی تعیین نکرده‌اید!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s پیام در هر گفتگو</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>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">غیر فعال کردن رمزگذاری ذخیره سازی؟</string>
+  <string name="ApplicationPreferencesActivity_disable">غیرفعال کردن</string>
+  <string name="ApplicationPreferencesActivity_unregistering">لغو ثبت ...</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">غیر فعال کردن پیام های فشار؟</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطا در اتصال به سرور!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">اس ام اس فعال</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">اس ام اس غیر فعال</string>
+  <string name="ApplicationPreferencesActivity_on">روشن</string>
+  <string name="ApplicationPreferencesActivity_On">روشن</string>
+  <string name="ApplicationPreferencesActivity_off">خاموش</string>
+  <string name="ApplicationPreferencesActivity_Off">خاموش</string>
+  <!--AppProtectionPreferenceFragment-->
+  <string name="AppProtectionPreferenceFragment_minutes">%d دقیقه</string>
+  <!--DraftDatabase-->
+  <string name="DraftDatabase_Draft_image_snippet">(تصویر)</string>
+  <string name="DraftDatabase_Draft_audio_snippet">(صوتی)</string>
+  <string name="DraftDatabase_Draft_video_snippet">(ویدئو)</string>
+  <!--AttchmentManager-->
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">تصویر</string>
+  <string name="AttachmentTypeSelectorAdapter_video">ویدئو</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">صدا</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">اطلاعات مخاطب</string>
+  <!--ConfirmIdentityDialog-->
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">حجم پیام: %d کیلوبایت</string>
+  <string name="ConversationItem_expires_s">انقضا: %s</string>
+  <string name="ConversationItem_error_not_delivered">تحویل داده نشد</string>
+  <string name="ConversationItem_view_secure_media_question">نمایش رسانه های امن؟</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">خطا، یک پیام کهنه تبادل کلید دریافت شد.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">یک پیام تبادل کلید دریافت شد. برای پردازش، اینجا را لمس کنید.</string>
+  <string name="ConversationItem_group_action_left">%1$s گروه را ترک کرده است.</string>
+  <string name="ConversationItem_click_for_details">برای جزئیات بیشتر ضربه بزنید</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">مجدد به تکه تکه کردن MMS؟</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_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_select_contact_info">انتخاب اطلاعات تماس</string>
+  <string name="ConversationActivity_compose_message">نوشتن پیام</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">متأسفم، خطا در تنظیم فایل پیوست شما وجود دارد.</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_group_conversation">گروه گفتگو</string>
+  <string name="ConversationActivity_unnamed_group">گروه بی نام</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d اعضای</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 عضو</string>
+  <string name="ConversationActivity_saved_draft">ذخیره پیش نویس</string>
+  <string name="ConversationActivity_invalid_recipient">گیرنده نامعتبر است!</string>
+  <string name="ConversationActivity_calls_not_supported">تماس پشتیبانی نمی شود</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">این دستگاه به نظر نمی رسد برای حمایت از اقدامات شماره گیری.</string>
+  <string name="ConversationActivity_leave_group">ترک گروه؟</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">آیا شما مطمئن هستید که میخواهید این گروه را ترک کنید؟</string>
+  <string name="ConversationActivity_transport_insecure_sms">پیامک نا امن</string>
+  <string name="ConversationActivity_transport_insecure_mms">MMS نا امن</string>
+  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_error_leaving_group">خطا ترک گروه ...</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">جزییات پیام</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_save_to_sd_card">ذخیره در ذخیره سازی؟</string>
+  <string name="ConversationFragment_success_exclamation">موفقیت!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">قادر نیست به ارسال به ذخیره سازی!</string>
+  <string name="ConversationFragment_saving_attachment">ذخیره کردن فایل پیوست</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">ذخیره کردن فایل پیوست در ذخیره سازی</string>
+  <string name="ConversationFragment_pending">در انتظار ...</string>
+  <string name="ConversationFragment_push">داده ها (TextSecure)</string>
+  <string name="ConversationFragment_mms">MMS</string>
+  <string name="ConversationFragment_sms">پیامک</string>
+  <string name="ConversationFragment_deleting">در حال حذف...</string>
+  <string name="ConversationFragment_deleting_messages">حذف پیام های...</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>
+  <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">با استفاده از سفارشی: %s</string>
+  <string name="CustomDefaultPreference_using_default">با استفاده از پیش فرض: %s</string>
+  <string name="CustomDefaultPreference_none">هیچ کدام</string>
+  <!--DateUtils-->
+  <string name="DateUtils_now">اکنون</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">به اشتراک گذاشتن با</string>
+  <!--ExportFragment-->
+  <string name="ExportFragment_export">خروجی</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">خروجی گرفتن متنی به کارت SD؟</string>
+  <string name="ExportFragment_cancel">لغو</string>
+  <string name="ExportFragment_exporting">خروجی گرفتن</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">خروجی گرفتن متنی به کارت SD ...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">خطا، قادر نیست به نوشتن در کارت SD!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">خطا هنگام نوشتن در کارت SD.</string>
+  <string name="ExportFragment_success">موفقیت!</string>
+  <!--GcmRefreshJob-->
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">گروه جدید</string>
+  <string name="GroupCreateActivity_actionbar_update_title">به روز رسانی گروه</string>
+  <string name="GroupCreateActivity_group_name_hint">نام گروه</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">گروه MMS جدید</string>
+  <string name="GroupCreateActivity_avatar_content_description">آواتار گروه</string>
+  <string name="GroupCreateActivity_menu_create_title">ایجاد گروه</string>
+  <string name="GroupCreateActivity_creating_group">ایجاد %1$s…</string>
+  <string name="GroupCreateActivity_updating_group">به روز رسانی %1$s...</string>
+  <string name="GroupCreateActivity_loading_group_details">در حال بارگذاری جزئیات گروه...</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">به من</string>
+  <string name="GroupMembersDialog_members">کاربران...</string>
+  <!--ImportExportActivity-->
+  <string name="ImportExportActivity_import">وارد کردن</string>
+  <string name="ImportExportActivity_export">خروجی</string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">سیستم وارد کردن پایگاه داده SMS؟</string>
+  <string name="ImportFragment_import">وارد کردن</string>
+  <string name="ImportFragment_cancel">لغو</string>
+  <string name="ImportFragment_restore_encrypted_backup">بازگرداندن نسخه پشتیبان رمزگذاری شده؟</string>
+  <string name="ImportFragment_restore">بازیابی</string>
+  <string name="ImportFragment_importing">وارد کردن</string>
+  <string name="ImportFragment_error_importing_backup">خطا در وارد کردن نسخه پشتیبان!</string>
+  <string name="ImportFragment_import_complete">واردکردن کامل شد!</string>
+  <string name="ImportFragment_restoring">بازیابی</string>
+  <string name="ImportFragment_restoring_encrypted_backup">بازگرداندن نسخه پشتیبان رمزگذاری ...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">پشتیبان رمزگذاری شده پیدا نشد!</string>
+  <string name="ImportFragment_restore_complete">بازیابی کامل شد!</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">کلید اسکن شده پیدا نشد!</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">نصب اسکنر بارکد؟</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure نیاز دارد به اسکنر بارکد برای کدهای QR.</string>
+  <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">ارسال نشد</string>
+  <string name="MessageDetailsRecipient_new_identity">هویت جدید</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_error_storing_mms">خطا در ذخیره MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">خطا در اتصال به ارائه دهنده MMS ...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">خطا در خواندن بی سیم تنظیمات MMS ارائه دهنده ...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">پیام های چند رسانه ای</string>
+  <!--MessageRecord-->
+  <string name="MessageRecord_left_group">شما گروه را ترک کرده اید.</string>
+  <string name="MessageRecord_updated_group">گروه به روز شده.</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">رمزها با هم نمی‌خوانند!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">رمز قبلی نادرست است!</string>
+  <!--DeviceProvisioningActivity-->
+  <string name="DeviceProvisioningActivity_link_this_device">پیوند این دستگاه؟</string>
+  <string name="DeviceProvisioningActivity_cancel">لغو</string>
+  <string name="DeviceProvisioningActivity_continue">ادامه</string>
+  <string name="DeviceProvisioningActivity_title">پیوند این دستگاه؟</string>
+  <string name="DeviceProvisioningActivity_content_intro">این قادر خواهد بود به</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">اضافه کردن دستگاه ...</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">اضافه کردن دستگاه جدید ...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">دستگاه اضافه شده است!</string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">دستگاه یافت نشد.</string>
+  <string name="DeviceProvisioningActivity_content_progress_network_error">خطای شبکه.</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">کد QR نامعتبر است.</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_enter_passphrase">رمز را وارد کنید</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">آیکون TextSecure</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">ثبت کردن عبارت عبور</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">رمز معتبر نیست!</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_processing">در حال پردازش</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">در حال پردازش فرایند تبادل کلید...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">اتصال با TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">کشور خود را انتخاب کنید</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">شما باید کد کشور خود را
+مشخص کنید
+    </string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">شما باید شماره تلفن همراه
+خود را مشخص کنید</string>
+  <string name="RegistrationActivity_invalid_number">شماره معتبر نیست</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">شماره‌ای که شما
+مشخص کرده‌اید (%s) معتبر نیست.</string>
+  <string name="RegistrationActivity_unsupported">پشتیبانی نشده</string>
+  <string name="RegistrationActivity_continue">ادامه</string>
+  <string name="RegistrationActivity_edit">ویرایش</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">مشکلات احتمالی</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">تایید شماره</string>
+  <string name="RegistrationProgressActivity_edit_s">ویرایش %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">ثبت نام کامل شد!</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">شما باید وارد کنید کد خود را اول دریافت کنید ...</string>
+  <string name="RegistrationProgressActivity_connecting">اتصال</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">اتصال برای تأیید ...</string>
+  <string name="RegistrationProgressActivity_network_error">خطای شبکه!</string>
+  <string name="RegistrationProgressActivity_verification_failed">تأیید نشد!</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">تلاش های بیش از حد</string>
+  <string name="RegistrationProgressActivity_requesting_call">درخواست تماس</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">درخواست ورودی تأیید تماس ...</string>
+  <string name="RegistrationProgressActivity_server_error">خطای سرور</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">سرور با خطا مواجه شده است. لطفا دوباره تلاش کنید.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">درخواست های بیش از حد!</string>
+  <string name="RegistrationProgressActivity_registration_conflict">تضاد در ثبت نام</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">ثبت نام کامل شد</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">ثبت نام TextSecure با موفقیت به پایان رسید.</string>
+  <string name="RegistrationService_registration_error">خطای ثبت نام</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">ثبت نام TextSecure با مشکل مواجه شده است.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_secure_session_ended">جلسه امن به پایان رسید.</string>
+  <string name="SmsMessageRecord_duplicate_message">تکثیر پیام.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">ترک گروه ...</string>
+  <string name="TheadRecord_secure_session_ended">جلسه امن به پایان رسید.</string>
+  <string name="ThreadRecord_draft">پیش نویس:</string>
+  <!--VerifyIdentityActivity-->
+  <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>
+  <!--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>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">اثر انگشت هویت من</string>
+  <!--KeyExchangeInitiator-->
+  <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>
+  <!--EncryptingSmsDatabase-->
+  <string name="EncryptingSmsDatabase_error_decrypting_message">خطا در رمز گشایی پیام.</string>
+  <!--ThreadDatabase-->
+  <string name="ThreadDatabase_error_decrypting_message">خطا در رمز گشایی پیام.</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">در حال اتصال به کارگزار پیام چندرسانه‌ای...</string>
+  <string name="MmsDatabase_downloading_mms">در حال بارگیری پیام چندرسانه‌ای...</string>
+  <string name="MmsDatabase_mms_download_failed">دانلود MMS انجام نشد!</string>
+  <string name="MmsDatabase_downloading">در حال بارگیری...</string>
+  <string name="MmsDatabase_mms_pending_download">ضربه بزنید و پیکربندی تنظیمات MMS برای ادامه دانلود.</string>
+  <string name="MmsDatabase_error_decrypting_message">خطا در رمز گشایی پیام.</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>
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">واردکردن در حال پیشرفت</string>
+  <string name="ApplicationMigrationService_importing_text_messages">واردکردن پیام های متنی</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">برای باز کردن لمس کنید.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure باز است</string>
+  <string name="KeyCachingService_lock">قفل با عبارت عبور</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d پیام های جدید</string>
+  <string name="MessageNotifier_most_recent_from_s">بیشترین از: %s</string>
+  <string name="MessageNotifier_encrypted_message">پیام رمزنگاری شده ...</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>
+  <string name="MessageNotifier_mark_all_as_read">علامت همه به عنوان خوانده شده</string>
+  <string name="MessageNotifier_mark_as_read">علامت گذاری به عنوان خوانده شده</string>
+  <string name="MessageNotifier_media_message">پیام رسانه</string>
+  <!--QuickResponseService-->
+  <!--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>
+  <string name="contact_selection_group_activity__finding_contacts">بارگیری لیست مخاطب‌ها</string>
+  <!--single_contact_selection_activity-->
+  <string name="SingleContactSelectionActivity_updating_directory">به روز رسانی دایرکتوری</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">به روز رسانی دایرکتوری فشار ...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">تصویر مخاطب</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_push">ارسال پیام TextSecure</string>
+  <string name="conversation_activity__type_message_sms_insecure">ارسال نا امن SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">ارسال نا امن MMS</string>
+  <string name="conversation_activity__send">ارسال</string>
+  <string name="conversation_activity__remove">حذف</string>
+  <string name="conversation_activity__window_description">مکالمه با %1$s</string>
+  <string name="conversation_activity__compose_description">ترکیب پیام</string>
+  <string name="conversation_activity__emoji_toggle_description">تعویض صفحه کلید شکلک</string>
+  <string name="conversation_activity__attachment_thumbnail">پیوست تصویر کوچک</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">دانلود پیام رسانه</string>
+  <string name="conversation_item__mms_image_description">پیام رسانه</string>
+  <string name="conversation_item__play_button_description">دکمه بازی</string>
+  <string name="conversation_item__secure_message_description">پیام امن</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">دریافت</string>
+  <string name="conversation_item_sent__downloading">در حال دانلود</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">ارسال نشد</string>
+  <string name="conversation_item_sent__pending_approval_description">در انتظار تایید</string>
+  <string name="conversation_item_sent__delivered_description">تحویل</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">دریافت</string>
+  <string name="conversation_item_received__contact_photo_description">تصویر مخاطب</string>
+  <string name="conversation_item_received__downloading">در حال دانلود</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">حالت انتخاب دسته ای</string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s منتخب</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">کشورهای در حال بارگذاری ...</string>
+  <string name="country_selection_fragment__search">جستجو</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__thanks">تشکر از کمک شما!</string>
+  <string name="log_submit_activity__submitting">ارسال</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__skip">پرش</string>
+  <string name="database_migration_activity__import">وارد کردن</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">به روز رسانی پایگاه داده ...</string>
+  <!--media_overview_activity-->
+  <string name="media_overview_activity__no_images">بدون تصاویر</string>
+  <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">تأیید کردن</string>
+  <string name="message_recipients_list_item__resend">ارسال دوباره</string>
+  <!--MmsPreferencesFragment-->
+  <string name="MmsPreferencesFragment__enabled">فعال</string>
+  <string name="MmsPreferencesFragment__disabled">غیر فعال</string>
+  <string name="MmsPreferencesFragment__not_set">تنظیم نشده</string>
+  <!--GroupUtil-->
+  <string name="GroupUtil_group_updated">گروه به روز شد.</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__unlock">قفل باز شود</string>
+  <!--prompt_mms_activity-->
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__complete">کامل</string>
+  <!--registration_activity-->
+  <string name="registration_activity__your_country">کشور شما</string>
+  <string name="registration_activity__your_country_code_and_phone_number">کد کشور شما و
+شماره تلفن</string>
+  <string name="registration_activity__phone_number">شماره تلفن</string>
+  <string name="registration_activity__register">ثبت نام</string>
+  <!--registration_problems-->
+  <string name="registration_problems__sms_interceptors">پیامک رهگیر.</string>
+  <string name="registration_problems__incorrect_number">تعداد نادرست.</string>
+  <string name="registration_problems__google_voice">Google Voice</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">تأیید صدا</string>
+  <string name="registration_progress_activity__verify">تأیید کردن</string>
+  <string name="registration_progress_activity__call_me">تماس با من</string>
+  <string name="registration_progress_activity__edit_number">ویرایش شماره</string>
+  <string name="registration_progress_activity__connectivity_error">خطای اتصال.</string>
+  <string name="registration_progress_activity__restrictive_firewall">محدود کردن دیواره آتش</string>
+  <string name="registration_progress_activity__connecting">اتصال ...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">در حال انتظار برای اس ام اس
+تایید ...</string>
+  <string name="registration_progress_activity__registering_with_server">ثبت نام با سرور ...</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS تایید
+ناموفق.</string>
+  <string name="registration_progress_activity__generating_keys">تولید کلید های ...</string>
+  <string name="registration_progress_activity__alert">هشدار</string>
+  <string name="registration_progress_activity__telephone">تلفن</string>
+  <string name="registration_progress_activity__check">بررسی</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to"><small>نام یا شماره را وارد کنید</small></string>
+  <string name="recipients_panel__add_member">اضافه کردن کاربر</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">هویت خود (آنها به عنوان خوانده شده):</string>
+  <string name="verify_identity_activity__your_identity_you_read">هویت خود (شما بخوانید):</string>
+  <!--message_details_header-->
+  <string name="message_details_header__sent">فرستاده</string>
+  <string name="message_details_header__received">رسیده</string>
+  <string name="message_details_header__via">از طریق</string>
+  <string name="message_details_header__to">به:</string>
+  <string name="message_details_header__from">از:</string>
+  <string name="message_details_header__with">با:</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_identity">تشخیص هویت</string>
+  <string name="AndroidManifest__log_submit">ارسال گزارش اشکال‌زدایی</string>
+  <string name="AndroidManifest__media_preview">پیش نمایش رسانه</string>
+  <string name="AndroidManifest__media_overview">همه تصاویر</string>
+  <!--arrays.xml-->
+  <string name="arrays__my_identity_key">کلید هویت من</string>
+  <string name="arrays__use_default">استفاده از پیش فرض</string>
+  <string name="arrays__use_custom">استفاده از سفارشی</string>
+  <!--plurals.xml-->
+  <plurals name="minutes_ago">
+    <item quantity="other">%d دقیقه</item>
+  </plurals>
+  <plurals name="hours_ago">
+    <item quantity="other">%d ساعت</item>
+  </plurals>
+  <!--preferences.xml-->
+  <string name="preferences__general">عمومی</string>
+  <string name="preferences__sms_mms">SMS و MMS</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__enable_enter_key_title">کلید Enter فعال باشد</string>
+  <string name="preferences__replace_smiley_with_enter_key">جایگزینی کلید نمایش خندانک با کلید Enter</string>
+  <string name="preferences__pref_enter_sends_title">ارسال با کلید Enter</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__change_passphrase">تغییر رمز</string>
+  <string name="preferences__change_my_passphrase">تغییر رمز من</string>
+  <string name="preferences__enable_passphrase">فعال‌سازی رمز</string>
+  <string name="preferences__passphrase_summary">رمز %s</string>
+  <string name="preferences__enable_local_encryption_of_messages_and_keys">فعال کردن رمزگذاری محلی از پیام ها و کلیدها</string>
+  <string name="preferences__screen_security">امنیت صفحه نمایش</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">بلوک کردن عکس گرفتن از صفحه در لیست تازه و در داخل برنامه</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__notifications">اطلاعیه‌ها</string>
+  <string name="preferences__display_message_notifications_in_status_bar">نمایش اطلاعیه دریافت پیام در نوار وضعیت</string>
+  <string name="preferences__led_color">رنگ چراغ ال‌ای‌دی</string>
+  <string name="preferences__led_color_unknown">ناشناخته</string>
+  <string name="preferences__pref_led_blink_title">الگوی چشمک زدن</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">تنظیم الگوی چشمک زدن چراغ ال‌ای‌دی</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">روشن به مدت:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">خاموش به مدت:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">الگوی چشمک زدن چراغ ال‌ای‌دی تنظیم شد</string>
+  <string name="preferences__sound">زنگ</string>
+  <string name="preferences__change_notification_sound">تغییر زنگ اطلاعیه‌ها</string>
+  <string name="preferences__inthread_notifications">در موضوع اطلاعیه</string>
+  <string name="preferences__repeat_alerts">تکرار هشدار</string>
+  <string name="preferences__never">هرگز</string>
+  <string name="preferences__one_time">یکبار</string>
+  <string name="preferences__two_times">دو بار</string>
+  <string name="preferences__three_times">سه بار</string>
+  <string name="preferences__five_times">پنج بار</string>
+  <string name="preferences__ten_times">ده بار</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__white">سفید</string>
+  <string name="preferences__none">هیچ کدام</string>
+  <string name="preferences__fast">سریع</string>
+  <string name="preferences__normal">عادی</string>
+  <string name="preferences__slow">آهسته</string>
+  <string name="preferences__custom">دلخواه</string>
+  <string name="preferences__advanced">تنظیمات پیشرفته</string>
+  <string name="preferences__app_protection">حفاظت برنامه</string>
+  <string name="preferences__advanced_mms_access_point_names">تنظیمات MMS دستی</string>
+  <string name="preferences__enable_manual_mms">استفاده از کتابچه تنظیمات MMS</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS پروکسی میزبان</string>
+  <string name="preferences__mms_proxy_port">MMS پروکسی پورت</string>
+  <string name="preferences__mmsc_username">MMSC نام کاربری</string>
+  <string name="preferences__mmsc_password">MMSC رمز عبور</string>
+  <string name="preferences__sms_delivery_reports">گزارش های تحویل پیام کوتاه</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__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>
+  <string name="preferences__light_theme">روشن</string>
+  <string name="preferences__dark_theme">تیره</string>
+  <string name="preferences__appearance">ظاهر برنامه</string>
+  <string name="preferences__theme">قالب</string>
+  <string name="preferences__theme_summary">تم %s</string>
+  <string name="preferences__default">پیش فرض</string>
+  <string name="preferences__language">زبان</string>
+  <string name="preferences__language_summary">زبان %s</string>
+  <string name="preferences__textsecure_messages">پیام های TextSecure</string>
+  <string name="preferences__submit_debug_log">ارسال گزارش اشکال‌زدایی</string>
+  <string name="preferences__support_wifi_calling">\'وای فای تلفن\' حالت سازگاری</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">انتخاب همه</string>
+  <string name="contact_selection_list__menu_unselect_all">عدم انتخاب همه</string>
+  <string name="contact_selection_list__header_textsecure_users">کاربران TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">همه مخاطب‌ها</string>
+  <string name="contact_selection_list__unknown_contact">پیام جدید به ...</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">به پایان رسید</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">بارگیری مجدد لیست مخاطب‌ها</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>
+  <string name="conversation_context__menu_resend_message">پیام فرستادن مجدد</string>
+  <!--conversation_context_image-->
+  <string name="conversation_context_image__save_attachment">ذخیره پیوست</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">دعوت کردن</string>
+  <!--conversation_insecure_no_push-->
+  <string name="conversation_insecure__menu_start_secure_session">آغاز گفتگوی امن</string>
+  <string name="conversation_insecure__security">امنیت</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_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">تماس با عکس تصویر</string>
+  <string name="conversation_list_item_view__attachment_indicator">پیوست شاخص</string>
+  <string name="conversation_list_item_view__error_alert">هشدار خطا</string>
+  <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">گفتگوی جدید</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">امنیت</string>
+  <string name="conversation_secure_verified__menu_verify_identity">تشخیص هویت</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">پایان گفتگوی امن</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">پیوست فایل</string>
+  <string name="conversation__menu_update_group">به روز رسانی گروه</string>
+  <string name="conversation__menu_leave_group">مرخص شدن از گروه</string>
+  <string name="conversation__menu_delete_thread">حذف موضوع</string>
+  <string name="conversation__menu_view_media">همه تصاویر</string>
+  <!--conversation_callable-->
+  <string name="conversation_add_to_contacts__menu_add_to_contacts">افزودن به مخاطب‌ها</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">لیست دریافت کنندگان</string>
+  <string name="conversation_group_options__delivery">تحویل</string>
+  <string name="conversation_group_options__conversation">گفتگو</string>
+  <string name="conversation_group_options__broadcast">پخش</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_normal-->
+  <string name="text_secure_normal__menu_new_message">پیام جدید</string>
+  <string name="text_secure_normal__menu_new_group">گروه جدید</string>
+  <string name="text_secure_normal__menu_settings">تنظیمات</string>
+  <string name="text_secure_normal__menu_clear_passphrase">قفل</string>
+  <string name="text_secure_normal__mark_all_as_read">علامت همه به عنوان خوانده شده</string>
+  <!--reminder_header-->
+  <string name="reminder_header_expired_build">ساخته خود از TextSecure منقضی شده است!</string>
+  <string name="reminder_header_sms_default_title">استفاده به عنوان برنامه پیش فرض SMS؟</string>
+  <string name="reminder_header_sms_import_title">سیستم وارد کردن SMS؟</string>
+  <string name="reminder_header_push_title">فعال کردن پیام های TextSecure؟</string>
+  <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">شما</string>
+  <string name="MediaPreviewActivity_cant_display">ناموفق برای پیش نمایش این تصویر</string>
+  <string name="MediaPreviewActivity_unssuported_media_type">نوع رسانه پشتیبانی نشده</string>
+  <!--media_preview-->
+  <string name="media_preview__save_title">دخیره</string>
+  <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">پیش‌نمایش تصویر</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">در حال حذف کردن...</string>
+  <string name="trimmer__deleting_old_messages">در حال حذف پیام‌های قدیمی...</string>
+  <string name="trimmer__old_messages_successfully_deleted">پیام‌های قدیمی با موفقیت حذف شدند</string>
+  <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">آیکون های حمل و نقل</string>
+  <!--EOF-->
+</resources>

res/values-fi/strings.xml

@@ -25,9 +25,9 @@ Tämä tulee lopettamaan pikaviestipalvelun poistamalla tietosi palvelimelta.
 Käyttääksesi pikaviestipalvelua tulevaisuudessa sinun täytyy rekisteröityä uudelleen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Tekstiviestit käytössä</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletus tekstiviestisovellustasi</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletustekstiviestisovellustasi</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Tekstiviestit poissa käytöstä</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Kosketa asettaaksesi TextSecuren oletus tekstiviestisovellukseksi</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Kosketa, jos haluat asettaa TextSecuren oletustekstiviestisovellukseksi</string>
   <string name="ApplicationPreferencesActivity_on">päällä</string>
   <string name="ApplicationPreferencesActivity_On">Päällä</string>
   <string name="ApplicationPreferencesActivity_off">pois</string>
@@ -53,14 +53,14 @@ tämän yhteystiedon.</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Viestin koko: %d kt</string>
   <string name="ConversationItem_expires_s">Umpeutuu: %s</string>
-  <string name="ConversationItem_error_not_delivered">Ei lähetetty</string>
+  <string name="ConversationItem_error_not_delivered">Ei toimitettu</string>
   <string name="ConversationItem_view_secure_media_question">Tarkastele salattua mediaa?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tämä media on tallennettu salattuun tietokantaan. Ulkoisella ohjelmalla tarkasteleminen vaatii sisällön salauksen purkua ja tallennusta muistiin. Oletko varma, että haluat tehdä tämän?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Virhe. Vastaanotettiin vanhentunut avaintenvaihtoviesti.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Avaintenvaihtoviesti vastaanotettu, napsauta aloittaaksesi käsittelyn.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Avaintenvaihtoviesti vastaanotettu. Aloita käsittely napsauttamalla.</string>
   <string name="ConversationItem_group_action_left">%1$s on lähtenyt ryhmästä.</string>
   <string name="ConversationItem_click_for_details">Lisätietoja napsauttamalla</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Napsauta lähettääksesi viestin salaamattomana</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Napsauta, jos haluat lähettää viestin salaamattomana</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Käytä salaamattomia tekstiviestejä?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Käytä salaamattomia MMS-viestejä?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tätä viestiä <b>ei</b> tulla salaamaan, koska vastaanottaja ei enää käytä TextSecurea.\n\nLähetä salaamaton viesti?</string>
@@ -68,19 +68,19 @@ tämän yhteystiedon.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Aloita salattu istunto?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Aloita salattu istunto %s:n kanssa?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Suojatun istunnon lopetuksen vahvistus</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Salatun istunnon lopetuksen vahvistus</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Haluatko varmasti lopettaa salatun istunnon?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Viestiketjun poiston vahvistus</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Haluatko varmasti poistaa tämän keskustelun pysyvästi?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Haluatko varmasti poistaa pysyvästi tämän keskustelun?</string>
   <string name="ConversationActivity_add_attachment">Lisää liite</string>
   <string name="ConversationActivity_select_contact_info">Valitse yhteystieto</string>
   <string name="ConversationActivity_compose_message">Kirjoita viesti</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Virhe liitteen lisäämisessä</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Pahoittelemme, mutta valittu video ylittää kokorajoituksemme (%1$skB).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Pahoittelemme, mutta valittu audio ylittää kokorajoituksemme (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Valitettavasti kyseinen video ylittää viesteille asetetun kokorajoituksen (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Valitettavasti kyseinen äänitallenne ylittää viesteille asetetun kokorajoituksen (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Annettu numero tai sähköpostiosoite ei ole kelvollinen!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Viesti on tyhjä!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Ryhmäkeskustelun osanottajat</string>
+  <string name="ConversationActivity_group_members">Ryhmän jäsenet</string>
   <string name="ConversationActivity_group_conversation">Ryhmäkeskustelu</string>
   <string name="ConversationActivity_unnamed_group">Nimeämätön ryhmä</string>
   <string name="ConversationActivity_d_recipients_in_group">%d jäsentä</string>
@@ -95,7 +95,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_transport_insecure_mms">Salaamaton MMS-viesti</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Hae täältä: %s</string>
-  <string name="ConversationActivity_install_textsecure">Asenna TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Keskustellaan käyttämällä tätä: %s</string>
   <string name="ConversationActivity_error_leaving_group">Virhe ryhmästä lähtiessä...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Viestin tiedot</string>
@@ -108,7 +108,7 @@ Vastaanotettu: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Varmista viestin poisto</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Oletko varma, että haluat pysyvästi poistaa kaikki valitut viestit?</string>
   <string name="ConversationFragment_save_to_sd_card">Tallenna muistiin?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Jos tallennat tämän tiedoston muistiin, kaikki muutkin sovellukset voivat käyttää sitä.\n\nHaluatko jatkaa?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Jos tallennat tämän tiedoston muistiin, niin kaikki muutkin sovellukset voivat käyttää sitä.\n\nHaluatko jatkaa?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Tiedoston tallennuksessa tapahtui virhe!</string>
   <string name="ConversationFragment_success_exclamation">Onnistui!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Muistiin tallentaminen epäonnistui!</string>
@@ -126,7 +126,7 @@ Vastaanotettu: %4$s</string>
   <string name="ConversationListFragment_deleting">Poistetaan</string>
   <string name="ConversationListFragment_deleting_selected_threads">Valittuja viestiketjuja poistetaan...</string>
   <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Avainvaihtoviesti...</string>
+  <string name="ConversationListItem_key_exchange_message">Avaintenvaihtoviesti...</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Käyttäen mukautettua: %s</string>
   <string name="CustomDefaultPreference_using_default">Käyttäen oletusta: %s</string>
@@ -148,14 +148,14 @@ Tämä toiminto vie TextSecure-viestiesi salaamattoman sisällön SD-muistikorti
   <string name="ExportFragment_success">Onnistui!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Pysyvä TextSecure-yhteysvirhe!</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi viestintä tietoverkon kautta on nyt otettu pois käytöstä. Ole hyvä ja kokeile rekisteröityä uudelleen TextSecuren asetuksista.</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi viestintä tietoverkon kautta on nyt otettu pois käytöstä. Kokeile rekisteröityä uudelleen TextSecuren asetuksista.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
   <string name="GroupCreateActivity_actionbar_update_title">Päivitä ryhmää</string>
   <string name="GroupCreateActivity_group_name_hint">Ryhmän nimi</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Uusi MMS-ryhmä</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Olet valinnut yhteystiedon, joka ei tue TextSecuren ryhmäkeskusteluja. Tämä istunto tulee olemaan MMS-pohjainen.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Et ole rekisteröitynyt käyttämään tiedonsiirtokanavaa, joten ryhmäkeskustelut ovat poissa käytöstä.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Et ole rekisteröitynyt käyttämään tietoverkkovälitteistä viestintää, joten ryhmäkeskustelut ovat poissa käytöstä.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ryhmän luonti epäonnistui odottamattoman virheen takia.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ryhmässä täytyy olla vähintään yksi henkilö!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Yhdellä ryhmän jäsenistä on puhelinnumero, jota ei voida lukea. Ole hyvä ja korjaa tämän henkilön yhteystiedot tai poista hänet ryhmästä ja yritä uudelleen.</string>
@@ -197,7 +197,7 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <string name="ImportFragment_restore_complete">Palautus suoritettu!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Skannattuja avaimia ei löytynyt!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">Asenna viivakoodinlukija?</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Asenna \"Barcode Scanner\" -viivakoodinlukija?</string>
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure tarvitsee \"Barcode Scanner\" -ohjelman QR-koodeja varten.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Lähetys epäonnistui</string>
@@ -209,12 +209,13 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimediaviesti</string>
   <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Saapunut viesti on salattu käyttäen vanhaa versiota TextSecuresta, jota ei enää tueta. Pyydä lähettäjää päivittämään TextSecure uusimpaan versioon ja lähettämään viesti uudelleen.</string>
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Vastaanotettiin viesti, joka on salattu TextSecuren vanhalla versiolla, jota ei enää tueta. Pyydä lähettäjää päivittämään TextSecure uusimpaan versioon ja lähettämään viesti uudelleen.</string>
   <string name="MessageRecord_left_group">Olet lähtenyt ryhmästä.</string>
   <string name="MessageRecord_updated_group">Ryhmä päivitetty.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Salalauseet eivät täsmää!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Vanha salalause on väärin!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Syötä uusi salalause!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Yhdistä tämä laite?</string>
   <string name="DeviceProvisioningActivity_cancel">PERUUTA</string>
@@ -222,8 +223,8 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <string name="DeviceProvisioningActivity_title">Yhdistä tämä laite?</string>
   <string name="DeviceProvisioningActivity_content_intro">Se voi</string>
   <string name="DeviceProvisioningActivity_content_bullets">
-- Lukea kaikki viestisi
-\n- Lähettää viestejä sinun nimissäsi</string>
+- lukea kaikki viestisi
+\n- lähettää viestejä sinun nimessäsi</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Lisätään laitetta...</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Lisätään uutta laitetta...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Laite lisätty!</string>
@@ -247,7 +248,8 @@ tämän yhteystiedon.</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Yhdistä TextSecurella</string>
   <string name="RegistrationActivity_select_your_country">Valitse maasi</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Suuntanumero täytyy määritellä</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Suuntanumero täytyy
+määritellä</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Sinun täytyy määritellä 
 puhelinnumero</string>
   <string name="RegistrationActivity_invalid_number">Virheellinen numero</string>
@@ -284,19 +286,19 @@ Tarkista uudelleen, että tämä on numerosi! Aiomme vahvistaa sen lähettämäl
   <string name="RegistrationProgressActivity_too_many_requests">Liian monta pyyntöä!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Olet äskettäin pyytänyt puhelua. Voit pyytää uutta puhelua 20 minuutin kuluttua.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Rekisteröintiristiriita</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Tämä numero on jo rekisteröitynä toisella TextSecure-palvelimella (CyanogenMod?). Sinun täytyy purkaa rekisteröityminen siellä ennen kuin voit rekisteröityä.</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Tämä numero on jo rekisteröitynä toisella TextSecure-palvelimella (CyanogenMod?). Sinun täytyy purkaa rekisteröityminen siellä ennen kuin voit rekisteröityä täällä.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Rekisteröinti suoritettu</string>
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Rekisteröityminen suoritettiin onnistuneesti.</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecuren rekisteröityminen onnistui.</string>
   <string name="RegistrationService_registration_error">Rekisteröintivirhe</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rekisteröitymisessä ilmeni ongelma.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Vastaanotettu avainvaihtolähetys 
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Vastaanotettu avaintenvaihtoviesti 
 on viallinen!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-Vastaanotettu avainvaihtolähetys kuuluu väärälle protokollan versiolle.</string>
+Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäksesi ja käsitelläksesi</string>
+Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely napsauttamalla.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Vastaanotettiin päivitetty, mutta tuntematon identiteetti. Napsauta tarkistaaksesi.</string>
   <string name="SmsMessageRecord_secure_session_ended">Salattu istunto päättyi</string>
   <string name="SmsMessageRecord_duplicate_message">Viestin kaksoiskappale.</string>
@@ -312,7 +314,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäks
   <string name="VerifyIdentityActivity_get_my_key_scanned">Näytä oman avaimeni QR-koodi</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROITUS, skannattu avain EI TÄSMÄÄ! Tarkastakaa sormenjälki huolella.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">Ei vahvistettu!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastaanottajan avain on oikea. Tarkistuta myös sinun avain vastaanottajalla.</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastapuolen avain on oikea. Huomaa, että hänen on syytä tarkastaa vastaavasti sinun avaimesi.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Vahvistettu!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sinulla ei ole identiteettiavainta!</string>
   <!--ViewIdentityActivity-->
@@ -351,7 +353,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäks
   <string name="ApplicationMigrationService_import_in_progress">Tuonti käynnissä</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tuo tekstiviestejä</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Kosketa avataksesi.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Avaa koskettamalla.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Kosketa avataksesi tai kosketa lukkoa sulkeaksesi.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecuren lukitus on auki</string>
   <string name="KeyCachingService_lock">Lukitse salalauseella</string>
@@ -406,7 +408,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäks
   <string name="conversation_item_sent__downloading">Ladataan</string>
   <string name="conversation_item_sent__send_failed_indicator_description">Lähetys epäonnistui</string>
   <string name="conversation_item_sent__pending_approval_description">Odottaa hyväksyntää</string>
-  <string name="conversation_item_sent__delivered_description">Lähetetty</string>
+  <string name="conversation_item_sent__delivered_description">Toimitettu</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Lataa</string>
   <string name="conversation_item_received__contact_photo_description">Yhteystiedon kuva</string>
@@ -452,7 +454,7 @@ Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva SMS Backup And Restore:lla.</s
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Puhelimesi edellyttää manuaalista MMS-asetusten säätöä.</string>
   <string name="MmsPreferencesFragment__enabled">Otettu käyttöön</string>
   <string name="MmsPreferencesFragment__disabled">Poistettu käytöstä</string>
-  <string name="MmsPreferencesFragment__not_set">Ei ole asetettu</string>
+  <string name="MmsPreferencesFragment__not_set">Ei asetettu</string>
   <string name="MmsPreferencesFragment__invalid_uri">Syötetty teksti ei ollut kelvollinen URI</string>
   <string name="MmsPreferencesFragment__invalid_host">Syötetty teksti ei ollut kelvollinen palvelin</string>
   <!--GroupUtil-->
@@ -462,19 +464,19 @@ Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva SMS Backup And Restore:lla.</s
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Avaa</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure edellyttää MMS-asetuksia lähettääkseen mediaa ja ryhmäviestejä verkko-operaattorisi kautta. Laitettasi ei ole konfiguroitu antamaan näitä tietoja itsestään, mikä voi johtua laitteen lukituksesta operaattoriin tai muusta rajoitetusta kokoonpanosta.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Lähettääksesi mediatiedostoja ja ryhmäviestejä, napsauta \"OK\" ja täydennä pyydetyt asetukset. Verkko-operaattorisi MMS-asetukset voi yleensä paikantaa etsimällä termiä \"APN\". Sinun tarvitsee tehdä tämän vain kerran.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Jotta TextSecure voisi lähettää mediatiedostoja ja ryhmäviestejä puhelinoperaattorisi kautta, täytyy MMS-asetusten olla määritelty. Tällä hetkellä nämä asetukset eivät ole saatavilla laitteessasi, mikä voi johtua laitteesi operaattorilukituksesta tai muista rajoittavista asetuksista.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Jotta voit lähettää mediatiedostoja ja ryhmäviestejä, napsauta \"OK\" ja täydennä pyydetyt asetukset. Puhelinoperaattorisi MMS-asetukset yleensä löytyvät, kun haet Internetistä operaattorisi nimellä ja termillä \"APN\". Tämä asetusten säätö tarvitsee tehdä vain kerran.</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Valmis</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-Vahvista puhelinnumerosi ottaaksesi TextSecuren käyttöön.</string>
+Jotta voit ottaa TextSecuren käyttöön, tulee sinun ensin vahvistaa puhelinnumerosi.</string>
   <string name="registration_activity__your_country">MAA</string>
-  <string name="registration_activity__your_country_code_and_phone_number">SUUNTA- JA
+  <string name="registration_activity__your_country_code_and_phone_number">MAATUNNUKSESI JA
 PUHELINNUMEROSI</string>
   <string name="registration_activity__phone_number">PUHELINNUMERO</string>
   <string name="registration_activity__register">Rekisteröidy</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Rekisteröitymisen aikana joitakin yhteystietoja siirtyy palvelimelle. Niitä ei kuitenkaan tallenneta sinne.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Rekisteröityminen siirtää joitakin yhteystietoja väliaikaisesti palvelimelle. Niitä ei kuitenkaan tallenneta sinne.</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mahdollisiin ongelmiin
 sisältyvät:</string>
@@ -525,14 +527,14 @@ epäonnistui.</string>
   <string name="recipients_panel__to"><small>Syötä nimi tai numero</small></string>
   <string name="recipients_panel__add_member">Lisää jäsen</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Vastapuolen identiteetti (he lukevat):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Vastapuolen identiteetti (hän lukee):</string>
   <string name="verify_identity_activity__your_identity_you_read">Oma identiteettisi (sinä luet):</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Jotkin asiat kaipaavat huomiotasi.</string>
   <string name="message_details_header__sent">Lähetetty</string>
   <string name="message_details_header__received">Vastaanotettu</string>
   <string name="message_details_header__via">Tyyppi</string>
-  <string name="message_details_header__to">Vast.ott:</string>
+  <string name="message_details_header__to">Vastaanottajat:</string>
   <string name="message_details_header__from">Lähettäjä:</string>
   <string name="message_details_header__with">Avulla:</string>
   <!--AndroidManifest.xml-->
@@ -580,7 +582,7 @@ epäonnistui.</string>
   <string name="preferences__change_my_passphrase">Vaihda salalauseeni</string>
   <string name="preferences__enable_passphrase">Aseta salalause</string>
   <string name="preferences__passphrase_summary">Salalause %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Ota käyttöön paikallisten viestien ja avainten salaus</string>
+  <string name="preferences__enable_local_encryption_of_messages_and_keys">Ota käyttöön laitteesi viestien ja avainten salaus</string>
   <string name="preferences__screen_security">Näytön suojaus</string>
   <string name="preferences__screen_security_summary">Näytön suojaus %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Estä kuvakaappaukset \"viimeksi käytetyt sovellukset\" -näkymästä sekä sovelluksen sisältä</string>
@@ -590,17 +592,17 @@ epäonnistui.</string>
   <string name="preferences__pref_timeout_interval_title">Ajastimen pituus</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Odotusaika, ennen kuin salalause unohdetaan muistista</string>
   <string name="preferences__notifications">Ilmoitukset</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset palkissa</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset viesteistä tilapalkissa</string>
   <string name="preferences__led_color">LED:in väri</string>
   <string name="preferences__led_color_unknown">Tuntematon</string>
   <string name="preferences__pref_led_blink_title">LED:in vilkkumistahti</string>
-  <string name="preferences__pref_led_blink_custom_pattern_title">Aseta mukautettu LED:in vilkkumiskuvio</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Aseta mukautettu LED:in vilkkumistahti</string>
   <string name="preferences__pref_led_blink_custom_pattern_on_for">Päällä:</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Pois päältä:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Mukautettu LED:in vilkkumiskuvio asetettu!</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Mukautettu LED:in vilkkumistahti asetettu!</string>
   <string name="preferences__sound">Ääni</string>
   <string name="preferences__change_notification_sound">Vaihda ilmoitusääni</string>
-  <string name="preferences__inthread_notifications">Istunnonsisäiset ilmoitukset</string>
+  <string name="preferences__inthread_notifications">Keskustelun sisäiset ilmoitukset</string>
   <string name="preferences__play_inthread_notifications">Toista ilmoitusäänet aktiivista keskustelua tarkasteltaessa.</string>
   <string name="preferences__repeat_alerts">Hälytysten toisto</string>
   <string name="preferences__never">Älä toista</string>
@@ -726,11 +728,11 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="reminder_header_expired_build">Käyttämäsi TextSecure on vanhentunut!</string>
   <string name="reminder_header_expired_build_details">Viestejä ei enää voida lähettää onnistuneesti. Ole hyvä ja päivitä viimeisimpään versioon.</string>
   <string name="reminder_header_sms_default_title">Käytä oletus tekstiviestisovelluksena?</string>
-  <string name="reminder_header_sms_default_text">Napsauta tehdäksesi TextSecuresta oletus tekstiviestisovelluksesi.</string>
+  <string name="reminder_header_sms_default_text">Napsauta, jos haluat tehdä TextSecuresta oletustekstiviestisovelluksesi.</string>
   <string name="reminder_header_sms_import_title">Tuo järjestelmän tekstiviestit TextSecureen?</string>
-  <string name="reminder_header_sms_import_text">Napsauta kopioidaksesi puhelimesi tekstiviestit sen salattuun tietokantaan</string>
-  <string name="reminder_header_push_title">Ota käyttöön TextSecure pikaviestipalvelu?</string>
-  <string name="reminder_header_push_text">Napsauta, jos haluat nopeaa viestittelyä ja vahvempaa yksityisyyttä sekä heittää hyvästit tekstiviestimaksuille.</string>
+  <string name="reminder_header_sms_import_text">Napsauta, jos haluat kopioida puhelimesi tekstiviestit sen salattuun tietokantaan.</string>
+  <string name="reminder_header_push_title">Ota käyttöön TextSecure-pikaviestipalvelu?</string>
+  <string name="reminder_header_push_text">Napsauta tästä, jos haluat sanoa ei tekstiviestimaksuille ja kyllä vahvemmalle yksityisyydensuojalle sekä nopeille viesteille.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Sinä</string>
   <string name="MediaPreviewActivity_cant_display">Kuvan esikatselu epäonnistui</string>

res/values-fr/strings.xml

@@ -84,7 +84,7 @@ vérifier ce contact.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Désolé, le fichier audio sélectionné dépasse les restrictions de taille de message (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse SMS ou e-mail valide !</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Le message est vide !</string>
-  <string name="ConversationActivity_group_conversation_recipients">Destinataires de la conversation de groupe</string>
+  <string name="ConversationActivity_group_members">Membres du groupe</string>
   <string name="ConversationActivity_group_conversation">Conversation de groupe</string>
   <string name="ConversationActivity_unnamed_group">Groupe sans nom</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
@@ -99,7 +99,6 @@ vérifier ce contact.</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS non-sécurisé</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Mettez-vous-y: %s</string>
-  <string name="ConversationActivity_install_textsecure">Installez TextSecure : %s</string>
   <string name="ConversationActivity_error_leaving_group">Erreur en quittant le groupe...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Détails du message</string>
@@ -217,6 +216,7 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
   <!--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>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Entrer la nouvelle phrase de passe !</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Lier cet appareil?</string>
   <string name="DeviceProvisioningActivity_cancel">ANNULER</string>

res/values-hr/strings.xml

@@ -82,7 +82,6 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Odabrani audio prelazi ograničenje veličine poruke (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Primatelj nije valjana SMS ili adresa e-pošte!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Poruka je prazna!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Primatelji grupnog razgovora</string>
   <string name="ConversationActivity_group_conversation">Grupni razgovor</string>
   <string name="ConversationActivity_unnamed_group">Neimenovana grupa</string>
   <string name="ConversationActivity_d_recipients_in_group">%d članova</string>
@@ -97,7 +96,6 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_transport_insecure_mms">Nesigurni MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Dohvati s njime: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instaliraj TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Greška prilikom napuštanja grupe...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalji poruke</string>

res/values-hu/strings.xml

@@ -85,7 +85,6 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sajnos a kiválasztott hangállomány mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A fogadó címe nem érvényes SMS vagy email cím!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Üres az üzenet!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Csoportos beszélgetés fogadói</string>
   <string name="ConversationActivity_group_conversation">Csoportos beszélgetés</string>
   <string name="ConversationActivity_unnamed_group">Névtelen csoport</string>
   <string name="ConversationActivity_d_recipients_in_group">%d tagok</string>
@@ -100,7 +99,6 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_transport_insecure_mms">Nem biztonságos MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Szerezd be itt: %s</string>
-  <string name="ConversationActivity_install_textsecure">TextSecure telepítése: %s</string>
   <string name="ConversationActivity_error_leaving_group">Hiba a csoport elhagyásakor...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Üzenet részletei</string>

res/values-in/strings.xml

@@ -21,7 +21,9 @@ dapat mengaksesnya</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Jangan gunakan push message</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kesalahan dalam menghubungkan ke server!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS digunakan</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Sentuh untuk mengubah aplikasi SMS default</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS tidak diaktifkan</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Sentuh untuk membuat TextSecure sebagai aplikasi SMS default</string>
   <!--AppProtectionPreferenceFragment-->
   <!--DraftDatabase-->

res/values-it/strings.xml

@@ -24,12 +24,15 @@ Questo disabiliterà i messaggi push e annullerà la tua registrazione sul serve
 Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messaggi push in futuro.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Abilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Premi per cambiare l\'applicazione predefinita per gli SMS</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Disabilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <string name="ApplicationPreferencesActivity_on">on</string>
   <string name="ApplicationPreferencesActivity_On">On</string>
   <string name="ApplicationPreferencesActivity_off">off</string>
   <string name="ApplicationPreferencesActivity_Off">Off</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuti</string>
   <!--DraftDatabase-->
@@ -77,7 +80,7 @@ questo contatto.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Errore, l\'audio selezionato supera la dimensione massima (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Il destinatario non è un indirizzo valido per l\'SMS o per l\'email!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Il messaggio è vuoto!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Destinatari conversazione di gruppo</string>
+  <string name="ConversationActivity_group_members">Membri del gruppo</string>
   <string name="ConversationActivity_group_conversation">Conversazione di gruppo</string>
   <string name="ConversationActivity_unnamed_group">Gruppo senza nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d partecipanti</string>
@@ -92,7 +95,7 @@ questo contatto.</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS non sicuro</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Ottienilo con: %s</string>
-  <string name="ConversationActivity_install_textsecure">Installa TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Vieni a chattare qui: %s</string>
   <string name="ConversationActivity_error_leaving_group">Errore nell\'abbandonare il gruppo...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Dettagli messaggio</string>
@@ -211,6 +214,7 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Le password non corrispondono!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Vecchia password errata!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Inserisci una nuova password!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Collegare questo dispositivo?</string>
   <string name="DeviceProvisioningActivity_cancel">ANNULLA</string>
@@ -585,6 +589,8 @@ non riuscita.
   <string name="preferences__sms_mms">SMS e MMS</string>
   <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizza per tutti gli MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usa TextSecure per ricevere gli SMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usa TextSecure per ricevere gli MMS</string>
   <string name="preferences__input_settings">Impostazioni di Input</string>
   <string name="preferences__enable_enter_key_title">Abilita il tasto Invio</string>
   <string name="preferences__replace_smiley_with_enter_key">Sostituisci il tasto smiley con il tasto Inivio</string>
@@ -667,6 +673,8 @@ non riuscita.
   <string name="preferences__default">Predefinito</string>
   <string name="preferences__language">Lingua</string>
   <string name="preferences__language_summary">Lingua %s</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="preferences__submit_debug_log">Invia log di debug</string>
   <string name="preferences__support_wifi_calling">Modalità di compatibilità \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Attiva questa opzione se il tuo dispositivo invia SMS/MMS tramite WiFi (attiva solo quando \'WiFi Calling\' è attivo sul tuo dispositivo).</string>

res/values-ja/strings.xml

@@ -83,7 +83,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">選択された音声ファイルはサイズ限度を超えています(%1$skB)。</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">受信先のSMS又はEメールアドレスが有効ではありません。</string>
   <string name="ConversationActivity_message_is_empty_exclamation">メッセージが空です。</string>
-  <string name="ConversationActivity_group_conversation_recipients">グループチャットの宛先</string>
   <string name="ConversationActivity_group_conversation">グループチャット</string>
   <string name="ConversationActivity_unnamed_group">無名グループ</string>
   <string name="ConversationActivity_d_recipients_in_group">参加者%d人</string>
@@ -98,7 +97,6 @@
   <string name="ConversationActivity_transport_insecure_mms">暗号化されていないMMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">一緒に取得: %s</string>
-  <string name="ConversationActivity_install_textsecure">TextSecureをインストール: %s</string>
   <string name="ConversationActivity_error_leaving_group">グループ離脱でエラー...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">メッセージの詳細</string>

res/values-kn-rIN/strings.xml

@@ -80,7 +80,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">ಕ್ಷಮಿಸಿ, ಆಯ್ಕೆ ಮಾಡಿದ ಶ್ರಾವ್ಯ ಸಂದೇಶ ಗಾತ್ರ ನಿರ್ಬಂಧಗಳನ್ನು ಮೀರಿದೆ  (%1$skB).</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_group_conversation_recipients">ಸಮೂಹ ಸಂವಾದದ ಸ್ವೀಕೃತದಾರರು</string>
   <string name="ConversationActivity_group_conversation">ಸಮೂಹ ಸಂವಾದ</string>
   <string name="ConversationActivity_unnamed_group">ಅನಾಮಧೇಯ ಸಮೂಹ</string>
   <string name="ConversationActivity_d_recipients_in_group">%d ಸದಸ್ಯರು </string>
@@ -95,7 +94,6 @@
   <string name="ConversationActivity_transport_insecure_mms">ಅಸುರಕ್ಷಿತ ಎಂಎಂಎಸ್ </string>
   <string name="ConversationActivity_transport_textsecure">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ </string>
   <string name="ConversationActivity_get_with_it">ಇದನ್ನು ಪಡೆಯಿರಿ:: %s</string>
-  <string name="ConversationActivity_install_textsecure">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಸ್ಥಾಪಿಸಿ : %s</string>
   <string name="ConversationActivity_error_leaving_group">ಗುಂಪು ಬಿಡುವಾಗ ದೋಷ ...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">ಸಂದೇಶದ ವಿವರಗಳು</string>

res/values-nl/strings.xml

@@ -78,7 +78,7 @@ Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wi
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Excuses, het audiobestand overschrijdt de maximale berichtgrootte (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ontvanger is niet een geldig SMS of e-mailadres!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Bericht is leeg!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Groepsgesprek ontvangers</string>
+  <string name="ConversationActivity_group_members">Groepsleden</string>
   <string name="ConversationActivity_group_conversation">Groepsgesprek</string>
   <string name="ConversationActivity_unnamed_group">Naamloze groep</string>
   <string name="ConversationActivity_d_recipients_in_group">%d leden</string>
@@ -93,7 +93,7 @@ Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wi
   <string name="ConversationActivity_transport_insecure_mms">Onveilige MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Kom erbij: %s</string>
-  <string name="ConversationActivity_install_textsecure">Installeer TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Laten we chatten via: %s</string>
   <string name="ConversationActivity_error_leaving_group">Fout bij het verlaten van de groep...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Berichtdetails</string>
@@ -204,6 +204,7 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Wachtwoorden komen niet overeen</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect oud wachtwoord!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Voer nieuw wachtwoord in!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Dit apparaat koppelen?</string>
   <string name="DeviceProvisioningActivity_cancel">ANNULEREN</string>

res/values-no/strings.xml

@@ -79,7 +79,6 @@ denne kontakten.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Beklager, den valgte lydfilen overstiger restriksjonene på meldingsstørrelse (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottakeren er ikke en gyldig SMS- eller e-postadresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Meldingen er tom!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Mottakere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppesamtale</string>
   <string name="ConversationActivity_unnamed_group">Navnløs gruppe</string>
   <string name="ConversationActivity_d_recipients_in_group">%d medlemmer</string>
@@ -94,7 +93,6 @@ denne kontakten.</string>
   <string name="ConversationActivity_transport_insecure_mms">Usikret MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Last ned, bli med: %s</string>
-  <string name="ConversationActivity_install_textsecure">Installere TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Feil ved utmelding av gruppen...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meldingsdetaljer</string>

res/values-pl/strings.xml

@@ -80,7 +80,6 @@ ten kontakt.
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Przepraszamy, ten plik audio przekracza dozwolony rozmiar (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Podany numer lub adres e-mail jest niepoprawny!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Wiadomość jest pusta!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Grupuj odbiorców rozmowy</string>
   <string name="ConversationActivity_group_conversation">Grupowa konwersacja</string>
   <string name="ConversationActivity_unnamed_group">Grupa bez nazwy</string>
   <string name="ConversationActivity_d_recipients_in_group">%d uczestników</string>
@@ -95,7 +94,6 @@ ten kontakt.
   <string name="ConversationActivity_transport_insecure_mms">Nieszyfrowany MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Weź z: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instaluj TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Błąd opuszczenia grupy...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Szczegóły wiadomości</string>

res/values-pt-rBR/strings.xml

@@ -89,7 +89,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Desculpe, o áudio selecionado excede as restrições de tamanho da mensagem (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">A mensagem está vazia!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Destinatários da conversa em grupo</string>
+  <string name="ConversationActivity_group_members">Membros do grupo</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sem nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membros</string>
@@ -104,7 +104,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS inseguro</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Baixar com: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instalar TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Vamos usar isto para conversar: %s</string>
   <string name="ConversationActivity_error_leaving_group">Erro ao sair do grupo...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
@@ -226,6 +226,7 @@ Tem certeza que deseja fazer isto?</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Frases-chave não coincidem!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase-chave anterior incorrecta!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Insira uma nova frase-chave!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Conectar este dispositivo?</string>
   <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>

res/values-pt/strings.xml

@@ -26,7 +26,9 @@ Isto vai desactivar as mensagens push, eliminando o seu registo do servidor.
 Vai necessitar de re-registar o seu número de telefone se pretender utilizar esta funcionalidade novamente.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Activos</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Definir como aplicação SMS por omissão</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Inactivos</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pressione para tornar TextSecure a sua applicação SMS por omissão</string>
   <string name="ApplicationPreferencesActivity_on">ligado</string>
   <string name="ApplicationPreferencesActivity_On">Ligado</string>
@@ -74,7 +76,6 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lamento, o áudio seleccionado excede as restrições de tamanho da mensagem (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">A mensagem está vazia!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Agrupar destinatários de conversa</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sem nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membros</string>
@@ -89,7 +90,6 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <string name="ConversationActivity_transport_insecure_mms">MMS insegura</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Alinha: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instalar TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Erro a abandonar grupo...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>

res/values-ro/strings.xml

@@ -24,6 +24,7 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
         Numărul tău de telefon va trebui înregistrat din nou pentru a utiliza mesajele de tip push pe viitor.
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare cu serverul!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS activat</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Atingeţi pentru a schimba aplicaţia SMS implicită</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Atingeţi pentru a seta TextSecure ca şi aplicaţie SMS implicită</string>
   <string name="ApplicationPreferencesActivity_on">activat</string>
@@ -73,7 +74,6 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ne pare rău, fișierul audio selectat depășește restricția marimii mesajului (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatarul nu este o adresă validă de SMS sau e-mail.</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Mesajul este gol!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Grupează destinatarii conversaţiei</string>
   <string name="ConversationActivity_group_conversation">Grupează conversaţia</string>
   <string name="ConversationActivity_unnamed_group">Grup nedenumit</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membrii</string>
@@ -88,7 +88,6 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationActivity_transport_insecure_mms">MMS nesecurizat</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Descarcă-l de aici: %s</string>
-  <string name="ConversationActivity_install_textsecure">Instalează TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Eroare la parăsirea grupului...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalii mesaj</string>
@@ -416,7 +415,7 @@ Restaurează un backup criptat exportat anterior din TextSecure.</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
   <!--media_overview_activity-->
-  <string name="media_overview_activity__no_images">Nici o imagine</string>
+  <string name="media_overview_activity__no_images">Nu sunt imagini</string>
   <!--message_recipients_list_item-->
   <string name="message_recipients_list_item__verify">VERIFICĂ</string>
   <string name="message_recipients_list_item__resend">RE-TRIMITE</string>

res/values-ru/strings.xml

@@ -23,7 +23,9 @@
 Это отключит push-сообщения, отменив вашу регистрацию на сервере.
 Чтобы в будущем включить push-сообщения, вам нужно будет зарегистрироваться вновь.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ошибка при соединении с сервером!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS доступна</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Нажмите для выбора SMS-приложения по умолчанию</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS отключена</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Нажмите, чтобы использовать TextSecure для всех SMS</string>
   <string name="ApplicationPreferencesActivity_on">включено</string>
   <string name="ApplicationPreferencesActivity_On">Включено</string>
@@ -76,7 +78,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Извините, выбранное аудио превышает ограничение на размер сообщения (%1$sКБ).</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_group_conversation_recipients">Участники группы</string>
   <string name="ConversationActivity_group_conversation">Групповой разговор</string>
   <string name="ConversationActivity_unnamed_group">Группа без названия</string>
   <string name="ConversationActivity_d_recipients_in_group">%d участников</string>
@@ -91,7 +92,6 @@
   <string name="ConversationActivity_transport_insecure_mms">Незащищённое MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Получить: %s</string>
-  <string name="ConversationActivity_install_textsecure">Установить TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Ошибка при выходе из группы...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Подробности</string>

res/values-sk/strings.xml

@@ -3,15 +3,15 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Áno</string>
   <string name="no">Nie</string>
-  <string name="delete">Zmaž</string>
+  <string name="delete">Zmazať</string>
   <string name="please_wait">Čakajte prosím...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Aktuálne: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ešte ste si nenastavili heslo!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s správ v jednom rozhovore</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s správ na rozhovor</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Zmazať všetky staré správy?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste si istí, že chcete skrátiť všetky rozhovory %s najnovších správ?</string>
-  <string name="ApplicationPreferencesActivity_delete">Zmaž</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste naozaj si istí, že chcete skrátiť všetky rozhovory na %s najnovších správ?</string>
+  <string name="ApplicationPreferencesActivity_delete">Zmazať</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Vypnúť šifrovanie úložiska?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Varovanie: týmto vypnete šifrovanie úložiska správ a šifrovacích kľúčov.
@@ -28,10 +28,17 @@ Týmto sa odhlásite zo serveru a vypnete príjem správ typu \"push\".
 Ak budete v budúcnosti chcieť dostávať upozornenia zo serveru,
 budete musieť znovu zaregistrovať vaše telefónne číslo.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba pripojenia na server!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS zapnuté</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotykom sem môžete zmeniť Vašu predvolenú aplikáciu pre SMS.</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS vypnuté</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Dotykom sem môžete nastaviť TextSecure ako Vašu predvolenú aplikáciu pre SMS.</string>
+  <string name="ApplicationPreferencesActivity_on">zapnuté</string>
+  <string name="ApplicationPreferencesActivity_On">Zapnuté</string>
+  <string name="ApplicationPreferencesActivity_off">vypnuté</string>
+  <string name="ApplicationPreferencesActivity_Off">Vypnuté</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minút</string>
+  <string name="AppProtectionPreferenceFragment_minutes">%d min</string>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(obrázok)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(zvuk)</string>
@@ -77,10 +84,10 @@ identitu tohto kontaktu.
   <string name="ConversationActivity_select_contact_info">Vyberte kontaktné informácie </string>
   <string name="ConversationActivity_compose_message">Vytvoriť správu</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Nastala chyba pri vytváraní prílohy.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Bohužiaľ, vybrané video presahuje obmedzenie na maximlnu veľkosť správy (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Bohužiaľ, vybraná nahrávka presahuje maximálnu veľkosť správy (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Príjemca nie je platná SMS alebo emailová adresa!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Správa je prázdna!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Príjemcovia skupinovej konverzácie</string>
   <string name="ConversationActivity_group_conversation">Skupinová konverzácia</string>
   <string name="ConversationActivity_unnamed_group">Nepomenovaná skupina</string>
   <string name="ConversationActivity_d_recipients_in_group">%d členovia</string>
@@ -94,6 +101,7 @@ identitu tohto kontaktu.
   <string name="ConversationActivity_transport_insecure_sms">Nezašifrovaná SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Nezašifrovaná MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_get_with_it">Prijať s tým: %s</string>
   <string name="ConversationActivity_error_leaving_group">Chyba pri opúšťaní skupiny...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detaily správy</string>
@@ -299,11 +307,13 @@ Bola prijatá správa vzájomnej výmeny kľúčov s neplatnou verziou protokolu
 </string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Bola prijatá aktualizované, ale neznáme identifikačné údaje. Dotykom potvrdíte idenitu.</string>
   <string name="SmsMessageRecord_secure_session_ended">Bezpečné spojenie ukončené.</string>
   <string name="SmsMessageRecord_duplicate_message">Zduplikuj správu.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Opustil skupinu...</string>
   <string name="TheadRecord_secure_session_ended">Bezpečné spojenie ukončené.</string>
+  <string name="ThreadRecord_draft">Rozpísaná správa:</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nemáte kľúč totožnosti.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Príjemca nemá kľúč totožnosti.</string>
@@ -323,7 +333,9 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="ViewIdentityActivity_not_verified_exclamation">NIE JE overené!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Scannovaný kľúč sa zhoduje!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verifikované!</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Môj identifikačný fingerprint</string>
   <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Začať aj napriek existujúcemu požiadavku?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Tomuto príjemcovi ste už poslali požiadavku na vytvorenie bezpečnej session. Poslanie ďalšej požiadavky zneplatní predchádzajúcu požiadavku.  Ste si istí že chcete poslať ďalšiu požiadavku?</string>
   <string name="KeyExchangeInitiator_send">Odošli</string>
   <!--MessageDisplayHelper-->
@@ -331,12 +343,16 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="MessageDisplayHelper_decrypting_please_wait">Prosím čakaj, dekryptujem...</string>
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Správa zakryptovaná pre neexistujúcu session...</string>
   <!--EncryptingSmsDatabase-->
+  <string name="EncryptingSmsDatabase_error_decrypting_message">Chyba pri dešifrovaní správy.</string>
   <!--ThreadDatabase-->
+  <string name="ThreadDatabase_error_decrypting_message">Chyba pri dešifrovaní správy.</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Pripájam sa na MMS server...</string>
   <string name="MmsDatabase_downloading_mms">Sťahujem MMS...</string>
   <string name="MmsDatabase_mms_download_failed">Sťahovanie MMS zlyhalo!</string>
   <string name="MmsDatabase_downloading">Sťahujem...</string>
+  <string name="MmsDatabase_mms_pending_download">Dotykom spustíte nastavenie MMS pre pokračovanie v sťahovaní.</string>
+  <string name="MmsDatabase_error_decrypting_message">Chyba pri dešifrovaní správy.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Prosím čakaj, dekryptujem MMS...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Nesprávne kryptovaná MMS správa...</string>
@@ -346,19 +362,23 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="ApplicationMigrationService_importing_text_messages">Nahrávanie textových správ</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Kliknutím otvor</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Otvorte dotykom sem, alebo zavrite dotykom na symbol zámku.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure je otvorený</string>
   <string name="KeyCachingService_lock">Zamkni s heslom</string>
   <!--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_encrypted_message">Kryptovaná správa...</string>
+  <string name="MessageNotifier_media_message_with_text">Multimediálna správa: %s</string>
   <string name="MessageNotifier_no_subject">(bez predmetu)</string>
   <string name="MessageNotifier_message_delivery_failed">Doručenie správy zlyhalo.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Zlyhanie doručenia správy.</string>
   <string name="MessageNotifier_error_delivering_message">Chyba doručovania správy.</string>
   <string name="MessageNotifier_mark_all_as_read">Označ všetko ako prečítané</string>
   <string name="MessageNotifier_mark_as_read">Označ ako prečítané</string>
+  <string name="MessageNotifier_media_message">Multimediálna správa</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Bohužiaľ, Quick Response zatiaľ nie je v TextSecure spodporované!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Staré heslo:</string>
   <string name="change_passphrase_activity__new_passphrase">Nové heslo:</string>
@@ -368,6 +388,9 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="contact_selection_group_activity__no_contacts">Žiadne kontakty.</string>
   <string name="contact_selection_group_activity__finding_contacts">Načítavanie kontaktov...</string>
   <!--single_contact_selection_activity-->
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nie ste registrovaný so službou push...</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Aktualizácia zoznamu</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizuje sa zoznam push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Fotka kontaktu</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vyber pre</string>
@@ -375,16 +398,28 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="contact_selection_recent_activity__no_recent_calls">Žiadne nedávne hovory.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Pošli TextSecure správu </string>
+  <string name="conversation_activity__type_message_sms_insecure">Poslať nezašifrovanú SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Poslať nezašifrovanú MMS</string>
   <string name="conversation_activity__send">Odoslať</string>
   <string name="conversation_activity__remove">Odstrániť</string>
+  <string name="conversation_activity__window_description">Konverzácia s %1$s</string>
+  <string name="conversation_activity__compose_description">Písanie správy</string>
+  <string name="conversation_activity__emoji_toggle_description">Prepínanie klávesnice emoji</string>
+  <string name="conversation_activity__attachment_thumbnail">Ikona prílohy</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Sťahovanie multimediálnej správy</string>
+  <string name="conversation_item__mms_image_description">Multimediálna správa</string>
   <string name="conversation_item__play_button_description">Prehrávacie tlačidlo</string>
+  <string name="conversation_item__secure_message_description">Zašifrovaná správa</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Stiahnuť</string>
   <string name="conversation_item_sent__downloading">Sťahujem</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Odoslanie zlyhalo</string>
   <string name="conversation_item_sent__pending_approval_description">Čaká na schválenie</string>
+  <string name="conversation_item_sent__delivered_description">Odoslané</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Stiahnuť</string>
+  <string name="conversation_item_received__contact_photo_description">Fotografia kontaktu</string>
   <string name="conversation_item_received__downloading">Sťahujem</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mód hromadného výberu</string>
@@ -393,8 +428,10 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="country_selection_fragment__loading_countries">Načítavanie krajín...</string>
   <string name="country_selection_fragment__search">Hľadaj</string>
   <!--log_submit_activity-->
+  <string name="log_submit_activity__log_fetch_failed">Nepodarilo sa získať logy z Vašeho zariadenia. Stále môžete použiť ADB na stiahnutie ladiacich logov.</string>
   <string name="log_submit_activity__thanks">Ďakujem za tvoju pomoc!</string>
   <string name="log_submit_activity__submitting">Posielanie</string>
+  <string name="log_submit_activity__posting_logs">Posielanie logov do gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Chcete importovať Vaše existujúce textové správy do kryptovanej databázy TextSecure? </string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Predvolená systémová databáza nebude modifikovaná alebo nahradenáv žiadnom prípade.</string>
@@ -417,24 +454,57 @@ Obnoviť predtým exportovanú zakryptovanú TextSecure zálohu.</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importovať nezakryptovanú zálohu. Kompatibilné so \'SMSBackup And Restore\'.</string>
   <!--media_overview_activity-->
+  <string name="media_overview_activity__no_images">Žiadne obrázky</string>
   <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">OVERIŤ</string>
+  <string name="message_recipients_list_item__resend">POSLAŤ ZNOVU</string>
   <!--MmsPreferencesFragment-->
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Manuálne MMS nastavenia sú vyžadované pre tvoj telefón.</string>
+  <string name="MmsPreferencesFragment__enabled">Povolené</string>
+  <string name="MmsPreferencesFragment__disabled">Zakázané</string>
+  <string name="MmsPreferencesFragment__not_set">Nenastavené</string>
+  <string name="MmsPreferencesFragment__invalid_uri">Vložený text nie je platná adresa URL</string>
+  <string name="MmsPreferencesFragment__invalid_host">Vložený text nie je platná adresa počítača</string>
   <!--GroupUtil-->
+  <string name="GroupUtil_joined_the_group">%1$s sa pridal do skupiny.</string>
+  <string name="GroupUtil_group_updated">Skupina aktualizovaná.</string>
+  <string name="GroupUtil_title_is_now">Názov je teraz \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Odomkni</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure potrebuje nastavenia MMS pre doručenie médií a skupinových správ s pomocou Vášho operátora. Vaše zariadenie nedalo tieto informácie k dispozícií, čo sa niekedy stáva u zablokovaných zariadení alebo kvôli príliš obmedzujúcim nastaveniam.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pre odosielanie multimédií a skupinových správ vyberte \'OK\' a preveďte potrebné nastavenia. Nastavenia MMS pre Vášho operátora sa väčšinou dajú nájsť zadaním \'Váš operátor APN\' do vyhľadávača na internete. Toto nastavenie je potrebné dokončiť iba prvykrát.</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Dokončené</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Pre spojenie s TextSecure overte Vaše telefónne číslo.
+</string>
   <string name="registration_activity__your_country">TVOJA KRAJINA</string>
   <string name="registration_activity__your_country_code_and_phone_number">Tvoj kód krajiny a
 telefónne číslo</string>
   <string name="registration_activity__phone_number">TELEFÓNNE ČÍSLO </string>
   <string name="registration_activity__register">Registrovať</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Pri registrácii budú odoslané niektoré Vaše kontakné údaje na vzdialený server. Tieto údaje nebudú trvalo uložené.</string>
   <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Niektoré možné problémy
+zahŕňajú:
+</string>
+  <string name="registration_problems__sms_interceptors">Odpočúvanie SMS</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Niektoré služby pre posielanie SMS od poskytovateľov ako napríklad Handcent alebo GoSMS
+sa správaju zvláštne a zadržiavajú všetky prichádzajúce SMS správy.
+Overte prosím, či ste dostali textovú správ ktorá začína slovami \'Your TextSecure verification code:\'.
+Možno budete musieť nastaviť Vašu SMS službu tak, aby tieto správy prepustila na Vaše zariadenie.
+</string>
   <string name="registration_problems__incorrect_number">Nesprávne číslo.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+Overte prosím, že ste zadali Vaše správne telefónne číslo,
+a že toto číslo je v správnom formáte pre Váš región.
+</string>
   <string name="registration_problems__google_voice">Google hlas</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecure nebude fungovať pre telefónne čísla služby Google Voice.
+</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Hlasové overovanie</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
@@ -445,10 +515,23 @@ kód ktoré budete počuť.
   <string name="registration_progress_activity__call_me">Zavolaj mi</string>
   <string name="registration_progress_activity__edit_number">Úprav číslo</string>
   <string name="registration_progress_activity__connectivity_error">Problém pripojenia.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure sa nedokázal spojiť so službou push.
+</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Niektoré možné
+problémy zahŕňajú:
+</string>
   <string name="registration_progress_activity__no_network_connectivity">Žiadne sieťové
 pripojenie.
+</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Aby ste mohli využívať túto funkciu TextSecure,
+Vaše zariadenie musí byť pripojené na Internet.
+Overte prosím, že ste pripojený ku sieti 3G alebo Wi-Fi.
 </string>
   <string name="registration_progress_activity__restrictive_firewall">Reštriktívny firewall</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Ak ste pripojený pomocou Wi-Fi, je možné, že máte nastavený firewall spôsobom, ktorý blokuje prístup k serveru TextSecure.
+Skúste sa pripojiť na Internet pomocou inej siete alebo pomocou Vášho mobilného operátora.
+</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
 Teraz TextSecure automaticky overí tvoje číslo prostredníctvom overovacej SMS správy.
 </string>
@@ -456,17 +539,33 @@ Teraz TextSecure automaticky overí tvoje číslo prostredníctvom overovacej SM
   <string name="registration_progress_activity__waiting_for_sms_verification">Čakanie na SMS
 overovanie...</string>
   <string name="registration_progress_activity__registering_with_server">Registrujem na server...</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS overovanie
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Toto môže chvíľu trvať.
+Prosím, majte strpenie. Upozorníme Vás notifikáciou keď bude Vaša verifikácia dokončená.
+</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+Vypršala maximálna doba čakania na verifikačnú SMS.
+</string>
+  <string name="registration_progress_activity__sms_verification_failed">Overenie pomocou SMS
 zlyhalo.
 </string>
   <string name="registration_progress_activity__generating_keys">Generovanie kľúčov...</string>
+  <string name="registration_progress_activity__alert">Upozornenie</string>
+  <string name="registration_progress_activity__telephone">Telefón</string>
+  <string name="registration_progress_activity__check">Kontrola</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Vlož meno alebo číslo</small></string>
-  <string name="recipients_panel__add_member">Pridaj člena</string>
+  <string name="recipients_panel__add_member">Pridať člena</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Ich totožnosť (oni vidia):</string>
   <string name="verify_identity_activity__your_identity_you_read">Vaša totožnosť (vy vidíte):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Isté problémy vyžadujú Vašu pozornosť.</string>
+  <string name="message_details_header__sent">Odoslané</string>
+  <string name="message_details_header__received">Prijaté</string>
+  <string name="message_details_header__via">Cez</string>
+  <string name="message_details_header__to">Komu:</string>
+  <string name="message_details_header__from">Od:</string>
+  <string name="message_details_header__with">S:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Vytvor heslo</string>
   <string name="AndroidManifest__enter_passphrase">Zadaj heslo</string>
@@ -476,37 +575,75 @@ zlyhalo.
   <string name="AndroidManifest__change_passphrase">Zmeň heslo</string>
   <string name="AndroidManifest__verify_identity">Over totožnosť</string>
   <string name="AndroidManifest__log_submit">Odošli ladiaci log</string>
+  <string name="AndroidManifest__media_preview">Náhľad</string>
+  <string name="AndroidManifest__media_overview">Všetky obrázky</string>
+  <string name="AndroidManifest__media_overview_named">Všetky obrázky s %1$s</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Import / export</string>
   <string name="arrays__my_identity_key">Môj kľúč totožnosti</string>
+  <string name="arrays__use_default">Použiť predvolené</string>
+  <string name="arrays__use_custom">Použiť vlastné</string>
   <!--plurals.xml-->
+  <plurals name="minutes_ago">
+    <item quantity="one">%d minúta</item>
+    <item quantity="few">%d minúty</item>
+    <item quantity="other">%d minút</item>
+  </plurals>
+  <plurals name="hours_ago">
+    <item quantity="one">%d hodina</item>
+    <item quantity="few">%d hodiny</item>
+    <item quantity="other">%d hodín</item>
+  </plurals>
   <!--preferences.xml-->
   <string name="preferences__general">Všeobecné</string>
+  <string name="preferences__sms_mms">SMS a MMS</string>
   <string name="preferences__pref_all_sms_title">Príjmy všetky SMS</string>
   <string name="preferences__pref_all_mms_title">Príjmy všetky MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použiť TextSecure pre všetky prichádzajúce textové správy</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Použiť TextSecure pre všetky prichádzajúce multimediálne správy</string>
   <string name="preferences__input_settings">Nastavenia vstupu</string>
-  <string name="preferences__replace_smiley_with_enter_key">Náhrad smajlíkov s klasickými znakmi</string>
-  <string name="preferences__display_settings">Nastavenia zobrazenia</string>
+  <string name="preferences__enable_enter_key_title">Zapnúť klávesu Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Náhradiť smajlíkov klasickými znakmi</string>
+  <string name="preferences__pref_enter_sends_title">Odoslať stiskom klávesy Enter</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stlačením klávesy Enter bude textová správa odoslaná</string>
+  <string name="preferences__display_settings">Nastavenie zobrazenia</string>
   <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__change_passphrase">Zmeň heslo</string>
+  <string name="preferences__change_passphrase">Zmeniť heslo</string>
   <string name="preferences__change_my_passphrase">Zmeniť moje heslo</string>
-  <string name="preferences__screen_security">Bezpečnosť obrazovky</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po určitom čase zmaž heslo z pamäte</string>
-  <string name="preferences__timeout_passphrase">Doba zapamätania hesla</string>
-  <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__notifications">Hlásenia</string>
+  <string name="preferences__enable_passphrase">Použiť heslo</string>
+  <string name="preferences__passphrase_summary">Heslo %s</string>
+  <string name="preferences__enable_local_encryption_of_messages_and_keys">Zapnúť lokálne šifrovanie správ a šifrovacích kľúčov</string>
+  <string name="preferences__screen_security">Zabezpečenie obrazovky</string>
+  <string name="preferences__screen_security_summary">Zabezpečenie obrazovky %s</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Zakázať vytváranie snímkov obrazovky vnútri aplikácie a v zozname bežiacích aplikácií</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po určitom čase vymazať heslo z pamäte</string>
+  <string name="preferences__timeout_passphrase">Doba platnosti hesla</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Vyber dobu platnosti hesla</string>
+  <string name="preferences__pref_timeout_interval_title">Doba platnosti</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Časový interval po ktorom sa heslo vymaže z pamäte</string>
+  <string name="preferences__notifications">Notifikácie</string>
   <string name="preferences__display_message_notifications_in_status_bar">Zobrazuj hlásenia o správach v stavovom riadku</string>
   <string name="preferences__led_color">LED farba</string>
-  <string name="preferences__pref_led_blink_title">Vzor blikania LED</string>
-  <string name="preferences__pref_led_blink_custom_pattern_title">Nastav vlastný vzor blikania LED</string>
+  <string name="preferences__led_color_unknown">Neznáme</string>
+  <string name="preferences__pref_led_blink_title">Sekvencia blikania LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Nastaviť vlastnú sekvenciu blikania LED</string>
   <string name="preferences__pref_led_blink_custom_pattern_on_for">Zapnuté pre:</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Vypnuté pre:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Vlastná sekvencia blikania nastavená!</string>
   <string name="preferences__sound">Zvuk</string>
-  <string name="preferences__change_notification_sound">Zmeň oznamovací zvuk</string>
-  <string name="preferences__vibrate">Vybruj</string>
-  <string name="preferences__also_vibrate_when_notified">Počas hlásenia tiež vibruj</string>
+  <string name="preferences__change_notification_sound">Zmeňiť zvuk notifikácie</string>
+  <string name="preferences__inthread_notifications">Notifikácie počas konverzácie</string>
+  <string name="preferences__play_inthread_notifications">Prehrať zvuk notifikácie počas aktívnej konverzácie.</string>
+  <string name="preferences__repeat_alerts">Opakovať hlášky</string>
+  <string name="preferences__never">Nikdy</string>
+  <string name="preferences__one_time">Raz</string>
+  <string name="preferences__two_times">Dvakrát</string>
+  <string name="preferences__three_times">Trikrát</string>
+  <string name="preferences__five_times">Päťkrát</string>
+  <string name="preferences__ten_times">Desaťkrát</string>
+  <string name="preferences__vibrate">Vybrácia</string>
+  <string name="preferences__also_vibrate_when_notified">Vibrácia pri notifikácii</string>
   <string name="preferences__minutes">minúty</string>
   <string name="preferences__hours">hodiny</string>
   <string name="preferences__green">Zelená</string>
@@ -522,24 +659,43 @@ zlyhalo.
   <string name="preferences__slow">Pomaly</string>
   <string name="preferences__custom">Vlastné</string>
   <string name="preferences__advanced">Rozšírené</string>
+  <string name="preferences__app_protection">Ochrana aplikácie</string>
+  <string name="preferences__advanced_mms_access_point_names">Manuálne MMS nastavenia</string>
+  <string name="preferences__enable_manual_mms">Použť manuálne MMS nastavenia</string>
+  <string name="preferences__override_system_mms_settings">Použiť nižšie uvedené parametre namiesto systémových MMS nastavení</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS proxy server</string>
+  <string name="preferences__mms_proxy_port">MMS proxy port</string>
+  <string name="preferences__mmsc_username">MMSC používateľ</string>
+  <string name="preferences__mmsc_password">MMSC heslo</string>
   <string name="preferences__sms_delivery_reports">Správy o doručení SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pre každú odoslanú SMS vyžiadaj správu o doručení</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Ak dĺžka vlákna presiahne nastavenú hranicu, automaticky zmaž najstaršie správy.</string>
-  <string name="preferences__delete_old_messages">Zmaž staré správy</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pre každú odoslanú SMS vyžiadať správu o doručení</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky zmazať najstaršie správy ak dĺžka vlákna presiahne nastavenú hranicu</string>
+  <string name="preferences__delete_old_messages">Vymazať staré správy</string>
   <string name="preferences__conversation_length_limit">Obmedzenie dĺžky konverzácie</string>
   <string name="preferences__trim_all_threads_now">Skráť všetky vlákna</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skontroluj dĺžku vlákna všetkých konverzácií.</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skontroluj počet správ vo všetkých konverzáciách</string>
+  <string name="preferences__light_theme">Svetlá</string>
+  <string name="preferences__dark_theme">Tmavá</string>
   <string name="preferences__appearance">Vzhľad</string>
   <string name="preferences__theme">Téma</string>
-  <string name="preferences__default">Pôvodné</string>
+  <string name="preferences__theme_summary">Téma %s</string>
+  <string name="preferences__default">Štandardné nastavenie</string>
   <string name="preferences__language">Jazyk</string>
+  <string name="preferences__language_summary">Jazyk %s</string>
+  <string name="preferences__textsecure_messages">Správy TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Bezplatné šifrované správy medzi používateľmi TextSecure
+</string>
   <string name="preferences__submit_debug_log">Odošli ladiaci log</string>
+  <string name="preferences__support_wifi_calling">Režim kompatibility \'WiFi volania\'</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Zapnite pokiaľ Vaše zariadenie používa WiFi pre doručovanie SMS/MMS správ (použite iba v prípade, že na Vašom zariadení máte nastavené \'Volanie pomocou WiFi\').</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">Vyber všetko</string>
-  <string name="contact_selection_list__menu_unselect_all">Odznač všetko</string>
+  <string name="contact_selection_list__menu_select_all">Vybrať všetko</string>
+  <string name="contact_selection_list__menu_unselect_all">Zrušiť celý výber</string>
   <string name="contact_selection_list__header_textsecure_users">TEXTSECURE POUŽÍVATELIA</string>
   <string name="contact_selection_list__header_other">VŠETKY KONTAKTY</string>
   <string name="contact_selection_list__unknown_contact">Nová správa pre...</string>
@@ -558,6 +714,7 @@ zlyhalo.
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Uložiť prílohu </string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Pozvať</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">Začni bezpečnú reláciu</string>
   <string name="conversation_insecure__security">Bezpečnosť</string>
@@ -567,7 +724,11 @@ zlyhalo.
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hľadaj</string>
   <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Avatar kontaktu</string>
+  <string name="conversation_list_item_view__attachment_indicator">Symbol prílohy</string>
+  <string name="conversation_list_item_view__error_alert">Chybová hláška</string>
   <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">Nová konverzácia</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Bezpečnosť</string>
   <string name="conversation_secure_verified__menu_verify_identity">Over totožnosť</string>
@@ -577,6 +738,7 @@ zlyhalo.
   <string name="conversation__menu_update_group">Aktualizuj skupinu</string>
   <string name="conversation__menu_leave_group">Opusti skupinu</string>
   <string name="conversation__menu_delete_thread">Zmaž vlákno</string>
+  <string name="conversation__menu_view_media">Všetky obrázky</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Pridať do kontaktov</string>
   <!--conversation_group_options-->

res/values-sl/strings.xml

@@ -22,14 +22,14 @@ Pozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku n
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">S tem boste izključili potisna sporočila in se odjavili s strežnika.
 Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo telefonsko številko.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Napaka pri povezavi s strežnikom!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Omogočeno</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Sporočila SMS omogočena</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotaknite se za spremembo privzete aplikacije za sporočila SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Izklopljeno</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Sporočila SMS izklopljena</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Z dotikom nastavi TexteScure za privzeto aplikacijo SMS</string>
-  <string name="ApplicationPreferencesActivity_on">Vključeno</string>
-  <string name="ApplicationPreferencesActivity_On">Vključeno</string>
-  <string name="ApplicationPreferencesActivity_off">Izključeno</string>
-  <string name="ApplicationPreferencesActivity_Off">Izključeno</string>
+  <string name="ApplicationPreferencesActivity_on">omogočeno</string>
+  <string name="ApplicationPreferencesActivity_On">Omogočeno</string>
+  <string name="ApplicationPreferencesActivity_off">Izklopljeno</string>
+  <string name="ApplicationPreferencesActivity_Off">Izklopljeno</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minut</string>
@@ -78,7 +78,7 @@ preveriti ta stik.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Izbran zvočni posnetek presega omejitev velikosti (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Naslov prejemnika ni veljaven SMS oz. email nalsov!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Sporočilo je prazno!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Sodelujoči v skupinskem pogovoru</string>
+  <string name="ConversationActivity_group_members">Člani skupine</string>
   <string name="ConversationActivity_group_conversation">Skupinski pogovor</string>
   <string name="ConversationActivity_unnamed_group">Skupina brez imena</string>
   <string name="ConversationActivity_d_recipients_in_group">%d članov</string>
@@ -93,7 +93,7 @@ preveriti ta stik.</string>
   <string name="ConversationActivity_transport_insecure_mms">Nezavarovan MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Ravnaj primerno: %s</string>
-  <string name="ConversationActivity_install_textsecure">Namesti TextSecure: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Uporabi za pogovor:  %s</string>
   <string name="ConversationActivity_error_leaving_group">Napaka pri zapuščanju skupine...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti sporočila</string>
@@ -203,6 +203,7 @@ preveriti ta stik.</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>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Vnesite novo geslo!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Povežem napravo?</string>
   <string name="DeviceProvisioningActivity_cancel">PREKINI</string>
@@ -518,7 +519,7 @@ bila uspešna.</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Ustvari geslo</string>
   <string name="AndroidManifest__enter_passphrase">Vnesite geslo</string>
-  <string name="AndroidManifest__select_contacts">Izberi stike</string>
+  <string name="AndroidManifest__select_contacts">Izberite naslovnike</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure zaznan</string>
   <string name="AndroidManifest__public_identity_key">Javni identifikacijski ključ</string>
   <string name="AndroidManifest__change_passphrase">Zamenjaj geslo</string>
@@ -563,10 +564,10 @@ bila uspešna.</string>
   <string name="preferences__change_passphrase">Zamenjaj geslo</string>
   <string name="preferences__change_my_passphrase">Določi novo geslo</string>
   <string name="preferences__enable_passphrase">Vklopi geslo</string>
-  <string name="preferences__passphrase_summary">Geslo %s</string>
+  <string name="preferences__passphrase_summary">Geslo: %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Omogoči lokalno šifriranje sporočil na napravi</string>
   <string name="preferences__screen_security">Zaščita zaslona</string>
-  <string name="preferences__screen_security_summary">Zaščita zaslona %s</string>
+  <string name="preferences__screen_security_summary">Zaščita zaslona: %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Prepreči zajem slike zaslona</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po določenem času bo geslo v pomnilniku pozabljeno</string>
   <string name="preferences__timeout_passphrase">Čas pomnjenja gesla</string>
@@ -580,7 +581,7 @@ bila uspešna.</string>
   <string name="preferences__pref_led_blink_title">Vzorec utripanja LED</string>
   <string name="preferences__pref_led_blink_custom_pattern_title">Nastavi utripanje LED po meri</string>
   <string name="preferences__pref_led_blink_custom_pattern_on_for">Prižgano:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_off_for">Ugasnjeno:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Izklopljeno za:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Utripenje LED je nastavljeno!</string>
   <string name="preferences__sound">Zvok</string>
   <string name="preferences__change_notification_sound">Spremeni zvok za obvestila</string>
@@ -630,10 +631,10 @@ bila uspešna.</string>
   <string name="preferences__dark_theme">Temna tema</string>
   <string name="preferences__appearance">Izgled</string>
   <string name="preferences__theme">Teme</string>
-  <string name="preferences__theme_summary">Tema %s</string>
+  <string name="preferences__theme_summary">Tema: %s</string>
   <string name="preferences__default">Privzeto</string>
   <string name="preferences__language">Jezik</string>
-  <string name="preferences__language_summary">Jezik %s</string>
+  <string name="preferences__language_summary">Jezik: %s</string>
   <string name="preferences__textsecure_messages">Sporočila TextSecure</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Brezplačno zasebno sporočanje za TextSecure in Signal</string>

res/values-sr/strings.xml

@@ -84,7 +84,7 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Изабрани звук прекорачује ограничења величине поруке (%1$skB).</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_group_conversation_recipients">Примаоци групне преписке</string>
+  <string name="ConversationActivity_group_members">Чланови групе</string>
   <string name="ConversationActivity_group_conversation">Групна преписка</string>
   <string name="ConversationActivity_unnamed_group">Неименована група</string>
   <string name="ConversationActivity_d_recipients_in_group">%d члан(ов)а</string>
@@ -99,7 +99,7 @@
   <string name="ConversationActivity_transport_insecure_mms">Необезбеђени ММС</string>
   <string name="ConversationActivity_transport_textsecure">Сигурна порука</string>
   <string name="ConversationActivity_get_with_it">Набавите је са: %s</string>
-  <string name="ConversationActivity_install_textsecure">Инсталирајте Сигурне поруке: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Хајде да користимо ово за ћаскање: %s</string>
   <string name="ConversationActivity_error_leaving_group">Грешка напуштања групе...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Детаљи поруке</string>
@@ -200,8 +200,8 @@
   <string name="ImportFragment_restore_complete">Враћање завршено!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Нема очитаног кључа!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">Инсталирати Скенер бар-кода?</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Сигурне поруке требају Скенер бар-кода за читање бар-кодова.</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Инсталирати Скенер бар-кôда?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Сигурне поруке требају Скенер бар-кôда за читање бар-кодова.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Неуспех слања</string>
   <string name="MessageDetailsRecipient_new_identity">Нови идентитет</string>
@@ -218,6 +218,7 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Лозинке се не поклапају!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Нетачна стара лозинка!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Унесите нову лозинку!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Да поежем овај уређај?</string>
   <string name="DeviceProvisioningActivity_cancel">ОДУСТАНИ</string>
@@ -232,7 +233,7 @@
   <string name="DeviceProvisioningActivity_content_progress_success">Уређај додат!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Није нађен уређај.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Грешка мреже.</string>
-  <string name="DeviceProvisioningActivity_content_progress_key_error">Неисправан бар-код.</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">Неисправан бар-кôд.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Унесите лозинку</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Икона Сигурних порука</string>
@@ -250,7 +251,7 @@
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Повежите се на Сигурне поруке</string>
   <string name="RegistrationActivity_select_your_country">Изаберите вашу државу</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Морате да наведете код
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Морате да наведете кôд
 ваше државе</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Морате да наведете ваш
 број телефона</string>
@@ -272,15 +273,15 @@
   <string name="RegistrationProgressActivity_verifying_number">Оверавам број</string>
   <string name="RegistrationProgressActivity_edit_s">Уреди %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Пријава је завршена!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Најпре морате да унесете код који сте добили...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Најпре морате да унесете кôд који сте добили...</string>
   <string name="RegistrationProgressActivity_connecting">Повезујем се</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Повезујем се за оверавање...</string>
   <string name="RegistrationProgressActivity_network_error">Грешка мреже!</string>
   <string name="RegistrationProgressActivity_unable_to_connect">Не могу да се повежем. Проверите вашу везу и покушајте поново.</string>
   <string name="RegistrationProgressActivity_verification_failed">Овера није успела!</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Код за оверу који сте послали није тачан. Покушајте поново.</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Кôд за оверу који сте послали није тачан. Покушајте поново.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Превише покушаја</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Послали сте код за оверу превише пута. Сачекајте мало пре него што поново покушате.</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Послали сте кôд за оверу превише пута. Сачекајте мало пре него што поново покушате.</string>
   <string name="RegistrationProgressActivity_requesting_call">Захтевање позива</string>
   <string name="RegistrationProgressActivity_requesting_incoming_call">Захтевам долазни позив за оверу...</string>
   <string name="RegistrationProgressActivity_server_error">Грешка сервера</string>
@@ -475,7 +476,7 @@
 Потврдите ваш број телефона да бисте се пријавили на Сигурне поруке.
     </string>
   <string name="registration_activity__your_country">ВАША ДРЖАВА</string>
-  <string name="registration_activity__your_country_code_and_phone_number">КОД ДРЖАВЕ И БРОЈ
+  <string name="registration_activity__your_country_code_and_phone_number">КÔД ДРЖАВЕ И БРОЈ
 ТЕЛЕФОНА</string>
   <string name="registration_activity__phone_number">БРОЈ ТЕЛЕФОНА</string>
   <string name="registration_activity__register">Пријави ме</string>
@@ -499,8 +500,8 @@
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Гласовна овера</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-Сигурне поруке вас могу и позвати да оверите ваш број. Додирните „Позови ме“ и унесите испод
-шестоцифрени код који чујете.</string>
+Сигурне поруке могу и да вас позову да оверите ваш број. Додирните „Позови ме“ и унесите испод
+шестоцифрени кôд који чујете.</string>
   <string name="registration_progress_activity__verify">Овери</string>
   <string name="registration_progress_activity__call_me">Позови ме</string>
   <string name="registration_progress_activity__edit_number">Уреди број</string>
@@ -594,7 +595,7 @@
   <string name="preferences__enable_passphrase">Омогући лозинку</string>
   <string name="preferences__passphrase_summary">Лозинка %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Омогући локално шифровање порука и кључева</string>
-  <string name="preferences__screen_security">Сигурност екрана</string>
+  <string name="preferences__screen_security">Безбедност екрана</string>
   <string name="preferences__screen_security_summary">обезбеђења екрана %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Блокирај снимке екрана у списку недавних апликација и унутар апликације</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Уклони лозинку из меморије након неког интервала</string>
@@ -696,7 +697,7 @@
   <string name="conversation_insecure__invite">Позови</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">Започни безбедну сесију</string>
-  <string name="conversation_insecure__security">Сигурност</string>
+  <string name="conversation_insecure__security">Безбедност</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Обриши изабрано</string>
   <string name="conversation_list_batch__menu_select_all">Изабери све</string>
@@ -709,7 +710,7 @@
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Нова преписка</string>
   <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Сигурност</string>
+  <string name="conversation_secure_verified__menu_security">Безбедност</string>
   <string name="conversation_secure_verified__menu_verify_identity">Овери идентитет</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Окончај безбедну сесију</string>
   <!--conversation-->

res/values-sv/strings.xml

@@ -80,7 +80,6 @@ verifiera denna kontakt.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Tyvärr, den valda ljudfilen överskrider gränsen för meddelandestorlek (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottagare är inte en giltig SMS eller e-postadress!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Meddelandet är tomt!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Mottagare för gruppkonversation</string>
   <string name="ConversationActivity_group_conversation">Gruppkonversation</string>
   <string name="ConversationActivity_unnamed_group">Namnlös grupp</string>
   <string name="ConversationActivity_d_recipients_in_group">%d medlemmar</string>
@@ -95,7 +94,6 @@ verifiera denna kontakt.</string>
   <string name="ConversationActivity_transport_insecure_mms">Okrypterat MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Kom med: %s</string>
-  <string name="ConversationActivity_install_textsecure">Installera TextSecure: %s</string>
   <string name="ConversationActivity_error_leaving_group">Fel vid lämnande av grupp...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meddelandedetaljer</string>

res/values-ta/strings.xml

@@ -82,7 +82,6 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">மன்னிக்கவும், தேர்ந்தெடுத்த ஆடியோ செய்தி அளவு கட்டுப்பாடுகளை மீறுகிறது (%1$skB).</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_group_conversation_recipients">குழு உரையாடலில் உள்ளவர்கள் </string>
   <string name="ConversationActivity_group_conversation">குழு உரையாடல்</string>
   <string name="ConversationActivity_unnamed_group">பெயரிடப்படாத குழு</string>
   <string name="ConversationActivity_d_recipients_in_group">%d உறுப்பினர்கள்</string>
@@ -97,7 +96,6 @@
   <string name="ConversationActivity_transport_insecure_mms">பாதுகாப்பற்ற MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">இதனுடன் பெறவும் : %s</string>
-  <string name="ConversationActivity_install_textsecure">TextSecure நிறுவு: %s</string>
   <string name="ConversationActivity_error_leaving_group">குழுவை விட்டு விலகுவதில் பிழை...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">செய்தி விவரங்கள்</string>

res/values-tr/strings.xml

@@ -80,7 +80,6 @@ isteyebilirsiniz.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Üzgünüz, seçilen ses mesaj boyutu limitini aşıyor (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Alıcı geçerli bir SMS veya e-posta adresi değil!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Mesaj boş!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Grup sohbeti alıcıları</string>
   <string name="ConversationActivity_group_conversation">Grup sohbeti</string>
   <string name="ConversationActivity_unnamed_group">Adlandırılmamış grup</string>
   <string name="ConversationActivity_d_recipients_in_group">%d üye</string>
@@ -95,7 +94,6 @@ isteyebilirsiniz.</string>
   <string name="ConversationActivity_transport_insecure_mms">Güvensiz MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">%s ile alın</string>
-  <string name="ConversationActivity_install_textsecure">TextSecure Kur: %s</string>
   <string name="ConversationActivity_error_leaving_group">Gruptan ayrılma hatası...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Mesaj detayları</string>

res/values-uk/strings.xml

@@ -16,7 +16,9 @@
   <string name="ApplicationPreferencesActivity_unregistering">Видалення реєстрації\u2026</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Видалення реєстрації для обміну повідомленнями через Інтернет</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Помилка підключення до сервера!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Вимкнено</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Торкніться, щоб змінити типову програму для SMS</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS вимкнено</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Торкніться аби зробити TextSecure типовою програмою SMS</string>
   <!--AppProtectionPreferenceFragment-->
   <!--DraftDatabase-->

res/values-vi/strings.xml

@@ -56,7 +56,6 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Xin lỗi, có lỗi thiết đặt tập tin đính kèm của bạn.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Nơi nhận không phải là SMS hay địa chỉ email có hiệu lực!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Tin nhắn trống không!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Gom nhóm theo người chat</string>
   <string name="ConversationActivity_group_conversation">Gom nhóm chat</string>
   <string name="ConversationActivity_unnamed_group">Nhóm chưa đặt tên</string>
   <string name="ConversationActivity_d_recipients_in_group">%d thành viên</string>

res/values-zh-rCN/strings.xml

@@ -23,12 +23,15 @@
 这将在服务器上注销您的号码以禁用推送信息。
 将来如果想再次使用推送信息您需要重新注册电话号码。</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">连接服务器错误！</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">已开启短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">点击来改变默认的短信应用</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">已禁用短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">点击将TextSecure设定为默认的短信应用</string>
   <string name="ApplicationPreferencesActivity_on">开</string>
   <string name="ApplicationPreferencesActivity_On">开</string>
   <string name="ApplicationPreferencesActivity_off">关</string>
   <string name="ApplicationPreferencesActivity_Off">关</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">短信 %1$s，彩信 %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d 分钟</string>
   <!--DraftDatabase-->
@@ -59,6 +62,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted">点击退回不安全的通信</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">退回未加密的短信？</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">退回到未加密的彩信？</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">这条信息将<b>不会</b>被加密，因为对方已经不再是 TextSecure 用户了。\n\n发送不加密的信息？</string>
   <string name="ConversationItem_unable_to_open_media">无法找到能打开该媒体的应用。</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">发起安全会话？</string>
@@ -75,7 +79,7 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">抱歉，选择的音频超过了信息大小限制（%1$skB）</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_group_conversation_recipients">接受群组会话</string>
+  <string name="ConversationActivity_group_members">群组成员</string>
   <string name="ConversationActivity_group_conversation">群组会话</string>
   <string name="ConversationActivity_unnamed_group">未命名的群组</string>
   <string name="ConversationActivity_d_recipients_in_group">%d 名成员</string>
@@ -90,7 +94,7 @@
   <string name="ConversationActivity_transport_insecure_mms">不安全的彩信</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">已获得： %s</string>
-  <string name="ConversationActivity_install_textsecure">安装 TextSecure： %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">让我们使用这个来聊天：%s</string>
   <string name="ConversationActivity_error_leaving_group">离开群组时遇到错误…</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">信息详情</string>
@@ -202,6 +206,7 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">口令不符！</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">旧密码不正确！</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">输入新的密码！</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">连接到此设备？</string>
   <string name="DeviceProvisioningActivity_cancel">取消</string>
@@ -342,6 +347,7 @@
   <string name="MessageNotifier_d_new_messages">%d 新信息</string>
   <string name="MessageNotifier_most_recent_from_s">最新邮件来自：%s</string>
   <string name="MessageNotifier_encrypted_message">加密信息...</string>
+  <string name="MessageNotifier_media_message_with_text">媒体信息：%s</string>
   <string name="MessageNotifier_no_subject">（无主题）</string>
   <string name="MessageNotifier_message_delivery_failed">信息发送失败。</string>
   <string name="MessageNotifier_failed_to_deliver_message">信息发送失败</string>
@@ -379,6 +385,7 @@
   <string name="conversation_activity__emoji_toggle_description">切换表情键盘</string>
   <string name="conversation_activity__attachment_thumbnail">附件缩略图</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">媒体信息正在下载</string>
   <string name="conversation_item__mms_image_description">媒体信息</string>
   <string name="conversation_item__play_button_description">播放按钮</string>
   <string name="conversation_item__secure_message_description">安全信息</string>
@@ -446,6 +453,8 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完成</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+通过验证您的手机号码来连接到 TextSecure 。</string>
   <string name="registration_activity__your_country">国家或地区</string>
   <string name="registration_activity__your_country_code_and_phone_number">您的国家代码和
 电话号码</string>
@@ -550,6 +559,8 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__sms_mms">短信和彩信</string>
   <string name="preferences__pref_all_sms_title">获得所有的短信</string>
   <string name="preferences__pref_all_mms_title">获得所有的彩信</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__enable_enter_key_title">开启进入密钥</string>
   <string name="preferences__replace_smiley_with_enter_key">使用输入的密钥替换相似的密钥</string>
@@ -632,6 +643,9 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__default">默认</string>
   <string name="preferences__language">语言</string>
   <string name="preferences__language_summary">语言 %s</string>
+  <string name="preferences__textsecure_messages">TextSecure 信息</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+免费的私密短信至 TextSecure 和单个用户</string>
   <string name="preferences__submit_debug_log">提交调试日志</string>
   <string name="preferences__support_wifi_calling">“Wifi呼叫”兼容模式</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">如果您的设备使用 WiFi 来接受或发送短信，请启用此选项（仅当您的设备启用WiFi呼叫时启用）。</string>

res/values-zh-rTW/strings.xml

@@ -62,7 +62,6 @@
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">抱歉，無法成功設定您指定的附件檔案</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">收件人並不是一個有效的 手機門號 或 email 位址！</string>
   <string name="ConversationActivity_message_is_empty_exclamation">訊息內容是空的！</string>
-  <string name="ConversationActivity_group_conversation_recipients">群組聊天連絡人</string>
   <string name="ConversationActivity_group_conversation">群組聊天</string>
   <string name="ConversationActivity_unnamed_group">未命名的群組</string>
   <string name="ConversationActivity_d_recipients_in_group">有 %d 名成員</string>