diff --git a/k9mail/src/main/res/values-cs/strings.xml b/k9mail/src/main/res/values-cs/strings.xml
index 63fa93391..26559620d 100644
--- a/k9mail/src/main/res/values-cs/strings.xml
+++ b/k9mail/src/main/res/values-cs/strings.xml
@@ -287,6 +287,7 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="global_settings_lock_screen_notification_visibility_app_name">Jméno aplikace</string>
   <string name="global_settings_lock_screen_notification_visibility_message_count">Počet nepřečtených zpráv</string>
   <string name="global_settings_lock_screen_notification_visibility_senders">Počet zpráv a odesilatelů</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Stejné jako při odemčené obrazovce</string>
   <string name="quiet_time">Doba klidu</string>
   <string name="quiet_time_description">Zakázat v noci zvonění, vibrace a blikání</string>
   <string name="quiet_time_starts">Doba klidu začíná</string>
diff --git a/k9mail/src/main/res/values-el/strings.xml b/k9mail/src/main/res/values-el/strings.xml
index 6080fbe99..ddefb7250 100644
--- a/k9mail/src/main/res/values-el/strings.xml
+++ b/k9mail/src/main/res/values-el/strings.xml
@@ -44,6 +44,7 @@
 </p>
     ]]></string>
   <!--Default signature-->
