diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 00a357e86..63d91d705 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -10,9 +10,12 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Nachrichten pro Konversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Bist du dir sicher, dass du alle Konversationen auf die letzten %s Nachrichten kürzen willst?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Sind Sie sicher, dass Sie alle Konversationen bis auf die letzten %s Nachrichten löschen wollen?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_my">Meine</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Speicherverschlüsselung deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nWarnung: Dies wird die Speicherverschlüsselung für alle Nachrichten und Schlüssel deaktivieren. Ihre verschlüsselten Sessions werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann auch auf die Sessions zugreifen.</string>
+  <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -25,7 +28,7 @@
   <string name="ConversationItem_saving_attachment">Anhang speichern</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Anhang wird auf die SD-Karte gespeichert...</string>
   <string name="ConversationItem_save_to_sd_card">Auf der SD-Karte speichern?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Diese Datei wurde in einer verschlüsselten Datenbank gespeichert. Die Version, die Sie auf der SD Karte speichern wird nicht mehr verschlüsselt sein. Möchten Sie trotzdem fortfahren?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Diese Datei wurde in einer verschlüsselten Datenbank gespeichert. Die Version, die Sie auf der SD Karte speichern, wird hingegen nicht mehr verschlüsselt sein. Möchten Sie trotzdem fortfahren?</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Fehler beim Speichern des Anhangs auf der SD-Karte!</string>
   <string name="ConversationItem_success_exclamation">Erfolgreich!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Es kann nicht auf die SD-Karte geschrieben werden!</string>
@@ -37,42 +40,42 @@
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Soll eine sichere Sitzung aufgebaut werden?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Eine sichere Sitzung mit %s aufbauen?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Sichere Sitzung beenden</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen sie die sichere Sitzung wirklich beenden?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Bestätigung zum Löschen der Unterhaltung</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Sind Sie sicher, dass sie die Unterhaltung unwiderruflich löschen möchten?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Bestätigung: Sichere Sitzung beenden</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen Sie die sichere Sitzung wirklich beenden?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Bestätigung zum Löschen des Threads</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Sind Sie sicher, dass Sie diese Konversation unwiderruflich löschen möchten?</string>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</string>
   <string name="ConversationActivity_compose_message">Nachricht erstellen</string>
   <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">Das ausgewählte Video überschreitet leider die maximal mögliche Nachrichtengröße.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Die ausgewählte Audiodatei überschreitet leider die maximal mögliche Nachrichtengröße.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Der angegeben Empfänger ist keine gültige SMS oder E-Mail Adresse!</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Der angegebene Empfänger 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_forward_message_prefix">Weiterleiten</string>
   <string name="ConversationActivity_group_conversation_recipients">Teilnehmer in Gruppengespräch</string>
   <string name="ConversationActivity_group_conversation">Gruppengespräch</string>
   <string name="ConversationActivity_d_recipients_in_group">%d Teilnehmer in Gruppe</string>
   <string name="ConversationActivity_saving_draft">Entwurf speichern...</string>
-  <string name="ConversationActivity_invalid_recipient">Ungültiger Empfänger</string>
-  <string name="ConversationActivity_calls_not_supported">Anrufe nicht unterstützt</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Vermutlich unterstützt dieses Gerät keine Wahlvorgänge</string>
+  <string name="ConversationActivity_invalid_recipient">Ungültiger Empfänger!</string>
+  <string name="ConversationActivity_calls_not_supported">Anrufe werden nicht unterstützt</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s Transport: %2$s Gesendet/Empfangen:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nGesendet/Empfangen:%3$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Absender: %1$s⏎\nTransport: %2$s⏎\nGesendet: %3$s⏎\nEmpfangen:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Nachricht löschen bestätigen</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Sind Sie sicher, dass Sie diese Nachricht unwiderruflich löschen möchten?</string>
   <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Schlüsselaustausch Nachricht</string>
+  <string name="ConversationListAdapter_key_exchange_message">Schlüsselaustausch Nachricht...</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">Sind Sie sicher, dass Sie alle ausgewählten Unterhaltungen löschen möchten?</string>
-  <string name="ConversationListFragment_deleting">Löscht</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Löscht ausgewählte Konversationen...</string>
+  <string name="ConversationListFragment_deleting">Löschen</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Lösche ausgewählte Threads...</string>
   <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch Nachricht</string>
+  <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch Nachricht...</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Auf SD-Karte verschieben?</string>
+  <string name="ExportFragment_export_to_sd_card">Auf SD-Karte exportieren?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dies\nwird Ihre verschlüsselten Keys, Einstellungen und Nachrichten auf die SD-Karte exportieren</string>
   <string name="ExportFragment_export">Export</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Im Klartext auf SD-Karte exportieren?</string>
@@ -86,27 +89,27 @@
   <string name="ExportFragment_exporting_keys_settings_and_messages">Exportiere verschlüsselte Keys,\nEinstellungen und Nachrichten...</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Soll die SMS-Systemdatenbank importiert werden?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Es werden jetzt die SMS von der Systemdatenbank importiert.\nWenn Sie dies schon einmal gemacht haben, werden ggf. doppelte Einträge erzeugt.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Es werden jetzt die SMS von der Systemdatenbank in TextSecure importiert.\nWenn Sie dies schon einmal gemacht haben, werden doppelte Nachrichten erzeugt.</string>
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Abbruch</string>
   <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nEine wiederhergestellte verschlüsselten Sicherung ersetzt Ihre bestehenden Keys, Einstellungen und\nNachrichten. Sie werden jegliche Informationen verlieren, die in Ihrer jetzigen TextSecure Installation sind,\naber nicht in der Sicherung.</string>
   <string name="ImportFragment_restore">Wiederherstellen</string>
-  <string name="ImportFragment_import_plaintext_backup">Importiere Klartext-Sicherung?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Es werden jetzt die SMS von der Systemdatenbank importiert.\nWenn Sie dies schon einmal gemacht haben, werden ggf. doppelte Einträge erzeugt.</string>
+  <string name="ImportFragment_import_plaintext_backup">Klartext-Sicherung importieren?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Es werden jetzt die SMS von der Systemdatenbank importiert.\nWenn Sie dies schon einmal gemacht haben, werden durch den erneuten Import doppelte Nachrichten erzeugt.</string>
   <string name="ImportFragment_importing">Importiere</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importiere Klartext-Sicherung</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Keine Klartext-Sicherung gefunden</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Keine Klartext-Sicherung gefunden!</string>
   <string name="ImportFragment_error_importing_backup">Fehler beim Importieren der Sicherung!</string>
-  <string name="ImportFragment_import_complete">Import fertig! </string>
+  <string name="ImportFragment_import_complete">Import abgeschlossen!</string>
   <string name="ImportFragment_restoring">Wiederherstellen</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Verschlüsselte Sicherung wiederherstellen...</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Verschlüsselte Sicherung wiederherstellen ...</string>
   <string name="ImportFragment_no_encrypted_backup_found">Keine verschlüsselte Sicherung gefunden!</string>
   <string name="ImportFragment_restore_complete">Wiederherstellung fertig!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Kein eingelesener Schlüssel gefunden!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Keine Verbindung für MMS-Download verfügbar, versuchen Sie es später noch einmal..</string>
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Keine Verbindung für MMS-Download verfügbar, versuchen Sie es später noch einmal ...</string>
   <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMSI</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fehler beim Verbinden zum MMS Provider...</string>
   <!--NotificationMmsMessageRecord-->
@@ -115,33 +118,33 @@
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passwörter stimmen nicht überein!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Das eingegebene alte Passwort ist falsch!</string>
   <!--PassphraseCreateActivity-->
-  <string name="PassphraseCreateActivity_passphrases_dont_match">Passphrasen stimmen nicht überein</string>
-  <string name="PassphraseCreateActivity_you_must_specify_a_password">Du musst ein Passwort angeben</string>
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Passwörter stimmen nicht überein</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Sie müssen ein Passwort angeben</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ungültiges Passwort!</string>
   <!--PromptApnActivity-->
