Updated language translations.

// FREEBIE

res/values-bo/strings.xml

@@ -34,6 +34,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
   <string name="ConversationFragment_success_exclamation">ལེགས་འགྲུབ། </string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་སྐུད་རིམ་འདེམས་པ་ཆ་ཚང་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
@@ -71,7 +72,6 @@
   <!--PassphrasePromptActivity-->
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">མུ་མཐུད། </string>
   <!--RegistrationProblemsActivity-->
@@ -164,7 +164,6 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">སྒོ་ཕྱེས། </string>
   <!--prompt_mms_activity-->
-  <!--receive_key_dialog-->
   <!--registration_activity-->
   <!--registration_problems-->
   <!--registration_progress_activity-->

res/values-ca/strings.xml

@@ -14,11 +14,6 @@
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Alerta, això desactivarà l\'emmagatzematge encriptat per a tots els missatges i claus. Les teves sessions continuaran funcionant, però qualsevol persona amb accés físic al teu dispositiu podrà accedir-hi.</string>
   <string name="ApplicationPreferencesActivity_disable">Desactiva</string>
   <string name="ApplicationPreferencesActivity_unregistering">Des-registrant...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Des-registrant per les comunicacions basades en dades</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Desactivar els missatges push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-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>
@@ -60,6 +55,7 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalls del missatge</string>
   <string name="ConversationFragment_success_exclamation">Èxit!</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Esborrar fils de conversa?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Estàs segur que vols esborrar TOTS els fils de conversa seleccionats?</string>
@@ -119,11 +115,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <!--PassphrasePromptActivity-->
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La signatura en aquest intercanvi de claus és diferent que el que havies rebut prèviament d\'aquest contacte. Això pot voler dir tant que algú està intentant interceptar la teva comunicació, o que aquest contacte simplement ha re-instal·lat TextSecure i ara té una clau d\'identitat nova.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
-  <string name="ReceiveKeyActivity_processing">Processant</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Processant intercanvi de clau...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Connecta amb TextSecure</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Has d\'especificar el teu codi de país</string>
@@ -266,8 +257,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure necessita ajustaments MMS per entregar missatges de grup i multimèdia a través de l\'operador inalàmbric. El teu dispositiu no fa que aquesta informació estigui disponible, cosa que és certa ocasionalment en dispositius bloquejats o amb altres configuracions restringides.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per enviar missatges multimèdia i de grup, clica \'OK\' i completa els ajustaments demanats. Els ajustaments MMS de la teva operadora normalment poden ser trobats buscant \'latevaoperadora APN\'. Només necessitaràs fer això una vegada.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Complet</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">EL TEU PAÍS</string>
   <string name="registration_activity__your_country_code_and_phone_number">EL TEU CODI DE PAÍS I NÚMERO DE TELÈFON</string>

res/values-cs/strings.xml

@@ -19,11 +19,11 @@ bude i nadále šifrována, ale bude si ji moci přečíst kdokoliv s fyzickým
 k vašemu zařízení.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivovat</string>
   <string name="ApplicationPreferencesActivity_unregistering">Rušení registrace...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Probíháhá zrušení datové komunikace</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Zakázat TextSecure zprávy?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Tímto zakážete TextSecure zprávy odregistrací ze serveru.
-Abyste mohli používat TextSecure zprávy v budoucnosti, budete muset znovu registrovat vaše telefonní číslo.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Probíhá odregistrování ze služby TextSecure</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Zakázat TextSecure zprávy?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Tímto zakážete textSecure zprávy odregistrací tohoto telefonního čísla ze serveru.
+Abyste mohli v budoucnu používat TextSecure zprávy, bude nutno toto telefonní číslo znovu zaregistrovat.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba při připojování k serveru!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS povoleny</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotykem nastavte výchozí aplikaci pro SMS</string>
@@ -55,6 +55,7 @@ zachytit vaši konverzaci, nebo že %2$s jen přeinstaloval TextSecure a nyní m
 identifikační klíč.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Zkontrolovat tento
 kontakt</string>
+  <string name="ConfirmIdentityDialog_accept">Akceptovat</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Délka zprávy: %d KB</string>
   <string name="ConversationItem_expires_s">Vyprší: %s</string>
@@ -124,6 +125,8 @@ kontakt</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Mažu...</string>
   <string name="ConversationFragment_deleting_messages">Mažu zprávy...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Vyhhledávám...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Smazat konverzace?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Opravdu chcete smazat VŠECHNY označené konverzace?</string>
@@ -137,6 +140,7 @@ kontakt</string>
   <string name="CustomDefaultPreference_none">Nic</string>
   <!--DateUtils-->
   <string name="DateUtils_now">teď</string>
+  <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Sdílet s</string>
   <!--ExportFragment-->
@@ -151,7 +155,7 @@ kontakt</string>
   <string name="ExportFragment_success">Úspěšně dokončeno!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Trvalá chyba komunikace TextSecure</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure se nemůže registrovat k službě Google Play. Datová komunikca byla zakázána, prosím zkuste se znovu registrovat v menu  nastavení TextSecure.</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure se nemůže registrovat k službě Google Play. Datová komunikace byla zakázána, prosím zkuste se znovu registrovat v menu nastavení TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Upravit skupinu</string>
@@ -244,14 +248,6 @@ Poslat zprávy Vaším jménem.</string>
   <string name="RatingManager_rate_now">Ohodnotit teď!</string>
   <string name="RatingManager_no_thanks">Ne díky</string>
   <string name="RatingManager_later">Později</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis na této výměně klíčů je jiný, než jaký jste od tohoto kontaktu obdrželi dříve. To může
-znamenat, že se někdo pokouší zachytit vaši konverzaci, nebo jen že si váš kontakt
-přeinstaloval TextSecure a má teď nový identifikační klíč.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Zkontrolovat tento
-kontakt</string>
-  <string name="ReceiveKeyActivity_processing">Probíhá zpracování</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Probíhá výměna klíčů...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Připojení pomocí TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Zvolte svou zemi</string>
@@ -466,8 +462,6 @@ Importovat nešifrovanou zálohu kompatibilní s \"SMSBackup And Restore\".</str
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure vyžaduje informace o nastavení MMS, aby mohly být média a skupinové zprávy doručovány. Váš přístroj tyto informace neposkytuje, což se stává u zamknutých nebo jinak upravených přístrojů.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pro odesílání médií a skupinových zpráv klepněte na OK a vyplňte požadované informace. Nastavení MMS pro vašeho operátora lze většinou zjistit hledáním \"*váš operátor* APN\". Toto je je třeba udělat pouze jednou.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Hotovo</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Ověření vašeho telefoního čísla pro připojení k TextSecure</string>
@@ -568,11 +562,6 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="arrays__use_default">Použít defualtní</string>
   <string name="arrays__use_custom">Použít vlastní</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minuta</item>
-    <item quantity="few">%d minuty</item>
-    <item quantity="other">%d minut</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d hodina</item>
     <item quantity="few">%d hodiny</item>

res/values-da/strings.xml

@@ -20,12 +20,6 @@ men alle med fysisk adgang til din enhed kan få adgang til dem.
 </string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivere</string>
   <string name="ApplicationPreferencesActivity_unregistering">Afregistrerer...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Afregistrerer for data kommunikation</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Deaktiver \'push\' beskeder?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-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>
@@ -97,6 +91,7 @@ denne kontakt.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Sletter...</string>
   <string name="ConversationFragment_deleting_messages">Sletter beskeder...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Slet tråde?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Er du sikker på at du vil slette ALLE valgte samtaletråde?</string>
@@ -187,14 +182,6 @@ Genoprettelse af en krypteret backup vil overskrive eksisterende nøgler, indsti
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ugyldigt kodeord!</string>
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne udvekslingsnøgle er ikke ens med den som du tidligere modtog fra denne
-kontakt. Det kan enten betyde, at der er nogle som prøver på at kompromitterer din kommunikation eller
-at din kontakt har installeret TextSecure på ny og dermed fået en ny udvekslingsnøgle.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Du bør verificere
-denne kontakt.</string>
-  <string name="ReceiveKeyActivity_processing">Arbejder</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Arbejder på nøgleudvekling...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Forbind med TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Vælg land</string>
@@ -392,8 +379,6 @@ Importer en klartekst backup fil. Kompatibel med \'SMSBackup og Restore\'.</stri
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure har brug for at kende MMS-indstillingerne for at sende medieindhold og gruppebeskeder gennem din teleudbyder. Din enhed gør ikke disse oplysninger tilgængelige, hvilket kan forekomme for f.eks. låste enheder.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">For at sende multimedia- og gruppebeskeder klik \'OK\' og udfyld indstillingerne. MMS-indstillingerne for din teleoperatør kan ofte findes ved at søge på \'din operatør APN\'. Du behøver kun gøre dette en gang.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Udført</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">DIT LAND</string>
   <string name="registration_activity__your_country_code_and_phone_number">DIN LANDEKODE OG DIT

res/values-de/strings.xml

@@ -4,7 +4,7 @@
   <string name="yes">Ja</string>
   <string name="no">Nein</string>
   <string name="delete">Löschen</string>
-  <string name="please_wait">Bitte warten...</string>
+  <string name="please_wait">Bitte warten …</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momentan: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
@@ -17,11 +17,12 @@
 Warnung: Dies wird die verschlüsselte Speicherung für alle Nachrichten und Schlüssel deaktivieren.
 Ihre verschlüsselten Unterhaltungen werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann dann auf sie zugreifen.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Kontolöschung</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Konto für TextSecure-Nachrichten wird gelöscht...</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">TextSecure-Nachrichten deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Durch das Deaktivieren von TextSecure-Nachrichten wird Ihre Registrierung bei TextSecure aufgehoben. Um zukünftig wieder TextSecure-Nachrichten nutzen zu können, muss Ihre Rufnummer erneut registriert werden.</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Konto löschen</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecure-Nachrichten werden abgemeldet</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">TextSecure-Nachrichten deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Dies wird TextSecure-Nachrichten deaktivieren durch Löschung Ihres Benutzerkontos vom Server.
+Sie werden Ihre Rufnummer erneut registrieren müssen, um TextSecure-Nachrichten zukünftig wieder nutzen zu können.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiviert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Standard-SMS-App ändern</string>
@@ -41,7 +42,7 @@ Durch das Deaktivieren von TextSecure-Nachrichten wird Ihre Registrierung bei Te
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Keine App zur Dateiauswahl auffindbar.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Foto aufnehmen</string>
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Fotografieren</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -50,6 +51,7 @@ Durch das Deaktivieren von TextSecure-Nachrichten wird Ihre Registrierung bei Te
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Der Schlüssel von %1$s hat sich geändert.
 Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleicht hat %2$s TextSecure aber auch nur neu installiert und benutzt nun einen neuen Schlüssel.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Sie sollten diesen Kontakt ggf. überprüfen.</string>
+  <string name="ConfirmIdentityDialog_accept">Annehmen</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Nachrichtengröße: %d kB</string>
   <string name="ConversationItem_expires_s">Läuft ab in: %s</string>
@@ -57,9 +59,9 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationItem_view_secure_media_question">Verschlüsselte Datei anzeigen?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei ist in einer verschlüsselten Datenbank gespeichert. Zur Anzeige muss sie vorübergehend entschlüsselt abgespeichert werden. Möchten Sie dennoch fortfahren?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fehler: Abgelaufene Schlüsselaustausch-Nachricht empfangen.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Schlüsselaustausch-Nachricht empfangen. Antippen um fortzufahren.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Schlüsselaustausch-Nachricht empfangen. Zum Fortfahren antippen.</string>
   <string name="ConversationItem_group_action_left">%1$s hat die Gruppe verlassen.</string>
-  <string name="ConversationItem_click_for_details">Antippen für Details</string>
+  <string name="ConversationItem_click_for_details">Für Details antippen</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Für Rückgriff auf unsicheren Versand antippen</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Rückgriff auf unverschlüsselte SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Rückgriff auf unverschlüsselte MMS?</string>
@@ -78,7 +80,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Leider ist ein Fehler beim Hinzufügen des Anhangs aufgetreten.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Die ausgewählte Videodatei überschreitet leider die maximal mögliche Nachrichtengröße (%1$skB).</string>
   <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_recipient_is_not_a_valid_sms_or_email_address_exclamation">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_members">Gruppenmitglieder</string>
   <string name="ConversationActivity_group_conversation">Gruppenunterhaltung</string>