+  <string name="default_signature">-- \nΣταλμένο από τη συσκευή μου Android με το K-9 Mail. Παρακαλώ συγχωρήστε την ολιγολογία μου.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Ο λογαριασμός \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφεί από το K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Όλα τα δεδομένα για το λογαριασμό \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφούν από το K-9 Mail, αλλά οι ρυθμίσεις του λογαριασμού θα διατηρηθούν.</string>
@@ -157,6 +158,10 @@
   <string name="clearing_account">Καθαρισμός λογαριασμού \'<xliff:g id="account">%s</xliff:g>\'</string>
   <string name="recreating_account">Ανακατασκευή λογαριασμού \'<xliff:g id="account">%s</xliff:g>\'</string>
   <string name="notification_new_title">Νέο μήνυμα</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> νέο μήνυμα</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> νέα μηνύματα</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> μη αναγνωσμένα (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> περισσότερα στον <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Απάντηση</string>
@@ -264,6 +269,8 @@
   <string name="global_settings_confirm_action_delete_starred">Διαγραφή με αστέρι (προβολή μηνύματος μόνον)</string>
   <string name="global_settings_confirm_action_spam">Σκουπίδια</string>
   <string name="global_settings_confirm_action_delete_notif">Διαγραφή (από ειδιοποίηση)</string>
+  <string name="global_settings_privacy_hide_useragent">Αφαίρεση του User-Agent K-9 από την κεφαλίδα του mail</string>
+  <string name="global_settings_privacy_hide_timezone">Χρήση της UTC σαν ζώνη ώρας στην κεφαλίδα του mail</string>
   <string name="global_settings_notification_hide_subject_title">Απόκρυψη θέματος στις ειδοποιήσεις</string>
   <string name="global_settings_notification_hide_subject_never">Ποτέ</string>
   <string name="global_settings_notification_hide_subject_when_locked">Όταν το τηλέφωνο είναι κλειδωμένο</string>
@@ -273,6 +280,12 @@
   <string name="global_settings_notification_quick_delete_when_single_msg">Για ειδοποίηση ενός μηνύματος</string>
   <string name="global_settings_notification_quick_delete_always">Πάντοτε</string>
   <string name="global_settings_notification_quick_delete_description">Προβολή πλήκτρου στην ειδοποίηση που επιτρέπει τη γρήγορη διαγραφή του μηνύματος</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Ειδοποιήσεις οθόνης κλειδώματος</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Χωρίς ειδοποιήσεις οθόνης κλειδώματος</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Όνομα εφαρμογής</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Αριθμός μη αναγνωσμένων μηνυμάτων</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Αριθμός μηνυμάτων και αποστολείς</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Το ίδιο με όταν η οθόνη δεν είναι κλειδωμένη</string>
   <string name="quiet_time">Ώρες ησυχίας</string>
   <string name="quiet_time_description">Απενεργοποιεί κουδούνισμα και αναβοσβήσιμο τη νύχτα</string>
   <string name="quiet_time_starts">Έναρξη ωρών ησυχίας</string>
@@ -280,6 +293,7 @@
   <string name="account_setup_basics_title">Ρύθμιση νέου λογαριασμού</string>
   <string name="account_setup_basics_email_hint">Διεύθυνση email</string>
   <string name="account_setup_basics_password_hint">Συνθηματικό</string>
+  <string name="account_setup_basics_show_password">Εμφάνιση κωδικού πρόσβασης</string>
   <string name="account_setup_basics_manual_setup_action">Χειροκίνητη ρύθμιση</string>
   <string name="account_setup_check_settings_title"/>
   <string name="account_setup_check_settings_retr_info_msg">Ανάκτηση πληροφοριών λογαριασμού\u2026</string>
@@ -299,9 +313,11 @@
   <string name="account_setup_auth_type_normal_password">Απλό συνθηματικό</string>
   <string name="account_setup_auth_type_insecure_password">Συνθηματικό, μεταβιβασμένο χωρίς ασφάλεια</string>
   <string name="account_setup_auth_type_encrypted_password">Κρυπτογραφημένο συνθηματικό</string>
+  <string name="account_setup_auth_type_tls_client_certificate">Πιστοποιητικό πελάτη</string>
   <string name="account_setup_incoming_title">Ρυθμίσεις εισερχόμενης αλληλογραφίας</string>
   <string name="account_setup_incoming_username_label">Όνομα χρήστη</string>
   <string name="account_setup_incoming_password_label">Συνθηματικό</string>
+  <string name="account_setup_incoming_client_certificate_label">Πιστοποιητικό πελάτη</string>
   <string name="account_setup_incoming_pop_server_label">Εξυπηρέτης POP3</string>
   <string name="account_setup_incoming_imap_server_label">Εξυπηρέτης IMAP</string>
   <string name="account_setup_incoming_webdav_server_label">Exchange Server</string>
@@ -397,6 +413,9 @@
   <string name="account_setup_options_mail_display_count_all">Όλα τα μηνύματα</string>
   <string name="move_copy_cannot_copy_unsynced_message">Αδύνατη η αντιγραφή ή μετακίνηση μηνύματος που δεν έχει συγχρονιστεί με τον εξυπηρέτη</string>
   <string name="account_setup_failed_dlg_title">Οι ρυθμίσεις δεν μπόρεσαν να ολοκληρωθούν.</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Το όνομα χρήστη ή ο κωδικός πρόσβασης δεν είναι σωστά.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Ο διακομιστής παρουσίασε ένα μη εγκυρο πιστοποιητικό SSL. Κάποιες φορές αυτό συμβαίνει λόγω κακής ρύθμισής του. Άλλες φορές γιατί κάποιος προσπαθεί να επιτεθεί σε εσάς ή τον διακομιστή mail σας. Αν δεν είστε βέβαιοι τι συμβαίνει, επιλέξτε Απόρριψη και επικοινωνήστε με τους διαχειριστές του διακομιστή mail σας.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Αδύνατη η σύνδεση στον διακομιστή.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Διόρθωση λεπτομερειών</string>
   <string name="account_setup_failed_dlg_continue_action">Συνέχεια</string>
   <string name="account_settings_push_advanced_title">Προχωρημένα</string>
@@ -404,6 +423,12 @@
   <string name="account_settings_default_label">Εξ ορισμού λογαριασμός</string>
   <string name="account_settings_default_summary">Αποστολή ταχυδρομείου από αυτό το λογαριασμό εξ ορισμού</string>
   <string name="account_settings_notify_label">Ειδοποιήσεις νέων μηνυμάτων</string>
+  <string name="account_settings_folder_notify_new_mail_mode_label">Φάκελοι ειδοποιήσεων</string>
+  <string name="account_settings_folder_notify_new_mail_mode_all">Όλοι</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_class">Μόνο φάκελοι 1ου επιπέδου</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">Φάκελοι 1ου και 2ου επιπέδου</string>
+  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Όλοι εκτός από του 2ου επιπέδου</string>
+  <string name="account_settings_folder_notify_new_mail_mode_none">Κανένας</string>
   <string name="account_settings_notify_sync_label">Συγχρονισμός ειδοποιήσεων</string>
   <string name="account_settings_email_label">Η ηλεκτρονική σου διεύθυνση</string>
   <string name="account_settings_notify_summary">Ειδοποίηση στη γραμμή κατάστασης όταν φτάνει νέο μήνυμα</string>
@@ -442,6 +467,7 @@
   <string name="account_settings_quote_prefix_label">Πρόθεμα κειμένου παράθεσης</string>
   <string name="account_settings_crypto">Κρυπτογραφία</string>
   <string name="account_settings_crypto_app">Πάροχος OpenPGP</string>
+  <string name="account_settings_no_openpgp_provider_installed">Δεν υπάρχει εγκατεστημένος πάροχος OpenPGP</string>
   <string name="account_settings_mail_check_frequency_label">Συχνότητα ενημέρωσης φακέλων</string>
   <string name="account_settings_storage_title">Αποθήκευση</string>
   <string name="account_settings_color_label">Χρώμα λογαριασμού</string>
@@ -519,6 +545,10 @@
   <string name="folder_settings_folder_push_mode_first_class">Πρώτο επίπεδο</string>
   <string name="folder_settings_folder_push_mode_second_class">Δεύτερο επίπεδο</string>
   <string name="folder_settings_folder_push_mode_inherited">Όπως το επίπεδο συγχρονισμού</string>
+  <string name="folder_settings_folder_notify_mode_label">Επίπεδο ειδοποίησης φακέλου</string>
+  <string name="folder_settings_folder_notify_mode_normal">Κανένας</string>
+  <string name="folder_settings_folder_notify_mode_first_class">Πρώτο επίπεδο</string>
+  <string name="folder_settings_folder_notify_mode_second_class">Δεύτερο επίπεδο</string>
   <string name="account_settings_incoming_label">Ρυθμίσεις εισερχομένων</string>
   <string name="account_settings_incoming_summary">Ρύθμιση εξυπηρέτη εισερχόμενης αλληλογραφίας</string>
   <string name="account_settings_outgoing_label">Ρυθμίσεις εξερχομένων</string>
@@ -858,6 +888,7 @@
   <string name="fetching_attachment_dialog_title_send">Αποστολή μηνύματος</string>
   <string name="fetching_attachment_dialog_title_save">Αποθήκευση πρόχειρου</string>
   <string name="fetching_attachment_dialog_message">Ανάκληση συνημμένων…</string>
+  <string name="auth_external_error">Αδύνατη η πιστοποίηση. Ο διακομιστής δεν διαφημίζει την ικανότητα SASL EXTERNAL. Αυτό μπορεί να συμβαίνει λόγω κάποιου προβληματος με το πιστοποιητικό του πελάτη (ληγμένο, άγνωστη αρχή πιστοποίησης) ή κάποιο άλλο πρόβλημα ρυθμίσεων.</string>
   <!--=== OpenPGP specific ==================================================================-->
   <string name="openpgp_decrypting_verifying">Αποκρυπτογράφηση/Επαλήθευση…</string>
   <string name="openpgp_successful_decryption">Επιτυχής αποκρυπτογράφηση</string>
@@ -873,4 +904,10 @@
   <string name="openpgp_error">Σφάλμα OpenPGP:</string>
   <string name="openpgp_user_id">Ταυτότητα χρήστη</string>
   <!--=== Client certificates specific ==================================================================-->
+  <string name="account_setup_basics_client_certificate">Χρήση πιστοποιητικού πελάτη</string>
+  <string name="client_certificate_spinner_empty">Χωρίς πιστοποιητικό πελάτη</string>
+  <string name="client_certificate_spinner_delete">Αφαίρεση επιλογής πιστοποιητικού πελάτη</string>
+  <string name="client_certificate_retrieval_failure">Αποτυχία ανάκτησης του πιστοποιητικού πελάτη για το ψευδώνυμο \"<xliff:g id="alias">%s</xliff:g>\"</string>
+  <string name="client_certificate_advanced_options">Προχωρημένες ρυθμίσεις</string>
+  <string name="client_certificate_expired">Το πιστοποιητικό πελάτη \"<xliff:g id="certificate_alias">%1$s</xliff:g>\" έχει λήξει ή δεν είναι ακόμα έγκυρο (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
 </resources>
diff --git a/k9mail/src/main/res/values-es/strings.xml b/k9mail/src/main/res/values-es/strings.xml
index 08eef109b..77f6a856a 100644
--- a/k9mail/src/main/res/values-es/strings.xml
+++ b/k9mail/src/main/res/values-es/strings.xml
@@ -276,6 +276,12 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="global_settings_notification_quick_delete_when_single_msg">Para notificaciones de un mensaje</string>
   <string name="global_settings_notification_quick_delete_always">Siempre</string>
   <string name="global_settings_notification_quick_delete_description">Mostrar un botón en las notificaciones que permite borrar rápidamente los mensajes</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Notificaciones en pantalla bloqueada</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Sin notificaciones en pantalla bloqueada</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Nombre de la aplicación</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Cuenta de mensajes no leídos</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Cuenta de mensajes y remitentes</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Igual que con la pantalla desbloqueada</string>
   <string name="quiet_time">Horario de Silencio</string>
   <string name="quiet_time_description">Desactivar sonidos, alertas y luces por la noche</string>
   <string name="quiet_time_starts">Silencio comienza</string>
@@ -459,6 +465,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_quote_prefix_label">Prefijo de texto citado</string>
   <string name="account_settings_crypto">Cifrado</string>
   <string name="account_settings_crypto_app">Proveedor OpenPGP</string>
+  <string name="account_settings_no_openpgp_provider_installed">No hay instalado un proveedor de OpenPGP</string>
   <string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string>
   <string name="account_settings_storage_title">Almacenamiento</string>
   <string name="account_settings_color_label">Color de la cuenta</string>
diff --git a/k9mail/src/main/res/values-fi/strings.xml b/k9mail/src/main/res/values-fi/strings.xml
index 3c4d805c5..d784877c5 100644
--- a/k9mail/src/main/res/values-fi/strings.xml
+++ b/k9mail/src/main/res/values-fi/strings.xml
@@ -259,7 +259,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="global_settings_messageview_fixedwidth_label">Kiinteä kirjasinleveys</string>
   <string name="global_settings_messageview_fixedwidth_summary">Käytä kiinteää kirjasinleveyttä muotoilemattomille viesteille</string>
   <string name="global_settings_messageview_autofit_width_label">Sovita viestit automaattisesti</string>
-  <string name="global_settings_messageview_autofit_width_summary">Kutista viestit sopimaan ruudulle</string>
+  <string name="global_settings_messageview_autofit_width_summary">Kutista viestit sopimaan näytölle</string>
   <string name="global_settings_messageview_return_to_list_label">Palaa poiston jälkeen listanäkymään</string>
   <string name="global_settings_messageview_return_to_list_summary">Palaa viestilistaan viestin poiston jälkeen</string>
   <string name="global_settings_messageview_show_next_label">Näytä poiston jälkeen seuraava viesti</string>
@@ -281,11 +281,12 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="global_settings_notification_quick_delete_when_single_msg">Yksittäisen viestin ilmoituksessa</string>
   <string name="global_settings_notification_quick_delete_always">Aina</string>
   <string name="global_settings_notification_quick_delete_description">Näytä ilmoituksessa painike, joka mahdollistaa nopean viestin poistamisen</string>
-  <string name="global_settings_lock_screen_notification_visibility_title">Lukitusruudun ilmoitukset</string>
-  <string name="global_settings_lock_screen_notification_visibility_nothing">Ei lukitusruudun ilmoituksia</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Lukitusnäytön ilmoitukset</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Ei lukitusnäytön ilmoituksia</string>
   <string name="global_settings_lock_screen_notification_visibility_app_name">Sovelluksen nimi</string>
   <string name="global_settings_lock_screen_notification_visibility_message_count">Lukemattomien viestien määrä</string>
   <string name="global_settings_lock_screen_notification_visibility_senders">Viestien määrä ja lähettäjät</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Sama kuin näytön ollessa lukittuna</string>
   <string name="quiet_time">Hiljainen aika</string>
   <string name="quiet_time_description">Poista käytöstä soittoäänen pirinä, pärinä ja vilkkuminen yöllä</string>
   <string name="quiet_time_starts">Hiljainen aika alkaa</string>
diff --git a/k9mail/src/main/res/values-fr/strings.xml b/k9mail/src/main/res/values-fr/strings.xml
index b77ec472c..76dd35426 100644
--- a/k9mail/src/main/res/values-fr/strings.xml
+++ b/k9mail/src/main/res/values-fr/strings.xml
@@ -279,11 +279,12 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="global_settings_notification_quick_delete_when_single_msg">Pour la notification de message unique</string>
   <string name="global_settings_notification_quick_delete_always">Toujours</string>
   <string name="global_settings_notification_quick_delete_description">Afficher un bouton dans les notification permettant la suppression rapide des messages</string>
-  <string name="global_settings_lock_screen_notification_visibility_title">Notifications d\'écran de verrouillage</string>
-  <string name="global_settings_lock_screen_notification_visibility_nothing">Aucune notification d\'écran de verrouillage</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Notifications d\'écran verrouillé</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Notifications d\'écran déverrouillé</string>
   <string name="global_settings_lock_screen_notification_visibility_app_name">Nom d\'application</string>
   <string name="global_settings_lock_screen_notification_visibility_message_count">Nombre de messages non lus</string>
   <string name="global_settings_lock_screen_notification_visibility_senders">Nombre de messages et d\'expéditeurs</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Identiques à celles de l\'écran verrouillé</string>
   <string name="quiet_time">Heures silencieuses</string>
   <string name="quiet_time_description">Désactiver la sonnerie, la vibration et le clignotement pendant la nuit</string>
   <string name="quiet_time_starts">Début des heures silencieuses</string>
diff --git a/k9mail/src/main/res/values-hr/strings.xml b/k9mail/src/main/res/values-hr/strings.xml
index 432df995c..653c2383d 100644
--- a/k9mail/src/main/res/values-hr/strings.xml
+++ b/k9mail/src/main/res/values-hr/strings.xml
@@ -159,6 +159,11 @@ Molimo vas pošaljite izvještaj o manama, učestvujte u novim značajkama i pos
   <string name="clearing_account">Čišćenje računa \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Ponovno stvaranje računa \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Nova pošta</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nova poruka</item>
+    <item quantity="few"><xliff:g id="new_message_count">%d</xliff:g> novih poruka</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> novih poruka</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Nepročitano (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> više na <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Odgovori</string>
@@ -277,6 +282,12 @@ Molimo vas pošaljite izvještaj o manama, učestvujte u novim značajkama i pos
   <string name="global_settings_notification_quick_delete_when_single_msg">Za pojedinačnu obavijest poruke</string>
   <string name="global_settings_notification_quick_delete_always">Uvijek</string>
   <string name="global_settings_notification_quick_delete_description">Prikaži gumb u traci obavijesti koji dozvoljava brzo brisanje poruke</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Obavijesti Zaključanog Zaslona</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Nema obavijesti zaključanog zaslona</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Naziv aplikacije</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Broj nepročitanih poruka</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Broj poruka i pošiljatelja</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Isto kao kod otključanog zaslona</string>
   <string name="quiet_time">Tiho Vrijeme</string>
   <string name="quiet_time_description">Onemogućava zvonjavu, vibriranje i blicanje noću</string>
   <string name="quiet_time_starts">Vrijeme Tišine započinje</string>
diff --git a/k9mail/src/main/res/values-hu/strings.xml b/k9mail/src/main/res/values-hu/strings.xml
index 929d7c2ef..425e1e281 100644
--- a/k9mail/src/main/res/values-hu/strings.xml
+++ b/k9mail/src/main/res/values-hu/strings.xml
@@ -275,6 +275,10 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="global_settings_notification_quick_delete_when_single_msg">Egyszerű értesítés új levélnél</string>
   <string name="global_settings_notification_quick_delete_always">Mindig</string>
   <string name="global_settings_notification_quick_delete_description">Gomb mutatása az értesítések között a gyors üzenettörlés engedélyezéséhez</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Képernyőzár értesítések</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Nincsenek képernyőzár értesítések</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Alkalmazás neve</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Olvasatlan üzenetek száma</string>
   <string name="quiet_time">Csendes mód</string>
   <string name="quiet_time_description">Éjszakára kikapcsolja a jelzőhangokat, rezgést, villogást</string>
   <string name="quiet_time_starts">Csendes mód kezdete</string>
diff --git a/k9mail/src/main/res/values-it/strings.xml b/k9mail/src/main/res/values-it/strings.xml
index 9f8cea7a2..a80b885b8 100644
--- a/k9mail/src/main/res/values-it/strings.xml
+++ b/k9mail/src/main/res/values-it/strings.xml
@@ -280,9 +280,12 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="global_settings_notification_quick_delete_when_single_msg">Per la notifica di un singolo messaggio</string>
   <string name="global_settings_notification_quick_delete_always">Sempre</string>
   <string name="global_settings_notification_quick_delete_description">Mostra un pulsante nella notifica che consente l\'eliminazione rapida</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Notifiche schermata di blocco</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Nessuna notifica sulla schermata di blocco</string>
   <string name="global_settings_lock_screen_notification_visibility_app_name">Nome applicazione</string>
   <string name="global_settings_lock_screen_notification_visibility_message_count">Numero messaggi non letti</string>
   <string name="global_settings_lock_screen_notification_visibility_senders">Numero messaggi e mittenti</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Come quando lo schermo è sbloccato</string>
   <string name="quiet_time">Silenzioso a tempo</string>
   <string name="quiet_time_description">Disabilita chiamata, vibrazione e lampeggi di notte</string>
   <string name="quiet_time_starts">Attiva alle</string>
diff --git a/k9mail/src/main/res/values-ja/strings.xml b/k9mail/src/main/res/values-ja/strings.xml
index b877e2eb6..3ac212079 100644
--- a/k9mail/src/main/res/values-ja/strings.xml
+++ b/k9mail/src/main/res/values-ja/strings.xml
@@ -157,6 +157,9 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="clearing_account">アカウント \"<xliff:g id="account">%s</xliff:g>\" をクリアしています</string>
   <string name="recreating_account">アカウント \"<xliff:g id="account">%s</xliff:g>\" を再作成しています</string>
   <string name="notification_new_title">新着メール</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> 件の新着メッセージ</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> 未読 (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">返信</string>
@@ -275,6 +278,12 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="global_settings_notification_quick_delete_when_single_msg">通知メッセージが1件の場合</string>
   <string name="global_settings_notification_quick_delete_always">常に表示する</string>
   <string name="global_settings_notification_quick_delete_description">通知領域に削除ボタンを表示する</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">ロック画面通知</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">ロック画面通知なし</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">アプリケーション名</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">未読件数</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">メッセージ件数と送信者</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">画面ロックの解除と同じ</string>
   <string name="quiet_time">夜間時間帯</string>
   <string name="quiet_time_description">夜間での各種通知や表示を抑制する時間帯を設定</string>
   <string name="quiet_time_starts">開始時刻</string>
diff --git a/k9mail/src/main/res/values-lv/strings.xml b/k9mail/src/main/res/values-lv/strings.xml
index 28189c615..07401a5f4 100644
--- a/k9mail/src/main/res/values-lv/strings.xml
+++ b/k9mail/src/main/res/values-lv/strings.xml
@@ -160,6 +160,11 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="clearing_account">Iztukšot kontu \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Atjaunot kontu \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Jauna vēstule</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="zero"><xliff:g id="new_message_count">%d</xliff:g> nav jaunu vēstuļu</item>
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> jauna vēstule</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> jaunas vēstules</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Nelasītas (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> vairāk <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Atbildēt</string>
@@ -278,6 +283,12 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="global_settings_notification_quick_delete_when_single_msg">Vienas vēstules paziņojumam</string>
   <string name="global_settings_notification_quick_delete_always">Vienmēr</string>
   <string name="global_settings_notification_quick_delete_description">Paziņojumā rādīt pogu, ar kuru vēstuli var ātri izdzēst</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Paziņojumi bloķētā ekrānā</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Nekādus paziņojumus bloķētā ekrānā</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Aplikācijas nosaukums</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Saskaitīt nelasītās vēstules</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Vēstuļu skaitīšana un sūtītāji</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Tāds pats, kad ekrāns ir atbloķēts</string>
   <string name="quiet_time">Miera laiks</string>
   <string name="quiet_time_description">Noņemt zvanīšanu, vibrēšanu un mirgošanu naktī</string>
   <string name="quiet_time_starts">Miera laiks sākas</string>
@@ -461,6 +472,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_quote_prefix_label">Citētā teksta galvene</string>
   <string name="account_settings_crypto">Šifrēšana</string>
   <string name="account_settings_crypto_app">OpenPGP nodrošinātājs</string>
+  <string name="account_settings_no_openpgp_provider_installed">OpenPGP nodrošinātājs nav instalēts</string>
   <string name="account_settings_mail_check_frequency_label">Mapes pārbaudes biežums</string>
   <string name="account_settings_storage_title">Krātuve</string>
   <string name="account_settings_color_label">Konta krāsa</string>
diff --git a/k9mail/src/main/res/values-nb/strings.xml b/k9mail/src/main/res/values-nb/strings.xml
index 182fb1330..7d9f9b299 100644
--- a/k9mail/src/main/res/values-nb/strings.xml
+++ b/k9mail/src/main/res/values-nb/strings.xml
@@ -53,7 +53,7 @@ Vennligst send feilmeldinger, forbedringer og still spørsmål på
   <string name="account_clear_dlg_instructions_fmt">Lokale kopier av meldinger i \"<xliff:g id="account">%s</xliff:g>\" vil bli fjernet. Kontoinnstillinger vil bli beholdt.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Du må ha installert en filbehandler for å importere.</string>
-  <string name="open_market">Åpne Play-butikken</string>
+  <string name="open_market">Åpne Play Butikk</string>
   <!--=== General strings ==================================================================-->
   <string name="app_authors_fmt">Utviklere: <xliff:g id="app_authors">%s</xliff:g></string>
   <string name="app_revision_fmt">Revisjonsinformasjon: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -66,7 +66,7 @@ Vennligst send feilmeldinger, forbedringer og still spørsmål på
   <string name="delete_messages_label">Slett e-poster</string>
   <string name="delete_messages_desc">Tillat denne applikasjon å slette dine e-poster.</string>
   <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
-  <string name="accounts_title">Konti</string>
+  <string name="accounts_title">Kontoer</string>
   <string name="folders_title">Mapper</string>
   <string name="advanced">Avansert</string>
   <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
@@ -189,7 +189,7 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="debug_enable_debug_logging_title">Aktiver feilsøkingslogg</string>
   <string name="debug_enable_debug_logging_summary">Logg ekstra diagnostisk informasjon</string>
   <string name="debug_enable_sensitive_logging_title">Logg sensitiv informasjon</string>
-  <string name="debug_enable_sensitive_logging_summary">Kan vise passord i logger.</string>
+  <string name="debug_enable_sensitive_logging_summary">Passord kan vises i logger.</string>
   <string name="message_list_load_more_messages_action">Last flere meldinger</string>
   <string name="message_to_fmt">Til:<xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_compose_to_hint">Til</string>
@@ -627,7 +627,7 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Godta nøkkel</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Avvis nøkkel</string>
   <string name="message_list_help_key">Del (eller D) - Slett\nR - Svar\nA - Svar alle\nC - Skriv\nF - Videresend\nM - Flytt\nV - Arkiver\nY - Kopier\nZ - Marker (U)leste\nG - Stjerne\nO - Sorteringstype\nI - Sorteringsrekkefølge\nQ - Tilbake til mapper\nS - Velg/fjern valg\nJ eller P - Forrige melding\nK eller N - Neste melding</string>
-  <string name="folder_list_help_key">1 - Vis bare 1. klasses mapper\n2 - Vis 1. og 2. klasses mapper\n3 - Vis alle utenom 1. og 2. klasses mapper\n4 - Vis alle mapper\nQ - Tilbake til Konti\nS - Rediger kontoinnstillinger</string>
+  <string name="folder_list_help_key">1 - Vis bare 1. klasses mapper\n2 - Vis 1. og 2. klasses mapper\n3 - Vis alle utenom 1. og 2. klasses mapper\n4 - Vis alle mapper\nQ - Tilbake til Kontoer\nS - Rediger kontoinnstillinger</string>
   <string name="folder_list_filter_hint">mappenavn inneholder</string>
   <string name="folder_list_display_mode_label">Vis mapper …</string>
   <string name="folder_list_display_mode_all">Alle mapper</string>
@@ -642,7 +642,7 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="setting_theme_light">Lys</string>
   <string name="display_preferences">Visning</string>
   <string name="global_preferences">Globalt</string>
-  <string name="debug_preferences">Feilretting</string>
+  <string name="debug_preferences">Feilsøking</string>
   <string name="privacy_preferences">Personvern</string>
   <string name="network_preferences">Nettverk</string>
   <string name="interaction_preferences">Samhandling</string>
@@ -683,7 +683,7 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="measure_accounts_summary">Slå av for raskere visning</string>
   <string name="count_search_title">Tell søkeresultater</string>
   <string name="count_search_summary">Slå av for raskere visning</string>
-  <string name="hide_special_accounts_title">Gjem spesialkonti</string>
+  <string name="hide_special_accounts_title">Skjul spesialkontoer</string>
   <string name="hide_special_accounts_summary">Skjul den samlede innboksen og alle meldingskontoer</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="flagged_modifier">- Stjernede</string>
diff --git a/k9mail/src/main/res/values-nl/strings.xml b/k9mail/src/main/res/values-nl/strings.xml
index d672d7b86..20212afa9 100644
--- a/k9mail/src/main/res/values-nl/strings.xml
+++ b/k9mail/src/main/res/values-nl/strings.xml
@@ -158,6 +158,10 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="clearing_account">Account \"<xliff:g id="account">%s</xliff:g>\" wissen</string>
   <string name="recreating_account">Account \"<xliff:g id="account">%s</xliff:g>\" opnieuw instellen</string>
   <string name="notification_new_title">Nieuwe mail</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nieuwe berichten</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> nieuwe berichten</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Ongelezen (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> meer op <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Antwoorden</string>
@@ -276,6 +280,12 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="global_settings_notification_quick_delete_when_single_msg">Notificatie voor los bericht</string>
   <string name="global_settings_notification_quick_delete_always">Altijd</string>
   <string name="global_settings_notification_quick_delete_description">Laat een knop in de notificatie zien om snel te verwijderen</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Start scherm notificatie</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Geen start scherm notificatie</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">App naam</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Ongelezen berichten teller</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Berichten teller (ook verzonden)</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Het zelfde. Ook na schermontgrendeling</string>
   <string name="quiet_time">Stilteperiode</string>
   <string name="quiet_time_description">Schakel beltoon, vibratie en leds uit gedurende de nacht</string>
   <string name="quiet_time_starts">Stilteperiode start</string>
@@ -892,11 +902,17 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="openpgp_signature_unknown">Onbekende ondertekenaar</string>
   <string name="openpgp_signature_invalid">Ongeldige pgp handtekening</string>
   <string name="openpgp_signature_unknown_text">Geen publieke sleutel voor deze handtekening</string>
+  <string name="openpgp_successful_decryption_valid_signature_certified">Succesvolle decodering met geldige handtekening (gecertificeerd)</string>
+  <string name="openpgp_successful_decryption_valid_signature_uncertified">Succesvolle decodering met geldige handtekening (ongecertificeerd)</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Succesvolle decodering ondanks dat de publieke sleutels mist</string>
   <string name="openpgp_get_key">Zoek de missende sleutel</string>
   <string name="openpgp_error">OpenPGP Fout:</string>
   <string name="openpgp_user_id">Gebruikers-id</string>
   <!--=== Client certificates specific ==================================================================-->
   <string name="account_setup_basics_client_certificate">Gebruik cliënt certificaat</string>
   <string name="client_certificate_spinner_empty">Geen cliënt certificaat</string>
+  <string name="client_certificate_spinner_delete">Verwijder cliënt certificaat selectie</string>
+  <string name="client_certificate_retrieval_failure">Alias client certificaat niet ontvangen \"<xliff:g id="alias">%s</xliff:g>\"</string>
   <string name="client_certificate_advanced_options">Geavanceerde opties</string>
+  <string name="client_certificate_expired">Cliënt certificaat \"<xliff:g id="certificate_alias">%1$s</xliff:g>\" is verlopen of niet geldig (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
 </resources>
diff --git a/k9mail/src/main/res/values-pl/strings.xml b/k9mail/src/main/res/values-pl/strings.xml
index 4b39db55b..2277605d0 100644
--- a/k9mail/src/main/res/values-pl/strings.xml
+++ b/k9mail/src/main/res/values-pl/strings.xml
@@ -745,7 +745,7 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="messagelist_sent_cc_me_sigil">›</string>
   <string name="error_unable_to_connect">Błąd połączenia.</string>
   <string name="import_export_action">Kopia zapasowa</string>
-  <string name="settings_export_account">Ustawienia konta</string>
+  <string name="settings_export_account">Eksportuj ustawienia konta</string>
   <string name="settings_export_all">Eksport</string>
   <string name="settings_import_dialog_title">Importuj</string>
   <string name="settings_export_dialog_title">Eksportuj</string>
diff --git a/k9mail/src/main/res/values-ru/strings.xml b/k9mail/src/main/res/values-ru/strings.xml
index 9eacb0926..b09c8aa93 100644
--- a/k9mail/src/main/res/values-ru/strings.xml
+++ b/k9mail/src/main/res/values-ru/strings.xml
@@ -3,9 +3,9 @@
   <!--=== App-specific strings =============================================================-->
   <!--This should make it easier for forks to change the branding-->
   <!--Used in AndroidManifest.xml-->
-  <string name="app_name">K-9 Mail</string>
-  <string name="beta_app_name">K-9 Mail бета</string>
-  <string name="shortcuts_title">K-9 Учетные записи</string>
+  <string name="app_name">Почта</string>
+  <string name="beta_app_name">Почта β</string>
+  <string name="shortcuts_title">Почтовые ящики K-9</string>
   <string name="unread_widget_label">Не прочитано</string>
   <string name="remote_control_label">Удалённое управление</string>
   <string name="remote_control_desc">Разрешить удалённое управление настройками и действиями K-9 Mail</string>
@@ -38,7 +38,7 @@ K-9 Mail — почтовый клиент для Android.
   <li>…и многое другое!</li>
 </ul>
 <p>
-Отметим, что K-9 Mail не полностью совместим с MS Exchange и не поддерживает бесплатные ящики Hotmail
+Отметим, что K-9 Mail неполностью совместим с MS Exchange и не поддерживает бесплатные ящики Hotmail
 </p><p>
 Вопросы, сообщения об ошибках и участие в разработке на
 <a href=\"http://k9mail.googlecode.com/\">http://k9mail.googlecode.com/</a>.
@@ -158,6 +158,11 @@ K-9 Mail — почтовый клиент для Android.
   <string name="clearing_account">Очистка ящика \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Пересоздание ящика \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Новая почта</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> новое письмо</item>
+    <item quantity="few"><xliff:g id="new_message_count">%d</xliff:g> новых писем</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> новых писем</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> новых (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> в <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Ответить</string>
@@ -265,8 +270,8 @@ K-9 Mail — почтовый клиент для Android.
   <string name="global_settings_confirm_action_delete_starred">Удаление важного (в просмотре)</string>
   <string name="global_settings_confirm_action_spam">Перемещение в спам</string>
   <string name="global_settings_confirm_action_delete_notif">Удаление (в уведомлении)</string>
-  <string name="global_settings_privacy_hide_useragent">Убрать K-9 User-Agent из заголовков</string>
-  <string name="global_settings_privacy_hide_timezone">Временная зона UTC в заголовках</string>
+  <string name="global_settings_privacy_hide_useragent">Убрать заголовок K-9 User-Agent</string>
+  <string name="global_settings_privacy_hide_timezone">Время в UTC в заголовках</string>
   <string name="global_settings_notification_hide_subject_title">Скрыть тему в уведомлении</string>
   <string name="global_settings_notification_hide_subject_never">Никогда</string>
   <string name="global_settings_notification_hide_subject_when_locked">При блокировке</string>
@@ -276,6 +281,12 @@ K-9 Mail — почтовый клиент для Android.
   <string name="global_settings_notification_quick_delete_when_single_msg">Для одиночного</string>
   <string name="global_settings_notification_quick_delete_always">Всегда</string>
   <string name="global_settings_notification_quick_delete_description">Кнопка в уведомлении для быстрого удаления сообщения</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Встроить в экран блокировки</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Убрать с экрана блокировки</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Имя приложения</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Счётчик непрочитанных</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Счётчик писем и отправители</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Как без блокировки</string>
   <string name="quiet_time">Период тишины</string>
   <string name="quiet_time_description">Отключить мелодию, вибрацию и индикатор на ночь</string>
   <string name="quiet_time_starts">Начало</string>
@@ -415,12 +426,12 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_settings_default_label">Ящик по умолчанию</string>
   <string name="account_settings_default_summary">По умолчанию отправлять почту с этого ящика</string>
   <string name="account_settings_notify_label">Уведомить о почте</string>
-  <string name="account_settings_folder_notify_new_mail_mode_label">Папки уведомлений</string>
+  <string name="account_settings_folder_notify_new_mail_mode_label">Уведомления папок</string>
   <string name="account_settings_folder_notify_new_mail_mode_all">Все</string>
-  <string name="account_settings_folder_notify_new_mail_mode_first_class">Папки 1-го класса</string>
-  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">Папки 1-го и 2-го Класса</string>
-  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Все кроме папок 2-го Класса</string>
-  <string name="account_settings_folder_notify_new_mail_mode_none">Ничего</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_class">1 класс</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1 и 2 классы </string>
+  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Кроме 2 класса</string>
+  <string name="account_settings_folder_notify_new_mail_mode_none">Нет</string>
   <string name="account_settings_notify_sync_label">Уведомить о проверке</string>
   <string name="account_settings_email_label">Ваш адрес email</string>
   <string name="account_settings_notify_summary">Показать уведомление о новой почте</string>
@@ -459,6 +470,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_settings_quote_prefix_label">Префикс цитаты</string>
   <string name="account_settings_crypto">Криптография</string>
   <string name="account_settings_crypto_app">Провайдер OpenPGP</string>
+  <string name="account_settings_no_openpgp_provider_installed">Провайдер OpenPGP не установлен</string>
   <string name="account_settings_mail_check_frequency_label">Интервал проверки</string>
   <string name="account_settings_storage_title">Хранение</string>
   <string name="account_settings_color_label">Цвет</string>
@@ -506,7 +518,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_settings_folder_sync_mode_first_and_second_class">1 и 2 классы</string>
   <string name="account_settings_folder_sync_mode_not_second_class">Кроме 2 класса</string>
   <string name="account_settings_folder_sync_mode_none">Нет</string>
-  <string name="account_settings_folder_push_mode_label">Push папки</string>
+  <string name="account_settings_folder_push_mode_label">Push</string>
   <string name="account_settings_folder_push_mode_all">Все</string>
   <string name="account_settings_folder_push_mode_first_class">1 класс</string>
   <string name="account_settings_folder_push_mode_first_and_second_class">1 и 2 классы</string>
@@ -531,16 +543,16 @@ K-9 Mail — почтовый клиент для Android.
   <string name="folder_settings_folder_sync_mode_first_class">1 класс</string>
   <string name="folder_settings_folder_sync_mode_second_class">2 класс</string>
   <string name="folder_settings_folder_sync_mode_inherited">Как видимости</string>
-  <string name="folder_settings_folder_push_mode_label">Папка push класса</string>
+  <string name="folder_settings_folder_push_mode_label">Push</string>
   <string name="folder_settings_folder_push_mode_normal">Нет</string>
   <string name="folder_settings_folder_push_mode_first_class">1 класс</string>
   <string name="folder_settings_folder_push_mode_second_class">2 класс</string>
   <string name="folder_settings_folder_push_mode_inherited">Как синхронизации</string>
-  <string name="folder_settings_folder_notify_mode_label">Папка класса уведомлений</string>
-  <string name="folder_settings_folder_notify_mode_normal">Ничего</string>
-  <string name="folder_settings_folder_notify_mode_first_class">1-ый Класс</string>
-  <string name="folder_settings_folder_notify_mode_second_class">2-ой Класс</string>
-  <string name="folder_settings_folder_notify_mode_inherited">Такой же как и push  класс</string>
+  <string name="folder_settings_folder_notify_mode_label">Уведомление</string>
+  <string name="folder_settings_folder_notify_mode_normal">Нет</string>
+  <string name="folder_settings_folder_notify_mode_first_class">1 класс</string>
+  <string name="folder_settings_folder_notify_mode_second_class">2 класс</string>
+  <string name="folder_settings_folder_notify_mode_inherited">Как push</string>
   <string name="account_settings_incoming_label">Сервер входящих</string>
   <string name="account_settings_incoming_summary">Настройки сервера входящей почты</string>
   <string name="account_settings_outgoing_label">Сервер исходящих</string>
@@ -668,7 +680,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_setup_push_limit_500">500 папок</string>
   <string name="account_setup_push_limit_1000">1000 папок</string>
   <string name="animations_title">Анимация</string>
-  <string name="animations_summary">Видеоэффекты в интерфейсе</string>
+  <string name="animations_summary">Анимация интерфейса</string>
   <string name="gestures_title">Жесты</string>
   <string name="gestures_summary">Управление жестами</string>
   <string name="volume_navigation_title">Прокрутка кнопками Vol+/-</string>
diff --git a/k9mail/src/main/res/values-sk/strings.xml b/k9mail/src/main/res/values-sk/strings.xml
index 40caf6221..4fc298583 100644
--- a/k9mail/src/main/res/values-sk/strings.xml
+++ b/k9mail/src/main/res/values-sk/strings.xml
@@ -158,6 +158,11 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="clearing_account">Čistenie účtu \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Obnovovanie účtu \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Nová správa</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nová správa</item>
+    <item quantity="few"><xliff:g id="new_message_count">%d</xliff:g> nové správy</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> nových správ</item>
+  </plurals>
   <string name="notification_new_one_account_fmt">Počet neprečítaných správ: <xliff:g id="unread_message_count">%d</xliff:g> v <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_additional_messages">+ ďalších <xliff:g id="additional_messages">%d</xliff:g> v <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Odpovedať</string>
@@ -264,7 +269,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="global_settings_confirm_action_delete">Vymazať</string>
   <string name="global_settings_confirm_action_delete_starred">Vymazať správy s hviezdičkou (v zobrazení správ)</string>
   <string name="global_settings_confirm_action_spam">Nevyžiadaná pošta</string>
-  <string name="global_settings_confirm_action_delete_notif">Vymazať (z oznámenia)</string>
+  <string name="global_settings_confirm_action_delete_notif">Vymazať (z oznámení)</string>
   <string name="global_settings_privacy_hide_useragent">Odstrániť používateľského agenta K-9 z hlavičiek správ</string>
   <string name="global_settings_privacy_hide_timezone">Použiť UTC ako časové pásmo v hlavičkách správ</string>
   <string name="global_settings_notification_hide_subject_title">Skryť predmet v oznámení</string>
@@ -276,6 +281,12 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="global_settings_notification_quick_delete_when_single_msg">Pre vymazanie jednej správy</string>
   <string name="global_settings_notification_quick_delete_always">Vždy</string>
   <string name="global_settings_notification_quick_delete_description">Zobraziť tlačidlo v oznámení pre rýchle vymazanie správy</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Oznámenia na obrazovke uzamknutia</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Žiadne oznámenia na obrazovke uzamknutia</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Názov aplikácie</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Počet neprečítaných správ</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Počet správ a odosielatelia</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Rovnaké ako pri odomknutej obrazovke</string>
   <string name="quiet_time">Čas ticha</string>
   <string name="quiet_time_description">Zakázať vyzváňanie, bzučanie a blikanie v noci</string>
   <string name="quiet_time_starts">Čas ticha začína o</string>
@@ -414,7 +425,13 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_title_fmt">Nastavenia účtu</string>
   <string name="account_settings_default_label">Predvolený účet</string>
   <string name="account_settings_default_summary">Odosielať e-maily z tohto účtu</string>
-  <string name="account_settings_notify_label">Oznámenie o nových správach</string>
+  <string name="account_settings_notify_label">Oznámenia o nových správach</string>
+  <string name="account_settings_folder_notify_new_mail_mode_label">Priečinky oznámení</string>
+  <string name="account_settings_folder_notify_new_mail_mode_all">Všetky</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_class">Len priečinky 1. triedy</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">Priečinky 1. a 2. triedy</string>
+  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Všetky okrem priečinkov 2. triedy</string>
+  <string name="account_settings_folder_notify_new_mail_mode_none">Žiadne</string>
   <string name="account_settings_notify_sync_label">Oznámenie o synchronizácii</string>
   <string name="account_settings_email_label">Vaša e-mailová adresa</string>
   <string name="account_settings_notify_summary">Oznamovať v stavovej lište, keď príde nová pošta</string>
@@ -424,7 +441,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_notification_opens_unread_label">Oznámenie otvorí neprečítané správy</string>
   <string name="account_settings_notification_opens_unread_summary">Po otvorení oznámenia zobraziť neprečítané správy</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Po otvorení označiť ako prečítané</string>
-  <string name="account_settings_mark_message_as_read_on_view_summary">Označiť správu ako prečítanú po jej otvorení na zobrazenie</string>
+  <string name="account_settings_mark_message_as_read_on_view_summary">Označiť správu ako prečítanú po jej zobrazení</string>
   <string name="account_settings_show_pictures_label">Vždy zobraziť obrázky</string>
   <string name="account_settings_show_pictures_never">Nie</string>
   <string name="account_settings_show_pictures_only_from_contacts">Od kontaktov</string>
@@ -453,6 +470,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_quote_prefix_label">Predpona citovaného textu</string>
   <string name="account_settings_crypto">Šifrovanie</string>
   <string name="account_settings_crypto_app">Poskytovateľ OpenPGP</string>
+  <string name="account_settings_no_openpgp_provider_installed">Nenainštalovaný poskytovateľ OpenPGP</string>
   <string name="account_settings_mail_check_frequency_label">Frekvencia synchronizácie priečinkov</string>
   <string name="account_settings_storage_title">Ukladací priestor</string>
   <string name="account_settings_color_label">Farba účtu</string>
@@ -530,13 +548,18 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="folder_settings_folder_push_mode_first_class">1. trieda</string>
   <string name="folder_settings_folder_push_mode_second_class">2. trieda</string>
   <string name="folder_settings_folder_push_mode_inherited">Rovnaká ako trieda synchronizácie</string>
+  <string name="folder_settings_folder_notify_mode_label">Trieda priečinkov oznámení</string>
+  <string name="folder_settings_folder_notify_mode_normal">Žiadna</string>
+  <string name="folder_settings_folder_notify_mode_first_class">1. trieda</string>
+  <string name="folder_settings_folder_notify_mode_second_class">2. trieda</string>
+  <string name="folder_settings_folder_notify_mode_inherited">Rovnaká ako push trieda</string>
   <string name="account_settings_incoming_label">Server prichádzajúcej pošty</string>
   <string name="account_settings_incoming_summary">Nastaviť server prichádzajúcej pošty</string>
   <string name="account_settings_outgoing_label">Server odchádzajúcej pošty</string>
   <string name="account_settings_outgoing_summary">Nastaviť (SMTP) server odchádzajúcej pošty</string>
   <string name="account_settings_description_label">Názov účtu</string>
   <string name="account_settings_name_label">Vaše meno</string>
-  <string name="notifications_title">Upozornenia</string>
+  <string name="notifications_title">Oznámenia</string>
   <string name="account_settings_vibrate_enable">Vibrovanie</string>
   <string name="account_settings_vibrate_summary">Vibrovať pri doručení nového e-mailu</string>
   <string name="account_settings_vibrate_pattern_label">Vzory vibrovania</string>
@@ -547,7 +570,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_vibrate_pattern_4">Vzor 4</string>
   <string name="account_settings_vibrate_pattern_5">Vzor 5</string>
   <string name="account_settings_vibrate_times">Opakovať vibrovanie</string>
-  <string name="account_settings_ringtone">Vyzváňanie pre novä správu</string>
+  <string name="account_settings_ringtone">Zvonenie pre novú správu</string>
   <string name="account_settings_led_label">Blikanie LED</string>
   <string name="account_settings_led_summary">Blikať diódou LED pri doručení novej správy</string>
   <string name="account_settings_composition_title">Možnosti vytvárania správ</string>
@@ -646,7 +669,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="background_ops_label">Synchronizácia na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <string name="background_ops_always">Vždy</string>
-  <string name="background_ops_auto_sync_only">Keď je možnosť \'Automatická synchronizácia\'  zaškrtnutá</string>
+  <string name="background_ops_auto_sync_only">Keď je povolená možnosť \"Automatická synchronizácia\"</string>
   <string name="batch_select_all">Vybrať všetko</string>
   <string name="account_setup_push_limit_label">Maximálny počet priečinkov na kontrolu pomocou push</string>
   <string name="account_setup_push_limit_10">10 priečinkov</string>
diff --git a/k9mail/src/main/res/values-sv/strings.xml b/k9mail/src/main/res/values-sv/strings.xml
index 0e2e6f6f0..a0df46562 100644
--- a/k9mail/src/main/res/values-sv/strings.xml
+++ b/k9mail/src/main/res/values-sv/strings.xml
@@ -45,6 +45,7 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
 </p>
     ]]></string>
   <!--Default signature-->
+  <string name="default_signature">-- \nSkickat från min Android-enhet med K-9 E-post. Ursäkta min fåordighet.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Kontot \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas från K-9 E-post.</string>
   <string name="account_recreate_dlg_instructions_fmt">Alla lokala data för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas. Kontoinställningar behålls.</string>
@@ -158,6 +159,10 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="clearing_account">Rensar konto \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Återskapar konto \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Ny e-post</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nytt meddelande</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> nya meddelanden</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> olästa (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> ytterligare på <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Svara</string>
@@ -276,6 +281,12 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="global_settings_notification_quick_delete_when_single_msg">För borttagning av enstaka meddelande</string>
   <string name="global_settings_notification_quick_delete_always">Alltid</string>
   <string name="global_settings_notification_quick_delete_description">Visa en knapp i aviseringen som möjliggör snabb borttagning av meddelandet</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Aviseringar på låsskärm</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Inga aviseringar på låsskärm</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Applikationsnamn</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Antal olästa meddelanden</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Meddelandeantal och avsändare</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Samma som när skärmen är olåst</string>
   <string name="quiet_time">Tyst tid</string>
   <string name="quiet_time_description">Inaktivera ringsignaler, vibration och blinkande på natten</string>
   <string name="quiet_time_starts">Tyst tid börjar</string>
@@ -283,6 +294,7 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_setup_basics_title">Konfigurera ett nytt konto</string>
   <string name="account_setup_basics_email_hint">e-postadress</string>
   <string name="account_setup_basics_password_hint">Lösenord</string>
+  <string name="account_setup_basics_show_password">Visa lösenord</string>
   <string name="account_setup_basics_manual_setup_action">Konfigurera manuellt</string>
   <string name="account_setup_check_settings_title"/>
   <string name="account_setup_check_settings_retr_info_msg">Hämtar kontoinformation\u2026</string>
@@ -302,9 +314,11 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_setup_auth_type_normal_password">Normalt lösenord</string>
   <string name="account_setup_auth_type_insecure_password">Lösenord som skickas oskyddat</string>
   <string name="account_setup_auth_type_encrypted_password">Krypterat lösenord</string>
+  <string name="account_setup_auth_type_tls_client_certificate">Klientcertifikat</string>
   <string name="account_setup_incoming_title">Inställningar för inkommande server</string>
   <string name="account_setup_incoming_username_label">Användarnanm</string>
   <string name="account_setup_incoming_password_label">Lösenord</string>
+  <string name="account_setup_incoming_client_certificate_label">Klientcertifikat</string>
   <string name="account_setup_incoming_pop_server_label">POP3-server</string>
   <string name="account_setup_incoming_imap_server_label">IMAP-server</string>
   <string name="account_setup_incoming_webdav_server_label">Exchange-server</string>
@@ -314,7 +328,8 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_setup_incoming_security_none_label">Ingen</string>
   <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
   <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
-  <string name="account_setup_incoming_delete_policy_label">När jag tar bort meddelanden</string>
+  <string name="account_setup_incoming_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" är inte giltigt tillsammans med \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
+  <string name="account_setup_incoming_delete_policy_label">När jag raderar ett meddelande</string>
   <string name="account_setup_incoming_delete_policy_never_label">Radera inte på servern</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Radera på servern</string>
   <string name="account_setup_incoming_delete_policy_markread_label">Markera som läst på servern</string>
@@ -353,6 +368,7 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_setup_outgoing_username_label">Användarnamn</string>
   <string name="account_setup_outgoing_password_label">Lösenord</string>
   <string name="account_setup_outgoing_authentication_label">Autentiseringstyp</string>
+  <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" är inte giltigt tillsammans med \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Ogiltig konfiguration: <xliff:g id="err_mess">%s</xliff:g></string>
   <string name="account_setup_options_title">Kontoinställningar</string>
   <string name="compact_action">Komprimera konto</string>
@@ -400,6 +416,9 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_setup_options_mail_display_count_all">alla brev</string>
   <string name="move_copy_cannot_copy_unsynced_message">Kan inte kopiera eller flytta ett brev som inte är synkroniserat med servern</string>
   <string name="account_setup_failed_dlg_title">Kunde inte fullborda konfigurationen</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Felaktigt användarnamn eller lösenord.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Servern skickade ett ogiltigt SSL-certifikat. Det kan bero på en felaktigt konfigurerad server. Det kan också bero på att någon försöker attackera dig eller din epostserver. Om du inte vet vad som pågår, välj Avvisa och kontakta personerna som sköter epostservern.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Kan inte ansluta till servern.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Redigera detaljer</string>
   <string name="account_setup_failed_dlg_continue_action">Fortsätt</string>
   <string name="account_settings_push_advanced_title">Avancerat</string>
@@ -407,6 +426,12 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_settings_default_label">Standardkonto</string>
   <string name="account_settings_default_summary">Skicka e-post från detta konto som standard</string>
   <string name="account_settings_notify_label">Avisering för ny e-post</string>
+  <string name="account_settings_folder_notify_new_mail_mode_label">Aviseringskataloger</string>
+  <string name="account_settings_folder_notify_new_mail_mode_all">Alla</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_class">Bara första klassens mappar</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">Första och andra klassens mappar</string>
+  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Allt utom andra klassens mappar</string>
+  <string name="account_settings_folder_notify_new_mail_mode_none">Inga</string>
   <string name="account_settings_notify_sync_label">Avisering vid synkronisering</string>
   <string name="account_settings_email_label">Din e-postadress</string>
   <string name="account_settings_notify_summary">Visa avisering i statusraden vid ny e-post</string>
@@ -445,6 +470,7 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_settings_quote_prefix_label">Citatprefix</string>
   <string name="account_settings_crypto">Kryptering</string>
   <string name="account_settings_crypto_app">OpenPGP-leverantör</string>
+  <string name="account_settings_no_openpgp_provider_installed">Ingen OpenPGP-leverantör installerad</string>
   <string name="account_settings_mail_check_frequency_label">Frekvens för att kontrollera mappar</string>
   <string name="account_settings_storage_title">Lagring</string>
   <string name="account_settings_color_label">Kontofärg</string>
@@ -522,6 +548,11 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="folder_settings_folder_push_mode_first_class">1:a klassen</string>
   <string name="folder_settings_folder_push_mode_second_class">2:a klassen</string>
   <string name="folder_settings_folder_push_mode_inherited">Samma som synkroniseringsklass</string>
+  <string name="folder_settings_folder_notify_mode_label">Aviseringsklass för mapp</string>
+  <string name="folder_settings_folder_notify_mode_normal">Inga</string>
+  <string name="folder_settings_folder_notify_mode_first_class">Första klass</string>
+  <string name="folder_settings_folder_notify_mode_second_class">Andra klass</string>
+  <string name="folder_settings_folder_notify_mode_inherited">Samma som push-klass</string>
   <string name="account_settings_incoming_label">Inkommande server</string>
   <string name="account_settings_incoming_summary">Konfigurera servern för inkommande e-post</string>
   <string name="account_settings_outgoing_label">Utgående server</string>
@@ -603,6 +634,8 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_setup_failed_dlg_invalid_certificate_title">Okänt certifikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Acceptera nyckel</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Neka nyckel</string>
+  <string name="message_list_help_key">Del (eller D) - Ta bort\nR - Svara\nA - Svara alla\nC - Skriv nytt\nF - Vidarebefordra\nM - Flytta\nV - Arkivera\nY - Kopiera\nZ - Markera som (o)läst\nG - Stjärnmärk\nO - Sorteringstyp\nI - Sorteringsordning\nQ - Tillbaka till mappar\nS - Markera/avmarkera\nJ eller P - Föregående meddelande\nK eller N - Nästa meddelande</string>
+  <string name="folder_list_help_key">1 - Visa endast första klassens mappar\n2 - Visa första och andra klassens mappar\n3 - Visa alla utom andra klassens mappar\n4 - Visa alla mappar\nQ - Återvänd till konton\nS - Redigera kontoinställningar</string>
   <string name="folder_list_filter_hint">mappnamnet innehåller</string>
   <string name="folder_list_display_mode_label">Visa mappar…</string>
   <string name="folder_list_display_mode_all">Alla mappar</string>
@@ -861,6 +894,7 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="fetching_attachment_dialog_title_send">Skickar meddelande</string>
   <string name="fetching_attachment_dialog_title_save">Sparar utkast</string>
   <string name="fetching_attachment_dialog_message">Hämtar bilaga…</string>
+  <string name="auth_external_error">Misslyckades med att autentisera. Servern annonserar inte SASL EXTERNAL-förmågan. Det kan bero på ett problem med klientcertifikatet (utgånget, okänd certifikatutfärdare) eller något annat konfigurationsproblem.</string>
   <!--=== OpenPGP specific ==================================================================-->
   <string name="openpgp_decrypting_verifying">Dekrypterar/verifierar…</string>
   <string name="openpgp_successful_decryption">Slutförd dekryptering</string>
@@ -868,12 +902,18 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="openpgp_signature_valid_uncertified">Giltig signatur men ej certifierad</string>
   <string name="openpgp_signature_unknown">Signerad av okänd</string>
   <string name="openpgp_signature_invalid">Ogiltig signatur</string>
-  <string name="openpgp_signature_unknown_text">Offentlig nyckel saknas för denna signatur</string>
+  <string name="openpgp_signature_unknown_text">Publik nyckel saknas för denna signatur</string>
   <string name="openpgp_successful_decryption_valid_signature_certified">Lyckad dekryptering och giltig signatur (certifierad)</string>
   <string name="openpgp_successful_decryption_valid_signature_uncertified">Lyckad dekryptering och giltig signatur men ocertifierad</string>
-  <string name="openpgp_successful_decryption_unknown_signature">Lyckad dekryptering men offentlig nyckel saknas</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Lyckad dekryptering men publik nyckel saknas</string>
   <string name="openpgp_get_key">Sök nyckel som saknas</string>
   <string name="openpgp_error">OpenPGP Error:</string>
   <string name="openpgp_user_id">Användar-ID</string>
   <!--=== Client certificates specific ==================================================================-->
+  <string name="account_setup_basics_client_certificate">Använd klientcertifikat</string>
+  <string name="client_certificate_spinner_empty">Inget klientcertifikat</string>
+  <string name="client_certificate_spinner_delete">Ta bort klientcertifikat val</string>
+  <string name="client_certificate_retrieval_failure">Kunde inte hitta klientcertifikat för \"<xliff:g id="alias">%s</xliff:g>\"</string>
+  <string name="client_certificate_advanced_options">Avancerade inställningar</string>
+  <string name="client_certificate_expired">Klientcertifikatet \"<xliff:g id="certificate_alias">%1$s</xliff:g>\" har gått ut eller är inte giltigt ännu (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
 </resources>
diff --git a/k9mail/src/main/res/values-tr/strings.xml b/k9mail/src/main/res/values-tr/strings.xml
index a1f8ae820..06916123e 100644
--- a/k9mail/src/main/res/values-tr/strings.xml
+++ b/k9mail/src/main/res/values-tr/strings.xml
@@ -158,6 +158,10 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="clearing_account">Hesap temizleme \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Hesap yenileme \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Yeni posta</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> yeni mesaj</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> yeni mesaj</item>
+  </plurals>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Okunmadı (<xliff:g id="account">%s</xliff:g>)</string>
   <string name="notification_additional_messages"><xliff:g id="additional_messages">%d</xliff:g> daha fazla <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">Yanıtla</string>
@@ -276,6 +280,12 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="global_settings_notification_quick_delete_when_single_msg">Tek bir mesaj bildirimi için</string>
   <string name="global_settings_notification_quick_delete_always">Her zaman</string>
   <string name="global_settings_notification_quick_delete_description">Hızlı mesaj silmek için bildirimde buton göster</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Kilit Ekranı Bildirimleri</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Kilit ekranı bildirimi yok</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Uygulama adı</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Okunmamış mesaj sayısı</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Mesaj sayısı ve gönderenler</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Ekran kilidi açıkken olduğu gibi</string>
   <string name="quiet_time">Sessiz Zaman</string>
   <string name="quiet_time_description">Zil sesi, titreşim ve flaşı devre dışı bırak</string>
   <string name="quiet_time_starts">Sessiz Zaman başlangıcı</string>
diff --git a/k9mail/src/main/res/values-zh-rCN/strings.xml b/k9mail/src/main/res/values-zh-rCN/strings.xml
index 754d8e367..ab756746e 100644
--- a/k9mail/src/main/res/values-zh-rCN/strings.xml
+++ b/k9mail/src/main/res/values-zh-rCN/strings.xml
@@ -157,6 +157,9 @@ K-9改进的功能包括：
   <string name="clearing_account">正在清理账户“<xliff:g id="account">%s</xliff:g>”</string>
   <string name="recreating_account">正在重建账户“<xliff:g id="account">%s</xliff:g>”</string>
   <string name="notification_new_title">您有新邮件</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> 条新消息</item>
+  </plurals>
   <string name="notification_new_one_account_fmt">您有<xliff:g id="unread_message_count">%d</xliff:g>封未读邮件（<xliff:g id="account">%s</xliff:g>）</string>
   <string name="notification_additional_messages">再加载 <xliff:g id="additional_messages">%d</xliff:g> 条信息, 账户 <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_action_reply">回复</string>
@@ -275,6 +278,12 @@ K-9改进的功能包括：
   <string name="global_settings_notification_quick_delete_when_single_msg">为单条消息通知</string>
   <string name="global_settings_notification_quick_delete_always">总是</string>
   <string name="global_settings_notification_quick_delete_description">在通知区域中显示一个按钮以允许快速删除信息</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">屏幕锁定通知</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">无屏幕锁定通知</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">应用程序名称</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">未读消息计数</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">消息计数及发件人</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">与解除屏幕锁定时相同</string>
   <string name="quiet_time">安静时间</string>
   <string name="quiet_time_description">禁止铃声，震动以及闪光</string>
   <string name="quiet_time_starts">安静时间开始</string>