-  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du musst eine MMSC URL für deinen Anbieter angeben.</string>
-  <string name="PromptApnActivity_mms_settings_updated">MMS Einstellungen upgedatet</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kannst diese Werte jederzeit im TextSecure Einstellungsmenü ändern.</string>
+  <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Sie müssen eine MMSC URL für Ihren Provider angeben.</string>
+  <string name="PromptApnActivity_mms_settings_updated">MMS Einstellungen aktualisiert</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Sie können diese Werte jederzeit in den TextSecure Einstellungen ändern.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs ist eine andere als die schon von diesem Kontakt erhaltenen.\nDas könnte bedeuten, dass jemand versucht, Ihr Gespräch abzufangen oder\ndass dieser Kontakt TextSecure neu installiert hat und nun einen neuen Schlüssel benutzt.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs ist eine andere als die schon von diesem Kontakt erhaltenen.\nDas könnte bedeuten, dass jemand versucht, Ihr Gespräch abzufangen oder\nauch nur, dass dieser Kontakt TextSecure neu installiert hat und nun einen neuen Schlüssel benutzt.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Sie können diesen Kontakt überprüfen.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Die Signatur dieses Schlüsselaustauschs ist vertrauenswürdig, aber die Einstellung \'Schlüsselaustausch automatisch vervollständigen\' ist nicht aktiv.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen Schlüssel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Der Empfänger hat keinen Schlüssel.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Empfänger hat keinen zugeordneten Schlüssel!</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Der Empfänger hat keinen Schlüssel!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Schlüssel zum Vergleich einlesen</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Eigenen Schlüssel einlesen</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ACHTUNG: Der gescannte Schlüssel stimmt nicht überein! Bitte überprüfen Sie den Fingerabdruck des Schlüssels sorgfältig.</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ACHTUNG: Der eingelesene Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Fingerabdruck des Schlüssels sorgfältig.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NICHT verifiziert!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel ist korrekt. Sie sollten den Empfänger auch Ihren eigenen Schlüssel überprüfen lassen.</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel ist korrekt. Lassen Sie den Empfänger auch Ihren eigenen Schlüssel überprüfen.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verifiziert!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sie haben keinen persönlichen Schlüssel!</string>
   <!--VerifyKeysActivity-->
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Eigenen Fingerabdruck einlesen lassen</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Scanne den Fingerabdruck ihrer Schlüssel </string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ACHTUNG: Der gescannte Schlüssel stimmt nicht überein! Bitte überprüfen sie den Fingerabdruck des Schlüssels sorgfältig.</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Deren Fingerabdruck einlesen </string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ACHTUNG: Der gescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Fingerabdruck des Schlüssels sorgfältig.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NICHT verifiziert!</string>
   <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Dieser Schlüssel ist korrekt. Sie sollten auch Ihren eigenen Fingerabdruck einlesen lassen.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Verifiziert!</string>
@@ -149,17 +152,17 @@
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen Schlüssel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Zum Vergleich einlesen</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">Zum Vergleich einlesen lassen</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ACHTUNG, der gescannte Schlüssel stimmt nicht überein.</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ACHTUNG, der eingelesene Schlüssel stimmt NICHT überein!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NICHT verifiziert!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Der gescannte Schlüssel stimmt überein!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Der eingelesene Schlüssel stimmt überein!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verifiziert!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Fingerabdruck</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Trotz vorhandener Anfragen initiieren?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Sitzungsaufbau Nachricht an den Empfänger gesendet, sind Sie sicher dass Sie eine weitere senden wollen? Dies macht die erste Nachricht ungültig.</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Sitzungsaufbau Nachricht an den Empfänger gesendet, sind Sie sicher, dass Sie eine weitere senden wollen? Dies macht die erste Nachricht ungültig.</string>
   <string name="KeyExchangeInitiator_send">Senden</string>
   <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Fehlerhafte, verschlüsselte Nachricht...</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 Sitzung verschlüsselt...</string>
   <!--MmsDatabase-->
@@ -169,38 +172,38 @@
   <string name="MmsDatabase_downloading">Herunterladen...</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt, bitte warten...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Falsch verschlüsselte MMS...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für einen nicht existierende Sitzung verschlüsselt...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlererhaft verschlüsselte MMS...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht existierende Sitzung verschlüsselt...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">MMS Nachricht kann gerade nicht gesendet werden.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Ihre MMS kann derzeit nicht gesendet werden.</string>
   <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Import in Gange</string>
-  <string name="ApplicationMigrationService_importing_text_messages">Importiert Nachrichten</string>
+  <string name="ApplicationMigrationService_import_in_progress">Import läuft</string>
+  <string name="ApplicationMigrationService_importing_text_messages">NachrichtenImport</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passwort gecached</string>
   <string name="KeyCachingService_passphrase_cached">Passwort gecached</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) Neue Nachrichten</string>
+  <string name="MessageNotifier_d_new_messages">%d neue Nachrichten</string>
   <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
   <string name="MessageNotifier_encrypted_message">Verschlüsselte Nachricht...</string>
   <string name="MessageNotifier_no_subject">(Kein Betreff)</string>
-  <string name="MessageNotifier_message_delivery_failed">Senden fehlgeschlagen.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">Senden fehlgeschlagen.</string>
-  <string name="MessageNotifier_error_delivering_message">Senden fehlgeschlagen.</string>
+  <string name="MessageNotifier_message_delivery_failed">Nachrichtenübermittlung fehlgeschlagen.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Nachrichtenübermittlung fehlgeschlagen.</string>
+  <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_mark_all_as_read">Alle als gelesen markieren</string>
   <string name="MessageNotifier_mark_as_read">Als gelesen markieren</string>
   <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">SMS kann gerade nicht gesendet werden. Wird gesendet sobald der Dienst wieder verfügbar ist.</string>
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">SMS kann gerade nicht gesendet werden. Sie wird gesendet, sobald der Dienst wieder verfügbar ist.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Sie haben eine Nachricht von jemand empfangen, der verschlüsselte Sitzungen über TextSecure unterstützt. Wollen Sie jetzt eine sicher Sitzung aufbauen?</string>
-  <string name="auto_initiate_activity__initiate_exchange">Austausch initieren</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Sie haben eine Nachricht von jemandem empfangen, der verschlüsselte Sitzungen über TextSecure unterstützt. Wollen Sie jetzt eine sichere Sitzung aufbauen?</string>
+  <string name="auto_initiate_activity__initiate_exchange">Austausch initiieren</string>
   <!--change_passphrase_activity-->
-  <string name="change_passphrase_activity__old_passphrase">Altes Passwort:</string>
-  <string name="change_passphrase_activity__new_passphrase">Neues Passwort:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">Neues Passwort wiederholen:</string>
+  <string name="change_passphrase_activity__old_passphrase">ALTES PASSWORT:</string>
+  <string name="change_passphrase_activity__new_passphrase">NEUES PASSWORT:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">NEUES PASSWORT WIEDERHOLEN:</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__no_contacts">Keine Kontakte.</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
   <!--contact_selection_recent_activity-->
@@ -218,36 +221,36 @@
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mehrfachauswahl</string>
   <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Bitte wählen Sie ein starkes Passwort aus, dass dazu genutzt wird ihre Daten lokal zu verschlüsseln.</string>
-  <string name="create_passphrase_activity__passphrase">Passwort:</string>
-  <string name="create_passphrase_activity__repeat">Wiederholen:</string>
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Bitte wählen Sie ein starkes Passwort aus, das dazu genutzt wird, Ihre Daten lokal zu verschlüsseln.</string>
+  <string name="create_passphrase_activity__passphrase">PASSWORT:</string>
+  <string name="create_passphrase_activity__repeat">WIEDERHOLEN:</string>
   <string name="create_passphrase_activity__continue">Fortsetzen</string>
   <string name="create_passphrase_activity__generating_secrets">GENERIERT SICHERHEITSSCHLÜSSEL</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchtest du deine vorhandenen Nachrichten in TextSecure\'s verschlüsselte Datenbank importieren?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die Standard Datenbank wird in keiner Weise verändert.</string>