@@ -96,7 +98,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Sicher kommunizieren: %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>
+  <string name="ConversationActivity_error_leaving_group">Fehler beim Verlassen der Gruppe …</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nicht unterstützt</string>
   <string name="ConversationActivity_mms_not_supported_message">Diese Nachricht kann nicht gesendet werden, da Ihr Mobilfunkbetreiber MMS nicht unterstützt.</string>
   <string name="ConversationActivity_specify_recipient">Bitte einen Kontakt auswählen</string>
@@ -112,26 +114,29 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationFragment_success_exclamation">Erfolgreich!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kein Schreibzugriff auf Gerätespeicher!</string>
   <string name="ConversationFragment_saving_attachment">Anhang speichern</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Anhang wird im Gerätespeicher gespeichert...</string>
-  <string name="ConversationFragment_pending">Ausstehend...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Anhang wird im Gerätespeicher gespeichert …</string>
+  <string name="ConversationFragment_pending">Ausstehend …</string>
   <string name="ConversationFragment_push">Datenkanal (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Löschen</string>
-  <string name="ConversationFragment_deleting_messages">Nachrichten werden gelöscht...</string>
+  <string name="ConversationFragment_deleting_messages">Nachrichten werden gelöscht …</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Suchen …</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Unterhaltungen löschen?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Möchten Sie wirklich ALLE ausgewählten Unterhaltungen löschen?</string>
   <string name="ConversationListFragment_deleting">Löschen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht...</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht …</string>
   <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht...</string>
+  <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht …</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Benutzerdefiniert: %s</string>
   <string name="CustomDefaultPreference_using_default">Standard: %s</string>
   <string name="CustomDefaultPreference_none">Kein Eintrag</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Jetzt</string>
+  <string name="DateUtils_minutes_ago">%d Min.</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Teilen mit</string>
   <!--ExportFragment-->
@@ -139,14 +144,14 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ExportFragment_export_plaintext_to_sd_card">Klartext auf SD-Karte exportieren?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung, dies wird Ihre TextSecure-Nachrichten im Klartext auf die SD-Karte exportieren.</string>
   <string name="ExportFragment_cancel">Abbruch</string>
-  <string name="ExportFragment_exporting">Export</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Klartext wird auf SD-Karte exportiert...</string>
+  <string name="ExportFragment_exporting">Exportieren</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Klartext wird auf SD-Karte exportiert …</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Fehler: Kein Schreibzugriff auf die SD-Karte!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Fehler beim Schreiben auf die SD-Karte.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Dauerhaftes Problem mit TextSecure-Nachrichten!</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure konnte keine Verbindung zu den Google Play-Diensten herstellen. TextSecure-Nachrichten wurden daher deaktiviert. Bitte im Menü \"Einstellungen\" erneut registrieren.</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure konnte keine Verbindung zu den Google Play-Diensten herstellen. TextSecure-Nachrichten wurden daher deaktiviert. Bitte über das Menü \"Einstellungen\" erneut registrieren.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Gruppe bearbeiten</string>
@@ -159,10 +164,10 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="GroupCreateActivity_contacts_invalid_number">Eines der Gruppenmitglieder hat eine nicht korrekt lesbare Rufnummer. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppenavatar</string>
   <string name="GroupCreateActivity_menu_create_title">Gruppe erstellen</string>
-  <string name="GroupCreateActivity_creating_group">%1$s wird erstellt...</string>
-  <string name="GroupCreateActivity_updating_group">%1$s wird aktualisiert...</string>
+  <string name="GroupCreateActivity_creating_group">%1$s wird erstellt …</string>
+  <string name="GroupCreateActivity_updating_group">%1$s wird aktualisiert …</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Es können keine Kontakte ohne TextSecure-Registrierung zu einer existierenden TextSecure-Gruppe hinzugefügt werden</string>
-  <string name="GroupCreateActivity_loading_group_details">Gruppendetails werden geladen...</string>
+  <string name="GroupCreateActivity_loading_group_details">Gruppendetails werden geladen …</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">Ich</string>
   <!--ImportExportActivity-->
@@ -182,13 +187,13 @@ Sie werden jegliche Informationen Ihrer jetzigen TextSecure-Installation verlier
   <string name="ImportFragment_import_plaintext_backup">Klartextsicherung importieren?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten aus einer Klartext-Datensicherung importieren.
 Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedoppelten Nachrichten führen.</string>
-  <string name="ImportFragment_importing">Import</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Klartextsicherung wird importiert...</string>
+  <string name="ImportFragment_importing">Importieren</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Klartextsicherung wird importiert …</string>
   <string name="ImportFragment_no_plaintext_backup_found">Keine Klartextsicherung gefunden!</string>
   <string name="ImportFragment_error_importing_backup">Fehler beim Importieren der Datensicherung!</string>
-  <string name="ImportFragment_import_complete">Import abgeschlossen!</string>
-  <string name="ImportFragment_restoring">Wiederherstellung</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Verschlüsselte Datensicherung wird wiederhergestellt...</string>
+  <string name="ImportFragment_import_complete">Importieren abgeschlossen!</string>
+  <string name="ImportFragment_restoring">Wiederherstellen</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Verschlüsselte Datensicherung wird wiederhergestellt …</string>
   <string name="ImportFragment_no_encrypted_backup_found">Keine verschlüsselte Datensicherung gefunden!</string>
   <string name="ImportFragment_restore_complete">Wiederherstellung abgeschlossen!</string>
   <!--KeyScanningActivity-->
@@ -200,8 +205,8 @@ Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedop
   <string name="MessageDetailsRecipient_new_identity">Neue Identität</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Verbindung zum MMS-Anbieter fehlgeschlagen...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">MMS-Einstellungen des Mobilfunkanbieters konnten nicht gelesen werden...</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Verbindung zum MMS-Anbieter fehlgeschlagen …</string>
+  <string name="MmsDownloader_error_reading_mms_settings">MMS-Einstellungen des Mobilfunkanbieters konnten nicht gelesen werden …</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Mediennachricht</string>
   <!--MessageRecord-->
@@ -222,8 +227,8 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="DeviceProvisioningActivity_content_bullets">
 - Alle Nachrichten lesen
 \n- Nachrichten in Ihrem Namen senden </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Gerät hinzufügen...</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird hinzugefügt...</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Gerät hinzufügen</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird hinzugefügt …</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Geräte wurde hinzugefügt!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Kein Gerät gefunden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netzwerkfehler.</string>
@@ -241,11 +246,6 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="RatingManager_rate_now">Jetzt bewerten!</string>
   <string name="RatingManager_no_thanks">Nein danke</string>
   <string name="RatingManager_later">Später</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs hat sich geändert. Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleicht hat dieser Kontakt TextSecure aber auch nur neu installiert und benutzt nun einen neuen Schlüssel.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Sie sollten diesen Kontakt ggf. überprüfen.</string>
-  <string name="ReceiveKeyActivity_processing">Schlüsselaustausch</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Schlüsselaustausch wird durchgeführt...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Mit TextSecure verbinden</string>
   <string name="RegistrationActivity_select_your_country">Wählen Sie Ihr Land aus</string>
@@ -262,20 +262,20 @@ Bitte kontrollieren Sie noch einmal Ihre Rufnummer. Diese wird anschließend dur
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Mögliche Probleme</string>
   <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Überprüfe Rufnummer</string>
+  <string name="RegistrationProgressActivity_verifying_number">Rufnummer wird überprüft</string>
   <string name="RegistrationProgressActivity_edit_s">%s bearbeiten</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrierung abgeschlossen!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Sie müssen den Code eingeben, den Sie zuvor empfangen haben...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Sie müssen den Code eingeben, den Sie zuvor empfangen haben …</string>
   <string name="RegistrationProgressActivity_connecting">Verbinden</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Verbindung wird zur Überprüfung hergestellt...</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Verbindung wird zur Überprüfung hergestellt …</string>
   <string name="RegistrationProgressActivity_network_error">Netzwerkfehler!</string>
   <string name="RegistrationProgressActivity_unable_to_connect">Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Verbindung und versuchen Sie es dann erneut.</string>
   <string name="RegistrationProgressActivity_verification_failed">Überprüfung fehlgeschlagen!</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Der eingegebene Code ist falsch. Bitte versuchen Sie es erneut.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Zu viele Versuche</string>
   <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Sie haben zu viele falsche Codes eingegeben. Bitte warten Sie eine Minute und versuchen Sie es dann erneut.</string>
-  <string name="RegistrationProgressActivity_requesting_call">Anrufanforderung</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Bestätigungsanruf wird angefordert...</string>
+  <string name="RegistrationProgressActivity_requesting_call">Anruf anfordern</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Bestätigungsanruf wird angefordert …</string>
   <string name="RegistrationProgressActivity_server_error">Serverfehler</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Der Server hat einen Fehler festgestellt. Bitte versuchen Sie es erneut.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Zu viele Anfragen!</string>
@@ -292,12 +292,12 @@ Bitte kontrollieren Sie noch einmal Ihre Rufnummer. Diese wird anschließend dur
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string>
+Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Veränderte, aber unbekannte Identitätsinformation empfangen. Antippen, um die Identität zu prüfen.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sichere Unterhaltung beendet.</string>
   <string name="SmsMessageRecord_duplicate_message">Doppelte Nachricht.</string>
   <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Gruppe wurde verlassen...</string>
+  <string name="ThreadRecord_left_the_group">Gruppe wurde verlassen …</string>
   <string name="TheadRecord_secure_session_ended">Sichere Unterhaltung beendet.</string>
   <string name="ThreadRecord_draft">Entwurf:</string>
   <!--VerifyIdentityActivity-->
@@ -325,26 +325,26 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Unterhaltungsanfrage an den Empfänger gesendet. Sind Sie sicher, dass Sie eine weitere senden wollen? Dies wird die erste Anfrage ungültig machen.</string>
   <string name="KeyExchangeInitiator_send">Senden</string>
   <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Fehlerhaft verschlüsselte Nachricht...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Entschlüsselung läuft, bitte warten...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht existierende Unterhaltung verschlüsselt...</string>
+  <string name="MessageDisplayHelper_bad_encrypted_message">Fehlerhaft verschlüsselte Nachricht …</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Entschlüsselung läuft, bitte warten …</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht existierende Unterhaltung verschlüsselt …</string>
   <!--EncryptingSmsDatabase-->
   <string name="EncryptingSmsDatabase_error_decrypting_message">Fehler beim Entschlüsseln der Nachricht.</string>
   <!--ThreadDatabase-->
   <string name="ThreadDatabase_error_decrypting_message">Fehler beim Entschlüsseln der Nachricht.</string>
   <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Verbindung zum MMS-Server wird aufgebaut...</string>
-  <string name="MmsDatabase_downloading_mms">MMS wird heruntergeladen...</string>
+  <string name="MmsDatabase_connecting_to_mms_server">Verbindung zum MMS-Server wird aufgebaut …</string>
+  <string name="MmsDatabase_downloading_mms">MMS wird heruntergeladen …</string>
   <string name="MmsDatabase_mms_download_failed">Herunterladen der MMS fehlgeschlagen!</string>
-  <string name="MmsDatabase_downloading">Wird heruntergeladen...</string>
+  <string name="MmsDatabase_downloading">Herunterladen …</string>
   <string name="MmsDatabase_mms_pending_download">Antippen und MMS-Einstellungen konfigurieren, um das Herunterladen fortzusetzen.</string>
   <string name="MmsDatabase_error_decrypting_message">Fehler beim Entschlüsseln der Nachricht.</string>
   <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt. Bitte warten...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlerhaft verschlüsselte MMS...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht existierende Unterhaltung verschlüsselt...</string>
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt. Bitte warten …</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlerhaft verschlüsselte MMS …</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht existierende Unterhaltung verschlüsselt …</string>
   <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Import wird durchgeführt</string>
+  <string name="ApplicationMigrationService_import_in_progress">Importieren wird durchgeführt</string>
   <string name="ApplicationMigrationService_importing_text_messages">Nachrichten werden importiert</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Zum Öffnen antippen.</string>
@@ -354,7 +354,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_messages_in_d_conversations">%1$d Nachrichten in %2$d Unterhaltungen</string>
   <string name="MessageNotifier_most_recent_from_s">Neueste von: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Verschlüsselte Nachricht...</string>
+  <string name="MessageNotifier_encrypted_message">Verschlüsselte Nachricht …</string>
   <string name="MessageNotifier_media_message_with_text">Mediennachricht: %s</string>
   <string name="MessageNotifier_no_subject">(Kein Betreff)</string>
   <string name="MessageNotifier_message_delivery_failed">Nachrichtenübermittlung fehlgeschlagen.</string>
@@ -372,11 +372,11 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Keine Kontakte.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Kontakte werden geladen...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Kontakte werden geladen …</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht für den TextSecure-Dienst registriert...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aktualisierung</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Kontaktliste wird aktualisiert...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht für den TextSecure-Dienst registriert …</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Aktualisieren</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Kontaktliste wird aktualisiert …</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktbild</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
@@ -398,34 +398,34 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="conversation_item__secure_message_description">Sichere Nachricht</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
-  <string name="conversation_item_sent__downloading">Lädt herunter</string>
+  <string name="conversation_item_sent__downloading">Herunterladen</string>
   <string name="conversation_item_sent__send_failed_indicator_description">Senden fehlgeschlagen</string>
   <string name="conversation_item_sent__pending_approval_description">Bestätigung ausstehend</string>
   <string name="conversation_item_sent__delivered_description">Übermittelt</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Herunterladen</string>
   <string name="conversation_item_received__contact_photo_description">Kontaktbild</string>
-  <string name="conversation_item_received__downloading">Wird heruntergeladen</string>
+  <string name="conversation_item_received__downloading">Herunterladen</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mehrfachauswahl</string>
   <string name="conversation_fragment_cab__batch_selection_amount">%s ausgewählt</string>
   <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Länder werden geladen...</string>
+  <string name="country_selection_fragment__loading_countries">Länder werden geladen …</string>
   <string name="country_selection_fragment__search">Suchen</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen das Protokoll mit ADB auszulesen.</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
-  <string name="log_submit_activity__submitting">Versand</string>
-  <string name="log_submit_activity__posting_logs">Diagnoseprotokoll wird übermittelt...</string>
+  <string name="log_submit_activity__submitting">Versenden</string>
+  <string name="log_submit_activity__posting_logs">Diagnoseprotokoll wird übermittelt …</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchten Sie Ihre vorhandenen Nachrichten in TextSecures verschlüsselte Datenbank importieren?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die System-Datenbank des Geräts wird in keiner Weise verändert.</string>
   <string name="database_migration_activity__skip">Überspringen</string>
   <string name="database_migration_activity__import">Importieren</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Dies kann eine Weile dauern, bitte haben Sie etwas Geduld. Sie werden benachrichtigt, sobald der Import abgeschlossen ist.</string>
-  <string name="database_migration_activity__importing">WIRD IMPORTIERT</string>
+  <string name="database_migration_activity__importing">IMPORTIEREN</string>
   <!--database_upgrade_activity-->
-  <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert...</string>
+  <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert …</string>
   <string name="export_fragment__export_plaintext_backup">Klartextsicherung exportieren</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung exportieren.</string>
@@ -458,8 +458,6 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren.</str
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen, um Medien- und Gruppennachrichten zu versenden. Ihr Gerät stellt diese Informationen nicht zur Verfügung, was gelegentlich bei gesperrten oder anderweitig restriktiv konfigurierten Geräten der Fall ist.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Zum Versenden von Medien- und Gruppennachrichten bitte \"OK\" antippen und die geforderten Einstellungen vervollständigen. Die MMS-Einstellungen Ihres Anbieters können normalerweise  durch eine Internetsuche nach dem \"APN\" des Anbieters gefunden werden.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Abgeschlossen</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Überprüfen Sie zur Verbindung mit TextSecure Ihre Rufnummer.</string>
@@ -497,14 +495,14 @@ Verbindung zum TextSecure-Dienst konnte nicht hergestellt werden</string>
 Bei Verbindung über WLAN blockiert möglicherweise eine Firewall den Zugang zum TextSecure-Server. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
 TextSecure wird Ihre Rufnummer nun automatisch mit einer SMS überprüfen.</string>
-  <string name="registration_progress_activity__connecting">Verbindung wird hergestellt...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Warten auf SMS-Überprüfung...</string>
-  <string name="registration_progress_activity__registering_with_server">Registrierung wird durchgeführt...</string>
+  <string name="registration_progress_activity__connecting">Verbindung wird hergestellt …</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Warten auf SMS-Überprüfung …</string>
+  <string name="registration_progress_activity__registering_with_server">Registrierung wird durchgeführt …</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dies kann einen Moment dauern, bitte haben Sie Geduld. Wir benachrichtigen Sie, sobald die Überprüfung abgeschlossen ist.</string>
   <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
 Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="registration_progress_activity__sms_verification_failed">SMS-Überprüfung fehlgeschlagen.</string>
-  <string name="registration_progress_activity__generating_keys">Schlüssel werden erzeugt...</string>
+  <string name="registration_progress_activity__generating_keys">Schlüssel werden erzeugt …</string>
   <string name="registration_progress_activity__alert">Benachrichtigung</string>
   <string name="registration_progress_activity__telephone">Telefon</string>
   <string name="registration_progress_activity__check">Haken</string>
@@ -541,10 +539,6 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="arrays__use_default">Standard verwenden</string>
   <string name="arrays__use_custom">Benutzerdefiniert verwenden</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d Minute</item>
-    <item quantity="other">%d Minuten</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d Stunde</item>
     <item quantity="other">%d Stunden</item>
@@ -626,7 +620,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__mmsc_password">MMSC-Passwort</string>
   <string name="preferences__sms_delivery_reports">SMS-Zustellberichte</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, wenn die Unterhaltung eine bestimmte Länge überschreitet</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
   <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
   <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
@@ -653,7 +647,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="contact_selection_list__menu_unselect_all">Alle abwählen</string>
   <string name="contact_selection_list__header_textsecure_users">TEXTSECURE-KONTAKTE</string>
   <string name="contact_selection_list__header_other">ALLE KONTAKTE</string>
-  <string name="contact_selection_list__unknown_contact">Neue Nachricht an...</string>
+  <string name="contact_selection_list__unknown_contact">Neue Nachricht an …</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Fertig</string>
   <!--refreshing push directory from menu-->
@@ -729,7 +723,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="media_preview_activity__image_content_description">Bildvorschau</string>
   <!--Trimmer-->
   <string name="trimmer__deleting">Kürzen</string>
-  <string name="trimmer__deleting_old_messages">Alte Nachrichten werden gelöscht...</string>
+  <string name="trimmer__deleting_old_messages">Alte Nachrichten werden gelöscht …</string>
   <string name="trimmer__old_messages_successfully_deleted">Alte Nachrichten wurden erfolgreich gelöscht</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Übertragungssymbol</string>

res/values-es/strings.xml

@@ -7,9 +7,9 @@
   <string name="please_wait">Por favor, espere...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actualmente: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡No ha elegido aún una clave de acceso!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡Todavía no ha elegido una clave de acceso!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mensajes por conversación</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">¿Eliminar ahora todos los mensajes antiguos?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">¿Eliminar todos los mensajes antiguos?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">¿Está seguro de que quiere recortar inmediatamente todos los hilos de conversación a los %s últimos mensajes?</string>
   <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">¿Deshabilitar cifrado del almacenamiento?</string>
@@ -19,11 +19,11 @@
     </string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Cancelando registro...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Cancelando registro para comunicación basada en datos</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">¿Deshabilitar mensajes push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Esto deshabilitará los mensajes push al eliminar su registro del servidor.
-Tendrá que volver a registrarse con su número de teléfono si quiere volver a usar los mensajes push en un futuro.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Desregistrándose de los mensajes TextSecure</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">¿Deshabilitar los mensajes de TextSecure?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Esto deshabilitará los mensajes de TextSecure desregistrándolos de su servidor.
+En el futuro tendrá que volver a registrar su número de teléfono para usar de nuevo los mensajes de TextSecure.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS habilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</string>
@@ -56,6 +56,7 @@ nueva clave de identidad.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Puede que dese verificar
 este contacto.
 </string>
+  <string name="ConfirmIdentityDialog_accept">Aceptar</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Tamaño del mensaje: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
@@ -129,6 +130,8 @@ Recibido:%4$s</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Borrando...</string>
   <string name="ConversationFragment_deleting_messages">Borrando mensajes...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Buscar...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">¿Borrar conversaciones?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">¿Está seguro de que quiere borrar TODAS las conversaciones seleccionadas?</string>
@@ -142,6 +145,7 @@ Recibido:%4$s</string>
   <string name="CustomDefaultPreference_none">Ninguno</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Ahora</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartir con</string>
   <!--ExportFragment-->
@@ -261,13 +265,6 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
   <string name="RatingManager_rate_now">¡Evaluar ahora!</string>
   <string name="RatingManager_no_thanks">No, gracias</string>
   <string name="RatingManager_later">Más tarde</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La firma en este intercambio de claves es diferente de lo que previamente ha recibido de este contacto. Esto podría significar que alguien está intentando interceptar las comunicaciones o que este contacto simplemente reinstaló TextSecure y ahora tiene una nueva clave de identidad.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Puede que dese verificar
-este contacto.
-</string>
-  <string name="ReceiveKeyActivity_processing">Procesando</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Procesando intercambio de claves...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectar con TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Seleccione su país</string>
@@ -405,7 +402,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">CLAVE DE ACCESO ANTERIOR:</string>
   <string name="change_passphrase_activity__new_passphrase">CLAVE DE ACCESO NUEVA:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">REPITA LA CLAVE DE ACCESO NUEVA:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">REPITA LA NUEVA CLAVE DE ACCESO:</string>
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
@@ -459,7 +456,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de datos de sistema por defecto no será modificada o alterada de ningún modo.</string>
   <string name="database_migration_activity__skip">Saltar</string>
   <string name="database_migration_activity__import">Importar</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Esto podría tardar un rato. Por favor, se paciente, te informaremos cuando la importación sea completada.</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Esto podría tardar un rato. Por favor, sea paciente, le informaremos en cuanto la importación sea completada.</string>
   <string name="database_migration_activity__importing">IMPORTANDO</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Actualizando base de datos...</string>
@@ -498,8 +495,6 @@ Importar una copia de seguridad en texto plano. Compatible con \'SMSBackup And R
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure necesita los datos de configuración de MMS para poder enviar mensajes de grupo a través de su proveedor de telefonía. Su dispositivo no hace pública esta información, cosa que ocurre ocasionalmente para dispositivos bloqueados y otras configuraciones restrictivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar contenido multimedia y mensajes de grupo haga click en \'OK\' y realice la configuración requerida. Las opciones de MMS de su proveedor de telefonía pueden ser encontradas normalmente buscando el \'APN de su proveedor\'. Solo necesitará hacer esto una vez.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Completo</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Verifique su número de teléfono para conectar con TextSecure.</string>
@@ -618,10 +613,6 @@ por SMS.
   <string name="arrays__use_default">Usar el predeterminado</string>
   <string name="arrays__use_custom">Usar el personalizado</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d min</item>
-    <item quantity="other">%d min</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
     <item quantity="other">%d horas</item>

res/values-eu/strings.xml

@@ -19,12 +19,6 @@ Zure enkriptatutako saioek funtzionatzen jarraituko dute, baina zure gailua fisi
 gai izango da saiootan sartzeko.</string>
   <string name="ApplicationPreferencesActivity_disable">Desgaitu</string>
   <string name="ApplicationPreferencesActivity_unregistering">Deserregistratzen...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Deserregistratzen datuetan oinarritutako komunikaziorako</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Push mezuak desgaitu?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Honek push mezuak desgaituko du zu zerbitzaritik deserregistratuz.
-Zure telefono zenbakia bererregistratu beharko duzu push mezuak berriro erabili ahal izateko.
-</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errorea zerbitzariarekin konektatzerakoan!</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Ukitu zure SMS aplikazio lehenetsia aldatzeko</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Ukitu TextSecure zure SMS aplikazio lehenetsia bihurtzeko</string>
@@ -106,6 +100,7 @@ Zure telefono zenbakia bererregistratu beharko duzu push mezuak berriro erabili
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Ezabatzen...</string>
   <string name="ConversationFragment_deleting_messages">Mezuak ezabatzen...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Hariak ezabatu?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ziur zaude aukeratutako solasaldi hari GUZTIAK ezabatu nahi izateaz?</string>
@@ -207,15 +202,6 @@ Babeskopia hau lehenago inportatu baduzu, mezu bikoiztuak sortu daitezke.
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Pasahitz baliogabea!</string>
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Gako
-elkar-trukatzen honen sinadura kontaktu honengandik aurretik jaso duzunaz desberdina da.
-Izan daiteke norbait zure komunikazioaren erdian egotea edo, era berean, posible da kontaktu honek TextSecure berrinstalatu izana eta gako berri bat edukitzea.
-
-</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Agian kontaktu hau egiaztatu beharko zenuke.</string>
-  <string name="ReceiveKeyActivity_processing">Prozesatzen</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Gakoaren datu-elkartrukea prozesatzen...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">TextSecure-ekin Konektatu</string>
   <string name="RegistrationActivity_select_your_country">Zure herrialdea aukeratu</string>
@@ -431,8 +417,6 @@ Enkriptatu gabeko babeskopia bat inportatu. Bateragarria \'SMSBackup Eta Restore
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecurek MMS ezarpenak behar ditu media eta taldeko mezuak banatu ahal izateko zure hari-gabeko hornitzailearen bitartez. Zure gailuak ez dauka informazio hau eskuragarri. Hau batzuetan gertatzen da blokeatuta dauden eta beste konfigurazio murrizgarriak dituzten gailuetan.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Media eta taldeko mezuak bidaltzeko, klik egin \'OK\'-n eta osatu beharrezkoak diren ezarpenak. Zure hornitzailearentzako ezarpenak normalean topa daitezke zure hornitzailearen APNa bilatuz. Bakarrik behin egin beharko duzu hau.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Osatuta</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">ZURE HERRIALDEA</string>
   <string name="registration_activity__your_country_code_and_phone_number">ZURE HERRIALDEA ETA 

res/values-fa/strings.xml

@@ -15,7 +15,6 @@
   <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>
@@ -96,6 +95,7 @@
   <string name="ConversationFragment_sms">پیامک</string>
   <string name="ConversationFragment_deleting">در حال حذف...</string>
   <string name="ConversationFragment_deleting_messages">حذف پیام های...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">حذف گفتگو ها؟</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">آیا مطمئن هستید که می خواهید همه موضوعات مکالمات انتخاب شده را حذف کنید؟</string>
@@ -193,11 +193,6 @@
   <string name="RatingManager_rate_now">اکنون بسنجید!</string>
   <string name="RatingManager_no_thanks">نه ممنون</string>
   <string name="RatingManager_later">بعد</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">شما ممکن است مایل به منظور بررسی
-تماس با ما</string>
-  <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>
@@ -383,8 +378,6 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">قفل باز شود</string>
   <!--prompt_mms_activity-->
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">کامل</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">کشور شما</string>
   <string name="registration_activity__your_country_code_and_phone_number">کد کشور شما و
@@ -449,9 +442,6 @@
   <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>

res/values-fi/strings.xml

@@ -18,11 +18,11 @@ Varoitus. Viestiesi ja avaimiesi tallennustilan salaus poistetaan käytöstä. S
 jatkavat toimintaansa, mutta kuka tahansa, jolla on fyysinen pääsy laitteeseesi voi lukea ne.</string>
   <string name="ApplicationPreferencesActivity_disable">Poista käytöstä</string>
   <string name="ApplicationPreferencesActivity_unregistering">Puretaan rekisteröintiä...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Tietoverkkovälitteiseen viestintään vaadittua rekisteröintiä puretaan</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Poistetaanko pikaviestit käytöstä?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Tämä lopettaa pikaviestipalvelun poistamalla tietosi palvelimelta.
-Jos haluat käyttää pikaviestipalvelua jatkossa, sinun täytyy rekisteröityä uudelleen.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Puretaan rekisteröintiä TextSecure-viestipalvelusta</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Poistetaanko TextSecure-viestit käytöstä?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Tämä lopettaa TextSecure-viestipalvelun poistamalla tietosi palvelimelta.
+Jos haluat käyttää TextSecure-viestejä jatkossa, 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, jos haluat vaihtaa oletustekstiviestisovellustasi</string>
@@ -54,6 +54,7 @@ viestiliikennettänne, tai sitä, että %2$s on uudelleenasentanut TextSecuren,
 uutta identiteettiavainta.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
 tämän yhteystiedon.</string>
+  <string name="ConfirmIdentityDialog_accept">Hyväksy</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Viestin koko: %d kt</string>
   <string name="ConversationItem_expires_s">Umpeutuu: %s</string>
@@ -116,7 +117,7 @@ Vastaanotettu: %4$s</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Haluatko varmasti poistaa kaikki valitut viestit pysyvästi?</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, 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_error_while_saving_attachment_to_sd_card">Tiedoston tallennuksessa sattui virhe!</string>
   <string name="ConversationFragment_success_exclamation">Onnistui!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Muistiin tallentaminen epäonnistui!</string>
   <string name="ConversationFragment_saving_attachment">Liitettä tallennetaan</string>
@@ -127,6 +128,8 @@ Vastaanotettu: %4$s</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Poistetaan...</string>
   <string name="ConversationFragment_deleting_messages">Viestejä poistetaan...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Hae...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Poista viestiketjut?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Haluatko varmasti poistaa KAIKKI valitut viestiketjut?</string>
@@ -140,6 +143,7 @@ Vastaanotettu: %4$s</string>
   <string name="CustomDefaultPreference_none">Ei asetettu</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nyt</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Jaa</string>
   <!--ExportFragment-->
@@ -250,15 +254,6 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <string name="RatingManager_rate_now">Arvostele nyt!</string>
   <string name="RatingManager_no_thanks">Ei kiitos</string>
   <string name="RatingManager_later">Myöhemmin</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Tämän
-avaintenvaihdon sormenjälki eroaa tältä yhteystiedolta aiemmin saadusta sormenjäljestä.
-Tämä voi tarkoittaa joko sitä, että joku yrittää kaapata viestiliikennettänne, tai sitä, että yhteystietosi
-on uudelleenasentanut TextSecuren ja käyttää nyt uutta tunnisteavainta.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
-tämän yhteystiedon.</string>
-  <string name="ReceiveKeyActivity_processing">Käsitellään</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Käsitellään avaintenvaihtoa...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Yhdistä TextSecurella</string>
   <string name="RegistrationActivity_select_your_country">Valitse maasi</string>
@@ -480,8 +475,6 @@ Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva SMS Backup And Restore:lla.</s
   <!--prompt_mms_activity-->
   <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_dialog-->
-  <string name="receive_key_dialog__complete">Jatka</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Jotta voit ottaa TextSecuren käyttöön, tulee sinun ensin vahvistaa puhelinnumerosi.</string>
@@ -524,7 +517,7 @@ tarvitsee verkkoyhteyttä tämän TextSecuren ominaisuuden käyttämiseen. Tarki
 on yhdistettynä 3G- tai WiFi-verkkoon.</string>
   <string name="registration_progress_activity__restrictive_firewall">Rajoittava palomuuri.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
-Jos olet yhdistänyt WiFi-verkkoon, on mahdollista että palomuuri estää pääsyn TextSecuren palvelimelle. Kokeille toista verkkoa tai mobiiliverkkoa.</string>
+Jos olet yhdistänyt WiFi-verkkoon, on mahdollista että palomuuri estää pääsyn TextSecuren palvelimelle. Kokeile toista verkkoa tai mobiiliverkkoa.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
 TextSecure vahvistaa nyt puhelinnumerosi automaattisesti tekstiviestillä.</string>
   <string name="registration_progress_activity__connecting">Yhdistetään...</string>
@@ -572,13 +565,9 @@ epäonnistui.</string>
   <string name="arrays__use_default">Käytä oletusta</string>
   <string name="arrays__use_custom">Käytä mukautettua</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d min</item>
-    <item quantity="other">%d min</item>
-  </plurals>
   <plurals name="hours_ago">
-    <item quantity="one">%d h</item>
-    <item quantity="other">%d h</item>
+    <item quantity="one">%d tunti</item>
+    <item quantity="other">%d tuntia</item>
   </plurals>
   <!--preferences.xml-->
   <string name="preferences__general">Yleistä</string>
@@ -591,7 +580,7 @@ epäonnistui.</string>
   <string name="preferences__enable_enter_key_title">Ota rivinvaihto käyttöön</string>
   <string name="preferences__replace_smiley_with_enter_key">Korvaa hymiönäppäin rivinvaihtonäppäimellä</string>
   <string name="preferences__pref_enter_sends_title">Rivinvaihto lähettää</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Rivinvaihdon painallus lähettää tekstiviestin</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Rivinvaihdon painallus lähettää viestin</string>
   <string name="preferences__display_settings">Näytön asetukset</string>
   <string name="preferences__choose_identity">Valitse identiteetti</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Valitse yhteystieto osoitekirjasta.</string>
@@ -748,7 +737,7 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</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?</string>
   <string name="reminder_header_sms_import_text">Napsauta, jos haluat kopioida puhelimesi tekstiviestit TextSecuren salattuun tietokantaan.</string>
-  <string name="reminder_header_push_title">Ota käyttöön TextSecure-pikaviestipalvelu?</string>
+  <string name="reminder_header_push_title">Ota käyttöön TextSecure-viestipalvelu?</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>

res/values-fr/strings.xml

@@ -19,11 +19,12 @@ continueront de fonctionner mais une personne ayant un accès physique à votre
 en mesure d’y accéder.</string>
   <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Déconnexion</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Déconnexion de la communication par données</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Désactiver les messages push ?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages push dans le futur.
-</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Annulation de l\'enregistrement aux messages TextSecure</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Désactiver les messages TextSecure?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+        Ceci va désactiver les messages TextSecure en vous désinscrivant du serveur.
+        Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages TextSecure dans le futur.
+    </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur distant!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Activé</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Appuyez pour modifier votre application SMS par défaut</string>
@@ -43,6 +44,7 @@ Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous de
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Impossible de trouver une application pour sélectionner le média.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Prendre une photo</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -54,6 +56,7 @@ d’intercepter votre communication, soit que %2$s a simplement réinstallé Tex
 clé d’identité.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Vous devriez
 vérifier ce contact.</string>
+  <string name="ConfirmIdentityDialog_accept">Accepter</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Taille du message : %d Ko</string>
   <string name="ConversationItem_expires_s">Expire : %s</string>
@@ -123,6 +126,8 @@ vérifier ce contact.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Suppression...</string>
   <string name="ConversationFragment_deleting_messages">Suppression des messages...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Recherche...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Supprimer les fils ?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Êtes-vous sûr de vouloir supprimer TOUS les fils de discussion sélectionnés ?</string>
@@ -136,6 +141,7 @@ vérifier ce contact.</string>
   <string name="CustomDefaultPreference_none">Aucun</string>
   <!--DateUtils-->
   <string name="DateUtils_now">À l\'instant</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partager avec</string>
   <!--ExportFragment-->
@@ -249,15 +255,6 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
   <string name="RatingManager_rate_now">Noter maintenant!</string>
   <string name="RatingManager_no_thanks">Non merci</string>
   <string name="RatingManager_later">Plus tard</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
-signature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce
-contact. Cela peut signifier que quelqu’un essaie d’intercepter votre communication ou
-que ce contact a simplement réinstallé TextSecure et possède maintenant une nouvelle clé d’identité.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Vous devriez
-vérifier ce contact.</string>
-  <string name="ReceiveKeyActivity_processing">Traitement</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Traitement de l\'échange de clés...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Se connecter avec TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Sélectionner votre pays</string>
@@ -478,8 +475,6 @@ Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup An
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure nécessite les paramètres MMS pour envoyer des médias et des messages groupés par votre fournisseur sans fil. Votre appareil ne fournit pas ces informations ; cela se produit parfois sur les appareils verrouillés et autres configurations restrictives.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pour envoyer des médias et messages groupés, cliquez « OK » et renseignez les paramètres demandés. Les paramètres MMS de votre fournisseur peuvent en général être trouvés en recherchant « APN votre fournisseur ». Vous aurez besoin de faire cela seulement une fois.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Compléter</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Veuillez vérifier votre numéro de téléphone pour vous connecter avec TextSecure.</string>
@@ -575,10 +570,6 @@ par SMS.</string>
   <string name="arrays__use_default">Par défaut</string>
   <string name="arrays__use_custom">Personnalisé</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minute</item>
-    <item quantity="other">%d minutes</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d heure</item>
     <item quantity="other">%d heures</item>

res/values-hr/strings.xml

@@ -19,11 +19,6 @@ sesije će nastaviti raditi, ali svi sa fizičkim pristupom vašem uređaju će
 im moći pristupiti.</string>
   <string name="ApplicationPreferencesActivity_disable">Onemogući</string>
   <string name="ApplicationPreferencesActivity_unregistering">Uklanjanje registracije...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Uklanjanje registracije za podatkovnu komunikaciju</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Onemogući instant poruke?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Ovo će onemogućiti instant poruke na način da će ukinuti registraciju na poslužitelju.
-Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili instant poruke u budućnosti.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Greška prilikom povezivanja na poslužitelj!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS omogućen</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pritisnite za promjenu zadane SMS aplikacije</string>
@@ -121,6 +116,7 @@ ovaj kontakt.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Brisanje...</string>
   <string name="ConversationFragment_deleting_messages">Brisanje poruka...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Obriši teme?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Jeste li sigurni da želite obrisati SVE odabrane teme?</string>
@@ -245,15 +241,6 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <string name="RatingManager_rate_now">Ocijenite sada!</string>
   <string name="RatingManager_no_thanks">Ne hvala</string>
   <string name="RatingManager_later">Kasnije</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Potpis
-na razmjeni ključeva je drugačiji od onoga što ste prethodno primali od ovog kontakta.
-Ovo može značiti da netko presreće vašu komunikaciju, ili da je ovaj kontakt
-jednostavno ponovno instalirao TextSecure i sada ima novi identifikacijski ključ.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Možda bi trebali provjeriti
-ovaj kontakt.</string>
-  <string name="ReceiveKeyActivity_processing">Obrađivanje</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Obrađivanje razmjene ključeva...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Povežite se sa TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Odaberite svoju zemlju</string>
@@ -474,8 +461,6 @@ Uvezi nekriptiranu kopiju kompatibilnu s \'SMSBackup And Restore\'.</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure zahtjeva MMS postavke kako bi dostavio multimedijalne ili grupne poruke preko vašeg operatera. Vaš uređaj nije ove informacije učinio dostupnima, što se ponekad događa kod zaključanih uređaja ili kod ograničenih postavki.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Kako biste slali multimedijalne ili grupne poruke, pritisnite \'OK\' i popunite tražene postavke. MMS postavke za vašeg operatera se obično mogu naći tražeći \'APN vašeg operatera\'. Ovo je potrebno napraviti samo jednom.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Završeno</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Potvrdite svoj broj telefona kako biste se povezali sa TextSecure.</string>
@@ -570,11 +555,6 @@ neuspješno.</string>
   <string name="arrays__use_default">Koristi zadano</string>
   <string name="arrays__use_custom">Koristi prilagođeno</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minuta</item>
-    <item quantity="few">%d minute</item>
-    <item quantity="other">%d minuta</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d sat</item>
     <item quantity="few">%d sata</item>

res/values-hu/strings.xml

@@ -20,12 +20,6 @@ hozzáférhet az üzenetekhez és a kulcsokhoz!
  </string>
   <string name="ApplicationPreferencesActivity_disable">Tiltás</string>
   <string name="ApplicationPreferencesActivity_unregistering">Regisztráció törlése...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Az adat alapú kommunikáció regisztrációjának törlése.</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Letiltod az azonnali üzeneteket?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Ez letiltja az azonnali üzeneteket a regisztrációd törlésével a kiszolgálón.
-A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli használatához.
- </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hiba a kiszolgálóhoz való kapcsolódáskor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS engedélyezett</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Érintsd meg az alapértelmezett SMS alkalmazás megváltoztatásához</string>
@@ -45,6 +39,7 @@ A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli h
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nem található alkalmazás a média kiválasztásához</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Fénykép készítése</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Kép</string>
   <string name="AttachmentTypeSelectorAdapter_video">Mozgókép</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Hang</string>
@@ -127,6 +122,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Törlés...</string>
   <string name="ConversationFragment_deleting_messages">Üzenetek törlése...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Töröljük az üzenetfolyamot?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Biztosan törölni szeretnéd az összes kiválasztott üzenetváltást?</string>
@@ -140,6 +136,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="CustomDefaultPreference_none">Egyik sem</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Most</string>
+  <string name="DateUtils_minutes_ago">%d perc</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Megosztás...</string>
   <!--ExportFragment-->
@@ -256,17 +253,6 @@ Kérlek telepíts újra a Google Play Szolgáltatásokat és próbálkozz újra!
   <string name="RatingManager_rate_now">Értékeld most!</string>
   <string name="RatingManager_no_thanks">Nem, köszönöm!</string>
   <string name="RatingManager_later">Később</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Az
-aláírás ezen a csere kulcson különbözik amit korábban kaptál ettől a
-személytől. Ez jelentheti, hogy valaki megpróbál betekinteni a kommunikációba, vagy
-azt, hogy ez a személy egyszerűen újra telepítette a TextSecure és így most egy új azonosító kulcsa van.
- </string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Talán érdemes ellenőrizni
-ezt a névjegyet.
- </string>
-  <string name="ReceiveKeyActivity_processing">Feldolgozás</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Kulcs csere folyamatban...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Csatlakozás a TextSecure-höz</string>
   <string name="RegistrationActivity_select_your_country">Saját ország kiválasztása </string>
@@ -496,8 +482,6 @@ Egy titkosítatlan biztonsági mentés fájl importálása. \"SMS biztonsági me
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">A TextSecure az MMS beállítások megadását igényli a média és csoportos üzenetek kézbesítéséhez a szolgáltatódon keresztül. Az eszközöd nem tesz elérhetővé ilyen információkat, ami igaz lehet zárolt eszközök és egyéb korlátozó beállítások esetén.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">A média és csoportos üzeneteke küldéséhez kattints az \"OK\" feliratra és add meg a kívánt beállításokat! A szolgáltatód MMS beállításai általában megtalálhatók a \"saját szolgáltató APN\" keresésével. Csupán egyszer van szüksége ezt megtenni.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Befejezés</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Ellenőrizd a telefonszámodat a TextSecure alkalmazással történő kapcsolódáshoz.</string>
@@ -610,10 +594,6 @@ sikertelen.
   <string name="arrays__use_default">Alapértelmezett</string>
   <string name="arrays__use_custom">Egyéni</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d perc</item>
-    <item quantity="other">%d perc</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d óra</item>
     <item quantity="other">%d óra</item>

res/values-it/strings.xml

@@ -17,12 +17,7 @@
 Attenzione, così facendo interromperai la cifratura di tutti i messaggi e le chiavi che hai salvato. Le tue sessioni cifrate continueranno a funzionare, ma chiunque avrà accesso fisico al tuo dispositivo sarà in grado di accedere ad esse.</string>
   <string name="ApplicationPreferencesActivity_disable">Disabilita</string>
   <string name="ApplicationPreferencesActivity_unregistering">Annullamento della registrazione ...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Annullamento della registrazione dei dati di base della Comunicazione</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Disattivare messaggi push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Questo disabiliterà i messaggi push e annullerà la tua registrazione sul server.
-Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messaggi push in futuro.
-</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Disattivare i messaggi TextSecure?</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">Tocca per cambiare l\'applicazione predefinita per gli SMS</string>
@@ -51,6 +46,7 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">La chiave che identificava %1$s è cambiata. Questo può significare che qualcuno sta cercando di intercettare la tua comunicazione, o che %2$s ha semplicemente reinstallato TextSecure e ora ha una nuova chiave identificativa.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Dovresti verificare
 questo contatto.</string>
+  <string name="ConfirmIdentityDialog_accept">Accetta</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Dimensione Messaggio: %d KB</string>
   <string name="ConversationItem_expires_s">Scadenza: %s</string>
@@ -120,6 +116,8 @@ questo contatto.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Cancellazione...</string>
   <string name="ConversationFragment_deleting_messages">Cancellazione messaggi...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Cerca...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Cancellare i threads?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Sei sicuro di voler cancellare TUTTE le conversazioni selezionate?</string>
@@ -133,6 +131,7 @@ questo contatto.</string>
   <string name="CustomDefaultPreference_none">Nessuna</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Adesso</string>
+  <string name="DateUtils_minutes_ago">%d minuto</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Condividi con</string>
   <!--ExportFragment-->
@@ -246,15 +245,6 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="RatingManager_rate_now">Vota ora!</string>
   <string name="RatingManager_no_thanks">No grazie</string>
   <string name="RatingManager_later">Più tardi</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
-firma su questo scambio di chiavi è diversa da quella ricevuta precedentemente. Questo potrebbe significare che qualcuno sta cercando di intercettare la tua comunicazione
-o
-che il contatto ha reinstallato TextSecure e ora ha una nuova chiave.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Dovresti verificare
-questo contatto.</string>
-  <string name="ReceiveKeyActivity_processing">Elaborazione</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Elaborazione scambio delle chiavi…</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Connetti Con TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Seleziona il tuo paese</string>
@@ -477,8 +467,6 @@ Importo una copia in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure ha bisogno delle impostazioni degli MMS per poter inviare messaggi multimediali e di gruppo con il tuo operatore. Il tuo dispositivo non fornisce queste impostazioni, probabilmente perché ha un operatore bloccato o altre configurazioni restrittive.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per inviare contenuti multimediali e messaggi di gruppo, tocca \"OK\" e completa le impostazioni richieste. Le impostazioni MMS del proprio operatore possono essere trovate generalmente cercando \"APN proprio operatore\". Sarà necessario eseguire una sola volta questa procedura.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Completa</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifica il tuo numero di telefono per connetterti a TextSecure.
@@ -587,10 +575,6 @@ non riuscita.
   <string name="arrays__use_default">Usa predefinito</string>
   <string name="arrays__use_custom">Usa personalizzato</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minuto</item>
-    <item quantity="other">%d minuti</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d ora</item>
     <item quantity="other">%d ore</item>

res/values-iw/strings.xml

@@ -50,6 +50,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">פרטי הודעה</string>
   <string name="ConversationFragment_success_exclamation">הצליח!</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">למחוק שרשורים?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">אתה בטוח שאתה רוצה למחוק את השרשורים של כל השיחות שנבחרו?</string>
@@ -110,16 +111,6 @@
   <!--PassphrasePromptActivity-->
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">החתימה
-על החלפת המפתח הזאת שונה ממה שקיבלת בעבר מאיש הקשר הזה.
-זה יכול להעיד שמישהו מנסה ליירט את התקשורת שלך
-או
-שאיש הקשר פשוט התקין מחדש את TextSecure ועכשיו יש לו מפתח זהות חדש.
-</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ייתכן שתרצה לאמת
-את איש הקשר הזה.
-</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">המשך</string>
   <!--RegistrationProblemsActivity-->
@@ -228,8 +219,6 @@
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure דורש הגדרות MMS כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות דרך ספק השירות שלך. המכשיר שלך לא מספק את המידע הזה, זה קורה לעיתים במכשירים נעולים או קונפיגורציות מוגבלות אחרות.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות,לחץ \'אישור\' והשלם את ההגדרות המתבקשות.את הגדרות ה-MMS עבור ספק השירות שלך אתה יכול למצוא בד\"כ ע\"י חיפוש \"ספק השרות APN\". אתה תצטרך להשלים מידע זה רק פעם אחת.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">השלם</string>
   <!--registration_activity-->
   <!--registration_problems-->
   <!--registration_progress_activity-->

res/values-ja/strings.xml

@@ -18,11 +18,6 @@
 通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</string>
   <string name="ApplicationPreferencesActivity_disable">無効</string>
   <string name="ApplicationPreferencesActivity_unregistering">登録破棄中…</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">データ通信を行うために登録を取消しています</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">プッシュメッセージを無効化しますか？</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-サーバーから登録を取消し、プッシュメッセージを無効化します。
-再びプッシュメッセージを使用するには、</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>
@@ -123,6 +118,7 @@
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">削除...</string>
   <string name="ConversationFragment_deleting_messages">メッセージの削除...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">スレッドを削除しますか？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">選択したすべての会話スレッドを、本当に削除してもよろしいですか？</string>
@@ -136,6 +132,7 @@
   <string name="CustomDefaultPreference_none">無し</string>
   <!--DateUtils-->
   <string name="DateUtils_now">今</string>
+  <string name="DateUtils_minutes_ago">%d 分</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共有</string>
   <!--ExportFragment-->
@@ -242,15 +239,6 @@
   <string name="RatingManager_rate_now">今評価する!</string>
   <string name="RatingManager_no_thanks">しません</string>
   <string name="RatingManager_later">後で</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">この
-鍵交換の電子署名は、以前この連絡先から受信したものと違っています。
-誰かがあなたの通信を傍受しようとしているか、もしくは
-単にこの連絡先がTextSecureを再インストールしたため、認証キーが新しくなった可能性があります。</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">この連絡先を
-照合することが推奨されています。</string>
-  <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>
@@ -465,8 +453,6 @@
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecureでは、無線通信事業者からファイル付きメッセージを配信するのに、APN設定が必要です。お使いの携帯端末では、この設定のための情報が取得できません。ロックされた端末であるか、その他の制限設定があるとこのような状況が生じます。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">ファイル付き及びグループ・メッセージを配信するのに、OKをクリックして設定を完了してください。お使いの通信事業者への設定値は通常、\"通信事業者APN”で検索すると設定できます。この作業の実行は一度だけでいいです。</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">完了</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         あなたの電話番号をTextSecureに接続するための検証。
@@ -552,9 +538,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <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>

res/values-my/strings.xml

@@ -34,6 +34,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
   <string name="ConversationFragment_success_exclamation">အောင်မြင်!</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">စကားဝိုင်းကိုဖျက်မည်လား</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">စကားဝိုင်းတွင်စကားစမည်ပြောထားသည်များကိုဖျက်မည်မှာသေချာပြီလား</string>
@@ -69,7 +70,6 @@
   <!--PassphrasePromptActivity-->
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">ရှေ့ဆက်</string>
   <!--RegistrationProblemsActivity-->
@@ -162,7 +162,6 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
   <!--prompt_mms_activity-->
-  <!--receive_key_dialog-->
   <!--registration_activity-->
   <!--registration_problems-->
   <!--registration_progress_activity-->

res/values-nl/strings.xml

@@ -17,11 +17,11 @@
 Let op, dit schakelt opslagversleuteling uit voor alle berichten en sleutels. Je versleutelde sessies zullen blijven werken, maar iedereen met fysieke toegang tot je apparaat zal er toegang toe hebben.</string>
   <string name="ApplicationPreferencesActivity_disable">Uitschakelen</string>
   <string name="ApplicationPreferencesActivity_unregistering">Afmelden...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Afmelden voor datagebaseerde communicatie.</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Pushberichten uitschakelen?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Dit zal push berichten uitzetten door uw registratie bij de server ongedaan te maken.
-Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wilt gebruiken.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Afmelden voor TextSecure berichten</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">TextSecure berichten uitschakelen?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Dit schakelt TextSecure berichten uit door je af te melden bij de server. 
+Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je telefoonnummer opnieuw moeten registreren.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fout bij verbinden met de server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS ingeschakeld</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Aanraken om je standaard SMS-applicatie te veranderen</string>
@@ -41,6 +41,7 @@ Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wi
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Geen app gevonden om media te selecteren.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Foto nemen</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Afbeelding</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -48,6 +49,7 @@ Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wi
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">De identificerende sleutel van %1$s is veranderd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen of dat %2$s simpelweg TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteit heeft.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Je wilt wellicht dit contact verifiëren.</string>
+  <string name="ConfirmIdentityDialog_accept">Accepteren</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Berichtgrootte: %d KB</string>
   <string name="ConversationItem_expires_s">Verloopt: %s</string>
@@ -117,6 +119,8 @@ Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wi
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Verwijderen...</string>
   <string name="ConversationFragment_deleting_messages">Berichten verwijderen...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Zoeken...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Gesprekken verwijderen?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Weet je zeker dat je ALLE geselecteerde gesprekken wilt verwijderen?</string>
@@ -130,6 +134,7 @@ Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wi
   <string name="CustomDefaultPreference_none">Niets</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nu</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Delen met</string>
   <!--ExportFragment-->
@@ -236,11 +241,6 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <string name="RatingManager_rate_now">Nu beoordelen!</string>
   <string name="RatingManager_no_thanks">Nee dankjewel</string>
   <string name="RatingManager_later">Later</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">De handtekening op deze sleuteluitwisseling is anders dan wat u eerder ontvangen heeft van dit contact. Dit kan betekenen dat iemand probeert uw communicatie the onderscheppen, of dat dit contact gewoon TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteitssleutel heeft.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Je wilt wellicht dit contact verifiëren.</string>
-  <string name="ReceiveKeyActivity_processing">Aan het verwerken</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Sleuteluitwisseling verwerken...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Verbind met TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Selecteer je land</string>
@@ -458,8 +458,6 @@ Importeer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</str
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure heeft MMS-instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Je toestel heeft deze informatie niet beschikbaar. Dit komt vaker voor bij gelockte toestellen en andere beperkende configuraties.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Om mediaberichten en groepsberichten te versturen, drukt u op \'OK\' en voert u de gevraagde gegevens in. De MMS-instellingen voor uw provider kunnen meestal gevonden worden door te zoeken naar \'&amp;lt;uw provider&amp;gt; APN\'. U hoeft dit maar eenmaal te doen.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Voltooid</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifieer je telefoonnummer om met TextSecure verbinding te maken.
@@ -552,10 +550,6 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="arrays__use_default">Gebruik standaard</string>
   <string name="arrays__use_custom">Gebruik handmatig</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minuut</item>
-    <item quantity="other">%d minuten</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d uur</item>
     <item quantity="other">%d uren</item>

res/values-no/strings.xml

@@ -17,11 +17,6 @@
 Advarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Dine krypterte sesjoner vil fortsette å fungere, men alle med fysisk tilgang til enheten din vil kunne få tilgang til dem.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Avregistrerer...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Avregistrerer for kommunikasjon via data kanal</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Deaktiver \'push\' meldinger?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Dette vil deaktivere \'push\' meldinger ved å avregistrere deg fra tjenesten.
-Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'push\' meldinger i fremtiden.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Feil ved tilkobling til meldingstjener!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktivert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Klikk for å endre standard SMS applikasjon</string>
@@ -119,6 +114,7 @@ denne kontakten.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Sletter...</string>
   <string name="ConversationFragment_deleting_messages">Sletter meldinger...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Slette trådene?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Er du sikker på at du vil slette ALLE valgte samtaletråder?</string>
@@ -132,6 +128,7 @@ denne kontakten.</string>
   <string name="CustomDefaultPreference_none">Ingen</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nå</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
   <!--ExportFragment-->
@@ -238,14 +235,6 @@ Gjenoppretting av en kryptert backup vil overskrive eksisterende nøkler, innsti
   <string name="RatingManager_rate_now">Vurder nå!</string>
   <string name="RatingManager_no_thanks">Nei takk</string>
   <string name="RatingManager_later">Senere</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne nøkkelutvekslingen er ikke lik den du tidligere mottok fra denne
-kontakten. Det kan enten bety at noen prøver å avskjære kommunikasjonen din eller
-at denne kontakten har installert TextSecure på nytt og dermed fått en ny identitetsnøkkel.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Du bør verifisere
-denne kontakten.</string>
-  <string name="ReceiveKeyActivity_processing">Prosesserer</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Prosesserer nøkkelutveksling...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Koble til TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Velg land</string>
@@ -461,8 +450,6 @@ Importer en klartekst backup kompatibel med \'SMSBackup And Restore\'.</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure trenger MMS innstillinger for å levere media og gruppemeldinger via din telefonoperatør. Enheten din er ikke i stand til å oppgi denne informasjonen automatisk, noe som ofte skjer dersom den er låst til operatør eller er konfigurert med andre restriksjoner.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">For å sende media og gruppemeldinger, klikk \'OK\' og fullfør de forespurte instillingene. MMS oppsettet for din operatør kan ofte finnes ved å søke etter \'din operatørs APN\'. Du trenger kun å gjøre dette én gang.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Ferdig</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Verifiser telefonnummeret dit for å koble til TextSecure.
@@ -551,10 +538,6 @@ feilet.</string>
   <string name="arrays__use_default">Benytt standard</string>
   <string name="arrays__use_custom">Benytt egendefinert</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minutt</item>
-    <item quantity="other">%d minutter</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
     <item quantity="other">%d timer</item>

res/values-pl/strings.xml

@@ -17,11 +17,6 @@
 Uwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone. Twoje szyfrowane sesje będą dalej funkcjonować, jednak każdy z fizycznym dostępem do Twojego telefonu będzie mógł uzyskać dostęp do Twoich wiadomości.</string>
   <string name="ApplicationPreferencesActivity_disable">Wyłącz</string>
   <string name="ApplicationPreferencesActivity_unregistering">Wyrejestrowywanie...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Wyrejestrowanie dla transmisji danych</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Wyłączyć wiadomości push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Wiadomości push zostaną wyłączone poprzez wyrejestrowanie Ciebie z serwera.
-Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponownie używać wiadomości push.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Błąd połączenia z serwerem!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Włączone</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotknij aby zmienić swoją domyślną aplikację SMS</string>
@@ -41,6 +36,7 @@ Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponow
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nie można znaleźć aplikacji, aby wybrać media.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Zrób zdjęcie</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Zdjęcie</string>
   <string name="AttachmentTypeSelectorAdapter_video">Film</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Dźwięk</string>
@@ -119,6 +115,7 @@ ten kontakt.
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Usuwanie...</string>
   <string name="ConversationFragment_deleting_messages">Usuwanie wiadomości...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Usunąć wątki?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Usunąć wybrane wątki? </string>
@@ -132,6 +129,7 @@ ten kontakt.
   <string name="CustomDefaultPreference_none">Brak</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Teraz</string>
+  <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podziel się z</string>
   <!--ExportFragment-->
@@ -239,15 +237,6 @@ Przywracanie szyfrowanej kopii zapasowej TextSecure spowoduje nadpisanie Twoich
   <string name="RatingManager_rate_now">Oceń teraz!</string>
   <string name="RatingManager_no_thanks">Nie dzięki</string>
   <string name="RatingManager_later">Później</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pod tą wymianą kluczy jest inny od tego, który otrzymałeś poprzednio od tego 
-kontaktu. Może to oznaczać, że ktoś próbuje przechwycić Twoją komunikację lub 
-Twój kontakt przeinstalował program TextSecure i posiada teraz nowy klucz tożsamości.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Możesz chcieć zweryfikować 
-ten kontakt.
-</string>
-  <string name="ReceiveKeyActivity_processing">Przetwarzanie</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Przetwarzanie wymiany kluczy...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Połącz z TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Wybierz swój kraj</string>
@@ -465,8 +454,6 @@ Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z \'SMSBackup And Re
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure wymaga ustawień MMS w celu dostarczenia wiadomości multimedialnych za pośrednictwem Twojego operatora. Twoje urządzenie nie udostępnia tych informacji. Może to być spowodowane pewnymi restrykcyjnymi konfiguracjami w telefonie.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Aby mieć możliwość wysyłania wiadomości multimedialnych i wiadomości grupowych, kliknij \'OK\' i wypełnij pola, o które jesteś proszony. Dane MMS dla Twojego operatora, można znaleźć szukając w ustawieniach frazy typu \'Punkty Dostępu - APN\'. Wystarczy to zrobić tylko jeden raz.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Zakończono</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Weryfikuj swój numer telefonu, aby połączyć się z TextSecure.</string>
@@ -549,11 +536,6 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="arrays__use_default">Użyj domyślnych</string>
   <string name="arrays__use_custom">Użyj własnych</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minuta</item>
-    <item quantity="few">%d minut</item>
-    <item quantity="other">%d minut</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d godzina</item>
     <item quantity="few">%d godzin</item>

res/values-pt-rBR/strings.xml

@@ -20,12 +20,6 @@
     </string>
   <string name="ApplicationPreferencesActivity_disable">Desabilitar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Descadastrando...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Descadastrando-se da comunicação de dados</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Desabilitar mensagens push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-        Isto irá desabilitar mensagens push, descadastrando-o do servidor.
-        Você precisará recadastrar seu número telefônico para usar mensagens push futuramente.
-    </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS habilitado</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toque para mudar seu app padrão de SMS</string>
@@ -129,6 +123,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Excluindo...</string>
   <string name="ConversationFragment_deleting_messages">Excluindo mensagens...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Excluir conversas?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Tem certeza que deseja excluir TODAS as conversas selecionadas?</string>
@@ -142,6 +137,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="CustomDefaultPreference_none">Nenhum</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Agora</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartilhar com</string>
   <!--ExportFragment-->
@@ -259,17 +255,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="RatingManager_rate_now">Avaliar agora!</string>
   <string name="RatingManager_no_thanks">Não, obrigado</string>
   <string name="RatingManager_later">Mais tarde</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A
-        assinatura nesta troca de chaves é diferente da que você recebeu anteriormente deste
-        contato. Isto pode significar que alguém está tentando interceptar sua comunicação, ou
-        que este contato reinstalou o TextSecure e agora tem uma nova chave de identidade.
-    </string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Talvez você queira verificar
-        este contato.
-    </string>
-  <string name="ReceiveKeyActivity_processing">Processando</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Processando troca de chaves...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectar-se ao TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Selecione seu país</string>
@@ -500,8 +485,6 @@ Tem certeza que deseja fazer isto?</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure precisa de configurações MMS para transmitir mídia e mensagens de grupo através da sua operadora. Seu aparelho não disponibiliza essa informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar mídia e mensagens de grupo, clique \'OK\' e complete as configurações pedidas. As configurações MMS da sua operadora geralmente podem ser encontradas procurando por \'operadora APN\'. Você só precisará fazer isto uma vez.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Concluído</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifique seu número telefônico para conectar-se ao TextSecure.
@@ -609,10 +592,6 @@ falhou.</string>
   <string name="arrays__use_default">Usar padrão</string>
   <string name="arrays__use_custom">Usar personalização</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d min</item>
-    <item quantity="other">%d mins</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
     <item quantity="other">%d horas</item>

res/values-pt/strings.xml

@@ -19,12 +19,6 @@ As suas sessões continuam cifradas, mas qualquer pessoa com acesso físico ao d
 terá acesso ás mensagens e chaves.</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">A desregistrar...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">A desregistrar-se da comunicação de dados</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Desactivar mensagens push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-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>
@@ -108,6 +102,7 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">A apagar...</string>
   <string name="ConversationFragment_deleting_messages">A apagar mensagens...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Apagar conversas?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Tem a certeza que pretende apagar TODAS as conversas seleccionadas?</string>
@@ -225,15 +220,6 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Palavra-chave inválida!</string>
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A
-assinatura deste intercâmbio de chaves é diferente da previamente recebida deste contacto.
-Isto pode significar que alguém está a tentar interceptar esta comunicação ou simplesmente
-que este contacto reinstalou TextSecure e tem agora uma nova chave de identidade.
-</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Pode ser desejável verificar este contracto.</string>
-  <string name="ReceiveKeyActivity_processing">A processar</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">A processar troca de chaves...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectar-se ao TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Escolha o seu país</string>
@@ -451,8 +437,6 @@ Importar uma cópia de segurança de texto simples. Compatível com \'SMSBackup
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">O TextSecure precisa de configurações MMS para transmitir média e mensagens de grupo através da sua operadora. O seu aparelho não disponibiliza essa informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar média e mensagens de grupo, clique \'OK\' e complete as configurações pedidas. As configurações MMS da sua operadora geralmente podem ser encontradas procurando por \'operadora APN\'. Você só precisará fazer isto uma vez.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Completo</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">PAÍS</string>
   <string name="registration_activity__your_country_code_and_phone_number">PAÍS E
@@ -535,10 +519,6 @@ falhou.
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d min</item>
-    <item quantity="other">%d mins</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
     <item quantity="other">%d horas</item>

res/values-ro/strings.xml

@@ -17,12 +17,6 @@
 Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor și cheilor. Sesiunile actuale criptate vor continua să funcționeze, dar oricine care are acces la dispozitiv va putea să le acceseze.</string>
   <string name="ApplicationPreferencesActivity_disable">Dezactivează</string>
   <string name="ApplicationPreferencesActivity_unregistering">Anulare înregistrării se află în desfășurare...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Anulare inregistrarii comunicatiilor de date</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Dezactivează mesajele push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-        Mesajele de tip push vor fi dezactivate prin dezabonarea de la server.
-        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>
@@ -115,6 +109,7 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Se șterge...</string>
   <string name="ConversationFragment_deleting_messages">Se șterg mesajele...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Şterg conversaţiile?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Eşti sigur că doreşti ştergerea TUTUROR conversaţiilor selectate?</string>
@@ -228,11 +223,6 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <string name="RatingManager_rate_now">Evaluează acum!</string>
   <string name="RatingManager_no_thanks">Nu mulţumesc</string>
   <string name="RatingManager_later">Mai târziu</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Semnătura digitală din acest schimb de chei este diferită fața de ce ai primit anterior de la această persoană. Asta poate însemna că cineva încearcă să intercepteze comunicația sau că această persoană a reinstalat TextSecure și acum are o nouă cheie de identitate.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Probabil ca doresti sa verifici aceasta persoana.</string>
-  <string name="ReceiveKeyActivity_processing">Procesare</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Se proceseaza schimbul de chei...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectare prin TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Alegeţi ţara dumneavostră</string>
@@ -450,8 +440,6 @@ Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</st
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure are nevoie de setările APN pentru a trimite mesaje multimedia prin operatorul wireless. Acest aparat nu oferă informațiile necesare, lucru care se poate întâmpla uneori pentru dispozitive blocate sau alte configurații restrictive.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pentru a putea trimite mesaje multimedia cât și mesaje într-un grup, apăsați \'OK\' și completați setările solicitate. Setările MMS pentru operatorul dvs. pot fi găsite cautând după \'APN operatorul tău\'. Această operațiune este necesară o singură dată.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Complet</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifică numărul tău de telefon pentru a te conecta la TextSecure.
@@ -541,11 +529,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="arrays__use_default">Implicit</string>
   <string name="arrays__use_custom">Specific</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d min</item>
-    <item quantity="few">%d min</item>
-    <item quantity="other">%d min</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d oră</item>
     <item quantity="few">%d ore</item>

res/values-sk/strings.xml

@@ -21,12 +21,6 @@ získa aj prístup k týmto odosieaným informáciám.
 </string>
   <string name="ApplicationPreferencesActivity_disable">Vypnúť</string>
   <string name="ApplicationPreferencesActivity_unregistering">Prebieha odhlasovanie...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Vypína sa prenos dát</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Vypnúť správy \"push\"?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-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>
@@ -122,6 +116,7 @@ identitu tohto kontaktu.
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Maže sa...</string>
   <string name="ConversationFragment_deleting_messages">Mažú sa správy...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Zmazať vlákna?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste si istí, že chcete naozaj zmazať VŠETKY označené vlákna konverzácií?</string>
@@ -240,16 +235,6 @@ opätovným importom zduplikujete správy.
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nesprávne heslo!</string>
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Elektronický podpis použítý pri tejto výmene šifrovacích kľúčov sa líši od podpisu,
-ktorý bol v minulosti použitý týmto kontaktom. To môže znamenať buď to,
-že sa niekto snaží odpočúvať Vašu komunikáciu, alebo to,
-že tento kontakt jednoducho preinštaloval TextSecure a teraz má nový elektronický podpis.
-</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Možno by ste mali overiť
-identitu tohto kontaktu.</string>
-  <string name="ReceiveKeyActivity_processing">Spracováva sa</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Spracovávajú sa kľúče vymeny</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Pripojiť s TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Vyber svoju krajinu</string>
@@ -472,8 +457,6 @@ Importovať nezakryptovanú zálohu. Kompatibilné so \'SMSBackup And Restore\'.
   <!--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_dialog-->
-  <string name="receive_key_dialog__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.
@@ -582,11 +565,6 @@ zlyhalo.
   <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>

res/values-sl/strings.xml

@@ -17,10 +17,11 @@
 Pozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku naprave. Vaše šifrirane komunikacije bodo še vedno varne, toda vsakdo s fizičnim dostopom do vaše naprave bo lahko dostopal do njih.</string>
   <string name="ApplicationPreferencesActivity_disable">Onemogoči</string>
   <string name="ApplicationPreferencesActivity_unregistering">Odjava poteka...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Odjava komunikacije preko podatkovne povezave</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Izključim potisna sporočila?</string>
-  <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_unregistering_from_textsecure_messages">Izklop sporočil TextSecure</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Izklopim sporočila TextSecure?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+S tem boste izključili sporočila TextSecure in se odjavili s strežnika.
+Za ponovno uporabo sporočil TextSecure 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">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>
@@ -40,6 +41,7 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Ne najdem aplikacije za izbor datotek.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Posnami fotografijo</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Slika</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Zvok</string>
@@ -48,6 +50,7 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Identifikacijski ključ osebe %1$s je bil spremenjen. To lahko pomeni, da nekdo prestreza komunikacijo, ali pa, da je oseba %2$s ponovno namestila TextSecure in ima zato nov identifikacijski ključ.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Morda bi želeli
 preveriti ta stik.</string>
+  <string name="ConfirmIdentityDialog_accept">Sprejmi</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Velikost sporočila: %d KB</string>
   <string name="ConversationItem_expires_s">Poteče: %s</string>
@@ -117,6 +120,8 @@ preveriti ta stik.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Brišem...</string>
   <string name="ConversationFragment_deleting_messages">Brišem sporočila...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Iščem...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Izbris pogovorov?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste prepričani, da želite izbrisati VSE izbrane pogovore?</string>
@@ -130,6 +135,7 @@ preveriti ta stik.</string>
   <string name="CustomDefaultPreference_none">Brez</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Ravnokar</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Deli z</string>
   <!--ExportFragment-->
@@ -234,12 +240,6 @@ preveriti ta stik.</string>
   <string name="RatingManager_rate_now">Oceni zdaj!</string>
   <string name="RatingManager_no_thanks">Ne, hvala!</string>
   <string name="RatingManager_later">Kasneje</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pri izmenjavi ključev se razlikuje od tistih pri predhodno izmenjanih ključih s to osebo. To lahko pomeni, da nekdo prestreza komunikacijo, ali pa, da je oseba ponovno namestila TextSecure in ima zdaj nov identifikacijski ključ.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Morda bi želeli
-preveriti ta stik.</string>
-  <string name="ReceiveKeyActivity_processing">Obdelujem</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Izmenjava ključev poteka...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Poveži s TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Izberite svojo državo</string>
@@ -450,8 +450,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Za pošiljanje multimedijskih in skupinskih sporočil potrebuje aplikacija TextSecure nastavitve MMS vašega mobilnega operaterja. Teh podatkov ni moč pridobiti iz vaše naprave, kar je značilno za zaklenjene naprave in druge omejene konfiguracije. </string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Za pošiljanje multimedijskih in skupinskih sporočil kliknite \'OK\' in vnesite potrebne podatke. Nastavitve MMS za vašo napravo najdete pod \'APN operaterja\'. Podatke morate vnesti samo enkrat.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Dokončaj</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Za uporabo sporočil TextSecure potrdite svojo telefonsko številko.</string>
@@ -544,12 +542,6 @@ bila uspešna.</string>
   <string name="arrays__use_default">Uporabi prednastavljeno</string>
   <string name="arrays__use_custom">Uporabi izbirno</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d min</item>
-    <item quantity="two">%d min</item>
-    <item quantity="few">%d min</item>
-    <item quantity="other">%d min</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d ura</item>
     <item quantity="two">%d uri</item>

res/values-sv/strings.xml

@@ -19,11 +19,6 @@ sessioner kommer fortsätta att fungera, men vem som helst med fysisk tillgång
 kommer kunna komma åt dem.</string>
   <string name="ApplicationPreferencesActivity_disable">Inaktivera</string>
   <string name="ApplicationPreferencesActivity_unregistering">Avregistrerar...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Avregistrerar för datakommunikation</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Inaktivera push-meddelanden?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern. Du kommer behöva återregistrera ditt telefonnummer för att använda pushmeddelanden igen i framtiden.
-</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fel vid anslutning till server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiverat</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tryck för att ändra din standardapp för SMS</string>
@@ -122,6 +117,7 @@ verifiera denna kontakt.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Raderar...</string>
   <string name="ConversationFragment_deleting_messages">Raderar meddelanden...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Radera trådar?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Är du säker på att du vill radera ALLA markerade konversationstrådar?</string>
@@ -135,6 +131,7 @@ verifiera denna kontakt.</string>
   <string name="CustomDefaultPreference_none">Inga</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nu</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Dela med</string>
   <!--ExportFragment-->
@@ -244,13 +241,6 @@ som för närvarande finns i TextSecure.</string>
   <string name="RatingManager_rate_now">Betygsätt nu!</string>
   <string name="RatingManager_no_thanks">Nej tack</string>
   <string name="RatingManager_later">Senare</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen för detta nyckelutbytet skiljer sig från det som du tidigare har mottagit från denna kontakt.
-Detta kan innebära antingen att någon försöker avlyssna din kommunikation, eller att denna kontakt helt enkelt installerade om TextSecure och nu har en ny identitetsnyckel.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Det kan vara en bra idé att
-verifiera denna kontakt.</string>
-  <string name="ReceiveKeyActivity_processing">Bearbetar</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Bearbetar nyckelutbyte...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Anslut med TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Välj ditt land</string>
@@ -462,8 +452,6 @@ från systemets standardapp för meddelanden.</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure kräver MMS inställningar för att leverera medie- och gruppmeddelanden via din mobilöperatör. Din enhet gör inte den här informationen tillgänglig, vilket ibland stämmer för låsta enheter och andra restriktiva konfigurationer.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">För att skicka medie- och gruppmeddelande, klicka \'OK\' och fyll i de begärda inställningarna. MMS inställningarna för din operatör kan generellt hittas genom att söka efter \'din operatör APN\'. Du behöver bara göra det här en gång.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Klart</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Verifiera ditt telefonnummer för att ansluta till TextSecure.</string>
@@ -550,10 +538,6 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <string name="arrays__use_default">Använd standardinställning</string>
   <string name="arrays__use_custom">Använd anpassad inställning</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="one">%d minut</item>
-    <item quantity="other">%d minuter</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="one">%d timme</item>
     <item quantity="other">%d timmar</item>

res/values-tr/strings.xml

@@ -19,10 +19,6 @@ oturumlarınız işlevlerini sürdürür, fakat cihazınıza fiziksel erişimi o
 erişebilir.</string>
   <string name="ApplicationPreferencesActivity_disable">Etkisizleştir</string>
   <string name="ApplicationPreferencesActivity_unregistering">Kayıt siliniyor...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Veri temelli iletişim için kayıt siliniyor</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Anlık bildirimler etkisizleştirilsin mi?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gelecekte anında mesajlaşmayı kullanmak isterseniz telefon numaranızı yeniden kaydettirmeniz gerekir.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Sunucu bağlantı hatası!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Etkinleştirildi</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Varsayılan SMS uygulamanızı değiştirmek için dokunun</string>
@@ -120,6 +116,7 @@ isteyebilirsiniz.</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Siliniyor...</string>
   <string name="ConversationFragment_deleting_messages">Mesajlar siliniyor...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Başlıkları sil?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Seçili bütün konuşmaları silmek istediğinizden emin misiniz?</string>
@@ -133,6 +130,7 @@ isteyebilirsiniz.</string>
   <string name="CustomDefaultPreference_none">Hiçbiri</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Şimdi</string>
+  <string name="DateUtils_minutes_ago">%d dk.</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Paylaşılan kişi</string>
   <!--ExportFragment-->
@@ -242,12 +240,6 @@ kurulumunuzda bulunan ancak yüklenecek yedekte bulunmayan tüm bilgiler kaybolu
   <string name="RatingManager_rate_now">Şimdi puan ver!</string>
   <string name="RatingManager_no_thanks">Hayır teşekkürler</string>
   <string name="RatingManager_later">Daha sonra</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Bu anahtar değişiminde alınan imza, bu kişi için daha önce alınandan farklı. Bu ya üçüncü bir kişi iletişiminizi dinlemeğe çalıştığında ya da iletişim kurduğunuz kişi TextSecure\'u yeniden kurarak yeni bir kimlik anahtarı sahibi olmuşsa mümkün olabilir.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Bu kişiyi doğrulamak 
-isteyebilirsiniz.</string>
-  <string name="ReceiveKeyActivity_processing">İşleniyor</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Anahtar takası işleniyor...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">TextSecure ile Bağlan</string>
   <string name="RegistrationActivity_select_your_country">Ülkenizi seçin</string>
@@ -468,8 +460,6 @@ Daha önce dışa aktarılmış bir şifrelenmiş TextSecure yedeğini yeniden y
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure medya ve grup mesajlarının kablosuz taşıyıcınız aracılığı ile taşınabilmesi için MMS ayarlarınızı gerektirir. Cihazınız bu bilgiyi sağlamamaktadır. Bu durum bazen kilitli veya diğer kısıtlı yapılandırılmış cihazlar için geçerli olabilmektedir.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Medya veya grup mesajları gönderebilmek için \'Tamam\' a tıklayınız ve istenen ayarları tamamlayınız. Taşıyıcınızın MMS ayarları genellikle \'taşıyıcı APN\' araştırılarak bulunabilir. Bunu bir kez yapmanız gerekecektir.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Tamamlandı</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 TextSecure\'a bağlanmak için telefon numaranızı doğrulayın</string>
@@ -563,9 +553,6 @@ başarısız.</string>
   <string name="arrays__use_default">Varsayılanı kullan</string>
   <string name="arrays__use_custom">Özelleştirilmiş kullan</string>
   <!--plurals.xml-->
-  <plurals name="minutes_ago">
-    <item quantity="other">%d dakika</item>
-  </plurals>
   <plurals name="hours_ago">
     <item quantity="other">%d saat</item>
   </plurals>

res/values-vi/strings.xml

@@ -15,10 +15,6 @@
 Cảnh báo, điều này tắt mã hóa lưu trữ cho tất cả tin nhắn và chìa khóa. Phiên mã hóa vẫn tiếp tục hoạt động, nhưng bất cứ ai vào được máy bạn sẽ truy cập được nội dung.</string>
   <string name="ApplicationPreferencesActivity_disable">Tắt</string>
   <string name="ApplicationPreferencesActivity_unregistering">Gỡ đăng ký...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Gỡ đăng ký cho thông tin qua đường truyền mạng</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Tắt tin nhắn đẩy?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn ra khỏi máy chủ. Bạn sẽ cần đăng ký lại số điện thoại để dùng tin nhắn đẩy trong tương lai.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Có lỗi kết nối vào máy chủ!</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Chạm vào để đổi ứng dụng SMS mặc định</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Chạm vào để chọn TextSecure làm ứng dụng SMS mặc định</string>
@@ -72,6 +68,7 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <string name="ConversationFragment_confirm_message_delete">Xác nhận xóa tin</string>
   <string name="ConversationFragment_success_exclamation">Thành công!</string>
   <string name="ConversationFragment_saving_attachment">Đang lưu lại phần đính kèm</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Xóa các luồng trao đổi?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Bạn có chắc là muốn xóa TẤT CẢ các luồng trao đổi đã chọn?</string>
@@ -152,13 +149,6 @@ Phục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Cụm từ mã hóa không hợp lệ!</string>
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Chữ ký của việc trao đổi chìa khóa này khác với lần trao đổi trước nhận được từ người liên lạc này. Điều này có nghĩa là có ai đó tìm cách chận bắt liên lạc thông tin của bạn, hoặc đơn thuần là người này cài đặt lại TextSecure và có chìa khóa nhận diện mới.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Bạn có thể muốn kiểm chứng
-địa chỉ liên lạc này.
-    </string>
-  <string name="ReceiveKeyActivity_processing">Đang xử lý</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Xử lý trao đổi chìa khóa...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Kết Nối Dùng TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Chọn lựa quốc gia</string>
@@ -314,8 +304,6 @@ Nhập tập tin sao lưu thường-không mã hóa. Tương thích với \'Sao
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure </string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Để gửi tin nhắn đa phương tiện hoặc tin nhắn nhóm, bấm \'OK\' và hoàn tất các thiết đặt cần thiết. Thiết đặt MMS cho nhà mạng di động có thể tìm thấy bằng cách tìm \'your carrier APN\'. Bạn chỉ cần làm bước này một lần.</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">Hoàn tất</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">QUỐC GIA BẠN</string>
   <string name="registration_activity__your_country_code_and_phone_number">MÃ SỐ QUỐC GIA VÀ

res/values-zh-rCN/strings.xml

@@ -17,11 +17,6 @@
 警告：这将会禁用所有信息和密钥的存储加密。您的加密会话继续有效，但是任何能物理接触到此设备的人都能够访问这些数据。</string>
   <string name="ApplicationPreferencesActivity_disable">禁用</string>
   <string name="ApplicationPreferencesActivity_unregistering">取消注册...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">取消数据通信注册</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">禁用消息推送？</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-这将在服务器上注销您的号码以禁用推送信息。
-将来如果想再次使用推送信息您需要重新注册电话号码。</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>
@@ -119,6 +114,7 @@
   <string name="ConversationFragment_sms">短信</string>
   <string name="ConversationFragment_deleting">正在删除…</string>
   <string name="ConversationFragment_deleting_messages">正在删除信息…</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">删除线程？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">是否确定要删除所有选定对话线程？</string>
@@ -238,11 +234,6 @@
   <string name="RatingManager_rate_now">立刻评价！</string>
   <string name="RatingManager_no_thanks">不，谢谢。</string>
   <string name="RatingManager_later">稍后</string>
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">此人当前签名所使用的密钥与之前所接收到的密钥不一致，这可能是由于某人正试图拦截您的通信，或者此人重新安装TextSecure而有了新密钥。</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">您可能希望验证这个联系人。</string>
-  <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>
@@ -460,8 +451,6 @@
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure需要通过运营商获取您的彩信设置才能接受彩信或组播信息，但是您的设备没有这些信息，可能是由于设备被锁定或者访问受到限制。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">想发送多媒体和组播信息，需点击“好”来完成所需的设置。您可以通过搜索“您的运营商 APN”（如百度／谷歌：中国移动 APN）来获取这些信息。通常，您只需要设置一次。</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__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>
@@ -559,9 +548,6 @@ TextSecure 在等待短信验证时超时。</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>

res/values-zh-rTW/strings.xml

@@ -18,12 +18,6 @@
     </string>
   <string name="ApplicationPreferencesActivity_disable">解除</string>
   <string name="ApplicationPreferencesActivity_unregistering">正在取消註冊...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">正在取消資料為準的通訊</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">取消即時訊息？</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-        若從伺服器取消註冊，將會取消即時訊息的功能。
-        將來您若欲重新使用即時訊息，則須把您的手機號碼再重新註冊一次。
-    </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">與伺服器的連線發生錯誤！</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">按這裡來變更您預設的手機簡訊APP</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">按這裡將 TextSecure 設為預設的手機簡訊APP</string>
@@ -86,6 +80,7 @@
   <string name="ConversationFragment_saving_attachment">正在儲存附件檔案</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">正在寫入儲存裝置中...</string>
   <string name="ConversationFragment_deleting">刪除中...</string>
+  <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">刪除對話群組？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">您確定要刪除已選擇的對話群組？</string>
@@ -180,16 +175,6 @@
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">無效的『自訂密碼』！</string>
   <!--PlayServicesProblemFragment-->
   <!--RatingManager-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">此次
-        金鑰確認所使用的數位簽名與同一名連絡人上次金鑰確認時所用的值並不一致。
-        這有可能是有不明人士試圖攔截您的通訊／對話內容。或
-        因為該名連絡人重新安裝過 TextSecure APP，以至於他的數位簽名值也跟著變更了。
-    </string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">您想要對這名連絡人
-進行認證嗎？</string>
-  <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>
@@ -390,8 +375,6 @@
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure 需要您通信業者的 MMS多媒體簡訊設定以發送媒體檔案與群組訊息。目前您的裝置並未提供完整的相關資訊，有時是因為裝置出廠時即被鎖定／限制該方面的功能。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">傳送媒體檔案或群組訊息，請按下 \"OK\" 並完成必要的設定。您所使用電信業者相關的MMS多媒體簡訊設定可能羅列在 \'無線與網路／行動網路\'的設定項目內。且您只需設定一次。</string>
-  <!--receive_key_dialog-->
-  <string name="receive_key_dialog__complete">完成</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">您的國家／區域</string>
   <string name="registration_activity__your_country_code_and_phone_number">您的國碼與