+  <string name="database_migration_activity__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">Das könnte eine Weile dauern. Bitte sei geduldig, wir benachrichtigen dich, wenn der Import abgeschlossen ist.</string>
-  <string name="database_migration_activity__importing">IMPORTIERT</string>
+  <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, wenn der Import abgeschlossen ist.</string>
+  <string name="database_migration_activity__importing">IMPORT</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert...</string>
   <string name="export_fragment__export_encrypted_backup">Exportiere verschlüsselte Sicherung</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportiere eine verschlüsselte\nSicherung auf die SD-Karte.</string>
   <string name="export_fragment__export_plaintext_backup">Exportiere Klartext-Sicherung</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportiert eine Klartext-Sicherung kompatibel mit \'SMSBackup And Restore\' auf die SD-Karte</string>
-  <string name="import_fragment__import_system_sms_database">Importiere SMS Systemdatenbank</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importiere die\nSystemdatenbank der Nachrichten App.</string>
+  <string name="import_fragment__import_system_sms_database">Importiere SMS-Systemdatenbank</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importiere die\nDatenbank der Standard Nachrichten-App des Geräts.</string>
   <string name="import_fragment__import_encrypted_backup">Importiere verschlüsselte Sicherung</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nWiederherstellen einer zuvor exportierten TextSecure Sicherung.</string>
   <string name="import_fragment__import_plaintext_backup">Importiere Klartext-Sicherung</string>
   <string name="import_fragment__import_a_plaintext_backup_file">\nImportiere eine Klartext-Sicherungdatei. Kompatibel mit \'SMSBackup And Restore\'</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSPHRASE</string>
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSWORT</string>
   <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure benötigt APN-Parameter um MMS über den Mobilfunkanbieter zu senden. Ihr Gerät gibt diese Informationen nicht preis, was gelegentlich auf restriktive Konfigurationen oder Geräte zutrifft.</string>
-  <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Um MMS zu verschicken, füllen Sie bitte die nötige APN Information aus. Die Werte für das Netzwerk können meist gefunden werden, indem man eine Suche ausführt \'&amp;lt;Ihr Netzwerk&amp;gt; APN\'. Diese Operation muss nur einmal ausgeführt werden.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure benötigt APN-Parameter, um MMS über den Mobilfunkanbieter zu senden. Ihr Gerät stellt diese Informationen nicht bereit, was gelegentlich auf gesperrte Geräte oder restriktive Konfigurationen hindeutet.</string>
+  <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Um MMS zu verschicken, tragen Sie bitte die nötige APN Information ein. Die Werte für das Netzwerk können normalerweise gefunden werden, indem man nach \'&amp;lt;Ihr Netzwerk&amp;gt; APN\' sucht. Das müssen Sie nur einmal tun.</string>
   <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (BENÖTIGT):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONAL):</string>
   <string name="prompt_apn_activity__mms_proxy_port_optional">MMS PROXY PORT (OPTIONAL):</string>
@@ -258,11 +261,11 @@
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Sie haben momentan keine Schlüssel denen Sie vertrauen in ihrer Datenbank.</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Identität des Kontakts:</string>
-  <string name="verify_identity_activity__your_identity_you_read">Eigene Identität (Sie lesen):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Deren Identität (sie lesen):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Ihre Identität (Sie lesen):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Name der Identität:</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importierte Identität:</string>
+  <string name="verify_import_identity_activity__identity_name_n">Name der Identität:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Importierte Identität:\\n</string>
   <string name="verify_import_identity_activity__verified">Verifiziert!</string>
   <string name="verify_import_identity_activity__compare">Vergleichen</string>
   <!--verify_keys_activity-->
@@ -272,7 +275,7 @@
   <string name="AndroidManifest__create_passphrase">Passwort erstellen</string>
   <string name="AndroidManifest__enter_passphrase">Passwort eingeben</string>
   <string name="AndroidManifest__select_contacts">Kontakt auswählen</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure erkannt.</string>
+  <string name="AndroidManifest__textsecure_detected">TextSecure erkannt</string>
   <string name="AndroidManifest__public_identity_key">Öffentlicher Schlüssel</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
   <string name="AndroidManifest__verify_session">Sitzung verifizieren</string>
@@ -287,20 +290,22 @@
   <string name="preferences__general">Allgemein</string>
   <string name="preferences__pref_all_sms_title">Für alle SMS benutzen</string>
   <string name="preferences__pref_all_mms_title">Für alle MMS benutzen</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden.</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure zur Anzeige und Speicherung aller eingehenden MMS verwenden.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure zur Anzeige und Speicherung aller eingehenden MMS verwenden</string>
   <string name="preferences__pref_enter_sends_title">Enter schickt ab</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter Taste versendet Nachrichten</string>
   <string name="preferences__display_settings">Anzeige-Einstellungen</string>
   <string name="preferences__choose_identity">Identität auswählen</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wählen Sie den Kontakt Eintrag aus der Kontakliste.</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wählen Sie den Kontakt aus der Kontaktliste.</string>
   <string name="preferences__change_passphrase">Passwort ändern</string>
   <string name="preferences__change_my_passphrase">Mein Passwort ändern</string>
   <string name="preferences__complete_key_exchanges">Schlüsselaustausch abschliessen</string>
+  <string name="preferences__disable_passphrase">Passwort deaktivieren</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Verschlüsselung von Nachrichten und Schlüsseln auf diesem Gerät deaktivieren</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatischer Schlüsselaustausch für neue Sitzungen und bestehende Sitzungen mit demselben persönlichen Schlüssel</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Passwort im Speicher nach einer gewissen Zeit vergessen</string>
   <string name="preferences__timeout_passphrase">Passwort im Speicher vergessen</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Auswahl des Passwort-Timeouts</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Passwort-Timeout auswählen</string>
   <string name="preferences__pref_timeout_interval_title">Timeout-Dauer</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Länge des Zeitraums, während dessen das Passwort im Speicher gehalten wird</string>
   <string name="preferences__identity_key_settings">Identitäten</string>
@@ -327,29 +332,30 @@
   <string name="preferences__cyan">Cyan</string>
   <string name="preferences__magenta">Magenta</string>
   <string name="preferences__fast">Schnell</string>
-  <string name="preferences__normal">Mittel</string>
+  <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Langsam</string>
   <string name="preferences__custom">Benutzerdefiniert</string>
   <string name="preferences__advanced">Weitere Einstellungen</string>
   <string name="preferences__passphrase">Passwort</string>
   <string name="preferences__advanced_mms_access_point_names">Ersatz für MMSC</string>
   <string name="preferences__enable_fallback_mmsc">Ersatz für MMSC aktivieren</string>
-  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Sollten APN-Daten fehlen, die hier folgenden MMSC-Daten nutzen.</string>
-  <string name="preferences__mmsc_url_required">MMSC URL(Benötigt)</string>
-  <string name="preferences__mms_proxy_host_optional">MMS Poxy Host (Optional)</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Benutzen Sie die hier konfigurierten MMSC-Daten, falls keine System APN-Daten vorliegen,</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (Benötigt)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Optional)</string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (Optional)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Einen Zustellungsbericht für jede SMS beantragen</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Einen Zustellungsbericht für jede von Ihnen gesendete SMS anfordern</string>
   <string name="preferences__sms_delivery_reports">SMS Zustellungsberichte</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, nachdem ein bestimmtes Limit überschritten wurde</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, falls der Thread eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
   <string name="preferences__storage">Speicher</string>
   <string name="preferences__conversation_length_limit">Limit der Konversationslänge</string>
   <string name="preferences__trim_all_threads_now">Alle Konversationen kürzen</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Gespräche scannen und Gesprächslängenbegrenzungen </string>
-  <string name="preferences__light_theme">Light Theme</string>
-  <string name="preferences__dark_theme">Dunkles Theme</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Konversationen durchgehen und dabei Längenbegrenzungen sicherstellen</string>
+  <string name="preferences__light_theme">Helles Design</string>
+  <string name="preferences__dark_theme">Dunkles Design</string>
   <string name="preferences__appearance">Aussehen</string>
-  <string name="preferences__theme">Theme</string>
+  <string name="preferences__theme">Design</string>
+  <string name="preferences__default">Voreinstellung</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -368,28 +374,28 @@
   <string name="conversation_context__menu_delete_message">Nachricht löschen</string>
   <string name="conversation_context__menu_forward_message">Nachricht weiterleiten</string>
   <!--conversation_insecure-->
-  <string name="conversation_insecure__menu_start_secure_session">Sicher Sitzung starten</string>
+  <string name="conversation_insecure__menu_start_secure_session">Sichere Sitzung starten</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Ausgewählte löschen</string>
   <string name="conversation_list_batch__menu_select_all">Alle auswählen</string>
   <!--conversation_list-->
-  <string name="conversation_list__menu_search">Suche</string>
+  <string name="conversation_list__menu_search">Suchen</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicherheit</string>
   <string name="conversation_secure_verified__menu_verify_session">Sitzung verifizieren</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Empfänger verifizieren</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Sitzung beenden</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Sitzung abbrechen</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Anhang hinzufügen</string>
   <string name="conversation__menu_delete_thread">Thread löschen</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Teilnehmerliste</string>
   <string name="conversation_group_options__delivery">Zustellung</string>
-  <string name="conversation_group_options__conversation">Gespräch</string>
+  <string name="conversation_group_options__conversation">Konversation</string>
   <string name="conversation_group_options__broadcast">Übertragen</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Vergleichen</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Zum Vergleich eingelesen werden</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Zum Vergleich einlesen lassen</string>
   <string name="key_scanning__menu_scan_to_compare">Zum Vergleich einlesen</string>
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">Entsperren</string>
@@ -400,5 +406,6 @@
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verifiziert</string>
+  <string name="preferences__language">Sprache</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ddc047153..1568a12f4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -13,6 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">¿Estás seguro de que te gustaría recortar inmediatamente todos los hilos de conversación a los %s últimos mensajes?</string>
   <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
   <string name="ApplicationPreferencesActivity_my">Mi</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">¿Deshabilitar cifrado del almacenamiento?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n        Atención, esto deshabilitará el cifrado del almacenamiento para todos los mensajes y claves. Sus sesiones cifradas\n        funcionarán pero cualquiera con acceso físico a su dispositivo podrá acceder a ellas.\n    </string>
+  <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Fotografía</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -54,6 +57,8 @@
   <string name="ConversationActivity_d_recipients_in_group">%d receptores en grupo</string>
   <string name="ConversationActivity_saving_draft">Guardando borrador...</string>
   <string name="ConversationActivity_invalid_recipient">Receptor inválido!</string>
+  <string name="ConversationActivity_calls_not_supported">Llamadas no compatibles</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo no es compatible con la función de realizar llamadas.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Remitente: %1$s\nTransporte: %2$s\nEnviado/Recibido:%3$s</string>
@@ -70,10 +75,37 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensaje de intercambio de claves...</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">¿Exportar a tarjeta SD?</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Esto\n        exportará sus claves cifradas, configuración y mensajes a la tarjeta SD.\n    </string>
   <string name="ExportFragment_export">Exportar</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">¿Exportar mensajes en claro a la tarjeta SD?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atención, esto\n        exportará sus mensajes en claro desde TextSecure a la tarjeta SD.\n    </string>
+  <string name="ExportFragment_cancel">Cancelar</string>
+  <string name="ExportFragment_exporting">Exportando</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportando mensajes en claro a la tarjeta SD...\n    </string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Error, ¡no se puede escribir en la tarjeta SD!\n     \n    </string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Se produjo un error mientras se escribía la tarjeta SD.\n    </string>
   <string name="ExportFragment_success">¡Éxito!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando claves cifradas,\n        configuración y mensajes...\n    </string>
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">¿Importar base de datos de SMS del sistema?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Esto importará\n        los mensajes desde la base de datos de SMS del sistema a TextSecure. Si la ha importado\n        anteriormente, obtendrá mensajes duplicados.\n    </string>
   <string name="ImportFragment_import">Importar</string>
+  <string name="ImportFragment_cancel">Cancelar</string>
+  <string name="ImportFragment_restore_encrypted_backup">¿Restaurar copia de seguridad cifrada?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n        Restaurar una copia de seguridad cifrada reemplazará completamente sus claves, preferencias y\n        mensajes. Perderá cualquier información que se encuentre en su instalación actual de TextSecure pero no\n       en la copia de seguridad.\n    </string>
+  <string name="ImportFragment_restore">Restaurar</string>
+  <string name="ImportFragment_import_plaintext_backup">¿Importar copia de seguridad de los mensajes en claro?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Esto importará\n        los mensajes desde una copia de seguridad sin cifrar. Si ha importado anteriormente la base de datos de SMS del sistema,\n        esto producirá mensajes duplicados.\n    </string>
+  <string name="ImportFragment_importing">Importando</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importando copia de seguridad de mensajes en claro...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">¡No se encontró una copia de seguridad de los mensajes en claro!</string>
+  <string name="ImportFragment_error_importing_backup">¡Error importando copia de seguridad!</string>
+  <string name="ImportFragment_import_complete">¡Se ha importado correctamente!</string>
+  <string name="ImportFragment_restoring">Restaurando</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Restaurando copia de seguridad cifrada...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">¡No se encontró la copia de seguridad cifrada!</string>
+  <string name="ImportFragment_restore_complete">¡Restauración completada!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">¡No se encontró una clave escaneada!</string>
   <!--MmsDownloader-->
@@ -203,6 +235,16 @@
   <string name="database_migration_activity__importing">IMPORTANDO</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Actualizando Base de Datos...</string>
+  <string name="export_fragment__export_encrypted_backup">Exportar copia de seguridad cifrada</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar copia de seguridad\n        cifrada a la tarjeta SD.\n    </string>
+  <string name="export_fragment__export_plaintext_backup">Exportar copia de seguridad de mensajes en claro</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n        Exportar una copia de seguridad de los mensajes en claro compatible con \'SMSBackup And Restore\'  a la tarjeta SD.</string>
+  <string name="import_fragment__import_system_sms_database">Importar base de datos SMS del sistema</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importar la base de datos\n        desde la aplicación de mensajería del sistema por defecto.\n    </string>
+  <string name="import_fragment__import_encrypted_backup">Importar copia de seguridad cifrada</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\n       Restaurar una copia de seguridad cifrada previamente exportada desde TextSecure.\n    </string>
+  <string name="import_fragment__import_plaintext_backup">Importar copia de seguridad de mensajes en claro</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\n        Importar una copia de seguridad de mensajes en claro compatible con \'SMSBackup And Restore.\'</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE DE CONTRASEÑA DE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
@@ -241,6 +283,9 @@
   <string name="AndroidManifest__manage_identity_keys">Gestionar claves de identidad</string>
   <string name="AndroidManifest__complete_key_exchange">Completar el intercambio de claves</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importar / Exportar</string>
+  <string name="arrays__my_identity_key">Mi clave de identidad</string>
+  <string name="arrays__contact_keys">Claves de contacto</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
   <string name="preferences__pref_all_sms_title">Usar para todos los SMS</string>
@@ -255,6 +300,8 @@
   <string name="preferences__change_passphrase">Cambiar frase de contraseña</string>
   <string name="preferences__change_my_passphrase">Cambiar mi frase de contraseña</string>
   <string name="preferences__complete_key_exchanges">Completar intercambio de claves</string>
+  <string name="preferences__disable_passphrase">desactivar la frase de contraseña</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desactive encriptación local de los mensajes y claves</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automáticamente los intercambios de clave para nuevas sesiones o para sesiones existentes con la misma clave de identidad</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Olvidar la frase de contraseña de la memoria después de un intervalo de tiempo</string>
   <string name="preferences__timeout_passphrase">Expirar la frase de contraseña</string>
@@ -304,6 +351,11 @@
   <string name="preferences__conversation_length_limit">Límite de longitud de la conversación</string>
   <string name="preferences__trim_all_threads_now">Recorta todos los hilos ahora</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Búsqueda a través de todos los hilos de conversación y fuerza los límites de longitud de la misma</string>
+  <string name="preferences__light_theme">Tema claro</string>
+  <string name="preferences__dark_theme">Tema oscuro</string>
+  <string name="preferences__appearance">Apariencia</string>
+  <string name="preferences__theme">Tema</string>
+  <string name="preferences__default">Por defecto</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -354,5 +406,6 @@
   <string name="text_secure_normal__mark_all_as_read">Marcar Todos Leídos</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
+  <string name="preferences__language">Idioma</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 82a1801bc..c1bed2153 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -13,6 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sur de vouloir réduire toutes les conversations aux %s messages les plus récents ?</string>
   <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
   <string name="ApplicationPreferencesActivity_my">Mon</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Désactiver le chiffrement de sauvegarde ?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAttention, ceci désactivera le chiffrement de stockage pour tous les messages et toutes les clefs. Vos sessions chiffrées continueront de fonctionner mais une personne ayant un accès physique à votre appareil sera en mesure d\'y accéder.</string>
+  <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
@@ -297,6 +300,8 @@
   <string name="preferences__change_passphrase">Modifier la phrase de passe</string>
   <string name="preferences__change_my_passphrase">Modifier mon mot de passe</string>
   <string name="preferences__complete_key_exchanges">Finaliser l’échange de clés</string>
+  <string name="preferences__disable_passphrase">Désactiver la phrase de passe</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Désactiver le chiffrement local des messages et des clés</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Finaliser automatiquement les échanges de clés pour les sessions, nouvelles ou existantes, avec la même clef d\'identité.</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Oublier le mot de passe en mémoire après une certaine durée</string>
   <string name="preferences__timeout_passphrase">Expiration du mot de passe</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index d6bbebebe..c953008cc 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -307,6 +307,7 @@
   <string name="preferences__dark_theme">כהה</string>
   <string name="preferences__appearance">מראה</string>
   <string name="preferences__theme">ערכת נושא</string>
+  <string name="preferences__default">ברירת מחדל</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -357,5 +358,6 @@
   <string name="text_secure_normal__mark_all_as_read">סמן הכל כנקרא</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">מאומת</string>
+  <string name="preferences__language">שפה</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fe44d83bb..7f12bbf74 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -8,12 +8,12 @@
   <string name="ApplicationPreferencesActivity_currently_s">現在： %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">鍵を管理する前に、パスワードを入力して下さい。</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">パスワードが登録されていません。</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">スレッド１本におけるメッセージ数</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">通のメッセージ（スレッド１本に対して）</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">全ての古いメッセージを今、削除しますか？</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">今すぐ全ての会話スレッドを最新メッセージ%s通にまで縮小（トリム）しますか？</string>
   <string name="ApplicationPreferencesActivity_delete">削除</string>
-  <string name="ApplicationPreferencesActivity_my">自分のフィンガープリント</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">端末内保存データの暗号化を無効化にしますか？</string>
+  <string name="ApplicationPreferencesActivity_my">自分のﾌｨﾝｶﾞｰﾌﾟﾘﾝﾄ</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">端末内保存データの暗号化を無効にしますか？</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！\n通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</string>
   <string name="ApplicationPreferencesActivity_disable">無効</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -95,16 +95,16 @@
   <string name="ImportFragment_restore_encrypted_backup">暗号化されたバックアップ・ファイルを復元しますか？</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n暗号化されたバックアップ・ファイルを復元すると、現在のキー、設定、及びメッセージは完全に上書きされます。現在のTextSecureインストール環境は上書きされますが、バックアップ・ファイルは残ります。</string>
   <string name="ImportFragment_restore">復元</string>
-  <string name="ImportFragment_import_plaintext_backup">非暗号テキストのバックアップ・ファイルをインポートしますか？</string>
+  <string name="ImportFragment_import_plaintext_backup">暗号化されていないテキストのバックアップ・ファイルをインポートしますか？</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">暗号化されていないテキストのバックアップ・ファイルからメッセージをインポートします。以前にこの作業を行ったことがあれば、メッセージが重複する場合があります。</string>
   <string name="ImportFragment_importing">インポート中…</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">非暗号テキストをインポート</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">非暗号テキストのバックアップ・ファイルをインポート中…</string>
   <string name="ImportFragment_no_plaintext_backup_found">非暗号テキストのバックアップ・ファイルが見つかりませんでした。</string>
   <string name="ImportFragment_error_importing_backup">バックアップ・ファイルのインポート中にエラーが発生しました。</string>
   <string name="ImportFragment_import_complete">インポート完了！</string>
   <string name="ImportFragment_restoring">復元中…</string>
   <string name="ImportFragment_restoring_encrypted_backup">暗号化されたバックアップ・ファイルをインポート中…</string>
-  <string name="ImportFragment_no_encrypted_backup_found">暗号化されたバックアップ・ファイルが見つかりませんでした。</string>
+  <string name="ImportFragment_no_encrypted_backup_found">暗号化されたバックアップ・ファイルは見つかりませんでした。</string>
   <string name="ImportFragment_restore_complete">復元完了！</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">スキャンした鍵はありません。</string>
@@ -146,7 +146,7 @@
   <string name="VerifyKeysActivity_scan_their_fingerprint">フィンガープリントをスキャン</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">警告、スキャンした鍵が正しくありません！フィンガープリントのテキストを慎重にチェックしてください。</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">照合できませんでした！</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">相手の鍵は正しいです。自分のフィンガープリントもスキャンする必要があります。</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">相手の鍵は正しいです。自分のフィンガープリントもスキャンしてもらう必要があります。</string>
   <string name="VerifyKeysActivity_verified_exclamation">照合できました。</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">認証キーがありません。</string>
@@ -156,7 +156,7 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">照合できませんでした！</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">スキャンした鍵が一致しました！</string>
   <string name="ViewIdentityActivity_verified_exclamation">照合できました。</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">認証フィンガープリント</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">認証ﾌｨﾝｶﾞｰﾌﾟﾘﾝﾄ</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">既存のリクエストがありますが、鍵交換を開始しますか？</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">セッション開始のリクエストはすでにこの受信者に送られています。別のリクエストをまた送ってもよろしいですか？送信すると、最初に送ったリクエストは無効になります。</string>
@@ -236,15 +236,15 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">データベースを更新中…</string>
   <string name="export_fragment__export_encrypted_backup">暗号化されたバックアップ・ファイルをエクスポート</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">SDカードへ暗号化されたバックアップ・ファイルをエクスポート</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">SDカードへ暗号化されたバックアップ・ファイルをエクスポートします</string>
   <string name="export_fragment__export_plaintext_backup">非暗号テキストのバックアップ・ファイルをエクスポート</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n「SMSバックアップと復元」と互換性のある非暗号テキストのバックアップ・ファイルをSDカードにエクスポート</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n「SMSバックアップと復元」と互換性のある暗号化されていないテキストのバックアップ・ファイルをSDカードにエクスポートします</string>
   <string name="import_fragment__import_system_sms_database">端末内のSMSデータベースをインポート</string>
   <string name="import_fragment__import_the_database_from_the_default_system">端末の既定のメッセンジャー・アプリからデータベースをインポート</string>
   <string name="import_fragment__import_encrypted_backup">暗号化されたバックアップ・ファイルをインポート</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\n前回エクスポートした暗号化されたTextSecureバックアップ・ファイルを復元</string>
   <string name="import_fragment__import_plaintext_backup">非暗号テキストのバックアップ・ファイルをインポート</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\n非暗号テキストのバックアップ・ファイルをインポート。「SMSバックアップと復元」と互換可能。</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\n暗号化されていないテキストのバックアップ・ファイルをインポートします。「SMSバックアップと復元」と互換可能です。</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TextSecureパスワード</string>
   <string name="prompt_passphrase_activity__unlock">ロック解除</string>
@@ -290,19 +290,21 @@
   <string name="preferences__general">一般設定</string>
   <string name="preferences__pref_all_sms_title">すべてのSMSに使用</string>
   <string name="preferences__pref_all_mms_title">すべてのMMSに使用</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">すべての受信テキスト・メッセージを表示および保存するのにTextSecureを使用する</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">受信するすべてのファイル付きメッセージを表示および保存するのにTextSecureを使用する</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">受信する全てのSMS（テキストメッセージ）の表示、及び保存にTextSecureを使用します</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">受信する全てのMMS（ファイル付きメッセージ）の表示、及び保存にTextSecureを使用します</string>
   <string name="preferences__pref_enter_sends_title">Enterキーで送信</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enterキーを押すとテキストメッセージが送信されます。</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enterキーを押すとテキストメッセージが送信されます</string>
   <string name="preferences__display_settings">表示設定</string>
   <string name="preferences__choose_identity">IDを選択</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">連絡先リストからあなたの連絡先を選んでください。</string>
   <string name="preferences__change_passphrase">パスワードの変更</string>
   <string name="preferences__change_my_passphrase">パスワードの変更</string>
   <string name="preferences__complete_key_exchanges">鍵交換の自動完了</string>
+  <string name="preferences__disable_passphrase">パスワードを無効にする</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">携帯端末におけるメッセージ及び鍵の暗号化を無効にする</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">同じIDネームとの新しいセッション、又は現在のセッションをするのに鍵交換を自動で完了させる</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">一定時間経過するとメモリからパスワードを消去する</string>
-  <string name="preferences__timeout_passphrase">パスワードのタイムアウト</string>
+  <string name="preferences__timeout_passphrase">パスワードの\nタイムアウト</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">パスワードの有効時間を選択</string>
   <string name="preferences__pref_timeout_interval_title">タイムアウトの間隔</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">メモリからパスワードを消去するまでの待ち時間です</string>
@@ -311,9 +313,9 @@
   <string name="preferences__manage_identity_keys">認証キーを管理</string>
   <string name="preferences__manage_configured_identity_keys">設定済みの認証キーを管理</string>
   <string name="preferences__notifications">通知</string>
-  <string name="preferences__display_message_notifications_in_status_bar">通知メッセージをステータスバーに表示</string>
+  <string name="preferences__display_message_notifications_in_status_bar">受信通知をステータスバーに表示</string>
   <string name="preferences__led_color">LED色</string>
-  <string name="preferences__change_notification_led_color">通知するLED色を変更</string>
+  <string name="preferences__change_notification_led_color">受信通知のLED色を変更</string>
   <string name="preferences__pref_led_blink_title">LED点滅パターン</string>
   <string name="preferences__change_notification_blink_pattern">通知LED点滅パターンの変更</string>
   <string name="preferences__pref_led_blink_dialogtitle">LED点滅パターンを選択</string>
@@ -341,19 +343,19 @@
   <string name="preferences__mmsc_url_required">MMSC URL (必須)</string>
   <string name="preferences__mms_proxy_host_optional">MMSプロキシ・ホスト（選択自由）</string>
   <string name="preferences__mms_proxy_port_optional">MMSプロキシ・ポート（選択自由）</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">送信する全てのSMSに配信報告をつける</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">送信する全てのSMSに配信報告をつけます</string>
   <string name="preferences__sms_delivery_reports">SMS配信報告</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">会話スレッドが一定の長さを超えると、古いメッセージが自動的に削除されます</string>
   <string name="preferences__delete_old_messages">古いメッセージの削除</string>
   <string name="preferences__storage">ストレージ</string>
   <string name="preferences__conversation_length_limit">会話の最大の長さ</string>
-  <string name="preferences__trim_all_threads_now">すべてのスレッドを今、トリムする</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">すべての会話スレッドをスキャンして、会話の長さ制限を強制します</string>
+  <string name="preferences__trim_all_threads_now">全スレッドを今、トリムする</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">すべての会話スレッドをスキャンして、会話の長さの制限を強制します</string>
   <string name="preferences__light_theme">白基調</string>
   <string name="preferences__dark_theme">黒基調</string>
   <string name="preferences__appearance">デザイン設定</string>
   <string name="preferences__theme">テーマ</string>
-  <string name="preferences__default">初期設定</string>
+  <string name="preferences__default">初期設定の言語</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5e2eb3347..89c8332bc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -70,10 +70,20 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Sleuteluitwisselingsbericht...</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">Opslaan op SD-kaart?</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dit exporteert je keys, instellingen en berichten versleuteld naar de SD-kaart</string>
   <string name="ExportFragment_export">Exporteer</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Exporteer onversleutelde tekst naar SD-kaart?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Waarschuwing, dit exporteert de onversleutelde tekst van je berichten in Textsecure naar de SD-kaart.</string>
   <string name="ExportFragment_cancel">Annuleren</string>
+  <string name="ExportFragment_exporting">Aan het exporteren</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Aan het exporteren naar de SD-kaart...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Fout, SD-kaart niet beschrijfbaar!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Fout tijdens het schrijven naar de SD-kaart.</string>
   <string name="ExportFragment_success">Succesvol!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Keys, instellingen en berichten versleuteld naar de SD-kaart aan het exporteren...</string>
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">SMS-berichten uit de systeemdatabase importeren?</string>
   <string name="ImportFragment_import">Importeer</string>
   <string name="ImportFragment_cancel">Annuleren</string>
   <!--KeyScanningActivity-->
@@ -306,6 +316,10 @@
   <string name="preferences__conversation_length_limit">Conversatielengte limiet</string>
   <string name="preferences__trim_all_threads_now">Oudere conversatieberichten nu verwijderen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle conversaties scannen en de maximale conversatielengte toepassen</string>
+  <string name="preferences__light_theme">Licht Thema</string>
+  <string name="preferences__dark_theme">Donker Thema</string>
+  <string name="preferences__appearance">Uiterlijk</string>
+  <string name="preferences__theme">Thema</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 68bd24fc1..6aeb8648c 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -13,6 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på at du ønsker å umiddelbart trimme alle samtaletrådene til de siste %s meldinger?</string>
   <string name="ApplicationPreferencesActivity_delete">Slett</string>
   <string name="ApplicationPreferencesActivity_my">Min</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivere kryptert lagring?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAdvarsel! 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>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bilde</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -297,6 +300,8 @@
   <string name="preferences__change_passphrase">Endre passord</string>
   <string name="preferences__change_my_passphrase">Endre mitt passord</string>
   <string name="preferences__complete_key_exchanges">Fullfør nøkkelutvekslinger</string>
+  <string name="preferences__disable_passphrase">Deaktiver passord</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Deaktiver lokal kryptering av meldinger og nøkler</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatisk fullføre nøkkelutvekslinger for nye sesjoner eller sesjoner med samme ID-nøkkel</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Fjern passord fra minnet etter et gitt intervall</string>
   <string name="preferences__timeout_passphrase">Passordtimeout</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 3ed66ca50..8299262a0 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -300,6 +300,8 @@
   <string name="preferences__change_passphrase">Mudar frase-chave</string>
   <string name="preferences__change_my_passphrase">Mudar a minha frase-chave</string>
   <string name="preferences__complete_key_exchanges">Completar trocas de chaves</string>
+  <string name="preferences__disable_passphrase">Desabilitar frase-chave</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desabilitar criptografia local de mensagens e chaves</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automaticamente intercâmbios de chaves para novas sessões ou para sessões existentes com a mesma chave de identidade</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Esquecer a frase-chave após algum intervalo</string>
   <string name="preferences__timeout_passphrase">Expirar frase-chave</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 48d05f790..561fa463c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -75,17 +75,24 @@
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportar para cartão SD?</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">As suas\nchaves de segurança, definições e mensagens serão exportadas para o cartão SD.\n</string>
   <string name="ExportFragment_export">Exportar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportar texto simples para cartão SD?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenção, esta operação\nirá exportar o conteúdo de texto das suas mensagens TextSecure para o cartão SD.\n</string>
   <string name="ExportFragment_cancel">Cancelar</string>
   <string name="ExportFragment_exporting">Exportar</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">A exportar texto simples para cartão SD</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Erro, não é possível escrever para o\ncartão SD!\n</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Erro ao escrever para o cartão SD.\n</string>
   <string name="ExportFragment_success">Sucesso!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">A exportar chaves de segurança,\ndefinições e mensagens...\n</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importar a base de dados SMS do sistema?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Esta operação irá\nexportar as mensagens da base de dados do seu sistema para o TextSecure. Se já as importou\nanteriormente, importar novamente poderá resultar em mensagens duplicadas.\n</string>
   <string name="ImportFragment_import">Importar</string>
   <string name="ImportFragment_cancel">Cancelar</string>
   <string name="ImportFragment_restore_encrypted_backup">Restaurar cópia de segurança cifrada?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nRestaurar um backup cifrado irá substituir totalmente as suas chaves, definições e msangens.\nIrá perder todas as informações na sua instalação atual do TextSecure, mas não do seu backup.\n</string>
   <string name="ImportFragment_restore">Restaurar</string>
   <string name="ImportFragment_import_plaintext_backup">Importar cópia de segurança em texto simples?</string>
   <string name="ImportFragment_importing">A importar</string>
@@ -227,6 +234,14 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">A actualizar a base de dados...</string>
   <string name="export_fragment__export_encrypted_backup">A exportar cópia de segurança cifrada</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar um backup\ncifrado para o cartão SD.\n</string>
+  <string name="export_fragment__export_plaintext_backup">Exportar Backup Simples</string>
+  <string name="import_fragment__import_system_sms_database">Importar a base de dados SMS do sistema?</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importar a base de dados\nda aplicação predefinida do sistema.\n</string>
+  <string name="import_fragment__import_encrypted_backup">Importar cópia de segurança cifrada</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRestaurar uma cópia de segurança cifrada TextSecure exportada.\n</string>
+  <string name="import_fragment__import_plaintext_backup">Importar cópia de segurança em texto simples</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImportar uma cópia de segurança de texto simples. Compatível com \'SMSBackup e Restaurar\'</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE-CHAVE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
@@ -265,6 +280,7 @@
   <string name="AndroidManifest__manage_identity_keys">Gerir chaves de identidade</string>
   <string name="AndroidManifest__complete_key_exchange">Completar intercâmbio de chaves</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
   <string name="arrays__contact_keys">Chaves de contacto</string>
   <!--preferences.xml-->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9094408b4..943bf161e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -13,6 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste prepričani, da želite izbrisati vse stare pogovore, razen najnovejših?</string>
   <string name="ApplicationPreferencesActivity_delete">Izbriši</string>
   <string name="ApplicationPreferencesActivity_my">Moj</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogoči šifriranje pomnilnika</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nPozor, 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>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Slika</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -30,7 +33,7 @@
   <string name="ConversationItem_success_exclamation">Izvršeno!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Onemogočeno pisanje na kartico SD!</string>
   <string name="ConversationItem_view_secure_media_question">Želite pogledati zavarovano datoteko?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ta datoteka je shranjena v šifrirani podatkovni zbirki. Če jo boste odprli z zunanjim pregledovalnikom, bo začasno dešifrirana in shranjena na disk?    Ste prepričani, da želite to storiti?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ta datoteka je shranjena v šifrirani podatkovni zbirki. Če jo boste odprli z zunanjim pregledovalnikom, bo začasno dešifrirana in shranjena na disk? Ste prepričani, da želite to storiti?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Sporočilo za izmenjavo ključev je prejeto in obdelano.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Napaka, prejeto zastarelo sporočilo za izmenjavo ključev.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Prejeto sporočilo za izmenjavo ključev, kliknite za obdelavo.</string>
@@ -73,23 +76,36 @@
   <string name="ConversationListItem_key_exchange_message">Sporočilo za izmenjavo ključev...</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Izvozim na kartico SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">S tem⏎\nboste izvozili svoje ključe (šifrirane), nastavitve in sporočila na kartico SD.⏎</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">S tem boste izvozili svoje ključe, nastavitve in sporočila na kartico SD v šifrirani obliki.</string>
   <string name="ExportFragment_export">Izvozi</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Izvozim na kartico SD v nešifrirani obliki?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Pozor, s tem boste⏎\nizvozili vsebino svojih sporočil na SD kartico v nešifrirani obliki.⏎</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Pozor, s tem boste izvozili vsebino svojih sporočil na SD kartico v nešifrirani obliki.</string>
   <string name="ExportFragment_cancel">Prekliči</string>
   <string name="ExportFragment_exporting">Izvažam</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Izvažam nešifrirano na kartico SD...⏎</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Napaka - ne morem pisati na⏎\nkartico SD</string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Napaka pri zapisovanju na kartico SD.⏎</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Izvažam nešifrirano na kartico SD...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Napaka, ne morem pisati na kartico SD!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Napaka pri zapisovanju na kartico SD.</string>
   <string name="ExportFragment_success">Uspešno opravljeno!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Izvažam ključe (šifrirane),⏎\nnastavitve in sporočila...⏎</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Izvažam ključe, nastavitve in sporočila v šifrirani obliki...</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Uvozim sistemsko zbirko SMS sporočil?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">S tem boste uvozili⏎\nsporočil iz sistemske zbirke SMS v TextSecure. Če ste predhodno⏎\nže uvozili sporočila iz sistemske SMS zbirke, bodo ta sporočila v aplikaciji TextSecure podvojena.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">S tem boste uvozili sporočila iz sistemske zbirke SMS v TextSecure. Če ste predhodno že uvozili sporočila iz sistemske SMS zbirke, bodo ta sporočila v aplikaciji TextSecure podvojena.</string>
   <string name="ImportFragment_import">Uvozi</string>
   <string name="ImportFragment_cancel">Prekliči</string>
   <string name="ImportFragment_restore_encrypted_backup">Obnovim iz šifirane varnostne kopije?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nObnova šifrirane varnostne kopije bo nadomestila vaše obstoječe ključe, nastavitve in sporočila. Izgubili boste vse kar se nahaja v trenutni podatkovni zbirki TextSecure, ne pa tudi v varnostni kopiji.</string>
+  <string name="ImportFragment_restore">Obnovi</string>
+  <string name="ImportFragment_import_plaintext_backup">Uvozim nešifrirano varnostno kopijo?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">S tem boste uvozili sporočila iz nešifrirane varnostne kopije v TextSecure. Če ste predhodno že uvozili sporočila iz iste varnostne kopije, bodo ta sporočila v aplikaciji TextSecure podvojena.</string>
+  <string name="ImportFragment_importing">Uvažam</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Uvozi nešifrirano varnostno kopijo...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Ne najdem nobene nešifrirane varnostne kopije!</string>
+  <string name="ImportFragment_error_importing_backup">Napaka pri uvozu varnostne kopije!</string>
+  <string name="ImportFragment_import_complete">Uvoz zaključen!</string>
+  <string name="ImportFragment_restoring">Obnavljam</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Obnavljam šifrirano varnostno kopijo...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Ne najdem nobene šifrirane varnostne kopije!</string>
+  <string name="ImportFragment_restore_complete">Obnova končana!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Noben skeniran ključ ni bil najden!</string>
   <!--MmsDownloader-->
@@ -111,36 +127,36 @@
   <string name="PromptApnActivity_mms_settings_updated">Nastavitve MMS posodobljene</string>
   <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vnešeno lahko kadarkoli popravite v nastavitvah TextSecure.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pri tej izmenjavi se razlikuje od predhodno izmenjanih ključev s to osebo. To lahko pomeni, da nekdo prestreza komunikacijo, ali pa, da je oseba ponovno namestila TextSecure in ima sedaj nov  ključ identitete.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Morda bi želeli overoviti⏎\nta stik.⏎</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pri tej 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 overoviti ta stik.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis pri tej izmenjavi je zaupanja vreden, vendar imate izklopljeno možnost \'Samodejno dokončaj izmenjavo ključev\'.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nimate identifikacijskega ključa.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Prejemnik nima identifikacijskega ključa.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Prejemnik nima identifikacijskega ključa!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skenirajte ključ stika za primerjavo</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Skeniraj moj ključ</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Prikaži moj ključ za skeniraje</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">POZOR, skenirani ključ SE NE UJEMA! Pazljivo preverite tekst prstnega odtisa.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NEOVERJENO!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ključ stika je pravilen. Tudi vaš ključ mora biti potrjen iz njegove strani.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Preverjeno!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nimate identifikacijskega ključa!</string>
   <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Skeniraj moj prstni odtis</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Prikaži moj prstni odtis za skeniranje</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">Skeniraj prstni odtis stika</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">POZOR, skeniran ključ SE NE UJEMA! Pazljivo preverite tekst prstnega odtisa.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NI preverjen!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ključ stika je pravilen. Potrebno je skenirati tudi vaš prstni odtis.</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ključ stika je pravilen. Potrebno je z njegove strani skenirati tudi vaš prstni odtis.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Preverjen!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nimate identifikacijskega ključa.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Skeniranje za primerjavo</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Skeniraj za primerjavo</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">POZOR, skeniran ključ  se NE UJEMA!</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Skeniraj za primerjavo</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Prikaži za skeniranje</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">POZOR, skeniran ključ se NE UJEMA!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NI preverjeno!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skeniran ključ se ujema!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Preverjen!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Prstni odtis identitete</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">Prstni odtis</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Uveljavim kljub obstoječi zahtevi?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Prejemniku ste že poslali zahtevo za inicijacijo, ste prepričani, da želite poslati še eno?    To bo razveljavilo prvo zahtevo.</string>
@@ -179,7 +195,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Sporočila SMS trenutno ni mogoče poslati. Poslano bo, takoj ko bo mogoče.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Prejeli ste sporočilo nekoga, ki uporablja šifriranje s TextSecure.    Želite začeti varno sejo?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Prejeli ste sporočilo nekoga, ki uporablja šifriranje s TextSecure. Želite začeti varno sejo?</string>
   <string name="auto_initiate_activity__initiate_exchange">Začni izmenjavo</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Staro geslo:</string>
@@ -205,7 +221,7 @@
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Paketni način izbire</string>
   <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Nastavite geslo, s katerim bodo šifrirani vaši podatki v okviru aplikacije.   Geslo naj bo močno.</string>
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Nastavite geslo, s katerim bodo šifrirani vaši podatki v okviru aplikacije.\n\nGeslo naj bo močno.</string>
   <string name="create_passphrase_activity__passphrase">Geslo:</string>
   <string name="create_passphrase_activity__repeat">Ponovi:</string>
   <string name="create_passphrase_activity__continue">Nadaljuj</string>
@@ -219,6 +235,16 @@
   <string name="database_migration_activity__importing">UVAŽANJE</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Posodabljam podatkovne zbirke...</string>
+  <string name="export_fragment__export_encrypted_backup">Izvoz šifrirane varnostne kopije</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Izvozi šifrirano varnostno kopijo na kartico SD.</string>
+  <string name="export_fragment__export_plaintext_backup">Izvozi nešifrirano varnostno kopijo</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nIzvozi nešifrirano varnostno kopijo združljivo s sistemskimi varnostnimi kopijami SMS na kartico SD.</string>
+  <string name="import_fragment__import_system_sms_database">Uvozi sistemsko zbirko SMS sporočil</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Uvozi podatke iz sistemsko privzete SMS aplikacije.</string>
+  <string name="import_fragment__import_encrypted_backup">Uvozi šifrirano varnostno kopijo</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nObnovi predhodno izvoženo šifrirano varnostno kopijo Text Secure.</string>
+  <string name="import_fragment__import_plaintext_backup">Uvozi nešifrirano varnostno kopijo</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nUvozi nešifrirano datoteko z varnostno kopijo. Združljivo s sistemskimi varnostnimi kopijami SMS.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">GESLO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odkleni</string>
@@ -249,7 +275,7 @@
   <string name="AndroidManifest__create_passphrase">Ustvari geslo</string>
   <string name="AndroidManifest__enter_passphrase">Vpiši geslo</string>
   <string name="AndroidManifest__select_contacts">Izberi stike</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure zaznan</string>
+  <string name="AndroidManifest__textsecure_detected">Aplikacija TextSecure zaznana</string>
   <string name="AndroidManifest__public_identity_key">Javni identifikacijski ključ</string>
   <string name="AndroidManifest__change_passphrase">Zamenjaj geslo</string>
   <string name="AndroidManifest__verify_session">Overovi sejo</string>
@@ -257,6 +283,9 @@
   <string name="AndroidManifest__manage_identity_keys">Upravljanje identifikacijskih ključev</string>
   <string name="AndroidManifest__complete_key_exchange">Dokončaj izmenjavo ključev</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Uvoz / izvoz</string>
+  <string name="arrays__my_identity_key">Moj ID ključ</string>
+  <string name="arrays__contact_keys">Ključi stikov</string>
   <!--preferences.xml-->
   <string name="preferences__general">Splošno</string>
   <string name="preferences__pref_all_sms_title">Uporabljaj za vsa SMS sporočila</string>
@@ -271,6 +300,8 @@
   <string name="preferences__change_passphrase">Zamenjaj geslo</string>
   <string name="preferences__change_my_passphrase">Zamenjaj geslo</string>
   <string name="preferences__complete_key_exchanges">Zaključi izmenjave ključev</string>
+  <string name="preferences__disable_passphrase">Izklopi geslo</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Izklopi lokalno šifriranje sporočil in ključev</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Samodejno dokončaj izmenjavo ključev za vse nove seje ali seje z istim identifikacijskim ključem </string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po določenem času bo geslo v pomnilniku pozabljeno</string>
   <string name="preferences__timeout_passphrase">Čas pomnjenja gesla</string>
@@ -279,7 +310,7 @@
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Koliko časa naj bo geslo v pomnilniku, preden bo pozabljeno</string>
   <string name="preferences__identity_key_settings">Identifikacijski ključi</string>
   <string name="preferences__view_my_identity_key">Ogled mojega identifikacijskega ključa</string>
-  <string name="preferences__manage_identity_keys">Upravljanje ključev identitete</string>
+  <string name="preferences__manage_identity_keys">Upravljanje identifikacijskih ključev</string>
   <string name="preferences__manage_configured_identity_keys">Upravljanje nastavljenih identifikacijskih ključev</string>
   <string name="preferences__notifications">Obvestila</string>
   <string name="preferences__display_message_notifications_in_status_bar">Prikaži obvestilo o sporočilu v statusni vrstici</string>
@@ -319,11 +350,12 @@
   <string name="preferences__storage">Shranjevanje</string>
   <string name="preferences__conversation_length_limit">Omejitev dolžine pogovorov</string>
   <string name="preferences__trim_all_threads_now">Obreži vse pogovore zdaj</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skeniraj vse pogovore in uveljavi omejitve dolžine</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skeniraj vse pogovore in uveljavi omejitve njihove dolžine</string>
   <string name="preferences__light_theme">Svetla tema</string>
   <string name="preferences__dark_theme">Temna tema</string>
   <string name="preferences__appearance">Izgled</string>
   <string name="preferences__theme">Teme</string>
+  <string name="preferences__default">Privzeto</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -363,7 +395,7 @@
   <string name="conversation_group_options__broadcast">Oddaja</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Primerjaj</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Skeniraj za primerjavo</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Prikaži za skeniranje</string>
   <string name="key_scanning__menu_scan_to_compare">Skeniraj za primerjavo</string>
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">Odkleni</string>
@@ -374,5 +406,6 @@
   <string name="text_secure_normal__mark_all_as_read">Označi vsa kot prebrana</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overjeno</string>
+  <string name="preferences__language">Jezik</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 16a84b8c7..c87c2e47b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -13,6 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Är du säker på att du omeddelbart vill trimma alla konversationstrådar till de %s senaste meddelandena?</string>
   <string name="ApplicationPreferencesActivity_delete">Radera</string>
   <string name="ApplicationPreferencesActivity_my">Mitt</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Inaktivera lagringskryptering?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nVarning, detta inaktiverar lagringskryptering för alla meddelanden och nycklar. Dina krypterade\nsessioner kommer fortsätta att fungera, men vem som helst med fysisk tillgång till din enhet\nkommer kunna komma åt dem.</string>
+  <string name="ApplicationPreferencesActivity_disable">Inaktivera</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -297,6 +300,8 @@
   <string name="preferences__change_passphrase">Ändra lösenord</string>
   <string name="preferences__change_my_passphrase">Ändra mitt lösenord</string>
   <string name="preferences__complete_key_exchanges">Fullborda nyckelutbyten</string>
+  <string name="preferences__disable_passphrase">Inaktivera lösenord</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Inaktivera lokal kryptering av meddelanden och nycklar</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Fullfölj nyckelutbyten automatiskt för nya sessioner eller för existerande sessioner med samma identitetsnyckel</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Glöm lösenord från minnet efter ett intervall</string>
   <string name="preferences__timeout_passphrase">Timeout lösenord</string>
@@ -350,6 +355,7 @@
   <string name="preferences__dark_theme">Mörkt tema</string>
   <string name="preferences__appearance">Utseende</string>
   <string name="preferences__theme">Tema</string>
+  <string name="preferences__default">Standard</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -400,5 +406,6 @@
   <string name="text_secure_normal__mark_all_as_read">Markera alla som lästa</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verifierad</string>
+  <string name="preferences__language">Språk</string>
   <!--EOF-->
 </resources>