Fetch translations from Transifex

Include new Basque (eu) translation

res/values-ca/strings.xml

@@ -396,9 +396,12 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="account_setup_options_mail_display_count_all">Tots els missatges</string>
   <string name="move_copy_cannot_copy_unsynced_message">No es pot copiar o moure un missatge que no està sincronitzat amb el servidor</string>
   <string name="account_setup_failed_dlg_title">No s\'ha pogut acabar la configuració</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Nom d\'usuari o contrasenya incorrectes.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">No es pot connectar al servidor de forma segura.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">No es pot connectar al servidor.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Nom d\'usuari o contrasenya incorrectes.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">No es pot connectar al servidor de forma segura.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">No es pot connectar al servidor.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Edita els detalls</string>
   <string name="account_setup_failed_dlg_continue_action">Continua</string>
   <string name="account_settings_push_advanced_title">Avançat</string>
@@ -610,32 +613,8 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificat no reconegut</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepta la clau</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rebutja la clau</string>
-  <string name="message_list_help_key">
-    Del (or D) - Esborra\n
-    R - Respon\n
-    A - Respon a tothom\n
-    C - Redacta\n
-    F - Reenvia\n
-    M - Mou\n
-    V - Archive\n
-    Y - Copia\n
-    V - Arxiva\n
-    Z - Mark (Un)read\n
-    G - Estel\n
-    O - Tipus d\'ordenació\n
-    I - Tipus d\'ordre\n
-    Q - Retorna a les carpetes\n
-    S - Selecciona/desselecciona\n
-    J o P - Previ Missatge\n
-    K o N - Missatge següent
-  </string>
-  <string name="folder_list_help_key">
-    1 – Mostra només les carpetes de 1a classe\u000A
-    2 – Mostra les carpetes de 1a i 2a classe\u000A
-    3 – Mostra-ho tot excepte carpetes de 2a classe\u000A
-    4 – Mostra totes les carpetes\u000A
-    Q - Torna als comptes\u000A
-    S - Edita la configuració del compte</string>
+  <string name="message_list_help_key">Del (or D) - Esborra\nR - Respon\nA - Respon a tothom\nC - Redacta\nF - Reenvia\nM - Mou\nV - Archive\nY - Copia\nV - Arxiva\nZ - Mark (Un)read\nG - Estel\nO - Tipus d\'ordenació\nI - Tipus d\'ordre\nQ - Retorna a les carpetes\nS - Selecciona/desselecciona\nJ o P - Previ Missatge\nK o N - Missatge següent</string>
+  <string name="folder_list_help_key">1 – Mostra només les carpetes de 1a classe\n2 – Mostra les carpetes de 1a i 2a classe\n3 – Mostra-ho tot excepte carpetes de 2a classe\n4 – Mostra totes les carpetes\nQ - Torna als comptes\nS - Edita la configuració del compte</string>
   <string name="folder_list_filter_hint">el nom de la carpeta conté</string>
   <string name="folder_list_display_mode_label">Carpetes</string>
   <string name="folder_list_display_mode_all">Mostra totes les carpetes</string>
@@ -901,5 +880,13 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="last_refresh_time_format_with_push">Última actualització <xliff:g id="time_with_preposition">%s</xliff:g> (Push actiu)</string>
   <string name="preposition_for_date">el <xliff:g id="date">%s</xliff:g></string>
   <string name="mark_all_as_read">Marca\'ls tots com a llegits</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Colorejar imatges de contacte</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">Colorejar imatges de contactes absents</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Accions de missatge visibles</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Mostrar accions seleccionades en el menu de vista de missatge</string>
+  <string name="loading_attachment">Carregant adjunt...</string>
+  <string name="fetching_attachment_dialog_title_send">Enviant missatge</string>
+  <string name="fetching_attachment_dialog_title_save">Guardant esborrany</string>
+  <string name="fetching_attachment_dialog_message">Recuperant adjunt...</string>
   <!--=== OpenPGP specific ==================================================================-->
 </resources>

res/values-cs/strings.xml

@@ -1,8 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Translator: (c) 2013, Jan Urbánek urbanek.jan.locus(a-t)gmail.com-->
-<!--This file is distributed under the same license as the k9mail project.-->
-<!--Available Plural-Forms: 3-->
-<!--Version: strings up to 4.328-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!--=== App-specific strings =============================================================-->
   <!--This should make it easier for forks to change the branding-->
@@ -400,9 +396,12 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="account_setup_options_mail_display_count_all">všechny zprávy</string>
   <string name="move_copy_cannot_copy_unsynced_message">Nelze kopírovat nebo přesunovat zprávu, která není synchronizována se serverem</string>
   <string name="account_setup_failed_dlg_title">Konfiguraci nastavení nelze dokončit</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Uživatelské jméno nebo heslo je nesprávné.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Nelze se bezpečně připojit k serveru.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Nelze se připojit k serveru.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Uživatelské jméno nebo heslo je nesprávné.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Nelze se bezpečně připojit k serveru.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Nelze se připojit k serveru.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Upravit podrobnosti</string>
   <string name="account_setup_failed_dlg_continue_action">Pokračovat</string>
   <string name="account_settings_push_advanced_title">Rozšířené</string>
@@ -614,31 +613,8 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="account_setup_failed_dlg_invalid_certificate_title">Neznámý certifikát</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Přijmout klíč</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odmítnout klíč</string>
-  <string name="message_list_help_key">
-    Del (nebo D) - Smazat\n
-    R - Odpovědět\n
-    A - Odpovědět všem\n
-    C - Nová\n
-    F - Přeposlat\n
-    M - Přesun\n
-    V - Archiv\n
-    Y - Kopie\n
-    Z - Označit (ne)přečteno\n
-    G - Hvězdička\n
-    O - Typ třídění\n
-    I - Pořadí třídění\n
-    Q - Návrat do složek\n
-    S - Vybrat/zrušit výběr\n
-    J nebo P - Předchozí zpráva\n
-    K nebo N - Další zpráva
-  </string>
-  <string name="folder_list_help_key">
-      1 - Zobrazit jen složky 1. třídy\u000A
-      2 - Zobrazit složky 1. a 2. třídy\u000A
-      3 - Zobrazit všechny vyjma složek 2. třídy\u000A
-      4 - Zobrazit všechny složky\u000A
-      Q - Návrat k účtům\u000A
-      S - Upravit nastavení účtu</string>
+  <string name="message_list_help_key">Del (nebo D) - Smazat\nR - Odpovědět\nA - Odpovědět všem\nC - Nová\nF - Přeposlat\nM - Přesun\nV - Archiv\nY - Kopie\nZ - Označit (ne)přečteno\nG - Hvězdička\nO - Typ třídění\nI - Pořadí třídění\nQ - Návrat do složek\nS - Vybrat/zrušit výběr\nJ nebo P - Předchozí zpráva\nK nebo N - Další zpráva</string>
+  <string name="folder_list_help_key">1 - Zobrazit jen složky 1. třídy\n2 - Zobrazit složky 1. a 2. třídy\n3 - Zobrazit všechny vyjma složek 2. třídy\n4 - Zobrazit všechny složky\nQ - Návrat k účtům\nS - Upravit nastavení účtu</string>
   <string name="folder_list_filter_hint">název složky obsahuje</string>
   <string name="folder_list_display_mode_label">Složky</string>
   <string name="folder_list_display_mode_all">Zobrazit všechny složky</string>
@@ -810,8 +786,8 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="settings_import_global_settings_success">Importovano globální nastaveni z <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_success">Importováno <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
   <plurals name="settings_import_accounts">
-    <item quantity="one"><xliff:g id="numAccounts">%s</xliff:g> účet</item><!--added var in place of 1 účet-->
-    <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> účty</item><!--2-4 need to be this and 5- other-->
+    <item quantity="one">1 účet</item>
+    <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> účty</item>
     <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> účtů</item>
   </plurals>
   <string name="settings_export_failure">Nepodařilo se exportovat nastavení</string>
@@ -824,15 +800,11 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="settings_import_activate_account_intro">Pro používání účtu \"<xliff:g id="account">%s</xliff:g>\" potřebujete zadat <xliff:g id="server_passwords">%s</xliff:g>.</string>
   <plurals name="settings_import_server_passwords">
     <item quantity="one">heslo</item>
-    <item quantity="few">hesla</item><!--2-4 need to be this few and 5- other-->
+    <item quantity="few">hesla</item>
     <item quantity="other">hesel</item>
   </plurals>
   <string name="settings_import_incoming_server">Příchozí server (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">Odchozí server (<xliff:g id="hostname">%s</xliff:g>):</string>
-  <plurals name="settings_import_setting_passwords">
-    <item quantity="one">Nastavit heslo…</item>
-    <item quantity="other">Nastavit hesla…</item>
-  </plurals>
   <string name="settings_import_use_incoming_server_password">Heslo pro příchozi server</string>
   <string name="activate_account_action">Aktivovat</string>
   <string name="account_unavailable">Účet \"<xliff:g id="account">%s</xliff:g>\" je nedostupný; zkontrolujte úložiště</string>

res/values-da/strings.xml

@@ -391,9 +391,12 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="account_setup_options_mail_display_count_all">alle mails</string>
   <string name="move_copy_cannot_copy_unsynced_message">Kan ikke kopiere eller flytte mail som ikke er synkroniseret med server</string>
   <string name="account_setup_failed_dlg_title">Kunne ikke fuldføre opsætning</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Brugernavn eller password ukorrekt.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Kan ikke oprette sikker forbindelse til server.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Kan ikke oprette forbindelse til server.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Brugernavn eller password ukorrekt.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Kan ikke oprette sikker forbindelse til server.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Kan ikke oprette forbindelse til server.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Rediger detaljer</string>
   <string name="account_setup_failed_dlg_continue_action">Fortsæt</string>
   <string name="account_settings_push_advanced_title">Avanceret</string>
@@ -605,31 +608,8 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="account_setup_failed_dlg_invalid_certificate_title">Ukendt certificat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepter nøgle</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Afvis nøgle</string>
-  <string name="message_list_help_key"><!--NEW: V, Z untranslated-->
-    Del (or D) - Slet\n
-    R - Svar\n
-    A - Svar alle\n
-    C - Skriv\n
-    F - Videresend\n
-    M - Flyt\n
-    V - Archive\n
-    Y - Kopier\n
-    Z - Mark (Un)read\n
-    G - Stjerne\n
-    O - Sorteringstype\n
-    I - Sorteringsorden\n
-    Q - Returner til Mapper\n
-    S - Vælg/fravælg\n
-    J or P - Foregående mail\n
-    K or N - Næste mail
-  </string>
-  <string name="folder_list_help_key">
-    1 - Vis kun primære mapper\u000A
-    2 - Vis primære og sekundære mapper\u000A
-    3 - Vis alle pånær sekundære mapper\u000A
-    4 - Vis alle mapper\u000A
-    Q - Returner til Konti\u000A
-    S - Rediger kontoindstillinger</string>
+  <string name="message_list_help_key">Del (or D) - Slet\nR - Svar\nA - Svar alle\nC - Skriv\nF - Videresend\nM - Flyt\nV - Archive\nY - Kopier\nZ - Mark (Un)read\nG - Stjerne\nO - Sorteringstype\nI - Sorteringsorden\nQ - Returner til Mapper\nS - Vælg/fravælg\nJ or P - Foregående mail\nK or N - Næste mail</string>
+  <string name="folder_list_help_key">1 - Vis kun primære mapper\n2 - Vis primære og sekundære mapper\n3 - Vis alle pånær sekundære mapper\n4 - Vis alle mapper\nQ - Returner til Konti\nS - Rediger kontoindstillinger</string>
   <string name="folder_list_display_mode_label">Mapper</string>
   <string name="folder_list_display_mode_all">Vis alle mapper</string>
   <string name="folder_list_display_mode_first_class">Vis kun primære mapper</string>

res/values-de/strings.xml

@@ -208,6 +208,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="message_compose_quote_header_to">An:</string>
   <string name="message_compose_quote_header_cc">CC:</string>
   <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> schrieb:</string>
+  <string name="message_compose_reply_header_fmt_with_date">Am <xliff:g id="sent_date">%1$s</xliff:g>, schrieb <xliff:g id="sender">%2$s</xliff:g>:</string>
   <string name="message_compose_error_no_recipients">Sie müssen mindestens einen Empfänger wählen.</string>
   <string name="error_contact_address_not_found">Es wurde keine E-Mail-Adresse für diesen Kontakt gefunden.</string>
   <string name="message_compose_attachments_skipped_toast">Einige Anhänge können nicht weitergeleitet werden, da diese nicht heruntergeladen wurden.</string>
@@ -301,6 +302,9 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_setup_account_type_pop_action">POP3-Konto</string>
   <string name="account_setup_account_type_imap_action">IMAP-Konto</string>
   <string name="account_setup_account_type_webdav_action">WebDAV(Exchange)-Konto</string>
+  <string name="account_setup_auth_type_normal_password">Passwort, normal</string>
+  <string name="account_setup_auth_type_insecure_password">Passwort, verschlüsselt übermittelt</string>
+  <string name="account_setup_auth_type_encrypted_password">Verschlüsseltes Passwort</string>
   <string name="account_setup_incoming_title">Einstellungen für Posteingangsserver</string>
   <string name="account_setup_incoming_username_label">Benutzername</string>
   <string name="account_setup_incoming_password_label">Passwort</string>
@@ -311,6 +315,8 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_setup_incoming_security_label">Sicherheitstyp</string>
   <string name="account_setup_incoming_auth_type_label">Authentifizierungstyp</string>
   <string name="account_setup_incoming_security_none_label">Keine Verschlüsselung</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">Beim Löschen von Nachrichten</string>
   <string name="account_setup_incoming_delete_policy_never_label">Nie von Server löschen</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Auch auf Server löschen</string>
@@ -391,12 +397,18 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_setup_options_mail_display_count_250">250 Nachrichten</string>
   <string name="account_setup_options_mail_display_count_500">500 Nachrichten</string>
   <string name="account_setup_options_mail_display_count_1000">1000 Nachrichten</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 Nachrichten</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 Nachrichten</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 Nachrichten</string>
   <string name="account_setup_options_mail_display_count_all">Alle Nachrichten</string>
   <string name="move_copy_cannot_copy_unsynced_message">Nachrichten, die nicht mit dem Server synchronisiert wurden, können nicht kopiert oder verschoben werden.</string>
   <string name="account_setup_failed_dlg_title">Einrichtung konnte nicht abgeschlossen werden</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Benutzername oder Kennwort fehlerhaft.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Aufbau einer gesicherten Verbindung zum Server nicht möglich.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Verbindung zum Server nicht möglich.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Benutzername oder Kennwort fehlerhaft.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Aufbau einer gesicherten Verbindung zum Server nicht möglich.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Verbindung zum Server nicht möglich.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Details bearbeiten</string>
   <string name="account_setup_failed_dlg_continue_action">Weiter</string>
   <string name="account_settings_push_advanced_title">Erweitert</string>
@@ -602,37 +614,14 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_delete_dlg_title">Entfernen</string>
   <string name="account_recreate_dlg_title">Konto neu erstellen</string>
   <string name="account_clear_dlg_title">Nachrichten löschen</string>
-  <string name="provider_note_auonejp">Wenn Sie für diesen Anbieter IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "AU One"-Einstellungsseite aktivieren.</string>
-  <string name="provider_note_naver">Wenn Sie für diesen Anbieter IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Naver Mail"-Einstellungsseite aktivieren.</string>
-  <string name="provider_note_hanmail">Wenn Sie für diesen Anbieter IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Hanmail(Daum)"-Einstellungsseite aktivieren.</string>
+  <string name="provider_note_auonejp">Wenn Sie für diesen Anbieter IMAP oder POP3 verwenden möchten, sollten Sie dies auf der \"AU One\"-Einstellungsseite aktivieren.</string>
+  <string name="provider_note_naver">Wenn Sie für diesen Anbieter IMAP oder POP3 verwenden möchten, sollten Sie dies auf der \"Naver Mail\"-Einstellungsseite aktivieren.</string>
+  <string name="provider_note_hanmail">Wenn Sie für diesen Anbieter IMAP oder POP3 verwenden möchten, sollten Sie dies auf der \"Hanmail(Daum)\"-Einstellungsseite aktivieren.</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Ungültiges Zertifikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Zertifikat akzeptieren</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Zertifikat ablehnen</string>
-  <string name="message_list_help_key">
-    Del (oder D) - Löschen\n
-    R - Antworten\n
-    A - Allen Antworten\n
-    C - Verfassen\n
-    F - Weiterleiten\n
-    M - Verschieben\n
-    V - Archivieren\n
-    Y - Kopieren\n
-    Z - Als (un)gelesen markieren\n
-    G - Markieren\n
-    O - Sortierung\n
-    I - Sortierungsreihenfolge\n
-    Q - Zurück zur Ordnerliste\n
-    S - Auswählen/abwählen
-    J oder P - Vorherige Nachricht\n
-    K oder N - Nächste Nachricht
-  </string>
-  <string name="folder_list_help_key">
-      1 - Nur Hauptordner anzeigen\u000A
-      2 - Haupt- und Nebenordner anzeigen\u000A
-      3 - Alle außer Nebenordner anzeigen\u000A
-      4 - Alle Ordner anzeigen\u000A
-      Q - Zurück zu den Konten\u000A
-      S - Kontoeinstellungen bearbeiten</string>
+  <string name="message_list_help_key">Del (oder D) - Löschen\nR - Antworten\nA - Allen Antworten\nC - Verfassen\nF - Weiterleiten\nM - Verschieben\nV - Archivieren\nY - Kopieren\nZ - Als (un)gelesen markieren\nG - Markieren\nO - Sortierung\nI - Sortierungsreihenfolge\nQ - Zurück zur Ordnerliste\nS - Auswählen/abwählen\nJ oder P - Vorherige Nachricht\nK oder N - Nächste Nachricht</string>
+  <string name="folder_list_help_key">1 - Nur Hauptordner anzeigen\n2 - Haupt- und Nebenordner anzeigen\n3 - Alle außer Nebenordner anzeigen\n4 - Alle Ordner anzeigen\nQ - Zurück zu den Konten\nS - Kontoeinstellungen bearbeiten</string>
   <string name="folder_list_filter_hint">Ordnername enthält</string>
   <string name="folder_list_display_mode_label">Ordner</string>
   <string name="folder_list_display_mode_all">Alle Ordner anzeigen</string>
@@ -729,6 +718,8 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="font_size_message_view_subject">Betreff</string>
   <string name="font_size_message_view_date">Uhrzeit und Datum</string>
   <string name="font_size_message_view_content">Nachrichtentext</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">Nachricht verfassen</string>
   <string name="font_size_message_compose_input">Texteingabefelder</string>
   <string name="font_size_default">Standard</string>
@@ -907,4 +898,17 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="fetching_attachment_dialog_title_save">Entwurf speichern</string>
   <string name="fetching_attachment_dialog_message">Anhang wird heruntergeladen…</string>
   <!--=== OpenPGP specific ==================================================================-->
+  <string name="openpgp_decrypting_verifying">Entschlüssle/Verifiziere...</string>
+  <string name="openpgp_successful_decryption">Erfolgreiche Entschlüsselung</string>
+  <string name="openpgp_signature_valid_certified">Gültige Signatur (beglaubigt)</string>
+  <string name="openpgp_signature_valid_uncertified">Gültige, aber unbeglaubigte Signatur</string>
+  <string name="openpgp_signature_unknown">Unbekannter Unterzeichner</string>
+  <string name="openpgp_signature_invalid">Ungültige Signatur</string>
+  <string name="openpgp_signature_unknown_text">Fehlender öffentlicher Schlüssel für diese Signatur</string>
+  <string name="openpgp_successful_decryption_valid_signature_certified">Erfolgreiche Entschlüsselung und gültige Signatur (beglaubigt)</string>
+  <string name="openpgp_successful_decryption_valid_signature_uncertified">Erfolgreiche Entschlüsselung und gültige, aber nicht beglaubigte Signatur</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Erfolgreiche Entschlüsselung, aber fehlender öffentlicher Schlüssel</string>
+  <string name="openpgp_get_key">Schlage fehlenden Schlüssel nach</string>
+  <string name="openpgp_error">OpenPGP Fehler:</string>
+  <string name="openpgp_user_id">Benutzer-ID</string>
 </resources>

res/values-el/strings.xml

@@ -287,7 +287,7 @@
   <string name="account_setup_basics_email_hint">Διεύθυνση email</string>
   <string name="account_setup_basics_password_hint">Συνθηματικό</string>
   <string name="account_setup_basics_manual_setup_action">Χειροκίνητη ρύθμιση</string>
-  <string name="account_setup_check_settings_title">Έλεγχος ρυθμίσεων</string>
+  <string name="account_setup_check_settings_title"/>
   <string name="account_setup_check_settings_retr_info_msg">Ανάκτηση πληροφοριών λογαριασμού\u2026</string>
   <string name="account_setup_check_settings_check_incoming_msg">Έλεγχος ρυθμίσεων εισερχόμενης αλληλογραφίας\u2026</string>
   <string name="account_setup_check_settings_check_outgoing_msg">Έλεγχος ρυθμίσεων εξερχόμενης αλληλογραφίας\u2026</string>
@@ -395,9 +395,12 @@
   <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">Αδύνατη η ασφαλής σύνδεση με τον εξυπηρέτη\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_auth_message_fmt">Εσφαλμένο όνομα χρήστη ή συνθηματικό
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Αδύνατη η ασφαλής σύνδεση με τον εξυπηρέτη
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Αδύνατη η σύνδεση με τον εξυπηρέτη
+(<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>
@@ -609,31 +612,8 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Άγνωστο πιστοποιητικό</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Αποδοχή κλειδιού</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Απόρριψη κλειδιού</string>
-  <string name="message_list_help_key">
-    Del (ή D) - Διαγραφή\n
-    R - Απάντηση\n
-    A - Απάντηση σε όλους\n
-    C - Σύνθεση\n
-    F - Προώθηση\n
-    M - Μετακίνηση\n
-    V - Αρχειοθέτηση\n
-    Y - Αντιγραφή\n
-    Z - (Μη) αναγνωσμένο\n
-    G - Αστέρι\n
-    O - Ταξινόμηση\n
-    I - Σειρά ταξινόμησης\n
-    Q - Επιστροφή στους φακέλους\n
-    S - Επιλογή/Αποεπιλογή\n
-    J ή P - Προηγούμενο μήνυμα\n
-    K ή N - Επόμενο μήνυμα
-  </string>
-  <string name="folder_list_help_key">
-    1 - Προβολή φακέλων πρώτου επιπέδου\u000A
-    2 - Προβολή φακέλων 1ου και 2ου επιπέδου\u000A
-    3 - Προβολή όλων εκτός από 2ου επιπέδου\u000A
-    4 - Προβολή όλων\u000A
-    Q - Επιστροφή στους λογαριασμούς\u000A
-    S - Διόρθωση ρυθμίσεων λογαριασμού</string>
+  <string name="message_list_help_key">Del (ή D) - Διαγραφή\nR - Απάντηση\nA - Απάντηση σε όλους\nC - Σύνθεση\nF - Προώθηση\nM - Μετακίνηση\nV - Αρχειοθέτηση\nY - Αντιγραφή\nZ - (Μη) αναγνωσμένο\nG - Αστέρι\nO - Ταξινόμηση\nI - Σειρά ταξινόμησης\nQ - Επιστροφή στους φακέλους\nS - Επιλογή/Αποεπιλογή\nJ ή P - Προηγούμενο μήνυμα\nK ή N - Επόμενο μήνυμα</string>
+  <string name="folder_list_help_key">1 - Προβολή φακέλων πρώτου επιπέδου\n2 - Προβολή φακέλων 1ου και 2ου επιπέδου\n3 - Προβολή όλων εκτός από 2ου επιπέδου\n4 - Προβολή όλων\nQ - Επιστροφή στους λογαριασμούς\nS - Διόρθωση ρυθμίσεων λογαριασμού</string>
   <string name="folder_list_filter_hint">το όνομα του φακέλου περιέχει</string>
   <string name="folder_list_display_mode_label">Φάκελοι</string>
   <string name="folder_list_display_mode_all">Προβολή όλων</string>

res/values-es/strings.xml

@@ -45,24 +45,24 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
 </p>
     ]]></string>
   <!--Default signature-->
-  <string name="default_signature">-- \nEnviado desde mi teléfono con K-9 Mail.</string>
+  <string name="default_signature">-- \nEnviado desde mi teléfono Android con K-9 Mail. Por favor disculpa mi brevedad.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">La cuenta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
-  <string name="account_recreate_dlg_instructions_fmt">Los datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero se mantendrá su configuración</string>
-  <string name="account_clear_dlg_instructions_fmt">Todos los mensajes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero la configuración de la cuenta se mantendrá</string>
-  <string name="insufficient_apg_permissions">K-9 no tiene permiso para acceder totalmente a APG, por favor, instale K-9 otra vez o arréglelo</string>
+  <string name="account_recreate_dlg_instructions_fmt">Los datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero se mantendrá su configuración.</string>
+  <string name="account_clear_dlg_instructions_fmt">Todos los mensajes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero la configuración de la cuenta se mantendrá.</string>
+  <string name="insufficient_apg_permissions">K-9 no tiene permiso para acceder totalmente a APG, por favor, instale K-9 otra vez para arreglarlo.</string>
   <!--=== App Store-specific strings =======================================================-->
-  <string name="import_dialog_error_message">No hay una aplicación disponible para importar el archivo. Por favor, instale un explorador de archivos desde Google Play</string>
+  <string name="import_dialog_error_message">Por favor instale un gestor de archivos para continuar con esta importación.</string>
   <string name="open_market">Abrir Google Play</string>
   <!--=== General strings ==================================================================-->
   <string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
-  <string name="app_revision_fmt">Información de la revisión <xliff:g id="app_revision_url">%s</xliff:g></string>
+  <string name="app_revision_fmt">Información de la revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
   <string name="app_libraries">Estamos usando las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
   <string name="app_emoji_icons">Iconos de Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
   <string name="read_attachment_label">Leer archivos adjuntos</string>
-  <string name="read_attachment_desc">Permitir a esta aplicación leer los archivos adjuntos a tus correos</string>
+  <string name="read_attachment_desc">Permitir a esta aplicación leer los archivos adjuntos a tus correos.</string>
   <string name="read_messages_label">Leer correos</string>
-  <string name="read_messages_desc">Permitir a esta aplicación leer tus correos</string>
+  <string name="read_messages_desc">Permitir a esta aplicación leer tus correos.</string>
   <string name="delete_messages_label">Borrar correos</string>
   <string name="delete_messages_desc">Permitir a esta aplicación borrar tus correos.</string>
   <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
@@ -82,13 +82,14 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
   <string name="status_next_poll">Próxima sincronización <xliff:g id="nexttime">%s</xliff:g></string>
   <string name="status_syncing_off">Sincronización deshabilitada</string>
+  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> seleccionados</string>
   <string name="next_action">Siguiente</string>
   <string name="previous_action">Anterior</string>
   <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
   <string name="okay_action">Aceptar</string>
   <string name="cancel_action">Cancelar</string>
   <string name="send_action">Enviar</string>
-  <string name="send_again_action">Reenviar al remitente</string>
+  <string name="send_again_action">Volver a enviar</string>
   <string name="select_action">Seleccionar</string>
   <string name="deselect_action">Deseleccionar</string>
   <string name="reply_action">Responder</string>
@@ -98,13 +99,14 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="spam_action">Spam</string>
   <string name="forward_action">Reenviar</string>
   <string name="move_action">Mover</string>
-  <string name="single_message_options_action">Opciones del mensaje…</string>
+  <string name="single_message_options_action">Enviar…</string>
+  <string name="refile_action">Archivar...</string>
   <string name="continue_action">Continuar</string>
   <string name="back_action">Atrás</string>
   <string name="done_action">Terminado</string>
   <string name="discard_action">Descartar</string>
   <string name="save_draft_action">Guardar como borrador</string>
-  <string name="check_mail_action">Sincronizar</string>
+  <string name="check_mail_action">Comprobar correo</string>
   <string name="send_messages_action">Enviar correo</string>
   <string name="refresh_folders_action">Refrescar lista de carpetas</string>
   <string name="filter_folders_action">Buscar carpeta</string>
@@ -125,10 +127,12 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="unflag_action">Borrar estrella</string>
   <string name="copy_action">Copiar</string>
   <string name="select_text_action">Seleccionar texto</string>
+  <string name="show_headers_action">Mostrar cabeceras</string>
+  <string name="hide_headers_action">Ocultar cabeceras</string>
   <string name="message_view_theme_action_dark">Cambiar a tema oscuro</string>
   <string name="message_view_theme_action_light">Cambiar a tema claro</string>
   <string name="mark_as_unread_action">Marcar como no leído</string>
-  <string name="add_cc_bcc_action">Añadir Cc/Bcc</string>
+  <string name="add_cc_bcc_action">Añadir CC/CCO</string>
   <string name="read_receipt">Confirmación de lectura</string>
   <string name="read_receipt_enabled">Se solicitará confirmación de lectura</string>
   <string name="read_receipt_disabled">No se solicitará confirmación de lectura</string>
@@ -159,7 +163,14 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="clearing_account">Limpiando cuenta \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="recreating_account">Recreando cuenta \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Correo nuevo</string>
+  <string name="notification_new_messages_title"><xliff:g id="new_message_count">%d</xliff:g> mensajes nuevos</string>
   <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Sin Leer (<xliff:g id="account">%s</xliff:g>)</string>
+  <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> más en <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_action_reply">Responder</string>
+  <string name="notification_action_mark_as_read">Marcar como leído</string>
+  <string name="notification_action_delete">Borrar</string>
+  <string name="notification_certificate_error_title">Error de certificado para <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_certificate_error_text">Compruebe su configuración de servidor</string>
   <string name="notification_bg_sync_ticker">Comprobando correo: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Comprobando correo</string>
   <string name="notification_bg_send_ticker">Enviando correo: <xliff:g id="account">%s</xliff:g></string>
@@ -182,9 +193,9 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="debug_enable_debug_logging_title">Habilitar log de depuración</string>
   <string name="debug_enable_debug_logging_summary">Log con información ampliada</string>
   <string name="debug_enable_sensitive_logging_title">Incluir información sensible</string>
-  <string name="debug_enable_sensitive_logging_summary">Mostrar password en el log</string>
+  <string name="debug_enable_sensitive_logging_summary">Puede mostrar contraseñas en los logs.</string>
   <string name="message_list_load_more_messages_action">Cargar más correos</string>
-  <string name="message_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
+  <string name="message_to_fmt">Para:<xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_compose_to_hint">Para</string>
   <string name="message_compose_cc_hint">CC</string>
   <string name="message_compose_bcc_hint">CCO</string>
@@ -198,13 +209,14 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="message_compose_quote_header_to">Para:</string>
   <string name="message_compose_quote_header_cc">CC:</string>
   <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> escribió:</string>
-  <string name="message_compose_error_no_recipients">Debe añadir al menos un destinatario</string>
-  <string name="error_contact_address_not_found">Dirección e-mail no encontrada.</string>
+  <string name="message_compose_reply_header_fmt_with_date">El <xliff:g id="sent_date">%1$s</xliff:g>, <xliff:g id="sender">%2$s</xliff:g> escribió:</string>
+  <string name="message_compose_error_no_recipients">Debe añadir al menos un destinatario.</string>
+  <string name="error_contact_address_not_found">No se encontró la dirección de correo electrónico de este contacto.</string>
   <string name="message_compose_attachments_skipped_toast">Algunos adjuntos no pueden reenviarse porque no han sido descargados.</string>
   <string name="message_compose_show_quoted_text_action">Incluir mensaje original</string>
-  <string name="message_compose_description_add_to">Añadir destinatario (To)</string>
+  <string name="message_compose_description_add_to">Añadir destinatario (Para)</string>
   <string name="message_compose_description_add_cc">Añadir destinatario (CC)</string>
-  <string name="message_compose_description_add_bcc">Añadir destinatario (BCC)</string>
+  <string name="message_compose_description_add_bcc">Añadir destinatario (CCO)</string>
   <string name="message_compose_description_delete_quoted_text">Eliminar mensaje original</string>
   <string name="message_compose_description_edit_quoted_text">Editar mensaje original</string>
   <string name="message_view_from_format">De: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
@@ -212,20 +224,20 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="message_view_cc_label">CC:</string>
   <string name="message_view_attachment_view_action">Abrir</string>
   <string name="message_view_attachment_download_action">Guardar</string>
-  <string name="message_view_status_attachment_saved">Adjunto guardado en la SD como <xliff:g id="filename">%s</xliff:g>.</string>
-  <string name="message_view_status_attachment_not_saved">Imposible guardar adjunto en la SD</string>
-  <string name="message_view_show_pictures_action">Mostrar imagen</string>
+  <string name="message_view_status_attachment_saved">Adjunto guardado en la tarjeta SD como <xliff:g id="filename">%s</xliff:g>.</string>
+  <string name="message_view_status_attachment_not_saved">Imposible guardar adjunto en la tarjeta SD.</string>
+  <string name="message_view_show_pictures_action">Mostrar imágenes</string>
   <string name="message_view_show_message_action">Mostrar mensaje</string>
-  <string name="message_view_show_attachments_action">Ver adjuntos</string>
+  <string name="message_view_show_attachments_action">Mostrar adjuntos</string>
   <string name="message_view_show_more_attachments_action">Más…</string>
   <string name="message_view_fetching_attachment_toast">Recuperando adjuntos.</string>
   <string name="message_view_no_viewer">Imposible encontrar visor de <xliff:g id="mimetype">%s</xliff:g>.</string>
   <string name="message_view_download_remainder">Descargar mensaje completo</string>
   <string name="message_view_downloading">Descargando…</string>
   <!--NOTE: The following message refers to strings with id account_setup_incoming_save_all_headers_label and account_setup_incoming_title-->
-  <string name="message_additional_headers_not_downloaded">No se han descargado o grabado todas las cabeceras. Seleccione \"Guardar todas las cabeceras localmente\" en la Configuración de cuenta para permitir esta acción en el futuro</string>
-  <string name="message_no_additional_headers_available">Se han descargado todas las cabeceras, y no hay cabeceras adicionales que mostrar</string>
-  <string name="message_additional_headers_retrieval_failed">Se ha producido un error al descargar las cabeceras desde la base de datos o el servidor</string>
+  <string name="message_additional_headers_not_downloaded">No se han descargado o grabado todas las cabeceras. Seleccione \"Guardar todas las cabeceras localmente\" en la Configuración de cuenta para permitir esta acción en el futuro.</string>
+  <string name="message_no_additional_headers_available">Se han descargado todas las cabeceras,  pero no hay cabeceras adicionales que mostrar.</string>
+  <string name="message_additional_headers_retrieval_failed">Se ha producido un error al descargar las cabeceras desde la base de datos o el servidor.</string>
   <string name="from_same_sender">Más de este remitente</string>
   <string name="message_discarded_toast">Mensaje descartado</string>
   <string name="message_saved_toast">Mensaje guardado como borrador</string>
@@ -233,7 +245,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="global_settings_flag_summary">Las estrellas indican un mensaje destacado</string>
   <string name="global_settings_checkbox_label">Casillas de selección múltiple</string>
   <string name="global_settings_checkbox_summary">Mostrar casillas de selección múltiple</string>
-  <string name="global_settings_preview_lines_label">Previsualizar lineas</string>
+  <string name="global_settings_preview_lines_label">Previsualizar líneas</string>
   <string name="global_settings_show_correspondent_names_label">Mostrar nombre asociado</string>
   <string name="global_settings_show_correspondent_names_summary">Mostrar nombre asociado en vez de dirección de correo</string>
   <string name="global_settings_sender_above_subject_label">Remitente encima de Asunto</string>
@@ -243,21 +255,31 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="global_settings_registered_name_color_label">Colorear contactos</string>
   <string name="global_settings_registered_name_color_default">No colorear los nombres en la lista de contactos</string>
   <string name="global_settings_registered_name_color_changed">Colorear nombres en la lista de contactos</string>
-  <string name="global_settings_messageview_fixedwidth_label">Fuentes de ancho fijo</string>
-  <string name="global_settings_messageview_fixedwidth_summary">Utilizar fuentes de ancho fijo al mostrar mensajes en formato texto</string>
+  <string name="global_settings_folderlist_wrap_folder_names_label">Ajustar nombres de carpeta largos</string>
+  <string name="global_settings_folderlist_wrap_folder_names_summary">Usar varias líneas para mostrar los nombres de carpeta largos</string>
+  <string name="global_settings_messageview_fixedwidth_label">Tipos de letra de ancho fijo</string>
+  <string name="global_settings_messageview_fixedwidth_summary">Utilizar tipos de letra de ancho fijo al mostrar mensajes en formato texto</string>
+  <string name="global_settings_messageview_autofit_width_label">Auto-ajustar los mensajes</string>
+  <string name="global_settings_messageview_autofit_width_summary">Encoger los mensajes para que quepan en la pantalla</string>
   <string name="global_settings_messageview_return_to_list_label">Volver a la lista después de borrar</string>
   <string name="global_settings_messageview_return_to_list_summary">Volver a la lista después de borrar un mensaje</string>
   <string name="global_settings_messageview_show_next_label">Mostrar siguiente mensaje después de borrar</string>
-  <string name="global_settings_messageview_show_next_summary">Mostrar por defecto el siguiente mensaje después de borrar</string>
+  <string name="global_settings_messageview_show_next_summary">Mostrar de manera predeterminada el siguiente mensaje después de borrar</string>
   <string name="global_settings_confirm_actions_title">Confirmar acciones</string>
   <string name="global_settings_confirm_actions_summary">Mostrar un diálogo cuando se realice una de estas acciones</string>
-  <string name="global_settings_confirm_action_delete">Borrar (Mensajes en la vista)</string>
-  <string name="global_settings_confirm_action_delete_starred">Borrar destacados (sólo en Vista mensajes)</string>
+  <string name="global_settings_confirm_action_delete">Borrar (en vista de mensajes)</string>
+  <string name="global_settings_confirm_action_delete_starred">Borrar destacados (sólo en vista de mensajes)</string>
   <string name="global_settings_confirm_action_spam">Spam</string>
+  <string name="global_settings_confirm_action_delete_notif">Borrar (de notificaciones)</string>
   <string name="global_settings_notification_hide_subject_title">Ocultar asunto en notificaciones</string>
   <string name="global_settings_notification_hide_subject_never">Nunca</string>
   <string name="global_settings_notification_hide_subject_when_locked">Cuando el dispositivo está bloqueado</string>
   <string name="global_settings_notification_hide_subject_always">Siempre</string>
+  <string name="global_settings_notification_quick_delete_title">Mostrar el botón \'Borrar\'</string>
+  <string name="global_settings_notification_quick_delete_never">Nunca</string>
+  <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="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>
@@ -281,6 +303,9 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_setup_account_type_pop_action">POP3</string>
   <string name="account_setup_account_type_imap_action">IMAP</string>
   <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+  <string name="account_setup_auth_type_normal_password">Contraseña normal</string>
+  <string name="account_setup_auth_type_insecure_password">Contraseña, transmitida de manera no segura</string>
+  <string name="account_setup_auth_type_encrypted_password">Contraseña cifrada</string>
   <string name="account_setup_incoming_title">Configuración del servidor de entrada</string>
   <string name="account_setup_incoming_username_label">Usuario</string>
   <string name="account_setup_incoming_password_label">Contraseña</string>
@@ -291,7 +316,9 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_setup_incoming_security_label">Tipo de Seguridad</string>
   <string name="account_setup_incoming_auth_type_label">Tipo de autentificación</string>
   <string name="account_setup_incoming_security_none_label">Ninguna</string>
-  <string name="account_setup_incoming_delete_policy_label">Borrado de mensajes</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">Cuando borre un mensaje</string>
   <string name="account_setup_incoming_delete_policy_never_label">No borrar del servidor</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Borrar del servidor</string>
   <string name="account_setup_incoming_delete_policy_markread_label">Marcar como leído en servidor</string>
@@ -299,11 +326,11 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_setup_incoming_mobile_label">Móvil</string>
   <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
   <string name="account_setup_incoming_other_label">Otras</string>
-  <string name="local_storage_provider_external_label">Almacenamiento externo (SD)</string>
+  <string name="local_storage_provider_external_label">Almacenamiento externo (tarjeta SD)</string>
   <string name="local_storage_provider_internal_label">Almacenamiento interno</string>
   <string name="local_storage_provider_samsunggalaxy_label">%1$s almacenamiento interno adicional</string>
   <string name="local_storage_provider_label">Ubicación del almacén</string>
-  <string name="account_setup_expunge_policy_label">Eliminar borrados</string>
+  <string name="account_setup_expunge_policy_label">Eliminar mensajes borrados en el servidor</string>
   <string name="account_setup_expunge_policy_immediately">Inmediatamente</string>
   <string name="account_setup_expunge_policy_on_poll">Durante comprobación</string>
   <string name="account_setup_expunge_policy_manual">Sólo manualmente</string>
@@ -320,13 +347,13 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_setup_incoming_webdav_path_prefix_hint">Opcional</string>
   <string name="account_setup_incoming_webdav_auth_path_label">Dirección de autentificación</string>
   <string name="account_setup_incoming_webdav_auth_path_hint">Opcional</string>
-  <string name="account_setup_incoming_webdav_mailbox_path_label">Dirección buzón</string>
+  <string name="account_setup_incoming_webdav_mailbox_path_label">Alias del buzón</string>
   <string name="account_setup_incoming_webdav_mailbox_path_hint">Opcional</string>
   <string name="account_setup_outgoing_title">Correo saliente</string>
   <string name="account_setup_outgoing_smtp_server_label">Servidor SMTP</string>
   <string name="account_setup_outgoing_port_label">Puerto</string>
   <string name="account_setup_outgoing_security_label">Tipo de Seguridad</string>
-  <string name="account_setup_outgoing_require_login_label">Requiere autentificación</string>
+  <string name="account_setup_outgoing_require_login_label">Requiere autentificación.</string>
   <string name="account_setup_outgoing_username_label">Usuario</string>
   <string name="account_setup_outgoing_password_label">Contraseña</string>
   <string name="account_setup_outgoing_authentication_label">Tipo de autentificación</string>
@@ -371,21 +398,28 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_setup_options_mail_display_count_250">250 mensajes</string>
   <string name="account_setup_options_mail_display_count_500">500 mensajes</string>
   <string name="account_setup_options_mail_display_count_1000">1000 mensajes</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 mensajes</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 mensajes</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 mensajes</string>
   <string name="account_setup_options_mail_display_count_all">Todos los mensajes</string>
   <string name="move_copy_cannot_copy_unsynced_message">No se puede copiar/mover un mensaje no sincronizado con el servidor</string>
   <string name="account_setup_failed_dlg_title">No se ha podido finalizar la Configuración</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Usuario o contraseña incorrectas.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">No se puede conectar de forma segura con el servidor. Certificado inválido\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">No se puede conectar con el servidor.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Usuario o contraseña incorrectos.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">El servidor ha presentado un certificado SSL no válido. A veces, esto es debido a una configuración no correcta en el servidor. A veces es porque alguien está intentando atacarle o atacar el servidor de correo. Si no está seguro de lo que ocurre, pulse en Rechazar y contacte con los administradores de su servidor de correo.
+
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">No se puede conectar con el servidor.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Editar detalles</string>
   <string name="account_setup_failed_dlg_continue_action">Continuar</string>
   <string name="account_settings_push_advanced_title">Avanzado</string>
   <string name="account_settings_title_fmt">Configuración de cuenta</string>
-  <string name="account_settings_default_label">Cuenta por defecto</string>
-  <string name="account_settings_default_summary">Enviar mensajes desde esta cuenta por defecto</string>
+  <string name="account_settings_default_label">Cuenta predeterminada</string>
+  <string name="account_settings_default_summary">Enviar mensajes desde esta cuenta de manera predeterminada</string>
   <string name="account_settings_notify_label">Notificar mensajes nuevos</string>
   <string name="account_settings_notify_sync_label">Notificar sincronización</string>
-  <string name="account_settings_email_label">Tu Dirección de correo</string>
+  <string name="account_settings_email_label">Su Dirección de correo</string>
   <string name="account_settings_notify_summary">Avisar cuando llegue correo nuevo</string>
   <string name="account_settings_notify_sync_summary">Avisar cuando se compruebe el correo</string>
   <string name="account_settings_notify_self_label">Incluir bandeja de salida</string>
@@ -394,15 +428,15 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_notification_opens_unread_summary">Abrir correo no leído desde la notificación</string>
   <string name="account_settings_notification_unread_count_label">Mostrar número de mensajes no leídos</string>
   <string name="account_settings_notification_unread_count_summary">Mostrar número de mensajes no leídos en barra de notificaciones.</string>
-  <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensaje como leído tras abrirlo</string>
+  <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensaje como leído al abrirlo</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marcar mensaje como leído cuando se abre para verlo</string>
-  <string name="account_settings_show_pictures_label">Mostrar imágenes</string>
-  <string name="account_settings_show_pictures_never">Nunca</string>
+  <string name="account_settings_show_pictures_label">Mostrar imágenes siempre</string>
+  <string name="account_settings_show_pictures_never">No</string>
   <string name="account_settings_show_pictures_only_from_contacts">Sólo de mis contactos</string>
   <string name="account_settings_show_pictures_always">De cualquiera</string>
   <string name="account_settings_composition">Envío de mensajes</string>
   <string name="account_settings_default_quoted_text_shown_label">Incluir mensaje original al responder</string>
-  <string name="account_settings_default_quoted_text_shown_summary">Al responder los mensajes, el mensaje original se incluirá en tu respuesta.</string>
+  <string name="account_settings_default_quoted_text_shown_summary">Al responder los mensajes, el mensaje original se incluirá en su respuesta.</string>
   <string name="account_settings_reply_after_quote_label">Respuesta tras mensaje original</string>
   <string name="account_settings_reply_after_quote_summary">Al responder un mensaje, el mensaje original aparecerá por encima de la respuesta</string>
   <string name="account_settings_strip_signature_label">Eliminar firma del mensaje original</string>
@@ -410,23 +444,26 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_message_format_label">Formato del mensaje</string>
   <string name="account_settings_message_format_text">Texto simple (se quitan las imágenes y el formato)</string>
   <string name="account_settings_message_format_html">HTML (se mantienen las imágenes y el formato)</string>
-  <string name="account_settings_message_format_auto">Automática (texto simple excepto si se responde a un mensaje HTML)</string>
+  <string name="account_settings_message_format_auto">Automático</string>
+  <string name="account_settings_always_show_cc_bcc_label">Mostrar siempre CC/CCO</string>
   <string name="account_settings_message_read_receipt_label">Confirmación de lectura</string>
   <string name="account_settings_message_read_receipt_summary">Solicitar siempre confirmación de lectura</string>
   <string name="account_settings_quote_style_label">Estilo de respuesta</string>
-  <string name="account_settings_quote_style_prefix">Prefijo (como Gmail, Pine)</string>
-  <string name="account_settings_quote_style_header">Cabecera (como Outlook, Yahoo!, Hotmail)</string>
+  <string name="account_settings_quote_style_prefix">Prefijo (como Gmail)</string>
+  <string name="account_settings_quote_style_header">Cabecera (como Outlook)</string>
   <string name="account_settings_general_title">Configuración general</string>
+  <string name="account_settings_reading_mail">Al leer el correo</string>
   <string name="account_settings_sync">Comprobación de correo</string>
   <string name="account_settings_folders">Carpetas</string>
   <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">OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Ninguna</string>
+  <string name="account_settings_crypto_app">Proveedor OpenPGP</string>
+  <string name="account_settings_crypto_app_none">Ninguno</string>
   <string name="account_settings_crypto_auto_signature">Firmar automáticamente</string>
-  <string name="account_settings_crypto_auto_signature_summary">Utilizar el correo para adivinar la clave de firma</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto-encriptado</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Encripta automáticamente si la clave pública es compatible.</string>
+  <string name="account_settings_crypto_auto_signature_summary">Utilizar el correo para adivinar la clave de firma.</string>
+  <string name="account_settings_crypto_auto_encrypt">Auto-cifrado</string>
+  <string name="account_settings_crypto_auto_encrypt_summary">Cifra automáticamente si la clave pública concuerda con un destinatario.</string>
+  <string name="account_settings_crypto_apg_not_installed">APG no instalado</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>
@@ -449,7 +486,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_autodownload_message_size_2048">2Mb</string>
   <string name="account_settings_autodownload_message_size_5120">5Mb</string>
   <string name="account_settings_autodownload_message_size_10240">10Mb</string>
-  <string name="account_settings_autodownload_message_size_any">completo (sin límite)</string>
+  <string name="account_settings_autodownload_message_size_any">cualquier tamaño (sin límite)</string>
   <string name="account_settings_message_age_label">Sincronizar desde</string>
   <string name="account_settings_message_age_any">Sin fecha (sin límite)</string>
   <string name="account_settings_message_age_0">hoy</string>
@@ -509,12 +546,12 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_outgoing_label">Servidor de salida</string>
   <string name="account_settings_outgoing_summary">Configurar servidor de salida (SMTP)</string>
   <string name="account_settings_description_label">Nombre de la cuenta</string>
-  <string name="account_settings_name_label">Tu nombre</string>
+  <string name="account_settings_name_label">Su nombre</string>
   <string name="notifications_title">Notificaciones</string>
   <string name="account_settings_vibrate_enable">Vibrar</string>
   <string name="account_settings_vibrate_summary">Vibrar cuando llega correo</string>
   <string name="account_settings_vibrate_pattern_label">Secuencia de vibración</string>
-  <string name="account_settings_vibrate_pattern_default">Por defecto</string>
+  <string name="account_settings_vibrate_pattern_default">Predeterminado</string>
   <string name="account_settings_vibrate_pattern_1">Secuencia 1</string>
   <string name="account_settings_vibrate_pattern_2">Secuencia 2</string>
   <string name="account_settings_vibrate_pattern_3">Secuencia 3</string>
@@ -525,23 +562,23 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_led_label">Parpadeo LED</string>
   <string name="account_settings_led_summary">Parpadear el LED cuando llega nuevo correo</string>
   <string name="account_settings_composition_title">Opciones de edición de mensaje</string>
-  <string name="account_settings_composition_label">Campos por defecto</string>
-  <string name="account_settings_composition_summary">Indicar por defecto Desde, CCO y Firma</string>
+  <string name="account_settings_composition_label">Campos predeterminados</string>
+  <string name="account_settings_composition_summary">Indicar de manera predeterminada De, CCO y Firma</string>
   <string name="account_settings_identities_label">Identidades</string>
   <string name="account_settings_identities_summary">Configurar direcciones y firmas alternativas</string>
-  <string name="manage_identities_title">Identidades</string>
-  <string name="manage_identities_context_menu_title">Identidades</string>
+  <string name="manage_identities_title">Gestionar identidades</string>
+  <string name="manage_identities_context_menu_title">Gestionar identidad</string>
   <string name="edit_identity_title">Editar identidad</string>
   <string name="new_identity_action">Nueva identidad</string>
   <string name="account_settings_always_bcc_label">CCO en todos los mensajes para</string>
   <string name="manage_identities_edit_action">Editar</string>
   <string name="manage_identities_move_up_action">Subir</string>
   <string name="manage_identities_move_down_action">Bajar</string>
-  <string name="manage_identities_move_top_action">Al principio / hacer principal</string>
+  <string name="manage_identities_move_top_action">Al principio / hacer predeterminado</string>
   <string name="manage_identities_remove_action">Eliminar</string>
-  <string name="edit_identity_description_label">Descripción identidad:</string>
+  <string name="edit_identity_description_label">Descripción identidad</string>
   <string name="edit_identity_description_hint">(Opcional)</string>
-  <string name="edit_identity_name_label">Tu nombre</string>
+  <string name="edit_identity_name_label">Su nombre</string>
   <string name="edit_identity_name_hint">(Opcional)</string>
   <string name="edit_identity_email_label">Dirección de correo</string>
   <string name="edit_identity_email_hint">(Requerido)</string>
@@ -554,12 +591,14 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="default_identity_description">Identidad principal</string>
   <string name="choose_identity_title">Seleccionar identidad</string>
   <string name="send_as">Enviar como</string>
-  <string name="no_removable_identity">No puedes eliminar tu única identidad</string>
-  <string name="identity_has_no_email">No puedes utilizar una identidad sin dirección de correo</string>
+  <string name="no_removable_identity">No puede eliminar su única identidad</string>
+  <string name="identity_has_no_email">No puede utilizar una identidad sin dirección de correo</string>
   <string name="sort_earliest_first">Nuevos mensajes primero</string>
-  <string name="sort_latest_first">Ultimos mensajes primero</string>
+  <string name="sort_latest_first">Últimos mensajes primero</string>
   <string name="sort_subject_alpha">Asunto (alfabético)</string>
   <string name="sort_subject_re_alpha">Asunto (alfabético inverso)</string>
+  <string name="sort_sender_alpha">Remitente alfabético</string>
+  <string name="sort_sender_re_alpha">Remitente alfabético inverso</string>
   <string name="sort_flagged_first">Marcados primero</string>
   <string name="sort_flagged_last">Sin marcar primero</string>
   <string name="sort_unread_first">Sin leer primero</string>
@@ -570,6 +609,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="sort_by_date">Fecha</string>
   <string name="sort_by_arrival">Llegada</string>
   <string name="sort_by_subject">Asunto</string>
+  <string name="sort_by_sender">Remitente</string>
   <string name="sort_by_flag">Estrellas</string>
   <string name="sort_by_unread">Leído/No leído</string>
   <string name="sort_by_attach">Adjuntos</string>
@@ -580,35 +620,12 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="provider_note_naver">Si quiere usar IMAP o POP3 con este proveedor debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Naver.</string>
   <string name="provider_note_hanmail">Si quiere usar IMAP o POP3 con este proveedor debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Hanmail(Daum).</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconocido</string>
-  <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string>
-  <string name="account_setup_failed_dlg_invalid_certificate_reject">Rechazar certificado</string>
-  <string name="message_list_help_key"><!--NEW: V, Z untranslated-->
-    Del (or D) - Borrar\n
-    R - Responder\n
-    A - Responder todos\n
-    C - Redactar\n
-    F - Desvío\n
-    M - Mover\n
-    V - Archive\n
-    Y - Copiar\n
-    Z - Mark (Un)read\n
-    G - Estrella\n
-    O - Tipo ordenación\n
-    I - Ordenar\n
-    Q - Volver a carpetas\n
-    S - Des/Marcar\n
-    J, P - Mensaje Previo\n
-    K, N - Siguiente mensaje
-  </string>
-  <string name="folder_list_help_key">
-    1 - Ver carpetas 1a Clase\u000A
-    2 - Ver carpetas 1a y 2a Clase\u000A
-    3 - Ver todas excepto las de 2a Clase\u000A
-    4 - Ver todas las carpetas\u000A
-    Q - Volver a cuentas\u000A
-    S - Editar preferencias cuenta</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar clave</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_reject">Rechazar clave</string>
+  <string name="message_list_help_key">Del (o D) - Borrar\nR - Responder\nA - Responder a todos\nC - Redactar\nF - Reenviar\nM - Mover\nV - Archivar\nY - Copiar\nZ - Marcar como (No) leído\nG - Estrella\nO - Tipo de ordenación\nI - Orden\nQ - Volver a Carpetas\n S - Seleccionar/Deseleccionar\nJ o P - Mensaje anterior\nK o N - Siguiente mensaje</string>
+  <string name="folder_list_help_key">1 - Ver carpetas 1a Clase\n2 - Ver carpetas 1a y 2a Clase\n3 - Ver todas excepto las de 2a Clase\n4 - Ver todas las carpetas\nQ - Volver a cuentas\nS - Editar preferencias cuenta</string>
   <string name="folder_list_filter_hint">nombre carpeta contiene</string>
-  <string name="folder_list_display_mode_label">Carpetas</string>
+  <string name="folder_list_display_mode_label">Mostrar carpetas...</string>
   <string name="folder_list_display_mode_all">Ver todas las carpetas</string>
   <string name="folder_list_display_mode_first_class">Ver sólo carpetas de 1a Clase</string>
   <string name="folder_list_display_mode_first_and_second_class">Ver carpetas de 1a y 2a Clase</string>
@@ -616,19 +633,26 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_signature__location_label">Posición de la firma</string>
   <string name="account_settings_signature__location_before_quoted_text">Antes del mensaje original</string>
   <string name="account_settings_signature__location_after_quoted_text">Después del mensaje original</string>
+  <string name="setting_theme_global">Usar el tema de la aplicación</string>
   <string name="setting_theme_dark">Oscuro</string>
   <string name="setting_theme_light">Claro</string>
   <string name="display_preferences">Visualización</string>
   <string name="global_preferences">Global</string>
-  <string name="debug_preferences">Debug</string>
+  <string name="debug_preferences">Depuración</string>
   <string name="privacy_preferences">Privacidad</string>
   <string name="network_preferences">Red</string>
   <string name="interaction_preferences">Interacción</string>
   <string name="accountlist_preferences">Lista de cuentas</string>
   <string name="messagelist_preferences">Lista de mensajes</string>
   <string name="messageview_preferences">Mensajes</string>
+  <string name="folderlist_preferences">Listas de carpeta</string>
   <string name="settings_theme_label">Tema</string>
+  <string name="settings_message_theme_label">Tema de vista de mensaje</string>
+  <string name="settings_compose_theme_label">Tema de redacción</string>
   <string name="settings_language_label">Idioma</string>
+  <string name="settings_message_theme_selection_label">Tema de mensaje fijo</string>
+  <string name="settings_message_theme_selection_summary_off">Seleccionar el tema de vista de mensaje mientras se muestra el mensaje</string>
+  <string name="settings_message_theme_selection_summary_on">Usar un tema de vista de mensaje fijo</string>
   <string name="settings_messageview_mobile_layout_label">Única Columna</string>
   <string name="settings_messageview_mobile_layout_summary">Ajusta mensajes HTML para pantallas pequeñas</string>
   <string name="setting_language_system">Configurado en el sistema</string>
@@ -636,7 +660,8 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Siempre</string>
   <string name="background_ops_enabled">Cuando \'Sincronización en segundo plano\' esté activo</string>
-  <string name="background_ops_auto_sync">Cuando \'Sincronización en segundo plano\' y \'Sincronización automática\' esten activos</string>
+  <string name="background_ops_auto_sync">Cuando \'Sincronización en segundo plano\' y \'Sincronización automática\' estén activos</string>
+  <string name="background_ops_auto_sync_only">Cuando \'sincronización automática\' esté activo</string>
   <string name="batch_select_all">Seleccionar todos</string>
   <string name="account_setup_push_limit_label">Max. carpetas Push</string>
   <string name="account_setup_push_limit_10">10 carpetas</string>
@@ -666,10 +691,10 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="search_all_messages_title">Todos los mensajes</string>
   <string name="search_all_messages_detail">Mensajes en las carpetas de búsqueda</string>
   <string name="integrated_inbox_title">Entrada unificada</string>
-  <string name="integrated_inbox_detail">Mensajes en la Entrada unificada</string>
+  <string name="integrated_inbox_detail">Todos los mensajes en la Entrada unificada</string>
   <string name="tap_hint">Pulsar para marcar como leído o poner una estrella</string>
   <string name="folder_settings_include_in_integrated_inbox_label">Unificar</string>
-  <string name="folder_settings_include_in_integrated_inbox_summary">Todos los mensajes se mostraran en una bandeja unificada</string>
+  <string name="folder_settings_include_in_integrated_inbox_summary">Todos los mensajes se mostrarán en una bandeja unificada</string>
   <string name="account_settings_searchable_label">Carpetas para buscar</string>
   <string name="account_settings_searchable_all">Todas</string>
   <string name="account_settings_searchable_displayable">Mostradas</string>
@@ -687,16 +712,19 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="font_size_message_list_sender">Remitente</string>
   <string name="font_size_message_list_date">Fecha</string>
   <string name="font_size_message_list_preview">Previsualizar</string>
-  <string name="font_size_message_view">mensajes</string>
+  <string name="font_size_message_view">Mensajes</string>
   <string name="font_size_message_view_sender">Remitente</string>
   <string name="font_size_message_view_to">Para</string>
-  <string name="font_size_message_view_cc">Cc</string>
+  <string name="font_size_message_view_cc">CC</string>
   <string name="font_size_message_view_additional_headers">Encabezados adicionales</string>
   <string name="font_size_message_view_subject">Asunto</string>
   <string name="font_size_message_view_date">Hora y Fecha</string>
   <string name="font_size_message_view_content">Cuerpo de mensaje</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">Composición mensaje</string>
   <string name="font_size_message_compose_input">Campos entrada texto</string>
+  <string name="font_size_default">Predeterminado</string>
   <string name="font_size_tiniest">La más pequeña</string>
   <string name="font_size_tiny">Muy pequeña</string>
   <string name="font_size_smaller">Más pequeña</string>
@@ -712,49 +740,47 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="misc_preferences_attachment_title">Usar galería</string>
   <string name="misc_preferences_attachment_description">Mostrar botones para Añadir adjuntos de imagen/vídeo</string>
   <!--APG related-->
-  <string name="error_activity_not_found">No existe aplicación para realizar esta acción</string>
-  <string name="error_apg_version_not_supported">No se admite esta versión de APG</string>
+  <string name="error_activity_not_found">No existe aplicación para realizar esta acción.</string>
+  <string name="error_apg_version_not_supported">No se admite esta versión de APG.</string>
   <string name="btn_crypto_sign">Firmar</string>
   <string name="btn_encrypt">Cifrar</string>
   <string name="btn_decrypt">Descifrar</string>
   <string name="btn_verify">Verificar</string>
   <string name="unknown_crypto_signature_user_id">&lt;desconocido&gt;</string>
   <string name="key_id">id: %s</string>
-  <string name="pgp_mime_unsupported">El formato PGP/MIME no está admitido aún</string>
-  <string name="attachment_encryption_unsupported">Advertencia: los adjuntos no estan firmados o cifrados</string>
+  <string name="pgp_mime_unsupported">El formato PGP/MIME no está admitido aún.</string>
+  <string name="attachment_encryption_unsupported">Advertencia: los adjuntos no están firmados o cifrados.</string>
   <string name="send_aborted">Envío cancelado.</string>
   <string name="save_or_discard_draft_message_dlg_title">¿Guardar como borrador?</string>
   <string name="save_or_discard_draft_message_instructions_fmt">¿Guardar o descartar este mensaje?</string>
-  <string name="confirm_discard_draft_message_title">¿Desechar mensaje?</string>
-  <string name="confirm_discard_draft_message">¿Está seguro de desechar este mensaje?</string>
+  <string name="confirm_discard_draft_message_title">¿Descartar mensaje?</string>
+  <string name="confirm_discard_draft_message">¿Está seguro de descartar este mensaje?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Rehusar guardar mensaje borrador.</string>
-  <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Rehusar guardar mensaje borrador marcado como encriptado.</string>
+  <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Rehusar guardar mensaje borrador marcado como cifrado.</string>
   <string name="continue_without_public_key_dlg_title">¿Continuar sin clave pública?</string>
-  <string name="continue_without_public_key_instructions_fmt">Uno o más recipientes no tienen clave pública. ¿Continuar?</string>
+  <string name="continue_without_public_key_instructions_fmt">Uno o más destinatarios no tienen clave pública. ¿Continuar?</string>
   <string name="select_text_now">Seleccionar texto a copiar.</string>
   <string name="dialog_confirm_delete_title">Confirmar borrado</string>
   <string name="dialog_confirm_delete_message">¿Quiere borrar este mensaje?</string>
-  <!--NEW:
   <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Do you really want to delete this message?</item>
-    <item quantity="other">Do you really want to delete <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
+    <item quantity="one">¿Realmente desea borrar este mensaje?</item>
+    <item quantity="other">¿Realmente desea borrar <xliff:g id="message_count">%1$d</xliff:g> mensajes?</item>
   </plurals>
--->
-  <string name="dialog_confirm_delete_confirm_button">Borrar</string>
-  <string name="dialog_confirm_delete_cancel_button">No borrar</string>
+  <string name="dialog_confirm_delete_confirm_button">Sí</string>
+  <string name="dialog_confirm_delete_cancel_button">No</string>
   <string name="dialog_confirm_spam_title">Confirmar mover a la carpeta Spam</string>
   <plurals name="dialog_confirm_spam_message">
     <item quantity="one">¿Quiere mover este mensaje a la carpeta Spam?</item>
     <item quantity="other">¿Quiere realmente mover <xliff:g id="message_count">%1$d</xliff:g> mensajes a la carpeta Spam?</item>
   </plurals>
-  <string name="dialog_confirm_spam_confirm_button">Si</string>
+  <string name="dialog_confirm_spam_confirm_button">Sí</string>
   <string name="dialog_confirm_spam_cancel_button">No</string>
   <string name="dialog_attachment_progress_title">Descargando adjunto</string>
   <string name="debug_logging_enabled">Opción de depuración activa</string>
   <string name="messagelist_sent_to_me_sigil">»</string>
   <string name="messagelist_sent_cc_me_sigil">›</string>
   <string name="error_unable_to_connect">Imposible conectar.</string>
-  <string name="import_export_action">Ajustes Importar &amp; Exportar</string>
+  <string name="import_export_action">Ajustes Importar y Exportar</string>
   <string name="settings_export_account">Exportar ajustes cuenta</string>
   <string name="settings_export_all">Exportar ajustes y cuentas</string>
   <string name="settings_import_dialog_title">Importar</string>
@@ -782,15 +808,15 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="settings_import_activate_account_intro">Para poder activar esta cuenta \"<xliff:g id="account">%s</xliff:g>\" debe proveer la <xliff:g id="server_passwords">%s</xliff:g>.</string>
   <plurals name="settings_import_server_passwords">
     <item quantity="one">palabra clave del servidor</item>
-    <item quantity="other">palabras claves del servidor</item>
+    <item quantity="other">contraseñas del servidor</item>
   </plurals>
   <string name="settings_import_incoming_server">Servidor de entrada (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">Servidor de salida (<xliff:g id="hostname">%s</xliff:g>):</string>
   <plurals name="settings_import_setting_passwords">
     <item quantity="one">Definir password...</item>
-    <item quantity="other">Definir passwords...</item>
+    <item quantity="other">Estableciendo contraseñas...</item>
   </plurals>
-  <string name="settings_import_use_incoming_server_password">Usar el password del Servidor de entrada</string>
+  <string name="settings_import_use_incoming_server_password">Usar la contraseña del Servidor de entrada</string>
   <string name="activate_account_action">Activar</string>
   <string name="account_unavailable">Cuenta \"<xliff:g id="account">%s</xliff:g>\" no disponible; comprobar</string>
   <string name="settings_attachment_default_path">Guardar adjuntos en…</string>
@@ -803,15 +829,15 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="import_dialog_error_title">No existe Explorador de Archivos</string>
   <string name="close">Cerrar</string>
   <string name="webview_empty_message">Sin texto</string>
-  <string name="webview_contextmenu_link_view_action">Abrir para ver</string>
+  <string name="webview_contextmenu_link_view_action">Abrir enlace</string>
   <string name="webview_contextmenu_link_share_action">Compartir enlace</string>
-  <string name="webview_contextmenu_link_copy_action">Copiar enlace portapapeles</string>
+  <string name="webview_contextmenu_link_copy_action">Copiar enlace al portapapeles</string>
   <string name="webview_contextmenu_link_clipboard_label">Enlace</string>
   <string name="webview_contextmenu_image_title">Imagen</string>
   <string name="webview_contextmenu_image_view_action">Ver imagen</string>
   <string name="webview_contextmenu_image_save_action">Guardar imagen</string>
   <string name="webview_contextmenu_image_download_action">Descargar imagen</string>
-  <string name="webview_contextmenu_image_copy_action">Copiar URL imagen al portapapeles</string>
+  <string name="webview_contextmenu_image_copy_action">Copiar URL de imagen al portapapeles</string>
   <string name="webview_contextmenu_image_clipboard_label">URL de la imagen</string>
   <string name="webview_contextmenu_phone_call_action">Número llamada</string>
   <string name="webview_contextmenu_phone_save_action">Guardar en Contactos</string>
@@ -819,9 +845,9 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="webview_contextmenu_phone_clipboard_label">Número teléfono</string>
   <string name="webview_contextmenu_email_send_action">Enviar mensaje</string>
   <string name="webview_contextmenu_email_save_action">Guardar en Contactos</string>
-  <string name="webview_contextmenu_email_copy_action">Copiar dirección email en portapapeles</string>
-  <string name="webview_contextmenu_email_clipboard_label">Dirección Email</string>
-  <string name="image_saved_as">Imagen guardado como \"<xliff:g id="filename">%s</xliff:g>\"</string>
+  <string name="webview_contextmenu_email_copy_action">Copiar dirección de correo en portapapeles</string>
+  <string name="webview_contextmenu_email_clipboard_label">Dirección de correo</string>
+  <string name="image_saved_as">Imagen guardada como \"<xliff:g id="filename">%s</xliff:g>\"</string>
   <string name="image_saving_failed">Error al guardar la imagen.</string>
   <string name="account_settings_remote_search_num_results_entries_all">Todos</string>
   <string name="account_settings_remote_search_num_results_entries_10">10</string>
@@ -850,5 +876,28 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="global_settings_background_as_unread_indicator_summary">Mostrar mensajes leídos/no leídos con distintos colores de fondo</string>
   <string name="global_settings_threaded_view_label">Vista agrupada por conversación</string>
   <string name="global_settings_threaded_view_summary">Contraer mensajes de la misma conversación</string>
+  <string name="upgrade_databases_title">Actualizando bases de datos</string>
+  <string name="upgrade_databases_unspecified">Actualizando bases de datos...</string>
+  <string name="upgrade_database_format">Actualizando base de datos de la cuenta \"<xliff:g id="account">%s</xliff:g>\"</string>
+  <string name="message_list_loading">Cargando...</string>
+  <string name="global_settings_splitview_mode_label">Mostrar pantalla dividida</string>
+  <string name="global_settings_splitview_always">Siempre</string>
+  <string name="global_settings_splitview_never">Nunca</string>
+  <string name="global_settings_splitview_when_in_landscape">Cuando esté en orientación horizontal</string>
+  <string name="message_view_empty">Por favor seleccione un mensaje en la izquierda</string>
+  <string name="global_settings_show_contact_picture_label">Mostrar imágenes de contactos</string>
+  <string name="global_settings_show_contact_picture_summary">Mostrar imágenes de contactos en la lista de mensajes</string>
+  <string name="last_refresh_time_format">Actualizado <xliff:g id="formatted_time">%s</xliff:g></string>
+  <string name="last_refresh_time_format_with_push">Actualizado <xliff:g id="time_with_preposition">%s</xliff:g> (Push activado)</string>
+  <string name="preposition_for_date">en <xliff:g id="date">%s</xliff:g></string>
+  <string name="mark_all_as_read">Marcar todo como leído</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Colorear las imágenes de contactos</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">Colorear las imágenes de contactos no existentes</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Acciones de mensaje visibles</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Mostrar las acciones seleccionadas en el menú de vista de mensaje</string>
+  <string name="loading_attachment">Cargando adjunto...</string>
+  <string name="fetching_attachment_dialog_title_send">Enviando mensaje</string>
+  <string name="fetching_attachment_dialog_title_save">Guardando borrador</string>
+  <string name="fetching_attachment_dialog_message">Recuperando adjunto...</string>
   <!--=== OpenPGP specific ==================================================================-->
 </resources>

res/values-eu/strings.xml

@@ -0,0 +1,892 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!--=== 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 BETA</string>
+  <string name="shortcuts_title">K-9 kontuak</string>
+  <string name="unread_widget_label">K-9 irakurgabeak</string>
+  <string name="remote_control_label">K-9 urruneko kontrola</string>
+  <string name="remote_control_desc">Aplikazio honi K-9 Mail aktibitate eta ezarpenak kontrolatzea ahalbidetzen du.</string>
+  <!--Used in the about dialog-->
+  <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+  <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
+  <string name="app_license">Apache lizentziarekin, 2.0 bertsioa</string>
+  <!--Welcome message-->
+  <string name="welcome_message_title">Ongi etorri K-9 Mail-era</string>
+  <string name="accounts_welcome"><![CDATA[
+<p>
+K-9 Mail Androiderako eposta bezero poteretsu bat da.
+</p><p>
+Ezaugarri nagusienak:
+</p>
+<ul>
+  <li>IMAP IDLE erabiliz eposta bidali</li>
+  <li>Lan-etekin hobea</li>
+  <li>Mezuen berkokapena</li>
+  <li>Eposta sinadurak</li>
+  <li>Bcc-no-bere-buruari</li>
+  <li>Karpeta harpidetzeak</li>
+  <li>Karpeta guztien sinkronizazioa</li>
+  <li>Erantzuteko helbidearen konfigurazioa</li>
+  <li>Teklatu lasterbideak</li>
+  <li>IMAP erabilpen hobea</li>
+  <li>Eranskinak SDan gorde</li>
+  <li>Zakarrontzia hustu</li>
+  <li>Mezuak ordenatu</li>
+  <li>…eta gehiago</li>
+</ul>
+<p>
+Mesedez kontutan hartu K-9 ezin dituela Hotmail kontu gehienak erabili, eta eposta bezero asko bezala, arazoak dituela Microsoft Exchangerekin komunikatzean.
+</p><p>
+Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko 
+<a href="http://k9mail.googlecode.com/">http://k9mail.googlecode.com/</a> erabili.
+</p>
+    ]]></string>
+  <!--Default signature-->
+  <string name="default_signature">-- \nK-9 Mail erabiliz nire Android gailutik bidalita. Mesedez, barkatu laburtasuna.</string>
+  <!--General strings that include the app name-->
+  <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" kontua K-9 Mail-etik ezabatuko da.</string>
+  <string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" kontuaren datu guztiak ezabatuko dira, Kontuaren ezarpenak mantenduko dira.</string>
+  <string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"  kontuaren mezuen kopia lokalak ezabatuko dira. Kontuaren ezarpenak mantenduko dira.</string>
+  <string name="insufficient_apg_permissions">K-9k ez du APG erabiltzeko baimen osoa, K-9 berrinstalatu konpontzeko.</string>
+  <!--=== App Store-specific strings =======================================================-->
+  <string name="import_dialog_error_message">Inportazioarekin jarraitzeko instalatu fitxategi kudeatzeaile bat, mesedez.</string>
+  <string name="open_market">Play Store-a ireki</string>
+  <!--=== General strings ==================================================================-->
+  <string name="app_authors_fmt">Egileak: <xliff:g id="app_authors">%s</xliff:g></string>
+  <string name="app_revision_fmt">Berrikustearen informazioa: <xliff:g id="app_revision_url">%s</xliff:g></string>
+  <string name="app_libraries">Besteen liburutegi hauek erabiltzen ditugu: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+  <string name="app_emoji_icons">Emoji ikonoak: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
+  <string name="read_attachment_label">Eposta eranskinak irakurri</string>
+  <string name="read_attachment_desc">Aplikazio honi zure eposten eranskinak irakurtzeko baimena ematen dio.</string>
+  <string name="read_messages_label">Eposta irakurri</string>
+  <string name="read_messages_desc">Aplikazio honi zure epostak irakurtzeko baimena ematen dio.</string>
+  <string name="delete_messages_label">Epostak ezabatu</string>
+  <string name="delete_messages_desc">Aplikazio honi zure epostak ezabatzeko baimena ematen dio.</string>
+  <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g>-ri buruz</string>
+  <string name="accounts_title">Kontuak</string>
+  <string name="folders_title">Karpetak</string>
+  <string name="advanced">Aurreratua</string>
+  <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
+  <string name="compose_title_compose">Idatzi</string>
+  <string name="compose_title_reply">Erantzun</string>
+  <string name="compose_title_reply_all">Denei erantzun</string>
+  <string name="compose_title_forward">Berbidali</string>
+  <string name="choose_folder_title">Karpeta hautatu</string>
+  <string name="status_loading_account_folder"><xliff:g id="account">%s</xliff:g> aztertzen:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="status_loading_account_folder_headers"><xliff:g id="account">%s</xliff:g> goiburuak eskuratzen:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="status_sending_account"><xliff:g id="account">%s</xliff:g> bidaltzen<xliff:g id="progress">%s</xliff:g></string>
+  <string name="status_processing_account">Prozesatzen <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
+  <string name="status_next_poll">Hurrengo azterketa <xliff:g id="nexttime">%s</xliff:g></string>
+  <string name="status_syncing_off">Sinkronizazioa ezgaituta</string>
+  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> hautatuta</string>
+  <string name="next_action">Hurrengoa</string>
+  <string name="previous_action">Aurrekoa</string>
+  <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
+  <string name="okay_action">OK</string>
+  <string name="cancel_action">Ezeztatu</string>
+  <string name="send_action">Bidali</string>
+  <string name="send_again_action">Berriz bidali</string>
+  <string name="select_action">Hautatu</string>
+  <string name="deselect_action">Ez-hautatu</string>
+  <string name="reply_action">Erantzun</string>
+  <string name="reply_all_action">Denei erantzun</string>
+  <string name="delete_action">Ezabatu</string>
+  <string name="archive_action">Artxibatu</string>
+  <string name="spam_action">Spam</string>
+  <string name="forward_action">Berbidali</string>
+  <string name="move_action">Mugitu</string>
+  <string name="single_message_options_action">Bidali...</string>
+  <string name="refile_action">Artxibatu...</string>
+  <string name="continue_action">Jarraitu</string>
+  <string name="back_action">Atzera</string>
+  <string name="done_action">Eginda</string>
+  <string name="discard_action">Baztertu</string>
+  <string name="save_draft_action">Zirriborroetan gorde</string>
+  <string name="check_mail_action">Eposta egiaztatu</string>
+  <string name="send_messages_action">Mezuak bidali</string>
+  <string name="refresh_folders_action">Karpeten zerrenda freskatu</string>
+  <string name="filter_folders_action">Karpeta bilatu</string>
+  <string name="add_account_action">Kontua gehitu</string>
+  <string name="compose_action">Idatzi</string>
+  <string name="search_action">Bilatu</string>
+  <string name="search_results">Bilaketaren emaitzak</string>
+  <string name="preferences_action">Ezarpenak</string>
+  <string name="account_settings_action">Kontu ezarpenak</string>
+  <string name="folder_settings_action">Karpeta ezarpenak</string>
+  <string name="global_settings_action">Ezarpen orokorrak</string>
+  <string name="remove_account_action">Kontua ezabatu</string>
+  <string name="clear_pending_action">Egiteke dauden ekintzak baztertu (arriskua!)</string>
+  <string name="mark_as_read_action">Irakurri bezala markatu</string>
+  <string name="send_alternate_action">Partekatu</string>
+  <string name="send_alternate_chooser_title">Bidaltzailea aukeratu</string>
+  <string name="flag_action">Izarra gehitu</string>
+  <string name="unflag_action">Izarra kendu</string>
+  <string name="copy_action">Kopiatu</string>
+  <string name="select_text_action">Testua hautatu</string>
+  <string name="show_headers_action">Goiburuak erakutsi</string>
+  <string name="hide_headers_action">Goiburuak ezkutatu</string>
+  <string name="message_view_theme_action_dark">Itxura ilunera aldatu</string>
+  <string name="message_view_theme_action_light">Itxura argira aldatu</string>
+  <string name="mark_as_unread_action">Irakurgabe markatu</string>
+  <string name="add_cc_bcc_action">Cc/Bcc gehitu</string>
+  <string name="read_receipt">Irakurragiria</string>
+  <string name="read_receipt_enabled">Irakurragiria eskatuko da</string>
+  <string name="read_receipt_disabled">Ez da irakurragiria eskatuko</string>
+  <string name="add_attachment_action">Eranskina gehitu</string>
+  <string name="add_attachment_action_image">Eranskina gehitu (Irudia)</string>
+  <string name="add_attachment_action_video">Eranskina gehitu (Bideoa)</string>
+  <string name="empty_trash_action">Zakarrontzia hustu</string>
+  <string name="expunge_action">Suntsitu</string>
+  <string name="clear_local_folder_action">Mezu lokalak garbitu</string>
+  <string name="about_action">Honi buruz</string>
+  <string name="prefs_title">Ezarpenak</string>
+  <string name="accounts_context_menu_title">Kontu aukerak</string>
+  <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
+  <string name="general_no_subject">(Gairik ez)</string>
+  <string name="general_no_sender">Bidaltzailerik ez</string>
+  <string name="status_loading">Aztertzen</string>
+  <string name="status_loading_more">Mezuak kargatzen\u2026</string>
+  <string name="status_network_error">Konexio errorea</string>
+  <string name="status_invalid_id_error">Ez da mezua topatu</string>
+  <string name="status_loading_more_failed">Saiatu berriz mezu gehiago kargatzen</string>
+  <string name="load_more_messages_fmt"><xliff:g id="messages_to_load">%d</xliff:g> gehiago kargatu</string>
+  <string name="abbrev_gigabytes">GB</string>
+  <string name="abbrev_megabytes">MB</string>
+  <string name="abbrev_kilobytes">KB</string>
+  <string name="abbrev_bytes">B</string>
+  <string name="account_size_changed">\"<xliff:g id="account">%s</xliff:g>\" kontua <xliff:g id="oldSize">%s</xliff:g>-tik <xliff:g id="newSize">%s</xliff:g>-ra trinkotu da</string>
+  <string name="compacting_account">\"<xliff:g id="account">%s</xliff:g>\" kontua trinkotzen</string>
+  <string name="clearing_account">\"<xliff:g id="account">%s</xliff:g>\" kontua garbitzen</string>
+  <string name="recreating_account">\"<xliff:g id="account">%s</xliff:g>\" kontua birsortzen</string>
+  <string name="notification_new_title">Eposta berria</string>
+  <string name="notification_new_messages_title"><xliff:g id="new_message_count">%d</xliff:g> mezu berri</string>
+  <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> irakurgabe (<xliff:g id="account">%s</xliff:g>)</string>
+  <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> gehiago <xliff:g id="account">%s</xliff:g> kontuan</string>
+  <string name="notification_action_reply">Erantzun</string>
+  <string name="notification_action_mark_as_read">Irakurrita markatu</string>
+  <string name="notification_action_delete">Ezabatu</string>
+  <string name="notification_certificate_error_title"><xliff:g id="account">%s</xliff:g> konturako ziurtagiri errorea</string>
+  <string name="notification_certificate_error_text">Egiaztatu zerbitzariaren ezarpenak</string>
+  <string name="notification_bg_sync_ticker">Eposta egiaztatzen: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
+  <string name="notification_bg_sync_title">Eposta egiaztatzen</string>
+  <string name="notification_bg_send_ticker">Eposta bidaltzen: <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_bg_send_title">Eposta bidaltzen</string>
+  <string name="notification_bg_title_separator">:</string>
+  <string name="special_mailbox_name_inbox">Sarrera</string>
+  <string name="special_mailbox_name_outbox">Irteera</string>
+  <string name="special_mailbox_name_drafts">Zirriborroak</string>
+  <string name="special_mailbox_name_trash">Zaborra</string>
+  <string name="special_mailbox_name_sent">Bidalitakoak</string>
+  <string name="special_mailbox_name_archive">Artxiboa</string>
+  <string name="special_mailbox_name_spam">Spam</string>
+  <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Zirriborroak)</string>
+  <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Zaborra)</string>
+  <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Bidalitakoak)</string>
+  <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Artxiboa)</string>
+  <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
+  <string name="send_failure_subject">Mezu batzuk bidaltzean errorea</string>
+  <string name="debug_version_fmt">Bertsioa: <xliff:g id="version">%s</xliff:g></string>
+  <string name="debug_enable_debug_logging_title">Arazketa logak gaitu</string>
+  <string name="debug_enable_debug_logging_summary">Diagnostikorako informazio gehigarria logean</string>
+  <string name="debug_enable_sensitive_logging_title">Informazio mimbera logetan</string>
+  <string name="debug_enable_sensitive_logging_summary">Logetan pasahitzak ikus daitezke.</string>
+  <string name="message_list_load_more_messages_action">Mezu gehiago kargatu</string>
+  <string name="message_to_fmt">Nori:<xliff:g id="counterParty">%s</xliff:g></string>
+  <string name="message_compose_to_hint">Nori</string>
+  <string name="message_compose_cc_hint">Cc</string>
+  <string name="message_compose_bcc_hint">Bcc</string>
+  <string name="message_compose_subject_hint">Gaia</string>
+  <string name="message_compose_content_hint">Mezuaren edukia</string>
+  <string name="message_compose_signature_hint">Sinadura</string>
+  <string name="message_compose_quote_header_separator">-------- Jatorrizko mezua --------</string>
+  <string name="message_compose_quote_header_subject">Gaia:</string>
+  <string name="message_compose_quote_header_send_date">Bidalita:</string>
+  <string name="message_compose_quote_header_from">Nork:</string>
+  <string name="message_compose_quote_header_to">Nori:</string>
+  <string name="message_compose_quote_header_cc">Cc:</string>
+  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g>-ek idatzi du:</string>
+  <string name="message_compose_error_no_recipients">Jasotzaile bat gutxienez adierazi behar duzu.</string>
+  <string name="error_contact_address_not_found">Kontaktu honen eposta helbidea ez da topatu.</string>
+  <string name="message_compose_attachments_skipped_toast">Eranskin batzuk ezin izan dira berbidali deskargatu ez direlako.</string>
+  <string name="message_compose_show_quoted_text_action">Mezua aipatu</string>
+  <string name="message_compose_description_add_to">Jasotzailea gehitu (Nori)</string>
+  <string name="message_compose_description_add_cc">Jasotzailea gehitu (CC)</string>
+  <string name="message_compose_description_add_bcc">Jasotzailea gehitu (BCC)</string>
+  <string name="message_compose_description_delete_quoted_text">Aipamena ezabatu</string>
+  <string name="message_compose_description_edit_quoted_text">Aipamena editatu</string>
+  <string name="message_view_from_format">Nondik: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
+  <string name="message_to_label">Nori:</string>
+  <string name="message_view_cc_label">Cc:</string>
+  <string name="message_view_attachment_view_action">Ireki</string>
+  <string name="message_view_attachment_download_action">Gorde</string>
+  <string name="message_view_status_attachment_saved">Eranskina SD txartelan gordeta: <xliff:g id="filename">%s</xliff:g>.</string>
+  <string name="message_view_status_attachment_not_saved">Ezin da eranskina SD txartelan gorde.</string>
+  <string name="message_view_show_pictures_action">Irudiak ikusi</string>
+  <string name="message_view_show_message_action">Mezua ikusi</string>
+  <string name="message_view_show_attachments_action">Eranskinak ikusi</string>
+  <string name="message_view_show_more_attachments_action">Gehiago...</string>
+  <string name="message_view_fetching_attachment_toast">Eranskina eskuratzen.</string>
+  <string name="message_view_no_viewer">Ez da <xliff:g id="mimetype">%s</xliff:g> ikusteko aplikaziorik topatu.</string>
+  <string name="message_view_download_remainder">Mezu osoa deskargatu</string>
+  <string name="message_view_downloading">Deskargatzen...</string>
+  <!--NOTE: The following message refers to strings with id account_setup_incoming_save_all_headers_label and account_setup_incoming_title-->
+  <string name="message_additional_headers_not_downloaded">Ez dira goiburu guztiak deskargatu edo gorde. Hautatu \"Gorder goiburu guztiak lokalki\" kontuaren sarrerako zerbitzariaren ezarpenetan etorkizunerako hau ahalbidetzeko.</string>
+  <string name="message_no_additional_headers_available">Goiburu guztiak deskargatu dira, baina ez dago erakusteko goiburu gehiago.</string>
+  <string name="message_additional_headers_retrieval_failed">Datubasetik edo zerbitzaritik goiburu gehiago eskuratzeak errorea eman du.</string>
+  <string name="from_same_sender">Bidaltzaile honengandik gehiago</string>
+  <string name="message_discarded_toast">Mezua baztertuta</string>
+  <string name="message_saved_toast">Mezua zirriborroetan gordeta</string>
+  <string name="global_settings_flag_label">Izarrak ikusi</string>
+  <string name="global_settings_flag_summary">Izarrak banderadun mezuak adierazten dute</string>
+  <string name="global_settings_checkbox_label">Aukera anitzeko kontrol laukiak</string>
+  <string name="global_settings_checkbox_summary">Aukera anitzeko kontrol laukiak beti ikusi</string>
+  <string name="global_settings_preview_lines_label">Aurreikuspen lerroak</string>
+  <string name="global_settings_show_correspondent_names_label">Dagokien izena ikusi</string>
+  <string name="global_settings_show_correspondent_names_summary">Eposta helbidearen ordez izena ikusi</string>
+  <string name="global_settings_sender_above_subject_label">Izena gaiaren gainean</string>
+  <string name="global_settings_sender_above_subject_summary">Izenak gaiaren gainean jarri, bere azpian jarri ordez</string>
+  <string name="global_settings_show_contact_name_label">Kontaktu izenak ikusi</string>
+  <string name="global_settings_show_contact_name_summary">Jasotzailearen izena kontaktuetaik hartu ahal denean</string>
+  <string name="global_settings_registered_name_color_label">Kontaktuak koloreztatu</string>
+  <string name="global_settings_registered_name_color_default">Ez koloreztatu izenik kontaktu zerrendan</string>
+  <string name="global_settings_registered_name_color_changed">Kontaktu zerrendan izenak koloreztatu</string>
+  <string name="global_settings_folderlist_wrap_folder_names_label">Karpeta izen luzeak moztu</string>
+  <string name="global_settings_folderlist_wrap_folder_names_summary">Lerro anitz erabili karpeta izen luzeak ikusteko</string>
+  <string name="global_settings_messageview_fixedwidth_label">Zabalera finkoko letra-tipoak</string>
+  <string name="global_settings_messageview_fixedwidth_summary">Testu soileko mezuak ikustean zabalera finkoko letra-tipoak erabili</string>
+  <string name="global_settings_messageview_autofit_width_label">Mezuak egokitu</string>
+  <string name="global_settings_messageview_autofit_width_summary">Mezuak txikitu pantailan sar daitezen</string>
+  <string name="global_settings_messageview_return_to_list_label">Ezabatu ondoren zerrendara itzuli</string>
+  <string name="global_settings_messageview_return_to_list_summary">Mezu bat ezabatzean mezuen zerrendara itzuli</string>
+  <string name="global_settings_messageview_show_next_label">Ezabatu ondoren hurrengo mezua ikusi</string>
+  <string name="global_settings_messageview_show_next_summary">Mezuak ezabatzerakoan defektuz hurrengo mezua ikusi</string>
+  <string name="global_settings_confirm_actions_title">Baieztatzeko ekintzak</string>
+  <string name="global_settings_confirm_actions_summary">Hautatutako ekintzak egiterakoan elkarrizketa koadroa ikusi</string>
+  <string name="global_settings_confirm_action_delete">Ezabatu (mezu ikuspegian)</string>
+  <string name="global_settings_confirm_action_delete_starred">Izarduna ezabatu (mezu ikuspegian)</string>
+  <string name="global_settings_confirm_action_spam">Spam</string>
+  <string name="global_settings_confirm_action_delete_notif">Ezabatu (Jakinarazpenetatik)</string>
+  <string name="global_settings_notification_hide_subject_title">Jakinarazpenetan gaia ezkutatu</string>
+  <string name="global_settings_notification_hide_subject_never">Inoiz ez</string>
+  <string name="global_settings_notification_hide_subject_when_locked">Gailua blokeatuta dagoenean</string>
+  <string name="global_settings_notification_hide_subject_always">Beti</string>
+  <string name="global_settings_notification_quick_delete_title">\'Ezabatu\' botoia erakutsi</string>
+  <string name="global_settings_notification_quick_delete_never">Inoiz ez</string>
+  <string name="global_settings_notification_quick_delete_when_single_msg">Mezu bakarreko jakinarazpenetarako</string>
+  <string name="global_settings_notification_quick_delete_always">Beti</string>
+  <string name="global_settings_notification_quick_delete_description">Jakinarazpenetan ezabatze azkarra ahalbidetzen duen botoia ikusi</string>
+  <string name="quiet_time">Tarte isila</string>
+  <string name="quiet_time_description">Timbrea, bibrazioa eta argiak gauez ezgaitu</string>
+  <string name="quiet_time_starts">Tarte isilaren hasiera</string>
+  <string name="quiet_time_ends">Tarte isilaren bukaera</string>
+  <string name="account_setup_basics_title">Kontu berria konfiguratu</string>
+  <string name="account_setup_basics_email_hint">Eposta helbidea</string>
+  <string name="account_setup_basics_password_hint">Pasahitza</string>
+  <string name="account_setup_basics_manual_setup_action">Eskuzko konfigurazioa</string>
+  <string name="account_setup_check_settings_title"/>
+  <string name="account_setup_check_settings_retr_info_msg">Kontuaren informazioa eskuratzen\u2026</string>
+  <string name="account_setup_check_settings_check_incoming_msg">Sarrerako zerbitzariaren ezarpenak egiaztatzen\u2026</string>
+  <string name="account_setup_check_settings_check_outgoing_msg">Irteerako zerbitzariaren ezarpenak egiaztatzen\u2026</string>
+  <string name="account_setup_check_settings_authenticate">Kautotzen\u2026</string>
+  <string name="account_setup_check_settings_fetch">Kontuaren ezarpenak eskuratzen\u2026</string>
+  <string name="account_setup_check_settings_canceling_msg">Ezeztatzen\u2026</string>
+  <string name="account_setup_names_title">Ia bukatu duzu!</string>
+  <string name="account_setup_names_account_name_label">Kontu honi izena eman (aukerazkoa):</string>
+  <string name="account_setup_names_user_name_label">Zure izena (bidalitako mezuetan ikusiko da):</string>
+  <string name="account_setup_account_type_title">Kontu mota</string>
+  <string name="account_setup_account_type_instructions">Ze kontu mota da hau?</string>
+  <string name="account_setup_account_type_pop_action">POP3</string>
+  <string name="account_setup_account_type_imap_action">IMAP</string>
+  <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+  <string name="account_setup_incoming_title">Sarrerako zerbitzariaren ezarpenak</string>
+  <string name="account_setup_incoming_username_label">Erabiltzaile izena</string>
+  <string name="account_setup_incoming_password_label">Pasahitza</string>
+  <string name="account_setup_incoming_pop_server_label">POP3 zerbitzaria</string>
+  <string name="account_setup_incoming_imap_server_label">IMAP zebitzaria</string>
+  <string name="account_setup_incoming_webdav_server_label">Exchange zerbitzaria</string>
+  <string name="account_setup_incoming_port_label">Portua</string>
+  <string name="account_setup_incoming_security_label">Segurtasuna</string>
+  <string name="account_setup_incoming_auth_type_label">Kautotzea</string>
+  <string name="account_setup_incoming_security_none_label">Ezer</string>
+  <string name="account_setup_incoming_delete_policy_label">Mezu bat ezabatzen dudanean</string>
+  <string name="account_setup_incoming_delete_policy_never_label">Ez ezabatu zerbitzarian</string>
+  <string name="account_setup_incoming_delete_policy_delete_label">Zerbitzarian ezabatu</string>
+  <string name="account_setup_incoming_delete_policy_markread_label">Zerbitzarian irakurrita markatu</string>
+  <string name="account_setup_incoming_compression_label">Sare hauetan trinkotzea erabili:</string>
+  <string name="account_setup_incoming_mobile_label">Mobila</string>
+  <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
+  <string name="account_setup_incoming_other_label">Bestelakoak</string>
+  <string name="local_storage_provider_external_label">Kanpoko biltegia (SD txartela)</string>
+  <string name="local_storage_provider_internal_label">Ohizko barruko biltegia</string>
+  <string name="local_storage_provider_samsunggalaxy_label">%1$s barneko biltegi gehigarria</string>
+  <string name="local_storage_provider_label">Biltegiaren kokapena</string>
+  <string name="account_setup_expunge_policy_label">Ezabatutako mezuak zerbitzaritik kendu</string>
+  <string name="account_setup_expunge_policy_immediately">Berehala</string>
+  <string name="account_setup_expunge_policy_on_poll">Aztertzean</string>
+  <string name="account_setup_expunge_policy_manual">Eskuz</string>
+  <string name="account_setup_incoming_autodetect_namespace_label">IMAP namespace-a auto-detektatu</string>
+  <string name="account_setup_incoming_imap_path_prefix_label">IMAP bidearen hasiera</string>
+  <string name="drafts_folder_label">Zirriborroen karpeta</string>
+  <string name="sent_folder_label">Bidalitakoen karpeta</string>
+  <string name="trash_folder_label">Zaborraren karpeta</string>
+  <string name="archive_folder_label">Artxiboaren karpeta</string>
+  <string name="spam_folder_label">Spam karpeta</string>
+  <string name="account_setup_incoming_subscribed_folders_only_label">Harpidetutako karpetak bakarrik ikusi</string>
+  <string name="account_setup_auto_expand_folder">Karpetak automatikoki zabaldu</string>
+  <string name="account_setup_incoming_webdav_path_prefix_label">OWA bidea</string>
+  <string name="account_setup_incoming_webdav_path_prefix_hint">Aukerazkoa</string>
+  <string name="account_setup_incoming_webdav_auth_path_label">Kautotze bidea</string>
+  <string name="account_setup_incoming_webdav_auth_path_hint">Aukerazkoa</string>
+  <string name="account_setup_incoming_webdav_mailbox_path_label">Postontzi aliasa</string>
+  <string name="account_setup_incoming_webdav_mailbox_path_hint">Aukerazkoa</string>
+  <string name="account_setup_outgoing_title">Bidaltzeko zerbitzariaren ezarpenak</string>
+  <string name="account_setup_outgoing_smtp_server_label">SMTP zerbitzaria</string>
+  <string name="account_setup_outgoing_port_label">Portua</string>
+  <string name="account_setup_outgoing_security_label">Segurtasuna</string>
+  <string name="account_setup_outgoing_require_login_label">Izen ematea behar du.</string>
+  <string name="account_setup_outgoing_username_label">Erabiltzailea</string>
+  <string name="account_setup_outgoing_password_label">Pasahitza</string>
+  <string name="account_setup_outgoing_authentication_label">Kautotzea</string>
+  <string name="account_setup_bad_uri">Konfigurazio ezegokia: <xliff:g id="err_mess">%s</xliff:g></string>
+  <string name="account_setup_options_title">Kontu aukerak</string>
+  <string name="compact_action">Kontua trinkotu</string>
+  <string name="clear_action">Mezuak ezabatu (arriskua!)</string>
+  <string name="recreate_action">Datuak birsortu (Azkeneko aukera!)</string>
+  <string name="account_setup_options_mail_check_frequency_label">Karpeta aztertzeko maiztasuna</string>
+  <string name="account_setup_options_mail_check_frequency_never">Inoiz ez</string>
+  <string name="account_setup_options_mail_check_frequency_1min">Minutuoro</string>
+  <string name="account_setup_options_mail_check_frequency_5min">5 minutuoro</string>
+  <string name="account_setup_options_mail_check_frequency_10min">10 minutuoro</string>
+  <string name="account_setup_options_mail_check_frequency_15min">15 minutuoro</string>
+  <string name="account_setup_options_mail_check_frequency_30min">30 minutuoro</string>
+  <string name="account_setup_options_mail_check_frequency_1hour">Orduro</string>
+  <string name="account_setup_options_mail_check_frequency_2hour">2 orduro</string>
+  <string name="account_setup_options_mail_check_frequency_3hour">3 orduro</string>
+  <string name="account_setup_options_mail_check_frequency_6hour">6 orduro</string>
+  <string name="account_setup_options_mail_check_frequency_12hour">12 orduro</string>
+  <string name="account_setup_options_mail_check_frequency_24hour">24 orduro</string>
+  <string name="push_poll_on_connect_label">Bidaltzeko konektatzerakoan aztertu</string>
+  <string name="account_setup_options_enable_push_label">Kontu honetarako \"push mail\" gaitu </string>
+  <string name="account_setup_options_enable_push_summary">Zure zerbitzariak onartzen badu, mezu berriak berehala agertuko dira. Aukera honek lan-etekinean eragin handia izan dezake.</string>
+  <string name="idle_refresh_period_label">Zereginik gabeko konexioa freskatu</string>
+  <string name="idle_refresh_period_1min">Minutuoro</string>
+  <string name="idle_refresh_period_2min">2 minutuoro</string>
+  <string name="idle_refresh_period_3min">3 minutuoro</string>
+  <string name="idle_refresh_period_6min">6 minutuoro</string>
+  <string name="idle_refresh_period_12min">12 minutuoro</string>
+  <string name="idle_refresh_period_24min">24 minutuoro</string>
+  <string name="idle_refresh_period_36min">36 minutuoro</string>
+  <string name="idle_refresh_period_48min">48 minutuoro</string>
+  <string name="idle_refresh_period_60min">60 minutuoro</string>
+  <string name="account_setup_options_notify_label">Eposta berria heltzean jakinarazi</string>
+  <string name="account_setup_options_notify_sync_label">Eposta egiaztatzerakoan jakinarazi</string>
+  <string name="account_setup_options_mail_display_count_label">Ikusiko diren mezu kopurua</string>
+  <string name="account_setup_options_mail_display_count_10">10 mezu</string>
+  <string name="account_setup_options_mail_display_count_25">25 mezu</string>
+  <string name="account_setup_options_mail_display_count_50">50 mezu</string>
+  <string name="account_setup_options_mail_display_count_100">100 mezu</string>
+  <string name="account_setup_options_mail_display_count_250">250 mezu</string>
+  <string name="account_setup_options_mail_display_count_500">500 mezu</string>
+  <string name="account_setup_options_mail_display_count_1000">1000 mezu</string>
+  <string name="account_setup_options_mail_display_count_all">mezu guztiak</string>
+  <string name="move_copy_cannot_copy_unsynced_message">Zerbitzariarekin sinkronizatuta ez dauden mezuak ezin dira kopiatu edo mugitu</string>
+  <string name="account_setup_failed_dlg_title">Konfigurazioak ezin izan du bukatu</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Erabiltzaile edo pasahitz okerra.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Zerbitzariak baliogabeko SSL ziurtagiria eman du. Batzutan zerbitzariaren konfigurazio oker bat da. Batzutan baten batek zure posta zerbitzaria erasotzen dagoela da. Ziur ez bazaude Baztertu sakatu eta eposta zerbitzaria kudeatzen dutenekin hitzegin.
+
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Ezin da zerbitzarira konektatu.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_edit_details_action">Xehetasunak editatu</string>
+  <string name="account_setup_failed_dlg_continue_action">Jarraitu</string>
+  <string name="account_settings_push_advanced_title">Aurreratua</string>
+  <string name="account_settings_title_fmt">Kontu ezarpenak</string>
+  <string name="account_settings_default_label">Defektuzko kontua</string>
+  <string name="account_settings_default_summary">Eposta defektuz kontu honetatik bidali</string>
+  <string name="account_settings_notify_label">Eposta berriko jakinarazpenak</string>
+  <string name="account_settings_notify_sync_label">Sinkronizazio jakinarazpenak</string>
+  <string name="account_settings_email_label">Zure posta helbidea</string>
+  <string name="account_settings_notify_summary">Mezuak heltzean egoera barran jakinarazi</string>
+  <string name="account_settings_notify_sync_summary">Mezuak egiaztatzean egoera barran jakinarazi</string>
+  <string name="account_settings_notify_self_label">Bidalitako mezuak ere bai</string>
+  <string name="account_settings_notify_self_summary">Bidaltzen ditudan mezuetarako jakinarazpena ikusi</string>
+  <string name="account_settings_notification_opens_unread_label">Jakinarazpenak irakurgabeko mezuak irekitzen ditu</string>
+  <string name="account_settings_notification_opens_unread_summary">Jakinarazpena irekitzean irakurri gabeko mezuak bilatu</string>
+  <string name="account_settings_notification_unread_count_label">Irakurgabeko kopurua ikusi</string>
+  <string name="account_settings_notification_unread_count_summary">Irakurgabeko mezu kopurua ikusi jakinarazpen barran.</string>
+  <string name="account_settings_mark_message_as_read_on_view_label">Irekitzean irakurrita markatu</string>
+  <string name="account_settings_mark_message_as_read_on_view_summary">Mezu bat irekitzerakoan irakurri bezala markatu</string>
+  <string name="account_settings_show_pictures_label">Irudiak beti ikusi</string>
+  <string name="account_settings_show_pictures_never">Ez</string>
+  <string name="account_settings_show_pictures_only_from_contacts">Kontaktuetatik</string>
+  <string name="account_settings_show_pictures_always">Edozeinetik</string>
+  <string name="account_settings_composition">Eposta bidaltzen</string>
+  <string name="account_settings_default_quoted_text_shown_label">Erantzuterakoan mezua aipatu</string>
+  <string name="account_settings_default_quoted_text_shown_summary">Erantzunean jatorrizko mezua sartu.</string>
+  <string name="account_settings_reply_after_quote_label">Erantzun aipamenaren ondoren</string>
+  <string name="account_settings_reply_after_quote_summary">Jatorrizko mezua zure erantzunaren gainean agertuko da.</string>
+  <string name="account_settings_strip_signature_label">Erantzuterakoan sinadurak kendu</string>
+  <string name="account_settings_strip_signature_summary">Aipamenetatik sinadurak kenduko dira</string>
+  <string name="account_settings_message_format_label">Mezuaren formatua</string>
+  <string name="account_settings_message_format_text">Testu soila (irudiak eta formatua kendu)</string>
+  <string name="account_settings_message_format_html">HTML (irudiak eta formatua mantendu)</string>
+  <string name="account_settings_message_format_auto">Automatikoa</string>
+  <string name="account_settings_always_show_cc_bcc_label">Cc/Bcc beti ikusi</string>
+  <string name="account_settings_message_read_receipt_label">Irakurragiria</string>
+  <string name="account_settings_message_read_receipt_summary">Irakurragiria eskatu beti</string>
+  <string name="account_settings_quote_style_label">Erantzunaren aipamen estiloa</string>
+  <string name="account_settings_quote_style_prefix">Aurrizkia (Gmail bezala)</string>
+  <string name="account_settings_quote_style_header">Goiburua (Outlook bezala)</string>
+  <string name="account_settings_general_title">Ezarpen orokorrak</string>
+  <string name="account_settings_reading_mail">Eposta irakurtzen</string>
+  <string name="account_settings_sync">Eposta jasotzen</string>
+  <string name="account_settings_folders">Karpetak</string>
+  <string name="account_settings_quote_prefix_label">Aipamen testuaren aurrizkia</string>
+  <string name="account_settings_crypto">Kriptografia</string>
+  <string name="account_settings_crypto_app">OpenPGP hornitzailea</string>
+  <string name="account_settings_crypto_app_none">Batez</string>
+  <string name="account_settings_crypto_auto_signature">Sinadura automatikoa</string>
+  <string name="account_settings_crypto_auto_signature_summary">Kontuaren eposta helbidea erabili sinatzeko gakoa asmatzeko.</string>
+  <string name="account_settings_crypto_auto_encrypt">Zifraketa automatikoa</string>
+  <string name="account_settings_crypto_auto_encrypt_summary">Jasotzailearen gako publikoa badago automatikoki zifratu.</string>
+  <string name="account_settings_crypto_apg_not_installed">APG ez dago instalatuta</string>
+  <string name="account_settings_mail_check_frequency_label">Karpeta aztertzeko maiztasuna</string>
+  <string name="account_settings_storage_title">Biltegia</string>
+  <string name="account_settings_color_label">Kontuaren kolorea</string>
+  <string name="account_settings_color_summary">Kontu honen kolorea karpeten zerrendan eta kontu zerrendan erabiliko da</string>
+  <string name="account_settings_led_color_label">Jakinarazpenetarako LED kolorea</string>
+  <string name="account_settings_led_color_summary">Kontu honetarako LEDaren kolorea</string>
+  <string name="account_settings_mail_display_count_label">Karpeta lokalaren tamaina</string>
+  <string name="account_settings_autodownload_message_size_label">Honenbeste mezu eskuratu</string>
+  <string name="account_settings_autodownload_message_size_1">1Kb</string>
+  <string name="account_settings_autodownload_message_size_2">2Kb</string>
+  <string name="account_settings_autodownload_message_size_4">4Kb</string>
+  <string name="account_settings_autodownload_message_size_8">8Kb</string>
+  <string name="account_settings_autodownload_message_size_16">16Kb</string>
+  <string name="account_settings_autodownload_message_size_32">32Kb</string>
+  <string name="account_settings_autodownload_message_size_64">64Kb</string>
+  <string name="account_settings_autodownload_message_size_128">128Kb</string>
+  <string name="account_settings_autodownload_message_size_256">256Kb</string>
+  <string name="account_settings_autodownload_message_size_512">512Kb</string>
+  <string name="account_settings_autodownload_message_size_1024">1Mb</string>
+  <string name="account_settings_autodownload_message_size_2048">2Mb</string>
+  <string name="account_settings_autodownload_message_size_5120">5Mb</string>
+  <string name="account_settings_autodownload_message_size_10240">10Mb</string>
+  <string name="account_settings_autodownload_message_size_any">edozen tamaina (mugarik ez)</string>
+  <string name="account_settings_message_age_label">Mezuak hauek sinkronizatu:</string>
+  <string name="account_settings_message_age_any">edozein datakoak (mugarik ez)</string>
+  <string name="account_settings_message_age_0">gaur</string>
+  <string name="account_settings_message_age_1">azken 2 egunak</string>
+  <string name="account_settings_message_age_2">azken 3 egunak</string>
+  <string name="account_settings_message_age_7">azken astea</string>
+  <string name="account_settings_message_age_14">azken 2 asteak</string>
+  <string name="account_settings_message_age_21">azken 3 asteak</string>
+  <string name="account_settings_message_age_1_month">azken hilabetea</string>
+  <string name="account_settings_message_age_2_months">azken 2 hilabeteak</string>
+  <string name="account_settings_message_age_3_months">azken 3 hilabeteak</string>
+  <string name="account_settings_message_age_6_months">azken 6 hilabeteak</string>
+  <string name="account_settings_message_age_1_year">azken urtea</string>
+  <string name="account_settings_folder_display_mode_label">Ikusiko direk karpetak</string>
+  <string name="account_settings_folder_display_mode_all">Guztiak</string>
+  <string name="account_settings_folder_display_mode_first_class">1.go mailakoak bakarrik</string>
+  <string name="account_settings_folder_display_mode_first_and_second_class">1.go eta 2. mailako karpetak</string>
+  <string name="account_settings_folder_display_mode_not_second_class">Guztiak 2. mailakoak ezik</string>
+  <string name="account_settings_folder_sync_mode_label">Karpetak aztertu</string>
+  <string name="account_settings_folder_sync_mode_all">Guztiak</string>
+  <string name="account_settings_folder_sync_mode_first_class">1.go mailakoak bakarrik</string>
+  <string name="account_settings_folder_sync_mode_first_and_second_class">1.go eta 2. mailako karpetak</string>
+  <string name="account_settings_folder_sync_mode_not_second_class">Guztiak 2. mailakoak ezik</string>
+  <string name="account_settings_folder_sync_mode_none">Batez</string>
+  <string name="account_settings_folder_push_mode_label">Karpeten \'Push\'a</string>
+  <string name="account_settings_folder_push_mode_all">Guztiak</string>
+  <string name="account_settings_folder_push_mode_first_class">1.go mailakoak bakarrik</string>
+  <string name="account_settings_folder_push_mode_first_and_second_class">1.go eta 2. mailako karpetak</string>
+  <string name="account_settings_folder_push_mode_not_second_class">Guztiak 2. mailakoak ezik</string>
+  <string name="account_settings_folder_push_mode_none">Batez</string>
+  <string name="account_settings_folder_target_mode_label">Helburu karpetak mugitu/kopiatu</string>
+  <string name="account_settings_folder_target_mode_all">Guztiak</string>
+  <string name="account_settings_folder_target_mode_first_class">1.go mailakoak bakarrik</string>
+  <string name="account_settings_folder_target_mode_first_and_second_class">1.go eta 2. mailako karpetak</string>
+  <string name="account_settings_folder_target_mode_not_second_class">Guztiak 2. mailakoak ezik</string>
+  <string name="account_settings_sync_remote_deletetions_label">Zerbitzariko ezabaketak sinkronizatu</string>
+  <string name="account_settings_sync_remote_deletetions_summary">Mezuak kendu zerbitzarian ezabatzen direnean</string>
+  <string name="folder_settings_title">Karpeta ezarpenak</string>
+  <string name="folder_settings_in_top_group_label">Goiko taldean ikusi</string>
+  <string name="folder_settings_in_top_group_summary">Karpeta zerrendaren goikaldetik hurbil ikusi</string>
+  <string name="folder_settings_folder_display_mode_label">Karpeta bistaratzeko klasea</string>
+  <string name="folder_settings_folder_display_mode_normal">Batez</string>
+  <string name="folder_settings_folder_display_mode_first_class">1.go maila</string>
+  <string name="folder_settings_folder_display_mode_second_class">2. maila</string>
+  <string name="folder_settings_folder_sync_mode_label">Karpeta sinkronizatzeko klasea</string>
+  <string name="folder_settings_folder_sync_mode_normal">Batez</string>
+  <string name="folder_settings_folder_sync_mode_first_class">1.go maila</string>
+  <string name="folder_settings_folder_sync_mode_second_class">2. maila</string>
+  <string name="folder_settings_folder_sync_mode_inherited">Bistaratzeko klasearen berdina</string>
+  <string name="folder_settings_folder_push_mode_label">Karpetaren \'push\' klasea</string>
+  <string name="folder_settings_folder_push_mode_normal">Batez</string>
+  <string name="folder_settings_folder_push_mode_first_class">1.go maila</string>
+  <string name="folder_settings_folder_push_mode_second_class">2. maila</string>
+  <string name="folder_settings_folder_push_mode_inherited">Sinkronizatzeko klasearen berdina</string>
+  <string name="account_settings_incoming_label">Sarrerako zerbitzaria</string>
+  <string name="account_settings_incoming_summary">Sarrerako zerbitzaria konfiguratu</string>
+  <string name="account_settings_outgoing_label">Irteera zerbitzaria</string>
+  <string name="account_settings_outgoing_summary">Irteerako zerbitzaria (SMTP) konfiguratu</string>
+  <string name="account_settings_description_label">Kontu izena</string>
+  <string name="account_settings_name_label">Zure izena</string>
+  <string name="notifications_title">Jakinarazpenak</string>
+  <string name="account_settings_vibrate_enable">Dardara</string>
+  <string name="account_settings_vibrate_summary">Dardar egin mezua heltzean</string>
+  <string name="account_settings_vibrate_pattern_label">Dardar ereduak</string>
+  <string name="account_settings_vibrate_pattern_default">defektuzkoa</string>
+  <string name="account_settings_vibrate_pattern_1">1 eredua</string>
+  <string name="account_settings_vibrate_pattern_2">2 eredua</string>
+  <string name="account_settings_vibrate_pattern_3">3 eredua</string>
+  <string name="account_settings_vibrate_pattern_4">4 eredua</string>
+  <string name="account_settings_vibrate_pattern_5">5 eredua</string>
+  <string name="account_settings_vibrate_times">Dardara errepikatu</string>
+  <string name="account_settings_ringtone">Eposta berrirako timbrea</string>
+  <string name="account_settings_led_label">LED keinukaria</string>
+  <string name="account_settings_led_summary">Eposta heltzean LEDarekin keinu egin</string>
+  <string name="account_settings_composition_title">Mezuak idazteko aukerak</string>
+  <string name="account_settings_composition_label">Idazterakoan lehenetsiak</string>
+  <string name="account_settings_composition_summary">Nork, Bcc eta sinadura lehenetsiak ezarri</string>
+  <string name="account_settings_identities_label">Identitateak kudeatu</string>
+  <string name="account_settings_identities_summary">Ordezko \'Nork\' helbide eta sinadurak ezarri</string>
+  <string name="manage_identities_title">Identitateak kudeatu</string>
+  <string name="manage_identities_context_menu_title">Identitatea kudeatu</string>
+  <string name="edit_identity_title">Identitatea aldatu</string>
+  <string name="new_identity_action">Identitate berria</string>
+  <string name="account_settings_always_bcc_label">Mezu guztietarako Bcc</string>
+  <string name="manage_identities_edit_action">Aldatu</string>
+  <string name="manage_identities_move_up_action">Gora mugitu</string>
+  <string name="manage_identities_move_down_action">Behera mugitu</string>
+  <string name="manage_identities_move_top_action">Goraino eraman / defektuzkoa egin</string>
+  <string name="manage_identities_remove_action">Kendu</string>
+  <string name="edit_identity_description_label">Identitatearen deskribapena</string>
+  <string name="edit_identity_description_hint">(Hautazkoa)</string>
+  <string name="edit_identity_name_label">Zure izena</string>
+  <string name="edit_identity_name_hint">(Hautazkoa)</string>
+  <string name="edit_identity_email_label">Eposta helbidea</string>
+  <string name="edit_identity_email_hint">(Beharrezkoa)</string>
+  <string name="edit_identity_reply_to_label">Erantzuteko helbidea</string>
+  <string name="edit_identity_reply_to_hint">(Hautazkoa)</string>
+  <string name="edit_identity_signature_label">Sinadura</string>
+  <string name="edit_identity_signature_hint">(Hautazkoa)</string>
+  <string name="account_settings_signature_use_label">Sinadura erabili</string>
+  <string name="account_settings_signature_label">Sinadura</string>
+  <string name="default_identity_description">Hasierako identitatea</string>
+  <string name="choose_identity_title">Identitatea hautatu</string>
+  <string name="send_as">Honela bidali:</string>
+  <string name="no_removable_identity">Ezin duzu zure identitate bakarra ezabatu</string>
+  <string name="identity_has_no_email">Ezin duzu eposta helbiderik gabeko identitatea erabili</string>
+  <string name="sort_earliest_first">Mezu zaharrak lehengo</string>
+  <string name="sort_latest_first">Mezu berriak lehengo</string>
+  <string name="sort_subject_alpha">Gaiaren arabeera alfabetikoki</string>
+  <string name="sort_subject_re_alpha">Gaiaren arabera alderantzizko alfabetikoki</string>
+  <string name="sort_sender_alpha">Bidaltzailearekiko alfabetikoki</string>
+  <string name="sort_sender_re_alpha">Bidaltzailearekiko alderantzizko alfabetikoki</string>
+  <string name="sort_flagged_first">Izardun mezuak lehengo</string>
+  <string name="sort_flagged_last">Izarrik gabeko mezuak lehengo</string>
+  <string name="sort_unread_first">Mezu irakurgabeak lehengo</string>
+  <string name="sort_unread_last">Irakurritako mezuak lehengo</string>
+  <string name="sort_attach_first">Eranskindun mezuak lehengo</string>
+  <string name="sort_unattached_first">Eranskin gabeko mezuak lehengo</string>
+  <string name="sort_by">Ordena...</string>
+  <string name="sort_by_date">Data</string>
+  <string name="sort_by_arrival">Jasoera</string>
+  <string name="sort_by_subject">Gaia</string>
+  <string name="sort_by_sender">Bidaltzailea</string>
+  <string name="sort_by_flag">Izarra</string>
+  <string name="sort_by_unread">Irakurrita/Irakurgabe</string>
+  <string name="sort_by_attach">Eranskinak</string>
+  <string name="account_delete_dlg_title">Kontua ezabatu</string>
+  <string name="account_recreate_dlg_title">Kontua birsortu</string>
+  <string name="account_clear_dlg_title">Kontua garbitu</string>
+  <string name="provider_note_auonejp">Ziurtatu au one epostako ezarpenetan POP3 edo IMAP gaituta duzula.</string>
+  <string name="provider_note_naver">Ziurtatu Naver epostako ezarpenetan POP3 edo IMAP gaituta duzula.</string>
+  <string name="provider_note_hanmail">Ziurtatu Hanmail(Daum) epostako ezarpenetan POP3 edo IMAP gaituta duzula.</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_title">Ziurtagiri ezezaguna</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_accept">Gakoa onartu</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_reject">Gakoa baztertu</string>
+  <string name="message_list_help_key">Del (edo D) - Ezabatu\nR - Erantzun\nA - Guztiei erantzun\nC - Idatzi\nF - Berbidali\nM - Mugitu\nV - Artxibatu\nY - Kopiatu\nZ - Irakurrita (edo ez) markatu\nG - Izarra\nO - Bilaketa mota\nI - Bilaketa ordena\nQ - Karpetetara itzuli\nS - Hautatu/desautatu\nJ edo P - Aurreko mezua\nK edo N - Hurrengo mezua</string>
+  <string name="folder_list_help_key">1 - 1.go mailako karpetak bakarrik ikusi\n2 - 1.go eta 2. mailako karpetak ikusi\n3 - 2. mailakoak ez diren karpetak ikusi\n4 - Karpeta guztiak ikusi\nQ - Kontuetara itzuli\nS - Kontu ezarpenak aldatu</string>
+  <string name="folder_list_filter_hint">karpetaren izenak dauka</string>
+  <string name="folder_list_display_mode_label">Karpetak ikusi...</string>
+  <string name="folder_list_display_mode_all">Karpeta guztiak</string>
+  <string name="folder_list_display_mode_first_class">1.go mailako karpetak</string>
+  <string name="folder_list_display_mode_first_and_second_class">1.go eta 2. mailako karpetak</string>
+  <string name="folder_list_display_mode_not_second_class">2. mailako karpetak ezkutatu</string>
+  <string name="account_settings_signature__location_label">Zinaduraren kokapena</string>
+  <string name="account_settings_signature__location_before_quoted_text">Aipamena baino lehen</string>
+  <string name="account_settings_signature__location_after_quoted_text">Aipamenaren ondoren</string>
+  <string name="setting_theme_global">Aplikazioaren itxura erabili</string>
+  <string name="setting_theme_dark">Iluna</string>
+  <string name="setting_theme_light">Argia</string>
+  <string name="display_preferences">Bistaratzea</string>
+  <string name="global_preferences">Orokorra</string>
+  <string name="debug_preferences">Arazketa</string>
+  <string name="privacy_preferences">Pribatutasuna</string>
+  <string name="network_preferences">Sarea</string>
+  <string name="interaction_preferences">Elkarrekintza</string>
+  <string name="accountlist_preferences">Kontuen zerrenda</string>
+  <string name="messagelist_preferences">Mezuen zerrenda</string>
+  <string name="messageview_preferences">Mezuak</string>
+  <string name="folderlist_preferences">Karpeten zerrenda</string>
+  <string name="settings_theme_label">Itxura</string>
+  <string name="settings_message_theme_label">Mezua ikusteko itxura</string>
+  <string name="settings_compose_theme_label">Mezua idazteko itxura</string>
+  <string name="settings_language_label">Hizkuntza</string>
+  <string name="settings_message_theme_selection_label">Mezu finkoaren itxura</string>
+  <string name="settings_message_theme_selection_summary_off">Mezua ikusten deneran itxura hautatu</string>
+  <string name="settings_message_theme_selection_summary_on">Mezua ikusteko itxura finkoa erabili</string>
+  <string name="settings_messageview_mobile_layout_label">Diseinu trinkoa</string>
+  <string name="settings_messageview_mobile_layout_summary">Pantaila txikietarako HTML mezuak moldatu</string>
+  <string name="setting_language_system">Sistemako defektuzkoa</string>
+  <string name="background_ops_label">Atzeko planoko sinkronizazioa</string>
+  <string name="background_ops_never">Inoiz ez</string>
+  <string name="background_ops_always">Beti</string>
+  <string name="background_ops_enabled">\'Background data\' gaituta dagoenean</string>
+  <string name="background_ops_auto_sync">\'Background data\' eta \'Auto-sinkronizazioa\' gaituta daudenean</string>
+  <string name="background_ops_auto_sync_only">\'Auto-sinkronizazioa\' gaituta dagoenean</string>
+  <string name="batch_select_all">Guztia hautatu</string>
+  <string name="account_setup_push_limit_label">Push erabiliz egiaztatuko diren karpeta kopuru maximoa</string>
+  <string name="account_setup_push_limit_10">10 karpeta</string>
+  <string name="account_setup_push_limit_25">25 karpeta</string>
+  <string name="account_setup_push_limit_50">50 karpeta</string>
+  <string name="account_setup_push_limit_100">100 karpeta</string>
+  <string name="account_setup_push_limit_250">250 karpeta</string>
+  <string name="account_setup_push_limit_500">500 karpeta</string>
+  <string name="account_setup_push_limit_1000">1000 karpeta</string>
+  <string name="animations_title">Animazioak</string>
+  <string name="animations_summary">Bistaratze efektu nabarmenak erabili</string>
+  <string name="gestures_title">Keinuak</string>
+  <string name="gestures_summary">Keinu bidezko kontrola gaitu</string>
+  <string name="volume_navigation_title">Bolumen teklekin nabigatu</string>
+  <string name="volume_navigation_message">Mezua ikustean</string>
+  <string name="volume_navigation_list">Zerrendetan</string>
+  <string name="start_integrated_inbox_title">Bateratutako sarreran hasi</string>
+  <string name="measure_accounts_title">Kontuaren tamaina ikusi</string>
+  <string name="measure_accounts_summary">Ezgaitu azkarrago bistaratzeko</string>
+  <string name="count_search_title">Bilaketa emaitzak zenbatu</string>
+  <string name="count_search_summary">Ezgaitu azkarrago bistaratzeko</string>
+  <string name="hide_special_accounts_title">Kontu bereziak ezkutatu</string>
+  <string name="hide_special_accounts_summary">Bateratutako sarrera eta mezu guztien kontuak ezkutatu</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"> - Izardun</string>
+  <string name="unread_modifier"> - Irakurgabe</string>
+  <string name="search_all_messages_title">Mezu guztiak</string>
+  <string name="search_all_messages_detail">Bilatzeko karpetetako mezu guztiak</string>
+  <string name="integrated_inbox_title">Bateratutako sarrera</string>
+  <string name="integrated_inbox_detail">Bateratutako karpetetako mezu guztiak</string>
+  <string name="tap_hint">Gutunazala edo izarra ikutu irakurgabeko edo izardun epostetarako</string>
+  <string name="folder_settings_include_in_integrated_inbox_label">Bateratu</string>
+  <string name="folder_settings_include_in_integrated_inbox_summary">Mezu guztiak bateratutako sarreran ikusten dira</string>
+  <string name="account_settings_searchable_label">Bilatzeko karpetak</string>
+  <string name="account_settings_searchable_all">Guztiak</string>
+  <string name="account_settings_searchable_displayable">Ikusten direnak</string>
+  <string name="account_settings_searchable_none">Batez</string>
+  <string name="font_size_settings_title">Letra-tipo tamaina</string>
+  <string name="font_size_settings_description">Letra-tipo tamaina konfiguratu</string>
+  <string name="font_size_account_list">Kontu zerrenda</string>
+  <string name="font_size_account_name">Kontu izena</string>
+  <string name="font_size_account_description">Kontu deskribapena</string>
+  <string name="font_size_folder_list">Karpeten zerrenda</string>
+  <string name="font_size_folder_name">Karpetaren izena</string>
+  <string name="font_size_folder_status">Karpetaren egoera</string>
+  <string name="font_size_message_list">Mezu zerrenda</string>
+  <string name="font_size_message_list_subject">Gaia</string>
+  <string name="font_size_message_list_sender">Bidaltzailea</string>
+  <string name="font_size_message_list_date">Data</string>
+  <string name="font_size_message_list_preview">Aurreikusi</string>
+  <string name="font_size_message_view">Mezuak</string>
+  <string name="font_size_message_view_sender">Bidaltzailea</string>
+  <string name="font_size_message_view_to">Nori</string>
+  <string name="font_size_message_view_cc">Cc</string>
+  <string name="font_size_message_view_additional_headers">Gainerako goiburuak</string>
+  <string name="font_size_message_view_subject">Gaia</string>
+  <string name="font_size_message_view_date">Ordua eta data</string>
+  <string name="font_size_message_view_content">Mezuaren gorputza</string>
+  <string name="font_size_message_compose">Mezua idaztean</string>
+  <string name="font_size_message_compose_input">Testu sarrera eremuak</string>
+  <string name="font_size_default">Defektuz</string>
+  <string name="font_size_tiniest">Txikiena</string>
+  <string name="font_size_tiny">Txikia</string>
+  <string name="font_size_smaller">Txikiagoa</string>
+  <string name="font_size_small">Txikia</string>
+  <string name="font_size_medium">Ertaina</string>
+  <string name="font_size_large">Handia</string>
+  <string name="font_size_larger">Handiagoa</string>
+  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
+  <string name="message_compose_buggy_gallery">\"Ezarpenak\" -&gt; \"Galeriako arazoa sahiestu\" gaitu 3D galeriako irudi edo bideoak erantsi ahal izateko.</string>
+  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
+  <string name="message_compose_use_workaround">\"Eranskina gehitu (Irudia)\" edo \"Eranskina gehitu (Video)\" erabili 3D galeriatik irudi edo bideoak eransteko.</string>
+  <string name="miscellaneous_preferences">Bestelakoak</string>
+  <string name="misc_preferences_attachment_title">Galeriako arazoa sahiestu</string>
+  <string name="misc_preferences_attachment_description">Irudi/bideoak eransteko botoiak ikusi (3D galeriako arazoa sahiesteko)</string>
+  <!--APG related-->
+  <string name="error_activity_not_found">Ez da honetarako aplikaziorik topatu.</string>
+  <string name="error_apg_version_not_supported">Instalatutako APG bertsioa ezin da erabili.</string>
+  <string name="btn_crypto_sign">Sinatu</string>
+  <string name="btn_encrypt">Zifratu</string>
+  <string name="btn_decrypt">Dezifratu</string>
+  <string name="btn_verify">Egiaztatu</string>
+  <string name="unknown_crypto_signature_user_id">&lt;ezezaguna&gt;</string>
+  <string name="key_id">id: %s</string>
+  <string name="pgp_mime_unsupported">PGP/MIME mezurik oraindik ez.</string>
+  <string name="attachment_encryption_unsupported">Kontuz: oraindik ez dira eranskinak zinatzen edo zifratzen.</string>
+  <string name="send_aborted">Bidalketa ezeztatua.</string>
+  <string name="save_or_discard_draft_message_dlg_title">Zirriborroa gorde?</string>
+  <string name="save_or_discard_draft_message_instructions_fmt">Mezu hau gorde edo baztertu?</string>
+  <string name="confirm_discard_draft_message_title">Mezua baztertu</string>
+  <string name="confirm_discard_draft_message">Ziur mezu hau baztertu nahi duzula?</string>
+  <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Zirriborroa gordetzea ukatu.</string>
+  <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Zifratuko diren zirriborroak gordetzea ukatu.</string>
+  <string name="continue_without_public_key_dlg_title">Gako publikorik gabe jarraitu?</string>
+  <string name="continue_without_public_key_instructions_fmt">Jasotzaile bat edo gehiago ez dute gako publikorik. Jarraitu?</string>
+  <string name="select_text_now">Kopiatuko den testua hautatu</string>
+  <string name="dialog_confirm_delete_title">Ezabatzea baieztatu</string>
+  <string name="dialog_confirm_delete_message">Mezu hau ezabatu nahi duzu?</string>
+  <plurals name="dialog_confirm_delete_messages">
+    <item quantity="one">Benetan mezu hau ezabatu nahi duzu?</item>
+    <item quantity="other">Benetan <xliff:g id="message_count">%1$d</xliff:g> mezu ezabatu nahi dituzu?</item>
+  </plurals>
+  <string name="dialog_confirm_delete_confirm_button">Bai</string>
+  <string name="dialog_confirm_delete_cancel_button">Ez</string>
+  <string name="dialog_confirm_spam_title">Spamera mugitzea baieztatu</string>
+  <plurals name="dialog_confirm_spam_message">
+    <item quantity="one">Benetan mezu hau spamera mugitu nahi duzula?</item>
+    <item quantity="other">Benetan <xliff:g id="message_count">%1$d</xliff:g> mezu spamera mugitu nahi dituzula?</item>
+  </plurals>
+  <string name="dialog_confirm_spam_confirm_button">Bai</string>
+  <string name="dialog_confirm_spam_cancel_button">Ez</string>
+  <string name="dialog_attachment_progress_title">Eranskina deskargatzen</string>
+  <string name="debug_logging_enabled">Arazketa logak gaituta</string>
+  <string name="messagelist_sent_to_me_sigil">»</string>
+  <string name="messagelist_sent_cc_me_sigil">›</string>
+  <string name="error_unable_to_connect">Ezin da konektatu</string>
+  <string name="import_export_action">Ezarpenen inportazio eta esportazioa</string>
+  <string name="settings_export_account">Kontu ezarpenak esportatu</string>
+  <string name="settings_export_all">Ezarpenak eta kontuak esportatu</string>
+  <string name="settings_import_dialog_title">Inportatu</string>
+  <string name="settings_export_dialog_title">Esportatu</string>
+  <string name="settings_import">Inporatzeko ezarpenak</string>
+  <string name="settings_import_selection">Hautapena inportatu</string>
+  <string name="settings_import_global_settings">Ezarpen orokorrak</string>
+  <string name="settings_exporting">Ezarpenak esportatzen...</string>
+  <string name="settings_importing">Ezarpenak inportatzen...</string>
+  <string name="settings_import_scanning_file">Fitxategia aztertzen...</string>
+  <string name="settings_export_success">Esportatutako ezarpenak hemen gorde dira: <xliff:g id="filename">%s</xliff:g></string>
+  <string name="settings_import_global_settings_success">Ezarpen orokorran hemendik inportatu dira: <xliff:g id="filename">%s</xliff:g></string>
+  <string name="settings_import_success"><xliff:g id="accounts">%s</xliff:g> inportatuta hemendik: <xliff:g id="filename">%s</xliff:g></string>
+  <plurals name="settings_import_accounts">
+    <item quantity="one">Kontu 1</item>
+    <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> kontu</item>
+  </plurals>
+  <string name="settings_export_failure">Ezarpenak esportatzean errorea</string>
+  <string name="settings_import_failure">Ez da ezarpenik inportatu hemendik: <xliff:g id="filename">%s</xliff:g></string>
+  <string name="settings_export_success_header">Esportazio egokia</string>
+  <string name="settings_export_failed_header">Esportazioa errorea</string>
+  <string name="settings_import_success_header">Inportazio egokia</string>
+  <string name="settings_import_failed_header">Inportatzean errorea</string>
+  <string name="settings_import_activate_account_header">Kontua gaitu</string>
+  <string name="settings_import_activate_account_intro">\"<xliff:g id="account">%s</xliff:g>\" kontua erabiltzeko <xliff:g id="server_passwords">%s</xliff:g> eman behar duzu.</string>
+  <plurals name="settings_import_server_passwords">
+    <item quantity="one">zerbitzariko pasahitza</item>
+    <item quantity="other">zerbitzariko pasahitzak</item>
+  </plurals>
+  <string name="settings_import_incoming_server">Jasotzeko zerbitzaria (<xliff:g id="hostname">%s</xliff:g>):</string>
+  <string name="settings_import_outgoing_server">Bidaltzeko zerbitzaria (<xliff:g id="hostname">%s</xliff:g>):</string>
+  <plurals name="settings_import_setting_passwords">
+    <item quantity="one">Pasahitza ezartzen..</item>
+    <item quantity="other">Pasahitzak ezartzen...</item>
+  </plurals>
+  <string name="settings_import_use_incoming_server_password">Sarrerako zerbitzariko pasahitza erabili</string>
+  <string name="activate_account_action">Gaitu</string>
+  <string name="account_unavailable">\"<xliff:g id="account">%s</xliff:g>\" kontua ez dago eskuragarri; biltegia egiaztatu</string>
+  <string name="settings_attachment_default_path">Eranskinak hemen gorde...</string>
+  <string name="attachment_save_title">Eranskina gorde</string>
+  <string name="attachment_save_desc">Fitxategi kudeatzailerik ez da topatu. Non gorde nahi duzu eranskina?</string>
+  <string name="manage_accounts_move_up_action">Gora mugitu</string>
+  <string name="manage_accounts_move_down_action">Behera mugitu</string>
+  <string name="manage_accounts_moving_message">Kontua mugitzen...</string>
+  <string name="unread_widget_select_account">Honen irakurgabe kopurua ikusi...</string>
+  <string name="import_dialog_error_title">Fitxategi kudeatzailerik ez da topatu</string>
+  <string name="close">Itxi</string>
+  <string name="webview_empty_message">Testurik ez</string>
+  <string name="webview_contextmenu_link_view_action">Esteka ireki</string>
+  <string name="webview_contextmenu_link_share_action">Esteka partekatu</string>
+  <string name="webview_contextmenu_link_copy_action">Esteka arbelera kopiatu</string>
+  <string name="webview_contextmenu_link_clipboard_label">Esteka</string>
+  <string name="webview_contextmenu_image_title">Irudia</string>
+  <string name="webview_contextmenu_image_view_action">Irudia ikusi</string>
+  <string name="webview_contextmenu_image_save_action">Irudia gorde</string>
+  <string name="webview_contextmenu_image_download_action">Irudia deskargatu</string>
+  <string name="webview_contextmenu_image_copy_action">Irudiaren URLa arbelera kopiatu</string>
+  <string name="webview_contextmenu_image_clipboard_label">Irudiaren URLa</string>
+  <string name="webview_contextmenu_phone_call_action">Deitu</string>
+  <string name="webview_contextmenu_phone_save_action">Kontaktuetan gorde</string>
+  <string name="webview_contextmenu_phone_copy_action">Zenbakia arbelera kopiatu</string>
+  <string name="webview_contextmenu_phone_clipboard_label">Telefono zenbakia</string>
+  <string name="webview_contextmenu_email_send_action">Eposta bidali</string>
+  <string name="webview_contextmenu_email_save_action">Kontaktuetan gorde</string>
+  <string name="webview_contextmenu_email_copy_action">Helbidea arbelera kopiatu</string>
+  <string name="webview_contextmenu_email_clipboard_label">Eposta helbidea</string>
+  <string name="image_saved_as">Irudia gordeta: \"<xliff:g id="filename">%s</xliff:g>\"</string>
+  <string name="image_saving_failed">Irudia gordetzean errorea.</string>
+  <string name="account_settings_remote_search_num_results_entries_all">Guztiak</string>
+  <string name="account_settings_remote_search_num_results_entries_10">10</string>
+  <string name="account_settings_remote_search_num_results_entries_25">25</string>
+  <string name="account_settings_remote_search_num_results_entries_50">50</string>
+  <string name="account_settings_remote_search_num_results_entries_100">100</string>
+  <string name="account_settings_remote_search_num_results_entries_250">250</string>
+  <string name="account_settings_remote_search_num_results_entries_500">500</string>
+  <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
+  <string name="account_settings_remote_search_num_label">Zerbitzarian bilatzeko limitea</string>
+  <string name="account_settings_remote_search_num_summary"><xliff:g id="num_results">%s</xliff:g> emaitza topatzean bilatzeari utzi.</string>
+  <string name="account_settings_remote_search_full_text">Zerbitzarian bilatzerakoan edukian ere bilatu</string>
+  <string name="account_settings_remote_search_full_text_summary">Testu osoan bilatzea mantsoa izan daiteke.</string>
+  <string name="remote_search_sending_query">Galdera zerbitzarira bidaltzen</string>
+  <string name="remote_search_downloading">%d emaitz eskuratzen</string>
+  <string name="remote_search_downloading_limited">%1$d-tik %2$d emaitz eskuratzen</string>
+  <string name="remote_search_error">Hurruneko bilaketa errorea</string>
+  <string name="account_settings_search">Bilatu</string>
+  <string name="account_settings_remote_search_enabled">Zerbitzarian bilatzea gaitu</string>
+  <string name="account_settings_remote_search_enabled_summary">Zure gailuan dauden mezuez gain zerbitzarian daudenak bilatu </string>
+  <string name="action_remote_search">Mezuak zerbitzarian bilatu</string>
+  <string name="pull_to_refresh_remote_search_from_local_search_pull">Tiratu zerbitzarian bilatzeko...</string>
+  <string name="pull_to_refresh_remote_search_from_local_search_release">Askatu zerbitzarian bilatzeko...</string>
+  <string name="remote_search_unavailable_no_network">Zerbitzarian bilatzeko sareko konexioa behar da.</string>
+  <string name="global_settings_background_as_unread_indicator_label">Mezuak ilundu irakurri ondoren</string>
+  <string name="global_settings_background_as_unread_indicator_summary">Atzeko plano gris batek mezua irakurria izan dela adieraziko du</string>
+  <string name="global_settings_threaded_view_label">Harien ikuspegia</string>
+  <string name="global_settings_threaded_view_summary">Mezuak elkarrizketen arabera taldekatu</string>
+  <string name="upgrade_databases_title">Datubaseak eguneratzen</string>
+  <string name="upgrade_databases_unspecified">Datubaseak eguneratzen...</string>
+  <string name="upgrade_database_format">\"<xliff:g id="account">%s</xliff:g>\" kontuaren datubasea eguneratzen</string>
+  <string name="message_list_loading">Kargatzen...</string>
+  <string name="global_settings_splitview_mode_label">Pantaila erdibitua ikusi</string>
+  <string name="global_settings_splitview_always">Beti</string>
+  <string name="global_settings_splitview_never">Inoiz ez</string>
+  <string name="global_settings_splitview_when_in_landscape">Horizontalean dagoenean</string>
+  <string name="message_view_empty">Ezkerreko mezu bat hautatu mesedez</string>
+  <string name="global_settings_show_contact_picture_label">Kontaktuen irudiak ikusi</string>
+  <string name="global_settings_show_contact_picture_summary">Mezu zerrendan kontaktuen irudiak ikusi</string>
+  <string name="last_refresh_time_format"><xliff:g id="formatted_time">%s</xliff:g> eguneratuta</string>
+  <string name="last_refresh_time_format_with_push"><xliff:g id="time_with_preposition">%s</xliff:g> eguneratuta (Push gaituta)</string>
+  <string name="preposition_for_date"><xliff:g id="date">%s</xliff:g></string>
+  <string name="mark_all_as_read">Guztia irakurrita markatu</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Kontaktuen irudiak koloreztatu</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">Irudirik ez duten kontaktuak koloreztatu</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Mezu ekintzak</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Mezua ikusteko menuan agertuko diren ekintzak</string>
+  <string name="loading_attachment">Eranskina kargatzen...</string>
+  <string name="fetching_attachment_dialog_title_send">Mezua bidaltzen</string>
+  <string name="fetching_attachment_dialog_title_save">Zirriborroa gorde</string>
+  <string name="fetching_attachment_dialog_message">Eranskina eskuratzen...</string>
+  <!--=== OpenPGP specific ==================================================================-->
+</resources>

res/values-fi/strings.xml

@@ -11,8 +11,8 @@
   <string name="remote_control_desc">Antaa sovellukselle luvan käyttää K-9 Mailin toimintoja ja asetuksia.</string>
   <!--Used in the about dialog-->
   <string name="app_authors">Google, The K-9 Dog Walkers.</string>
-  <string name="app_copyright_fmt">Tekijänoikeudet 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions tekijänoikeudet -<xliff:g>%s</xliff:g> Androidin avoimen lähdekoodin hanke.</string>
-  <string name="app_license">Lisensoitu Apache-lisenssillä, versio 2.0.</string>
+  <string name="app_copyright_fmt">Tekijänoikeudet 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Osittaiset tekijänoikeudet -<xliff:g>%s</xliff:g> Androidin avoimen lähdekoodin hanke.</string>
+  <string name="app_license">Lisensoitu Apache-lisenssin 2.0-versiolla.</string>
   <!--Welcome message-->
   <string name="welcome_message_title">Tervetuloa K-9 Mailiin</string>
   <string name="accounts_welcome"><![CDATA[
@@ -54,7 +54,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="insufficient_apg_permissions">K-9:llä ei ole oikeuksia kaikkien APG:n ominaisuuksien käyttämiseen. Ole hyvä ja asenna K-9 uudelleen.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Tuontitoiminnon käsittelemiseen ei ole sopivaa sovellusta. Asenna Google Play Kaupasta jokin tiedostonhallintasovellus.</string>
-  <string name="open_market">Avaa Play Kauppa</string>
+  <string name="open_market">Avaa Play-kauppa</string>
   <!--=== General strings ==================================================================-->
   <string name="app_authors_fmt">Tekijät: <xliff:g id="app_authors">%s</xliff:g></string>
   <string name="app_revision_fmt">Versiotiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -136,7 +136,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="add_cc_bcc_action">Lisää kopio/piilokopio</string>
   <string name="read_receipt">Vastaanottokuittaus</string>
   <string name="read_receipt_enabled">Vastaanottokuittaus pyydetään</string>
-  <string name="read_receipt_disabled">Vastaanottokuittausta ei pyydetä</string>
+  <string name="read_receipt_disabled">Ei pyydä lukukuittausta</string>
   <string name="add_attachment_action">Lisää liite</string>
   <string name="add_attachment_action_image">Lisää liite (Kuva)</string>
   <string name="add_attachment_action_video">Video</string>
@@ -210,6 +210,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="message_compose_quote_header_to">Vastaanottaja:</string>
   <string name="message_compose_quote_header_cc">Kopio:</string>
   <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> kirjoitti:</string>
+  <string name="message_compose_reply_header_fmt_with_date"><xliff:g id="sent_date">%1$s</xliff:g> <xliff:g id="sender">%2$s</xliff:g> kirjoitti:</string>
   <string name="message_compose_error_no_recipients">Valitse vähintään yksi vastaanottaja.</string>
   <string name="error_contact_address_not_found">Tämän henkilön sähköpostiosoitetta ei löytynyt.</string>
   <string name="message_compose_attachments_skipped_toast">Joitakin liitteitä ei voida lähettää edelleen, koska niitä ei ole ladattu.</string>
@@ -303,6 +304,9 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_setup_account_type_pop_action">POP3</string>
   <string name="account_setup_account_type_imap_action">IMAP</string>
   <string name="account_setup_account_type_webdav_action">WebDAV (Exchange)</string>
+  <string name="account_setup_auth_type_normal_password">Tavallinen salasana</string>
+  <string name="account_setup_auth_type_insecure_password">Salasana, välitetään turvattomasti</string>
+  <string name="account_setup_auth_type_encrypted_password">Salattu salasana</string>
   <string name="account_setup_incoming_title">Saapuvan postin palvelimen asetukset</string>
   <string name="account_setup_incoming_username_label">Käyttäjätunnus</string>
   <string name="account_setup_incoming_password_label">Salasana</string>
@@ -313,6 +317,8 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_setup_incoming_security_label">Suojauksen tyyppi</string>
   <string name="account_setup_incoming_auth_type_label">Todennuksen tyyppi</string>
   <string name="account_setup_incoming_security_none_label">Ei mitään</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">Kun viesti poistetaan</string>
   <string name="account_setup_incoming_delete_policy_never_label">Älä poista palvelimelta</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Poista palvelimelta</string>
@@ -330,7 +336,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_setup_expunge_policy_on_poll">Tarkistettaessa</string>
   <string name="account_setup_expunge_policy_manual">Vain manuaalisesti</string>
   <string name="account_setup_incoming_autodetect_namespace_label">Tunnista IMAP-nimiavaruus automaattisesti</string>
-  <string name="account_setup_incoming_imap_path_prefix_label">IMAP -polun etuliite</string>
+  <string name="account_setup_incoming_imap_path_prefix_label">IMAP-polun etuliite</string>
   <string name="drafts_folder_label">Luonnokset-kansio</string>
   <string name="sent_folder_label">Lähetetyt-kansio</string>
   <string name="trash_folder_label">Roskakori-kansio</string>
@@ -393,12 +399,18 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_setup_options_mail_display_count_250">250 viestiä</string>
   <string name="account_setup_options_mail_display_count_500">500 viestiä</string>
   <string name="account_setup_options_mail_display_count_1000">1000 viestiä</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 messages</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 viestiä</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 viestiä</string>
   <string name="account_setup_options_mail_display_count_all">Kaikki viestit</string>
   <string name="move_copy_cannot_copy_unsynced_message">Viestiä ei voi kopioida tai siirtää, koska sitä ei ole synkronoitu palvelimelle</string>
   <string name="account_setup_failed_dlg_title">Asennus ei onnistunut</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Käyttäjätunnus tai salasana on väärin.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Turvallinen yhteys palvelimeen ei onnistu.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Yhteys palvelimeen ei onnistu.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Käyttäjätunnus tai salasana on väärin.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Turvallinen yhteys palvelimeen ei onnistu.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Yhteys palvelimeen ei onnistu.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Muokkaa tietoja</string>
   <string name="account_setup_failed_dlg_continue_action">Jatka</string>
   <string name="account_settings_push_advanced_title">Lisäasetukset</string>
@@ -468,7 +480,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_settings_autodownload_message_size_32">32 kt</string>
   <string name="account_settings_autodownload_message_size_64">64 kt</string>
   <string name="account_settings_autodownload_message_size_128">128 kt</string>
-  <string name="account_settings_autodownload_message_size_256">252 kt</string>
+  <string name="account_settings_autodownload_message_size_256">256 kt</string>
   <string name="account_settings_autodownload_message_size_512">512 kt</string>
   <string name="account_settings_autodownload_message_size_1024">1 Mt</string>
   <string name="account_settings_autodownload_message_size_2048">2 Mt</string>
@@ -610,31 +622,8 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_setup_failed_dlg_invalid_certificate_title">Tunnistamaton varmenne</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Hyväksy-avain</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Hylkää-avain</string>
-  <string name="message_list_help_key">
-    Del (tai D) - Poista\n
-    R - Vastaa\n
-    A - Vastaa kaikille\n
-    C - Kirjoita\n
-    F - Välitä\n
-    M - Siirrä\n
-    V - Arkistoi\n
-    Y - Kopioi\n
-    Z - Merkitse lukemattomaksi/luetuksi\n
-    G - Tähti\n
-    O - Lajittelutyyppi\n
-    I - Lajittelujärjestys\n
-    Q - Palaa kansioihin\n
-    S - Valitse/poista valinta\n
-    J tai P - Edellinen Viesti\n
-    K tai N - Seuraava Viesti
-  </string>
-  <string name="folder_list_help_key">
-        1 - Näytä vain 1. luokan kansiot\u000A
-        2 - Näytä 1. ja 2. luokan kansiot\u000A
-        3 - Näytä kaikki paitsi 2. luokan kansiot\u000A
-        4 - Näytä kaikki kansiot\u000A
-        Q - Palaa tileihin\u000A
-        S - Muokkaa tilin asetuksia</string>
+  <string name="message_list_help_key">Del (tai D) - Poista\nR - Vastaa\nA - Vastaa kaikille\nC - Kirjoita\nF - Välitä\nM - Siirrä\nV - Arkistoi\nY - Kopioi\nZ - Merkitse lukemattomaksi/luetuksi\nG - Tähti\nO - Lajittelutyyppi\nI - Lajittelujärjestys\nQ - Palaa kansioihin\nS - Valitse/poista valinta\nJ tai P - Edellinen Viesti\nK tai N - Seuraava Viesti</string>
+  <string name="folder_list_help_key">1 - Näytä vain 1. luokan kansiot\n2 - Näytä 1. ja 2. luokan kansiot\n3 - Näytä kaikki paitsi 2. luokan kansiot\n4 - Näytä kaikki kansiot\nQ - Palaa tileihin\nS - Muokkaa tilin asetuksia</string>
   <string name="folder_list_filter_hint">kansionimi sisältää</string>
   <string name="folder_list_display_mode_label">Kansiot</string>
   <string name="folder_list_display_mode_all">Näytä kaikki</string>
@@ -731,6 +720,8 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="font_size_message_view_subject">Viestin aihe</string>
   <string name="font_size_message_view_date">Aika ja päivämäärä</string>
   <string name="font_size_message_view_content">Viestin sisältö</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">Viestin kirjoitus</string>
   <string name="font_size_message_compose_input">Tekstinsyöttökentät</string>
   <string name="font_size_default">Oletus</string>
@@ -757,10 +748,10 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="btn_verify">Vahvista</string>
   <string name="unknown_crypto_signature_user_id">&lt;tuntematon&gt;</string>
   <string name="key_id">id: %s</string>
-  <string name="pgp_mime_unsupported">PGP/MIME -viestejä ei vielä tueta.</string>
+  <string name="pgp_mime_unsupported">PGP/MIME-viestejä ei vielä tueta.</string>
   <string name="attachment_encryption_unsupported">Varoitus: Liitteitä ei allekirjoiteta tai salata tässä versiossa.</string>
   <string name="send_aborted">Lähetys keskeytetty.</string>
-  <string name="save_or_discard_draft_message_dlg_title">Tallenna luonnos?</string>
+  <string name="save_or_discard_draft_message_dlg_title">Tallennetaanko luonnos?</string>
   <string name="save_or_discard_draft_message_instructions_fmt">Tallennetaanko vai hylätäänkö tämä viesti?</string>
   <string name="confirm_discard_draft_message_title">Hylkää viesti?</string>
   <string name="confirm_discard_draft_message">Haluatko varmasti hylätä tämän viestin?</string>
@@ -900,5 +891,26 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="last_refresh_time_format_with_push">Päivitetty <xliff:g id="time_with_preposition">%s</xliff:g> (push-tilassa)</string>
   <string name="preposition_for_date"><xliff:g id="date">%s</xliff:g></string>
   <string name="mark_all_as_read">Merkitse kaikki luetuiksi</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Väritä yhteystietojen kuvat</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">Väritä yhteystietojen puuttuvat kuvat</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Näytettävät viestitoiminnot</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Näytä valitut toiminnot viestin Näytä-valikossa</string>
+  <string name="loading_attachment">Ladataan liitettä…</string>
+  <string name="fetching_attachment_dialog_title_send">Lähetetään viestiä</string>
+  <string name="fetching_attachment_dialog_title_save">Tallennetaan luonnosta</string>
+  <string name="fetching_attachment_dialog_message">Noudetaan liitettä…</string>
   <!--=== OpenPGP specific ==================================================================-->
+  <string name="openpgp_decrypting_verifying">Puretaan salausta/varmennetaan…</string>
+  <string name="openpgp_successful_decryption">Salauksen purku onnistui</string>
+  <string name="openpgp_signature_valid_certified">Kelvollinen allekirjoitus (varmennettu)</string>
+  <string name="openpgp_signature_valid_uncertified">Kelvollinen, mutta varmentamaton allekirjoitus</string>
+  <string name="openpgp_signature_unknown">Tuntematon allekirjoittaja</string>
+  <string name="openpgp_signature_invalid">Virheellinen allekirjoitus</string>
+  <string name="openpgp_signature_unknown_text">Tämän allekirjoituksen julkinen avain puuttuu</string>
+  <string name="openpgp_successful_decryption_valid_signature_certified">Salauksen purku onnistui ja kelvollinen allekirjoitus (varmennettu)</string>
+  <string name="openpgp_successful_decryption_valid_signature_uncertified">Salauksen purku onnistui ja kelvollinen, mutta varmentamaton allekirjoitus</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Salauksen purku onnistui, mutta julkinen avain puuttuu</string>
+  <string name="openpgp_get_key">Etsi puuttuva avain</string>
+  <string name="openpgp_error">OpenPGP-virhe:</string>
+  <string name="openpgp_user_id">Käyttäjätunniste</string>
 </resources>

res/values-hu/strings.xml

@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--Magyarította: Deák Tamás (maya98) és RootRulez-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!--=== App-specific strings =============================================================-->
   <!--This should make it easier for forks to change the branding-->
@@ -391,9 +390,12 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="account_setup_options_mail_display_count_all">Minden levél</string>
   <string name="move_copy_cannot_copy_unsynced_message">Ez a levél nem másolható illetve mozgatható máshova, mert nincs szinkronizálva a szerverrel.</string>
   <string name="account_setup_failed_dlg_title">A konfigurálás nem sikerült</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Felhasználónév vagy a jelszó hibás.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Nem lehet biztonságosan kapcsolódni a szerverhez.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Nem lehet kapcsolódni a szerverhez.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Felhasználónév vagy a jelszó hibás.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Nem lehet biztonságosan kapcsolódni a szerverhez.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Nem lehet kapcsolódni a szerverhez.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Módosítás</string>
   <string name="account_setup_failed_dlg_continue_action">Tovább</string>
   <string name="account_settings_push_advanced_title">Haladó</string>
@@ -602,31 +604,8 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="account_setup_failed_dlg_invalid_certificate_title">Felismerhetetlen tanúsítvány</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Kulcs elfogadva</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Kulcs elutasítva</string>
-  <string name="message_list_help_key">
-    Del (vagy D) - Törlés\n
-    R - Válasz\n
-    A - Válasz mindenkinek\n
-    C - Írás\n
-    F - Továbbít\n
-    M - Áthelyezés\n
-    V - Archívum\n
-    Y - Másolás\n
-    Z - Olvasottnak vagy olvasatlannak jelöl\n
-    G - Csillagoz\n
-    O - Rendezési típus\n
-    I - Rendezési sorrend\n
-    Q - Vissza a mappákba\n
-    S - Kijelölés/Kijelölés megszüntetése\n
-    J, P - Előző üzenet\n
-    K, N - Következő üzenet
-  </string>
-  <string name="folder_list_help_key">
-    1 - Csak az elsődleges mappák megjelenítése\u000A
-    2 - Elsődleges és másodlagos mappák megjelenítése\u000A
-    3 - Mindet megjeleníti, kivéve a másodlagos mappákat\u000A
-    4 - Minden mappa megjelenítése\u000A
-    Q - Vissza fiókokhoz\u000A
-    S - Fiókbeállítások módosítása</string>
+  <string name="message_list_help_key">Del (vagy D) - Törlés\nR - Válasz\nA - Válasz mindenkinek\nC - Írás\nF - Továbbít\nM - Áthelyezés\nV - Archívum\nY - Másolás\nZ - Olvasottnak vagy olvasatlannak jelöl\nG - Csillagoz\nO - Rendezési típus\nI - Rendezési sorrend\nQ - Vissza a mappákba\nS - Kijelölés/Kijelölés megszüntetése\nJ, P - Előző üzenet\nK, N - Következő üzenet</string>
+  <string name="folder_list_help_key">1 - Csak az elsődleges mappák megjelenítése\n2 - Elsődleges és másodlagos mappák megjelenítése\n3 - Mindet megjeleníti, kivéve a másodlagos mappákat\n4 - Minden mappa megjelenítése\nQ - Vissza fiókokhoz\nS - Fiókbeállítások módosítása</string>
   <string name="folder_list_filter_hint">mappa neve</string>
   <string name="folder_list_display_mode_label">Mappák megjelenítése</string>
   <string name="folder_list_display_mode_all">Minden mappa</string>
@@ -659,8 +638,8 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="background_ops_label">Háttérszinkronizálás</string>
   <string name="background_ops_never">Soha</string>
   <string name="background_ops_always">Mindig</string>
-  <string name="background_ops_enabled">"Ha a 'Háttéradatok' bekapcsolva"</string>
-  <string name="background_ops_auto_sync">"Ha a 'Háttéradatok' és 'Auto-szink' bekapcsolva"</string>
+  <string name="background_ops_enabled">Ha a \'Háttéradatok\' bekapcsolva</string>
+  <string name="background_ops_auto_sync">Ha a \'Háttéradatok\' és \'Auto-szink\' bekapcsolva</string>
   <string name="background_ops_auto_sync_only">Amikor az \'Automatikus szinkronizáció\' be van kapcsolva</string>
   <string name="batch_select_all">Mindent kijelöl</string>
   <string name="account_setup_push_limit_label">Ellenőrizhető mappák száma</string>

res/values-it/strings.xml

@@ -6,7 +6,7 @@
   <string name="app_name">K-9 Mail</string>
   <string name="beta_app_name">K-9 Mail BETA</string>
   <string name="shortcuts_title">Account di K-9</string>
-  <string name="unread_widget_label">K-9 nuovi messaggi</string>
+  <string name="unread_widget_label">Nuovi messaggi di K-9</string>
   <string name="remote_control_label">Controllo remoto di K-9 Mail</string>
   <string name="remote_control_desc">Consenti a questa applicazione di controllare le attività e le impostazioni di K-9 Mail.</string>
   <!--Used in the about dialog-->
@@ -17,7 +17,7 @@
   <string name="welcome_message_title">Benvenuto in K-9 Mail</string>
   <string name="accounts_welcome"><![CDATA[
 <p>
-K-9 Mail è un client di posta open source per Android originariamente basato sul client di posta standard di Android.
+K-9 Mail è un potente client di posta gratuito per Android.
 </p><p>
 Le funzionalità migliorate di K-9 includono:
 </p>
@@ -35,36 +35,36 @@ Le funzionalità migliorate di K-9 includono:
   <li>Salvataggio degli allegati nella SD</li>
   <li>Possibilità di svuotare il cestino</li>
   <li>Ordinamento dei messaggi</li>
-  <li>…ed altro</li>
+  <li>…e altro</li>
 </ul>
 <p>
-Si noti che K-9 non supporta gli account free di Hotmail e, come molti client di posta, ha alcune bizzarrie quando si parla di Microsoft Exchange.
+Nota che K-9 non supporta gli account gratuiti di Hotmail e, come molti client di posta, ha qualche incertezza quando comunica con Microsoft Exchange.
 </p><p>
 Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni su
 <a href="http://k9mail.googlecode.com/">http://k9mail.googlecode.com/</a>.
 </p>
-    ]]></string>
+]]></string>
   <!--Default signature-->
-  <string name="default_signature">-- Inviato dal mio cellulare Android con K-9 Mail.</string>
+  <string name="default_signature">-- \nInviato dal mio cellulare Android con K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">L\'account \"<xliff:g id="account">%s</xliff:g>\" sarà rimosso da K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Tutti i dati per \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
-  <string name="account_clear_dlg_instructions_fmt">Tutti i messaggi in \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
+  <string name="account_clear_dlg_instructions_fmt">Le copie locali dei messaggi in \"<xliff:g id="account">%s</xliff:g>\" saranno rimosse da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
   <string name="insufficient_apg_permissions">K-9 non ha i permessi per accedere pienamente ad APG, reinstalla K-9 per risolvere il problema.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Nessuna applicazione presente per gestire l\'importazione. Installa un file manager da Google Play Store.</string>
   <string name="open_market">Apri il Play Store</string>
   <!--=== General strings ==================================================================-->
   <string name="app_authors_fmt">Autori: <xliff:g id="app_authors">%s</xliff:g></string>
-  <string name="app_revision_fmt">Informazioni: <xliff:g id="app_revision_url">%s</xliff:g></string>
+  <string name="app_revision_fmt">Informazioni di versione: <xliff:g id="app_revision_url">%s</xliff:g></string>
   <string name="app_libraries">Ci avvaliamo delle seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
   <string name="app_emoji_icons">Icone emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
   <string name="read_attachment_label">Leggi gli allegati</string>
   <string name="read_attachment_desc">Permetti all\'applicazione di leggere gli allegati.</string>
-  <string name="read_messages_label">Leggi la posta</string>
-  <string name="read_messages_desc">Permetti all\'applicazione di leggere la posta.</string>
-  <string name="delete_messages_label">Elimina la posta</string>
-  <string name="delete_messages_desc">Permetti all\'applicazione di eliminare la posta.</string>
+  <string name="read_messages_label">Leggi i messaggi</string>
+  <string name="read_messages_desc">Permetti all\'applicazione di leggere i messaggi.</string>
+  <string name="delete_messages_label">Elimina messaggi</string>
+  <string name="delete_messages_desc">Permetti all\'applicazione di eliminare i messaggi.</string>
   <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
   <string name="accounts_title">Account</string>
   <string name="folders_title">Cartelle</string>
@@ -74,7 +74,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="compose_title_reply">Rispondi</string>
   <string name="compose_title_reply_all">Rispondi a tutti</string>
   <string name="compose_title_forward">Inoltra</string>
-  <string name="choose_folder_title">Scegli la cartella</string>
+  <string name="choose_folder_title">Scegli cartella</string>
   <string name="status_loading_account_folder">Verifica di <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
   <string name="status_loading_account_folder_headers">Recupero intestazioni <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
   <string name="status_sending_account">Invio <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
@@ -90,6 +90,8 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="cancel_action">Annulla</string>
   <string name="send_action">Invia</string>
   <string name="send_again_action">Invia di nuovo</string>
+  <string name="select_action">Seleziona</string>
+  <string name="deselect_action">Deseleziona</string>
   <string name="reply_action">Rispondi</string>
   <string name="reply_all_action">Rispondi a tutti</string>
   <string name="delete_action">Elimina</string>
@@ -106,7 +108,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="save_draft_action">Salva come bozza</string>
   <string name="check_mail_action">Controlla posta</string>
   <string name="send_messages_action">Invia messaggi</string>
-  <string name="refresh_folders_action">Aggiorna cartelle</string>
+  <string name="refresh_folders_action">Aggiorna elenco cartelle</string>
   <string name="filter_folders_action">Trova cartella</string>
   <string name="add_account_action">Aggiungi account</string>
   <string name="compose_action">Componi</string>
@@ -118,10 +120,10 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="global_settings_action">Impostazioni generali</string>
   <string name="remove_account_action">Rimuovi account</string>
   <string name="clear_pending_action">Annulla tutte le azioni in corso (pericolo!)</string>
-  <string name="mark_as_read_action">Segna come letto</string>
-  <string name="send_alternate_action">Inoltra con altra applicazione</string>
+  <string name="mark_as_read_action">Marca come letto</string>
+  <string name="send_alternate_action">Condividi</string>
   <string name="send_alternate_chooser_title">Scegli il mittente</string>
-  <string name="flag_action">Metti in evidenza</string>
+  <string name="flag_action">Aggiungi stella</string>
   <string name="unflag_action">Rimuovi stella</string>
   <string name="copy_action">Copia</string>
   <string name="select_text_action">Seleziona testo</string>
@@ -129,18 +131,18 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="hide_headers_action">Nascondi intestazioni</string>
   <string name="message_view_theme_action_dark">Passa al tema scuro</string>
   <string name="message_view_theme_action_light">Passa al tema chiaro</string>
-  <string name="mark_as_unread_action">Segna come da leggere</string>
+  <string name="mark_as_unread_action">Marca come da leggere</string>
   <string name="add_cc_bcc_action">Aggiungi Cc/Ccn</string>
   <string name="read_receipt">Notifica di lettura</string>
   <string name="read_receipt_enabled">Notifica di lettura attiva</string>
-  <string name="read_receipt_disabled">Notifica di lettura disattiva</string>
+  <string name="read_receipt_disabled">Non richiederà la notifica di lettura</string>
   <string name="add_attachment_action">Aggiungi allegato</string>
   <string name="add_attachment_action_image">Aggiungi allegato (Immagine)</string>
   <string name="add_attachment_action_video">Aggiungi allegato (Video)</string>
   <string name="empty_trash_action">Svuota cestino</string>
   <string name="expunge_action">Rimuovi messaggi eliminati</string>
   <string name="clear_local_folder_action">Cancella messaggi locali</string>
-  <string name="about_action">Informazioni su</string>
+  <string name="about_action">Informazioni</string>
   <string name="prefs_title">Impostazioni</string>
   <string name="accounts_context_menu_title">Opzioni account</string>
   <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
@@ -169,7 +171,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="notification_action_delete">Elimina</string>
   <string name="notification_certificate_error_title">Errore di certificato per <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_certificate_error_text">Controlla le impostazioni del server</string>
-  <string name="notification_bg_sync_ticker">Controllo posta in corso: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
+  <string name="notification_bg_sync_ticker">Controllo posta: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Controllo posta</string>
   <string name="notification_bg_send_ticker">Invio posta in corso: <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_bg_send_title">Invio posta</string>
@@ -207,6 +209,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="message_compose_quote_header_to">A:</string>
   <string name="message_compose_quote_header_cc">Cc:</string>
   <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> ha scritto:</string>
+  <string name="message_compose_reply_header_fmt_with_date">Il <xliff:g id="sent_date">%1$s</xliff:g>, <xliff:g id="sender">%2$s</xliff:g> ha scritto:</string>
   <string name="message_compose_error_no_recipients">È necessario specificare almeno un destinatario.</string>
   <string name="error_contact_address_not_found">Nessun indirizzo email trovato.</string>
   <string name="message_compose_attachments_skipped_toast">Alcuni allegati non possono essere inoltrati in quanto non sono stati scaricati.</string>
@@ -243,13 +246,13 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="global_settings_checkbox_label">Caselle di selezione multipla</string>
   <string name="global_settings_checkbox_summary">Mostra sempre caselle di selezione multipla</string>
   <string name="global_settings_preview_lines_label">Righe di anteprima</string>
-  <string name="global_settings_show_correspondent_names_label">Mostra nome mittente</string>
-  <string name="global_settings_show_correspondent_names_summary">Mostra il nome del mittente al posto dell\'indirizzo email</string>
+  <string name="global_settings_show_correspondent_names_label">Mostra nomi dei corrispondenti</string>
+  <string name="global_settings_show_correspondent_names_summary">Mostra i nomi dei corrispondenti al posto degli indirizzi email</string>
   <string name="global_settings_sender_above_subject_label">Corrispondenti sopra l\'oggetto</string>
-  <string name="global_settings_sender_above_subject_summary">Mostra i nomi corrispondenti sopra la riga dell\'oggetto, invece che sotto</string>
+  <string name="global_settings_sender_above_subject_summary">Mostra i nomi dei corrispondenti sopra la riga dell\'oggetto, invece che sotto</string>
   <string name="global_settings_show_contact_name_label">Mostra nomi dei contatti</string>
   <string name="global_settings_show_contact_name_summary">Utilizza i nomi dei destinatari dalla Rubrica quando disponibile</string>
-  <string name="global_settings_registered_name_color_label">Colora contatti</string>
+  <string name="global_settings_registered_name_color_label">Colora i contatti</string>
   <string name="global_settings_registered_name_color_default">Non colorare i nomi nel tuo elenco dei contatti</string>
   <string name="global_settings_registered_name_color_changed">Colora i nomi nel tuo elenco dei contatti</string>
   <string name="global_settings_folderlist_wrap_folder_names_label">Manda a capo i nomi lunghi delle cartelle</string>
@@ -268,7 +271,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="global_settings_confirm_action_delete_starred">Elimina messaggi con la stella (solo messaggi visualizzati)</string>
   <string name="global_settings_confirm_action_spam">Spam</string>
   <string name="global_settings_confirm_action_delete_notif">Elimina (da notifica)</string>
-  <string name="global_settings_notification_hide_subject_title">Nascondi l\'oggetto della mail nelle notifiche</string>
+  <string name="global_settings_notification_hide_subject_title">Nascondi l\'oggetto nelle notifiche</string>
   <string name="global_settings_notification_hide_subject_never">Mai</string>
   <string name="global_settings_notification_hide_subject_when_locked">Quanto lo schermo è bloccato</string>
   <string name="global_settings_notification_hide_subject_always">Sempre</string>
@@ -292,40 +295,45 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_setup_check_settings_authenticate">Autenticazione in corso\u2026</string>
   <string name="account_setup_check_settings_fetch">Recupero delle impostazioni dell\'account in corso\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Annullamento delle operazioni in corso\u2026</string>
-  <string name="account_setup_names_title">Quasi fatto!</string>
-  <string name="account_setup_names_account_name_label">Assegna un nome all\'account (opzionale):</string>
+  <string name="account_setup_names_title">Hai quasi fatto!</string>
+  <string name="account_setup_names_account_name_label">Assegna un nome all\'account (facoltativo):</string>
   <string name="account_setup_names_user_name_label">Scrivi il tuo nome (visualizzato nei messaggi in uscita):</string>
   <string name="account_setup_account_type_title">Tipo di account</string>
   <string name="account_setup_account_type_instructions">Che tipo di account è questo?</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
   <string name="account_setup_account_type_imap_action">IMAP</string>
   <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+  <string name="account_setup_auth_type_normal_password">Password normale</string>
+  <string name="account_setup_auth_type_insecure_password">Password, trasmessa in modo non sicuro</string>
+  <string name="account_setup_auth_type_encrypted_password">Password cifrata</string>
   <string name="account_setup_incoming_title">Impostazioni del server della posta in arrivo</string>
   <string name="account_setup_incoming_username_label">Nome utente</string>
   <string name="account_setup_incoming_password_label">Password</string>
   <string name="account_setup_incoming_pop_server_label">Server POP3</string>
   <string name="account_setup_incoming_imap_server_label">Server IMAP</string>
-  <string name="account_setup_incoming_webdav_server_label">Server WebDAV (Exchange)</string>
+  <string name="account_setup_incoming_webdav_server_label">Server Exchange</string>
   <string name="account_setup_incoming_port_label">Porta</string>
-  <string name="account_setup_incoming_security_label">Tipo di protezione</string>
-  <string name="account_setup_incoming_auth_type_label">Tipo di autenticazione</string>
+  <string name="account_setup_incoming_security_label">Protezione</string>
+  <string name="account_setup_incoming_auth_type_label">Autenticazione</string>
   <string name="account_setup_incoming_security_none_label">Nessuna</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">Quando si elimina un messaggio</string>
   <string name="account_setup_incoming_delete_policy_never_label">Non eliminare dal server</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Elimina dal server</string>
-  <string name="account_setup_incoming_delete_policy_markread_label">Segna come letto sul server</string>
+  <string name="account_setup_incoming_delete_policy_markread_label">Marca come letto sul server</string>
   <string name="account_setup_incoming_compression_label">Utilizza la compressione sulla rete:</string>
-  <string name="account_setup_incoming_mobile_label">Mobile</string>
+  <string name="account_setup_incoming_mobile_label">Cellulare</string>
   <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
   <string name="account_setup_incoming_other_label">Altra</string>
   <string name="local_storage_provider_external_label">Memoria esterna (SD card)</string>
   <string name="local_storage_provider_internal_label">Memoria interna standard</string>
   <string name="local_storage_provider_samsunggalaxy_label">Ulteriore memoria interna %1$s</string>
-  <string name="local_storage_provider_label">Posizione memorizzazione</string>
-  <string name="account_setup_expunge_policy_label">Elimina messaggi cancellati</string>
+  <string name="local_storage_provider_label">Posizione di archiviazione</string>
+  <string name="account_setup_expunge_policy_label">Elimina messaggi cancellati sul server</string>
   <string name="account_setup_expunge_policy_immediately">Immediatamente</string>
   <string name="account_setup_expunge_policy_on_poll">Durante ogni recupero</string>
-  <string name="account_setup_expunge_policy_manual">Solo manualmente</string>
+  <string name="account_setup_expunge_policy_manual">Manualmente</string>
   <string name="account_setup_incoming_autodetect_namespace_label">Imposta automaticamente il percorso IMAP</string>
   <string name="account_setup_incoming_imap_path_prefix_label">Prefisso percorso IMAP</string>
   <string name="drafts_folder_label">Cartella Bozze</string>
@@ -335,23 +343,23 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="spam_folder_label">Cartella Spam</string>
   <string name="account_setup_incoming_subscribed_folders_only_label">Mostra solo le cartelle sottoscritte</string>
   <string name="account_setup_auto_expand_folder">Auto-espandi cartella</string>
-  <string name="account_setup_incoming_webdav_path_prefix_label">Percorso WebDAV (Exchange)</string>
+  <string name="account_setup_incoming_webdav_path_prefix_label">Percorso OWA</string>
   <string name="account_setup_incoming_webdav_path_prefix_hint">Opzionale</string>
   <string name="account_setup_incoming_webdav_auth_path_label">Percorso di autenticazione</string>
   <string name="account_setup_incoming_webdav_auth_path_hint">Opzionale</string>
-  <string name="account_setup_incoming_webdav_mailbox_path_label">Percorso della casella di posta</string>
+  <string name="account_setup_incoming_webdav_mailbox_path_label">Alias della casella postale</string>
   <string name="account_setup_incoming_webdav_mailbox_path_hint">Opzionale</string>
   <string name="account_setup_outgoing_title">Impostazioni del server di posta in uscita</string>
   <string name="account_setup_outgoing_smtp_server_label">Server SMTP</string>
   <string name="account_setup_outgoing_port_label">Porta</string>
-  <string name="account_setup_outgoing_security_label">Tipo di protezione</string>
+  <string name="account_setup_outgoing_security_label">Protezione</string>
   <string name="account_setup_outgoing_require_login_label">Richiedi accesso.</string>
   <string name="account_setup_outgoing_username_label">Nome utente</string>
   <string name="account_setup_outgoing_password_label">Password</string>
   <string name="account_setup_outgoing_authentication_label">Tipo di autenticazione</string>
-  <string name="account_setup_bad_uri">Impostazioni non valide: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Opzioni dell\'account</string>
-  <string name="compact_action">Compatta</string>
+  <string name="account_setup_bad_uri">Configurazione non valida: <xliff:g id="err_mess">%s</xliff:g></string>
+  <string name="account_setup_options_title">Opzioni account</string>
+  <string name="compact_action">Compatta account</string>
   <string name="clear_action">Cancella i messaggi (pericolo!)</string>
   <string name="recreate_action">Ricrea dati (ultima spiaggia!)</string>
   <string name="account_setup_options_mail_check_frequency_label">Frequenza verifica posta</string>
@@ -390,18 +398,25 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_setup_options_mail_display_count_250">250 messaggi</string>
   <string name="account_setup_options_mail_display_count_500">500 messaggi</string>
   <string name="account_setup_options_mail_display_count_1000">1000 messaggi</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 messaggi</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 messaggi</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 messaggi</string>
   <string name="account_setup_options_mail_display_count_all">tutti i messaggi</string>
-  <string name="move_copy_cannot_copy_unsynced_message">Non è possibile copiare o spostare un messaggio che non sia sincronizzato con il server</string>
+  <string name="move_copy_cannot_copy_unsynced_message">Impossibile copiare o spostare un messaggio che non sia sincronizzato con il server</string>
   <string name="account_setup_failed_dlg_title">Impossibile completare la configurazione</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Nome utente o password errata.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Impossibile connettersi in modo sicuro al server.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Impossibile connettersi al server.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Nome utente o password errati.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Il server ha presentato un certificato SSL non valido. A volte, ciò si verifica a causa di una errata configurazione del server. In altri casi, il problema è causato da attacchi al server di posta. Se non sei sicuro di cosa stia accadendo, premi Rifiuta e contatta gli amministratori del server di posta.
+
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Impossibile connettersi al server.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Modifica i dettagli</string>
   <string name="account_setup_failed_dlg_continue_action">Continua</string>
-  <string name="account_settings_push_advanced_title">Impostazioni avanzate</string>
+  <string name="account_settings_push_advanced_title">Avanzate</string>
   <string name="account_settings_title_fmt">Impostazioni account</string>
   <string name="account_settings_default_label">Account predefinito</string>
-  <string name="account_settings_default_summary">Invia mail da questo account per impostazione predefinita</string>
+  <string name="account_settings_default_summary">Invia i messaggi da questo account in modo predefinito</string>
   <string name="account_settings_notify_label">Notifica nuovo messaggio</string>
   <string name="account_settings_notify_sync_label">Sincronizza notifiche</string>
   <string name="account_settings_email_label">Il tuo indirizzo email</string>
@@ -411,34 +426,34 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_settings_notify_self_summary">Mostra una notifica per i messaggi che ho inviato</string>
   <string name="account_settings_notification_opens_unread_label">Notifica apre i messaggi non letti</string>
   <string name="account_settings_notification_opens_unread_summary">Ricerca non letti quando Notifiche è aperto</string>
-  <string name="account_settings_notification_unread_count_label">Vedi numero messaggi non letti</string>
+  <string name="account_settings_notification_unread_count_label">Mostra numero messaggi non letti</string>
   <string name="account_settings_notification_unread_count_summary">Mostra il numero dei messaggi non letti nella barra di notifica.</string>
-  <string name="account_settings_mark_message_as_read_on_view_label">Segna messaggio come letto all\'apertura</string>
-  <string name="account_settings_mark_message_as_read_on_view_summary">Segna messaggio come letto quando aperto</string>
+  <string name="account_settings_mark_message_as_read_on_view_label">Marca messaggio come letto all\'apertura</string>
+  <string name="account_settings_mark_message_as_read_on_view_summary">Marca un messaggio come letto quando viene aperto per la visualizzazione</string>
   <string name="account_settings_show_pictures_label">Mostra sempre le immagini</string>
   <string name="account_settings_show_pictures_never">No</string>
   <string name="account_settings_show_pictures_only_from_contacts">Dai contatti</string>
   <string name="account_settings_show_pictures_always">Da chiunque</string>
   <string name="account_settings_composition">Composizione messaggio</string>
-  <string name="account_settings_default_quoted_text_shown_label">Quota messaggio originale alla risposta</string>
-  <string name="account_settings_default_quoted_text_shown_summary">Quando rispondi a un messaggio, inserisce il messaggio originale nella risposta.</string>
+  <string name="account_settings_default_quoted_text_shown_label">Cita messaggio originale nella risposta</string>
+  <string name="account_settings_default_quoted_text_shown_summary">Include il messaggio originale nella risposta.</string>
   <string name="account_settings_reply_after_quote_label">Risposta dopo testo citato</string>
-  <string name="account_settings_reply_after_quote_summary">Quando rispondi ai messaggi, il messaggio originale viene visualizzato sopra la tua risposta.</string>
-  <string name="account_settings_strip_signature_label">Rimuovi firma nella risposta quotata</string>
-  <string name="account_settings_strip_signature_summary">Quando rispondi a un messaggio, la firma del testo citato verrà rimossa</string>
+  <string name="account_settings_reply_after_quote_summary">Il messaggio originale viene visualizzato sopra la tua risposta.</string>
+  <string name="account_settings_strip_signature_label">Rimuovi firma nella risposta</string>
+  <string name="account_settings_strip_signature_summary">Le firme saranno rimosse dai messaggi citati</string>
   <string name="account_settings_message_format_label">Formato messaggio</string>
-  <string name="account_settings_message_format_text">Testo semplice (verranno rimosse immagini e formattazione)</string>
-  <string name="account_settings_message_format_html">HTML (immagini e formattazione verranno preservate)</string>
-  <string name="account_settings_message_format_auto">Automatico (A meno che si risponda a un testo HTML)</string>
+  <string name="account_settings_message_format_text">Testo semplice (saranno rimosse immagini e formattazione)</string>
+  <string name="account_settings_message_format_html">HTML (preserva immagini e formattazione)</string>
+  <string name="account_settings_message_format_auto">Automatico</string>
   <string name="account_settings_always_show_cc_bcc_label">Mostra sempre CC/Ccn</string>
   <string name="account_settings_message_read_receipt_label">Notifica di lettura</string>
   <string name="account_settings_message_read_receipt_summary">Richiedi sempre la notifica di lettura</string>
   <string name="account_settings_quote_style_label">Aspetto testo citato nelle risposte</string>
-  <string name="account_settings_quote_style_prefix">Prefisso (come Gmail, Pine)</string>
-  <string name="account_settings_quote_style_header">Intestazione (come Outlook, Yahoo!, Hotmail)</string>
+  <string name="account_settings_quote_style_prefix">Prefisso (come Gmail)</string>
+  <string name="account_settings_quote_style_header">Intestazione (come Outlook)</string>
   <string name="account_settings_general_title">Impostazioni generali</string>
   <string name="account_settings_reading_mail">Lettura dei messaggi</string>
-  <string name="account_settings_sync">Sincronizzazione messaggi</string>
+  <string name="account_settings_sync">Recupero messaggi</string>
   <string name="account_settings_folders">Cartelle</string>
   <string name="account_settings_quote_prefix_label">Prefisso testo citato</string>
   <string name="account_settings_crypto">Crittografia</string>
@@ -450,7 +465,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_settings_crypto_auto_encrypt_summary">Cifra automaticamente se la chiave pubblica corrisponde al destinatario</string>
   <string name="account_settings_crypto_apg_not_installed">APG non installato</string>
   <string name="account_settings_mail_check_frequency_label">Frequenza verifica cartelle</string>
-  <string name="account_settings_storage_title">Memorizzazione</string>
+  <string name="account_settings_storage_title">Archiviazione</string>
   <string name="account_settings_color_label">Colore dell\'account</string>
   <string name="account_settings_color_summary">Scegli il colore dell\'account utilizzato nell\'elenco delle cartelle e degli account</string>
   <string name="account_settings_led_color_label">Colore del LED di notifica</string>
@@ -485,26 +500,26 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_settings_message_age_3_months">gli ultimi 3 mesi</string>
   <string name="account_settings_message_age_6_months">gli ultimi 6 mesi</string>
   <string name="account_settings_message_age_1_year">l\'ultimo anno</string>
-  <string name="account_settings_folder_display_mode_label">Visualizza cartelle</string>
+  <string name="account_settings_folder_display_mode_label">Cartelle da visualizzare</string>
   <string name="account_settings_folder_display_mode_all">Tutte</string>
-  <string name="account_settings_folder_display_mode_first_class">Soltanto cartelle di 1a classe</string>
+  <string name="account_settings_folder_display_mode_first_class">Solo cartelle di 1a classe</string>
   <string name="account_settings_folder_display_mode_first_and_second_class">Cartelle di 1a e 2a classe</string>
   <string name="account_settings_folder_display_mode_not_second_class">Tutte eccetto le cartelle di 2a classe</string>
   <string name="account_settings_folder_sync_mode_label">Sincronizza cartelle</string>
   <string name="account_settings_folder_sync_mode_all">Tutte</string>
-  <string name="account_settings_folder_sync_mode_first_class">Soltanto cartelle di 1a classe</string>
+  <string name="account_settings_folder_sync_mode_first_class">Solo cartelle di 1a classe</string>
   <string name="account_settings_folder_sync_mode_first_and_second_class">Cartelle di 1a e 2a classe</string>
   <string name="account_settings_folder_sync_mode_not_second_class">Tutte eccetto le cartelle di 2a classe</string>
   <string name="account_settings_folder_sync_mode_none">Nessuna</string>
   <string name="account_settings_folder_push_mode_label">Cartelle Push</string>
   <string name="account_settings_folder_push_mode_all">Tutte</string>
-  <string name="account_settings_folder_push_mode_first_class">Soltanto cartelle di 1a classe</string>
+  <string name="account_settings_folder_push_mode_first_class">Solo cartelle di 1a classe</string>
   <string name="account_settings_folder_push_mode_first_and_second_class">Cartelle di 1a e 2a classe</string>
   <string name="account_settings_folder_push_mode_not_second_class">Tutte eccetto le cartelle di 2a classe</string>
   <string name="account_settings_folder_push_mode_none">Nessuna</string>
-  <string name="account_settings_folder_target_mode_label">Copia/Sposta cartelle di destinazione</string>
+  <string name="account_settings_folder_target_mode_label">Sposta/Copia cartelle di destinazione</string>
   <string name="account_settings_folder_target_mode_all">Tutte</string>
-  <string name="account_settings_folder_target_mode_first_class">Soltanto cartelle di 1a classe</string>
+  <string name="account_settings_folder_target_mode_first_class">Solo cartelle di 1a classe</string>
   <string name="account_settings_folder_target_mode_first_and_second_class">Cartelle di 1a e 2a classe</string>
   <string name="account_settings_folder_target_mode_not_second_class">Tutte eccetto le cartelle di 2a classe</string>
   <string name="account_settings_sync_remote_deletetions_label">Sincronizza eliminazioni sul server</string>
@@ -512,7 +527,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="folder_settings_title">Impostazioni cartella</string>
   <string name="folder_settings_in_top_group_label">Mostra nel gruppo superiore</string>
   <string name="folder_settings_in_top_group_summary">Mostra nella parte superiore dell\'elenco delle cartelle</string>
-  <string name="folder_settings_folder_display_mode_label">Classe di visualizzazione della cartella</string>
+  <string name="folder_settings_folder_display_mode_label">Classe di visualizzazione delle cartelle</string>
   <string name="folder_settings_folder_display_mode_normal">Nessuna</string>
   <string name="folder_settings_folder_display_mode_first_class">1a classe</string>
   <string name="folder_settings_folder_display_mode_second_class">2a classe</string>
@@ -526,9 +541,9 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="folder_settings_folder_push_mode_first_class">1a classe</string>
   <string name="folder_settings_folder_push_mode_second_class">2a classe</string>
   <string name="folder_settings_folder_push_mode_inherited">Uguale alla classe di sincronizzazione</string>
-  <string name="account_settings_incoming_label">Configurazione posta in arrivo</string>
+  <string name="account_settings_incoming_label">Server della posta in arrivo</string>
   <string name="account_settings_incoming_summary">Configura il server della posta in arrivo</string>
-  <string name="account_settings_outgoing_label">Configurazione posta in uscita</string>
+  <string name="account_settings_outgoing_label">Server della posta in uscita</string>
   <string name="account_settings_outgoing_summary">Configura il server della posta in uscita (SMTP)</string>
   <string name="account_settings_description_label">Nome account</string>
   <string name="account_settings_name_label">Il tuo nome</string>
@@ -547,7 +562,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_settings_led_label">LED lampeggiante</string>
   <string name="account_settings_led_summary">LED lampeggiante quando arriva un messaggio</string>
   <string name="account_settings_composition_title">Opzioni composizione messaggi</string>
-  <string name="account_settings_composition_label">Opzioni predefinite</string>
+  <string name="account_settings_composition_label">Opzioni predefinite di composizione</string>
   <string name="account_settings_composition_summary">Imposta Da, Ccn e firma predefiniti</string>
   <string name="account_settings_identities_label">Gestione identità</string>
   <string name="account_settings_identities_summary">Imposta indirizzo mittente e firma alternativi </string>
@@ -580,71 +595,48 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="identity_has_no_email">Non puoi utilizzare un\'identità senza un indirizzo email</string>
   <string name="sort_earliest_first">Data messaggio (più recenti)</string>
   <string name="sort_latest_first">Data messaggio (più vecchi)</string>
-  <string name="sort_subject_alpha">Oggetto (A-Z)</string>
-  <string name="sort_subject_re_alpha">Oggetto (Z-A)</string>
+  <string name="sort_subject_alpha">Oggetto in ordine alfabetico</string>
+  <string name="sort_subject_re_alpha">Oggetto in ordine alfabetico inverso</string>
   <string name="sort_sender_alpha">Mittente in ordine alfabetico</string>
   <string name="sort_sender_re_alpha">Mittente in ordine alfabetico inverso</string>
-  <string name="sort_flagged_first">Messaggi con stella</string>
-  <string name="sort_flagged_last">Messaggi senza stella</string>
-  <string name="sort_unread_first">Messaggi non letti</string>
-  <string name="sort_unread_last">Messaggi letti</string>
-  <string name="sort_attach_first">Messaggi con allegati</string>
-  <string name="sort_unattached_first">Messaggi senza allegati</string>
+  <string name="sort_flagged_first">Prima i messaggi con stella</string>
+  <string name="sort_flagged_last">Prima i messaggi senza stella</string>
+  <string name="sort_unread_first">Prima i messaggi non letti</string>
+  <string name="sort_unread_last">Prima i messaggi letti</string>
+  <string name="sort_attach_first">Prima i messaggi con allegati</string>
+  <string name="sort_unattached_first">Prima i messaggi senza allegati</string>
   <string name="sort_by">Ordina per…</string>
   <string name="sort_by_date">Data</string>
   <string name="sort_by_arrival">Arrivo</string>
   <string name="sort_by_subject">Oggetto</string>
   <string name="sort_by_sender">Mittente</string>
   <string name="sort_by_flag">Stella</string>
-  <string name="sort_by_unread">Letto/da leggere</string>
+  <string name="sort_by_unread">Letto/non letto</string>
   <string name="sort_by_attach">Allegati</string>
   <string name="account_delete_dlg_title">Rimuovi account</string>
   <string name="account_recreate_dlg_title">Ricrea account</string>
   <string name="account_clear_dlg_title">Cancella account</string>
-  <string name="provider_note_auonejp">Se si desidera utilizzare IMAP o POP3 per questo provider, si deve consentire l\'utilizzo di IMAP o POP3 sulla pagina delle impostazioni di au one mail.</string>
-  <string name="provider_note_naver">Se si desidera utilizzare IMAP o POP3 per questo provider, si deve consentire l\'utilizzo di IMAP o POP3 sulla pagina delle impostazioni di Naver mail.</string>
-  <string name="provider_note_hanmail">Se si desidera utilizzare IMAP o POP3 per questo provider, si deve consentire l\'utilizzo di IMAP o POP3 sulla pagina delle impostazioni di Hanmail(Daum).</string>
+  <string name="provider_note_auonejp">Assicurati di abilitare IMAP o POP3 sulla pagina delle impostazioni di au one.</string>
+  <string name="provider_note_naver">Assicurati di abilitare IMAP o POP3 sulla pagina delle impostazioni di Naver mail.</string>
+  <string name="provider_note_hanmail">Assicurati di abilitare IMAP o POP3 sulla pagina delle impostazioni di Hanmail(Daum).</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificato non riconosciuto</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Accetta chiave</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rifiuta chiave</string>
-  <string name="message_list_help_key">
-    Canc (o D) - Elimina\n
-    R - Rispondi\n
-    A - Rispondi a tutti\n
-    C - Componi\n
-    F - Inoltra\n
-    M - Sposta\n
-    V - Archive\n
-    Y - Copia\n
-    Z - Mark (Un)read\n
-    G - Stella\n
-    O - Tipo ordinamento\n
-    I - Verso ordinamento\n
-    Q - Ritorna alle cartelle\n
-    S - Seleziona/deseleziona\n
-    J o P - Messaggio Precedente\n
-    K o N - Messaggio successivo
-  </string>
-  <string name="folder_list_help_key">
-    1 - Visualizza soltanto cartelle di 1a classe\u000A
-    2 - Visualizza cartelle di 1a e 2a classe\u000A
-    3 - Visualizza tutte eccetto le cartelle di 2a classe\u000A
-    4 - Visualizza tutte le cartelle\u000A
-    Q - Ritorna agli account\u000A
-    S - Modifica le impostazioni dell\'account</string>
+  <string name="message_list_help_key">Canc (o D) - Elimina\nR - Rispondi\nA - Rispondi a tutti\nC - Componi\nF - Inoltra\nM - Sposta\nV - Archive\nY - Copia\nZ - Marca (non) letto\nG - Stella\nO - Tipo ordinamento\nI - Verso ordinamento\nQ - Ritorna alle cartelle\nS - Seleziona/deseleziona\nJ o P - Messaggio precedente\nK o N - Messaggio successivo</string>
+  <string name="folder_list_help_key">1 - Visualizza soltanto cartelle di 1a classe\n2 - Visualizza cartelle di 1a e 2a classe\n3 - Visualizza tutte eccetto le cartelle di 2a classe\n4 - Visualizza tutte le cartelle\nQ - Ritorna agli account\nS - Modifica le impostazioni dell\'account</string>
   <string name="folder_list_filter_hint">il nome della cartella contiene</string>
-  <string name="folder_list_display_mode_label">Cartelle</string>
-  <string name="folder_list_display_mode_all">Visualizza tutte le cartelle</string>
-  <string name="folder_list_display_mode_first_class">Visualizza soltanto le cartelle di 1a classe</string>
-  <string name="folder_list_display_mode_first_and_second_class">Visualizza cartelle di 1a e 2a classe</string>
-  <string name="folder_list_display_mode_not_second_class">Visualizza tutte eccetto le cartelle di 2a classe</string>
+  <string name="folder_list_display_mode_label">Mostra cartelle...</string>
+  <string name="folder_list_display_mode_all">Tutte le cartelle</string>
+  <string name="folder_list_display_mode_first_class">Cartelle di 1a classe</string>
+  <string name="folder_list_display_mode_first_and_second_class">Cartelle di 1a e 2a classe</string>
+  <string name="folder_list_display_mode_not_second_class">Nascondi le cartelle di 2a classe</string>
   <string name="account_settings_signature__location_label">Posizione della firma</string>
   <string name="account_settings_signature__location_before_quoted_text">Prima del testo citato</string>
   <string name="account_settings_signature__location_after_quoted_text">Dopo il testo citato</string>
   <string name="setting_theme_global">Usa il tema dell\'applicazione</string>
   <string name="setting_theme_dark">Scuro</string>
   <string name="setting_theme_light">Chiaro</string>
-  <string name="display_preferences">Preferenze di visualizzazione</string>
+  <string name="display_preferences">Visualizzazione</string>
   <string name="global_preferences">Globali</string>
   <string name="debug_preferences">Debug</string>
   <string name="privacy_preferences">Riservatezza</string>
@@ -670,7 +662,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="background_ops_enabled">Quando \'Dati in background\' è selezionato</string>
   <string name="background_ops_auto_sync">Quando \'Dati in background\' e \'Sincronizzazione automatica\' sono selezionati</string>
   <string name="background_ops_auto_sync_only">Quando \'Sincronizzazione automatica\' è selezionato</string>
-  <string name="batch_select_all">Seleziona tutti</string>
+  <string name="batch_select_all">Seleziona tutto</string>
   <string name="account_setup_push_limit_label">Max cartelle Push</string>
   <string name="account_setup_push_limit_10">10 cartelle</string>
   <string name="account_setup_push_limit_25">25 cartelle</string>
@@ -685,23 +677,23 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="gestures_summary">Attiva la gestione con il tocco dei controlli</string>
   <string name="volume_navigation_title">Navigazione tasti volume</string>
   <string name="volume_navigation_message">Visualizzazione messaggi</string>
-  <string name="volume_navigation_list">Diverse visualizzazioni di elenco</string>
+  <string name="volume_navigation_list">Visualizzazioni di elenco</string>
   <string name="start_integrated_inbox_title">Avvia in Posta in arrivo unificata</string>
-  <string name="measure_accounts_title">Visualizza dimensione account</string>
+  <string name="measure_accounts_title">Mostra dimensione account</string>
   <string name="measure_accounts_summary">Disattiva per una visualizzazione più veloce</string>
   <string name="count_search_title">Conta i risultati della ricerca</string>
   <string name="count_search_summary">Disattiva per una visualizzazione più veloce</string>
   <string name="hide_special_accounts_title">Nascondi account speciali</string>
   <string name="hide_special_accounts_summary">Nascondi Posta in arrivo unificata e tutti gli account dei messaggi</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"> - Con stella</string>
-  <string name="unread_modifier"> - Non letto</string>
+  <string name="flagged_modifier">- Con stella</string>
+  <string name="unread_modifier">- Non letto</string>
   <string name="search_all_messages_title">Tutti i messaggi</string>
   <string name="search_all_messages_detail">Tutti i messaggi nelle cartelle abilitate per la ricerca</string>
   <string name="integrated_inbox_title">Posta in arrivo unificata</string>
   <string name="integrated_inbox_detail">Tutti i messaggi nella Posta in arrivo unificata</string>
-  <string name="tap_hint">Tocca busta o stella per i messaggi non letti o con stella</string>
-  <string name="folder_settings_include_in_integrated_inbox_label">Posta in arrivo unificata</string>
+  <string name="tap_hint">Tocca la busta o la stella per i messaggi non letti o con stella</string>
+  <string name="folder_settings_include_in_integrated_inbox_label">Unifica</string>
   <string name="folder_settings_include_in_integrated_inbox_summary">Tutti i messaggi sono visualizzati nella Posta in arrivo unificata</string>
   <string name="account_settings_searchable_label">Ricerca nelle cartelle</string>
   <string name="account_settings_searchable_all">Tutte</string>
@@ -712,10 +704,10 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="font_size_account_list">Elenco account</string>
   <string name="font_size_account_name">Nome account</string>
   <string name="font_size_account_description">Descrizione account</string>
-  <string name="font_size_folder_list">Elenco cartelle</string>
+  <string name="font_size_folder_list">Elenchi cartelle</string>
   <string name="font_size_folder_name">Nome cartella</string>
   <string name="font_size_folder_status">Stato cartella</string>
-  <string name="font_size_message_list">Elenco Messaggi</string>
+  <string name="font_size_message_list">Elenchi messaggi</string>
   <string name="font_size_message_list_subject">Oggetto</string>
   <string name="font_size_message_list_sender">Mittente</string>
   <string name="font_size_message_list_date">Data</string>
@@ -724,10 +716,12 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="font_size_message_view_sender">Mittente</string>
   <string name="font_size_message_view_to">A</string>
   <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_additional_headers">Altre intestazioni</string>
+  <string name="font_size_message_view_additional_headers">Intestazioni aggiuntive</string>
   <string name="font_size_message_view_subject">Oggetto</string>
   <string name="font_size_message_view_date">Ora e data</string>
   <string name="font_size_message_view_content">Corpo del messaggio</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">Composizione messaggio</string>
   <string name="font_size_message_compose_input">Campi di testo</string>
   <string name="font_size_default">Predefinito</string>
@@ -742,7 +736,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="message_compose_buggy_gallery">Controlla \"Impostazioni\" -&gt; \"Aggira bug Galleria immagini\" per allegare immagini o video usando Galleria 3D.</string>
   <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
   <string name="message_compose_use_workaround">Utilizza \"Aggiungi allegato (Immagini)\" o \"Aggiungi allegato (Video)\" per allegare immagini o video con Galleria 3D.</string>
-  <string name="miscellaneous_preferences">Altre impostazioni</string>
+  <string name="miscellaneous_preferences">Varie</string>
   <string name="misc_preferences_attachment_title">Aggira bug Galleria immagini</string>
   <string name="misc_preferences_attachment_description">Visualizza i pulsanti per allegare immagini/video (evita bug della Galleria 3D)</string>
   <!--APG related-->
@@ -757,14 +751,14 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="pgp_mime_unsupported">I messaggi PGP/MIME non sono ancora supportati.</string>
   <string name="attachment_encryption_unsupported">Attenzione: gli allegati non sono ancora firmati o cifrati.</string>
   <string name="send_aborted">Invio interrotto.</string>
-  <string name="save_or_discard_draft_message_dlg_title">Salva bozza?</string>
-  <string name="save_or_discard_draft_message_instructions_fmt">Salva o rifiuta questo messaggio?</string>
-  <string name="confirm_discard_draft_message_title">Eliminare i messaggi?</string>
+  <string name="save_or_discard_draft_message_dlg_title">Vuoi salvare la bozza?</string>
+  <string name="save_or_discard_draft_message_instructions_fmt">Vuoi salvare o rifiutare questo messaggio?</string>
+  <string name="confirm_discard_draft_message_title">Vuoi eliminare i messaggi?</string>
   <string name="confirm_discard_draft_message">Sicuro di voler eliminare questo messaggio?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Impossibile salvare messaggio in bozze.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Impossibile salvare messaggio cifrato in bozze.</string>
-  <string name="continue_without_public_key_dlg_title">Continuare senza chiave pubblica?</string>
-  <string name="continue_without_public_key_instructions_fmt">Uno o più destinatari non hanno una chiave pubblica salvata, continuare?</string>
+  <string name="continue_without_public_key_dlg_title">Vuoi continuare senza chiave pubblica?</string>
+  <string name="continue_without_public_key_instructions_fmt">Uno o più destinatari non hanno una chiave pubblica salvata. Vuoi continuare?</string>
   <string name="select_text_now">Seleziona il testo da copiare.</string>
   <string name="dialog_confirm_delete_title">Conferma l\'eliminazione</string>
   <string name="dialog_confirm_delete_message">Vuoi eliminare questo messaggio?</string>
@@ -772,21 +766,21 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <item quantity="one">Vuoi davvero eliminare questo messaggio?</item>
     <item quantity="other">Vuoi davvero eliminare i <xliff:g id="message_count">%1$d</xliff:g> messaggi selezionati?</item>
   </plurals>
-  <string name="dialog_confirm_delete_confirm_button">Elimina</string>
-  <string name="dialog_confirm_delete_cancel_button">Non eliminare</string>
-  <string name="dialog_confirm_spam_title">Conferma spam</string>
+  <string name="dialog_confirm_delete_confirm_button">Sì</string>
+  <string name="dialog_confirm_delete_cancel_button">No</string>
+  <string name="dialog_confirm_spam_title">Conferma spostamento nella cartella spam</string>
   <plurals name="dialog_confirm_spam_message">
     <item quantity="one">Vuoi davvero spostare il messaggio nella cartella spam?</item>
     <item quantity="other">Vuoi davvero spostare i <xliff:g id="message_count">%1$d</xliff:g> messaggi selezionati nella cartella spam?</item>
   </plurals>
   <string name="dialog_confirm_spam_confirm_button">Sì</string>
   <string name="dialog_confirm_spam_cancel_button">No</string>
-  <string name="dialog_attachment_progress_title">Scarica allegato</string>
-  <string name="debug_logging_enabled">Registrazione dei log per il debug di Android abilitata</string>
+  <string name="dialog_attachment_progress_title">Scaricamento allegato</string>
+  <string name="debug_logging_enabled">Registrazione dei log per il debug abilitata</string>
   <string name="messagelist_sent_to_me_sigil">»</string>
   <string name="messagelist_sent_cc_me_sigil">›</string>
   <string name="error_unable_to_connect">Impossibile connettersi.</string>
-  <string name="import_export_action">Importa ed esporta</string>
+  <string name="import_export_action">Importa ed esporta impostazioni</string>
   <string name="settings_export_account">Esporta impostazioni account</string>
   <string name="settings_export_all">Esporta impostazioni e account</string>
   <string name="settings_import_dialog_title">Importa</string>
@@ -797,14 +791,14 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="settings_exporting">Esportazione impostazioni…</string>
   <string name="settings_importing">Importazione impostazioni…</string>
   <string name="settings_import_scanning_file">Scansione file…</string>
-  <string name="settings_export_success">Salvata esportazione impostazioni in <xliff:g id="filename">%s</xliff:g></string>
+  <string name="settings_export_success">Impostazioni esportate salvate in <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_global_settings_success">Impostazioni globali importate da <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_success">Importato <xliff:g id="accounts">%s</xliff:g> da <xliff:g id="filename">%s</xliff:g></string>
   <plurals name="settings_import_accounts">
     <item quantity="one">1 account</item>
     <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> account</item>
   </plurals>
-  <string name="settings_export_failure">Esportazione non riuscita</string>
+  <string name="settings_export_failure">Esportazione impostazioni non riuscita</string>
   <string name="settings_import_failure">Impossibile importare impostazioni da <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_export_success_header">Esportazione completata</string>
   <string name="settings_export_failed_header">Esportazione non riuscita</string>
@@ -824,14 +818,14 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   </plurals>
   <string name="settings_import_use_incoming_server_password">Usa la password del server della posta in arrivo</string>
   <string name="activate_account_action">Abilita</string>
-  <string name="account_unavailable">L\'account \"<xliff:g id="account">%s</xliff:g>\" non è disponibile; controllare lo spazio di archiviazione</string>
+  <string name="account_unavailable">L\'account \"<xliff:g id="account">%s</xliff:g>\" non è disponibile; controlla lo spazio di archiviazione</string>
   <string name="settings_attachment_default_path">Salva allegati in…</string>
   <string name="attachment_save_title">Salva allegato</string>
-  <string name="attachment_save_desc">Nessun file manager presente. Qual è il percorso del salvataggio degli allegati?</string>
+  <string name="attachment_save_desc">Nessun file manager presente. Qual è il percorso per il salvataggio degli allegati?</string>
   <string name="manage_accounts_move_up_action">Sposta in alto</string>
   <string name="manage_accounts_move_down_action">Sposta in basso</string>
   <string name="manage_accounts_moving_message">Spostamento account in corso…</string>
-  <string name="unread_widget_select_account">Mostra messaggi non letti per…</string>
+  <string name="unread_widget_select_account">Mostra numero messaggi non letti per…</string>
   <string name="import_dialog_error_title">Nessun file manager presente</string>
   <string name="close">Chiudi</string>
   <string name="webview_empty_message">Senza testo</string>
@@ -843,18 +837,18 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="webview_contextmenu_image_view_action">Mostra immagine</string>
   <string name="webview_contextmenu_image_save_action">Salva immagine</string>
   <string name="webview_contextmenu_image_download_action">Scarica immagine</string>
-  <string name="webview_contextmenu_image_copy_action">Copia link negli appunti</string>
-  <string name="webview_contextmenu_image_clipboard_label">URL dell\'immagine</string>
-  <string name="webview_contextmenu_phone_call_action">Chiama</string>
+  <string name="webview_contextmenu_image_copy_action">Copia URL immagine negli appunti</string>
+  <string name="webview_contextmenu_image_clipboard_label">URL immagine</string>
+  <string name="webview_contextmenu_phone_call_action">Chiama numero</string>
   <string name="webview_contextmenu_phone_save_action">Salva nei contatti</string>
   <string name="webview_contextmenu_phone_copy_action">Copia il numero negli appunti</string>
   <string name="webview_contextmenu_phone_clipboard_label">Numero di telefono</string>
-  <string name="webview_contextmenu_email_send_action">Invia mail</string>
+  <string name="webview_contextmenu_email_send_action">Invia messaggio</string>
   <string name="webview_contextmenu_email_save_action">Salva nei contatti</string>
   <string name="webview_contextmenu_email_copy_action">Copia l\'indirizzo negli appunti</string>
   <string name="webview_contextmenu_email_clipboard_label">Indirizzo mail</string>
   <string name="image_saved_as">Immagine salvata in \"<xliff:g id="filename">%s</xliff:g>\"</string>
-  <string name="image_saving_failed">Errore nel salvataggio dell\'immagine.</string>
+  <string name="image_saving_failed">Salvataggio dell\'immagine non riuscito.</string>
   <string name="account_settings_remote_search_num_results_entries_all">Tutti</string>
   <string name="account_settings_remote_search_num_results_entries_10">10</string>
   <string name="account_settings_remote_search_num_results_entries_25">25</string>
@@ -877,9 +871,9 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="action_remote_search">Cerca messaggi sul server</string>
   <string name="pull_to_refresh_remote_search_from_local_search_pull">Tira per cercare sul server…</string>
   <string name="pull_to_refresh_remote_search_from_local_search_release">Rilascia per cercare sul server…</string>
-  <string name="remote_search_unavailable_no_network">La rircerca remota non è disponibile in assenza di connettività di rete.</string>
+  <string name="remote_search_unavailable_no_network">La ricerca remota non è disponibile in assenza di connettività di rete.</string>
   <string name="global_settings_background_as_unread_indicator_label">Usa uno sfondo come indicatore letti/non letti</string>
-  <string name="global_settings_background_as_unread_indicator_summary">Mostra i messaggi letti e non letti con un colore di sfondo diverso</string>
+  <string name="global_settings_background_as_unread_indicator_summary">Uno sfondo grigio mostrerà che un messaggio è stato letto</string>
   <string name="global_settings_threaded_view_label">Vista di conversazione</string>
   <string name="global_settings_threaded_view_summary">Contrai i messaggi che appartengono alla stessa conversazione</string>
   <string name="upgrade_databases_title">Aggiornamento dei database</string>
@@ -897,5 +891,26 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="last_refresh_time_format_with_push">Ultimo aggiornamento <xliff:g id="time_with_preposition">%s</xliff:g> (Push attivo)</string>
   <string name="preposition_for_date">il <xliff:g id="date">%s</xliff:g></string>
   <string name="mark_all_as_read">Marca tutti come letti</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Colora le immagini dei contatti</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">Colora le immagini di contatto mancanti</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Azioni del messaggio visibili</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Mostra le azioni selezionate nel menu di visualizzazione messaggio</string>
+  <string name="loading_attachment">Caricamento allegati...</string>
+  <string name="fetching_attachment_dialog_title_send">Invio messaggio</string>
+  <string name="fetching_attachment_dialog_title_save">Salvataggio in bozze</string>
+  <string name="fetching_attachment_dialog_message">Recupero allegati...</string>
   <!--=== OpenPGP specific ==================================================================-->
+  <string name="openpgp_decrypting_verifying">Decifratura/Verifica...</string>
+  <string name="openpgp_successful_decryption">Decifratura avvenuta</string>
+  <string name="openpgp_signature_valid_certified">Firma valida (certificata)</string>
+  <string name="openpgp_signature_valid_uncertified">Firma valida ma non certificata</string>
+  <string name="openpgp_signature_unknown">Firmatario sconosciuto</string>
+  <string name="openpgp_signature_invalid">Firma non valida</string>
+  <string name="openpgp_signature_unknown_text">Chiave pubblica mancante per questa firma</string>
+  <string name="openpgp_successful_decryption_valid_signature_certified">Decifratura avvenuta e firma valida (certificata)</string>
+  <string name="openpgp_successful_decryption_valid_signature_uncertified">Decifratura avvenuta e firma valida ma non certificata</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Decifratura avvenuta ma chiave pubblica mancante</string>
+  <string name="openpgp_get_key">Cerca chiave mancante</string>
+  <string name="openpgp_error">Errore OpenPGP:</string>
+  <string name="openpgp_user_id">ID utente</string>
 </resources>

res/values-iw/strings.xml

@@ -451,7 +451,7 @@
   <string name="account_settings_composition_label">הרכב ברירת המחדל</string>
   <string name="account_settings_composition_summary">הגדר את ברירת המחדל שלך מ, עותק מוסתר וחתימה</string>
   <string name="account_settings_identities_label">ניהול זהויות</string>
-  <string name="account_settings_identities_summary">"הגדרה חלופית \' מ \ 'כתובות וחתימות "</string>
+  <string name="account_settings_identities_summary">"הגדרה חלופית \' מ \ \'כתובות וחתימות "</string>
   <string name="manage_identities_title">נהל זהויות</string>
   <string name="manage_identities_context_menu_title">נהל זהות</string>
   <string name="edit_identity_title">ערוך זהות</string>

res/values-ja/strings.xml

@@ -303,6 +303,9 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_setup_account_type_pop_action">POP3 サーバ</string>
   <string name="account_setup_account_type_imap_action">IMAP サーバ</string>
   <string name="account_setup_account_type_webdav_action">Exchange サーバ(WebDAV)</string>
+  <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_incoming_title">受信メールサーバ設定</string>
   <string name="account_setup_incoming_username_label">アカウント名</string>
   <string name="account_setup_incoming_password_label">パスワード</string>
@@ -313,6 +316,8 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_setup_incoming_security_label">保護された接続</string>
   <string name="account_setup_incoming_auth_type_label">認証タイプ</string>
   <string name="account_setup_incoming_security_none_label">使用しない</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">メール削除時の動作</string>
   <string name="account_setup_incoming_delete_policy_never_label">サーバでは削除しない</string>
   <string name="account_setup_incoming_delete_policy_delete_label">サーバでも削除する</string>
@@ -359,46 +364,53 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="recreate_action">アカウント再作成(最終手段！)</string>
   <string name="account_setup_options_mail_check_frequency_label">同期フォルダの同期間隔</string>
   <string name="account_setup_options_mail_check_frequency_never">しない</string>
-  <string name="account_setup_options_mail_check_frequency_1min">１分毎</string>
-  <string name="account_setup_options_mail_check_frequency_5min">５分毎</string>
-  <string name="account_setup_options_mail_check_frequency_10min">１０分毎</string>
-  <string name="account_setup_options_mail_check_frequency_15min">１５分毎</string>
-  <string name="account_setup_options_mail_check_frequency_30min">３０分毎</string>
-  <string name="account_setup_options_mail_check_frequency_1hour">１時間毎</string>
-  <string name="account_setup_options_mail_check_frequency_2hour">２時間毎</string>
-  <string name="account_setup_options_mail_check_frequency_3hour">３時間毎</string>
-  <string name="account_setup_options_mail_check_frequency_6hour">６時間毎</string>
-  <string name="account_setup_options_mail_check_frequency_12hour">１２時間毎</string>
-  <string name="account_setup_options_mail_check_frequency_24hour">２４時間毎</string>
+  <string name="account_setup_options_mail_check_frequency_1min">1分毎</string>
+  <string name="account_setup_options_mail_check_frequency_5min">5分毎</string>
+  <string name="account_setup_options_mail_check_frequency_10min">10分毎</string>
+  <string name="account_setup_options_mail_check_frequency_15min">15分毎</string>
+  <string name="account_setup_options_mail_check_frequency_30min">30分毎</string>
+  <string name="account_setup_options_mail_check_frequency_1hour">1時間毎</string>
+  <string name="account_setup_options_mail_check_frequency_2hour">2時間毎</string>
+  <string name="account_setup_options_mail_check_frequency_3hour">3時間毎</string>
+  <string name="account_setup_options_mail_check_frequency_6hour">6時間毎</string>
+  <string name="account_setup_options_mail_check_frequency_12hour">12時間毎</string>
+  <string name="account_setup_options_mail_check_frequency_24hour">24時間毎</string>
   <string name="push_poll_on_connect_label">プッシュ接続時の同期</string>
   <string name="account_setup_options_enable_push_label">このアカウントにプッシュメールを有効化</string>
   <string name="account_setup_options_enable_push_summary">メールサーバがサポートしていれば新しいメッセージは即座に表示されます。当オプションはパフォーマンスが改善もしくは低下します。</string>
   <string name="idle_refresh_period_label">IMAP IDLE（プッシュ）接続のリフレッシュ</string>
-  <string name="idle_refresh_period_1min">１分毎</string>
-  <string name="idle_refresh_period_2min">２分毎</string>
-  <string name="idle_refresh_period_3min">３分毎</string>
-  <string name="idle_refresh_period_6min">６分毎</string>
-  <string name="idle_refresh_period_12min">１２分毎</string>
-  <string name="idle_refresh_period_24min">２４分毎</string>
-  <string name="idle_refresh_period_36min">３６分毎</string>
-  <string name="idle_refresh_period_48min">４８分毎</string>
-  <string name="idle_refresh_period_60min">６０分毎</string>
+  <string name="idle_refresh_period_1min">1分毎</string>
+  <string name="idle_refresh_period_2min">2分毎</string>
+  <string name="idle_refresh_period_3min">3分毎</string>
+  <string name="idle_refresh_period_6min">6分毎</string>
+  <string name="idle_refresh_period_12min">12分毎</string>
+  <string name="idle_refresh_period_24min">24分毎</string>
+  <string name="idle_refresh_period_36min">36分毎</string>
+  <string name="idle_refresh_period_48min">48分毎</string>
+  <string name="idle_refresh_period_60min">60分毎</string>
   <string name="account_setup_options_notify_label">メール到着時に通知</string>
   <string name="account_setup_options_notify_sync_label">メール同期中を通知</string>
   <string name="account_setup_options_mail_display_count_label">受信メールを表示する件数</string>
-  <string name="account_setup_options_mail_display_count_10">１０件</string>
-  <string name="account_setup_options_mail_display_count_25">２５件</string>
-  <string name="account_setup_options_mail_display_count_50">５０件</string>
-  <string name="account_setup_options_mail_display_count_100">１００件</string>
-  <string name="account_setup_options_mail_display_count_250">２５０件</string>
-  <string name="account_setup_options_mail_display_count_500">５００件</string>
-  <string name="account_setup_options_mail_display_count_1000">１０００件</string>
+  <string name="account_setup_options_mail_display_count_10">10件</string>
+  <string name="account_setup_options_mail_display_count_25">25件</string>
+  <string name="account_setup_options_mail_display_count_50">50件</string>
+  <string name="account_setup_options_mail_display_count_100">100件</string>
+  <string name="account_setup_options_mail_display_count_250">250件</string>
+  <string name="account_setup_options_mail_display_count_500">500件</string>
+  <string name="account_setup_options_mail_display_count_1000">1000件</string>
+  <string name="account_setup_options_mail_display_count_2500">2500件</string>
+  <string name="account_setup_options_mail_display_count_5000">5000件</string>
+  <string name="account_setup_options_mail_display_count_10000">10000件</string>
   <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証明書を発行しました。これはサーバの設定ミスが原因で起こることがあります。あるいは誰かがあなたやあなたのメールサーバに攻撃を試みることによって起こることもあります。何が起こっているのかがよくわからないのであれば、「拒否」をクリックし、メールサーバを管理している人たちに連絡をとってください。\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_auth_message_fmt">アカウント名またはパスワード設定にエラーがあります
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">サーバが無効なSSL証明書を発行しました。これはサーバの設定ミスが原因で起こることがあります。あるいは誰かがあなたやあなたのメールサーバに攻撃を試みることによって起こることもあります。何が起こっているのかがよくわからないのであれば、「拒否」をクリックし、メールサーバを管理している人たちに連絡をとってください。
+
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">サーバに接続できません
+(<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>
@@ -480,14 +492,14 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_settings_message_age_0">今日</string>
   <string name="account_settings_message_age_1">2日前</string>
   <string name="account_settings_message_age_2">3日前</string>
-  <string name="account_settings_message_age_7">１週間前</string>
-  <string name="account_settings_message_age_14">２週間前</string>
-  <string name="account_settings_message_age_21">３週間前</string>
-  <string name="account_settings_message_age_1_month">１ヶ月前</string>
-  <string name="account_settings_message_age_2_months">２ヶ月前</string>
-  <string name="account_settings_message_age_3_months">３ヶ月前</string>
-  <string name="account_settings_message_age_6_months">６ヶ月前</string>
-  <string name="account_settings_message_age_1_year">１年前</string>
+  <string name="account_settings_message_age_7">1週間前</string>
+  <string name="account_settings_message_age_14">2週間前</string>
+  <string name="account_settings_message_age_21">3週間前</string>
+  <string name="account_settings_message_age_1_month">1ヶ月前</string>
+  <string name="account_settings_message_age_2_months">2ヶ月前</string>
+  <string name="account_settings_message_age_3_months">3ヶ月前</string>
+  <string name="account_settings_message_age_6_months">6ヶ月前</string>
+  <string name="account_settings_message_age_1_year">1年前</string>
   <string name="account_settings_folder_display_mode_label">表示するフォルダ</string>
   <string name="account_settings_folder_display_mode_all">すべて</string>
   <string name="account_settings_folder_display_mode_first_class">1st クラスフォルダのみ</string>
@@ -610,30 +622,8 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_setup_failed_dlg_invalid_certificate_title">証明書が無効です</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">許可</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">拒否</string>
-  <string name="message_list_help_key">
-    Del (or D) - 削除\n
-    R - 返信\n
-    A - 全員に返信\n
-    C - 作成\n
-    F - 転送\n
-    M - 移動\n
-    V - アーカイブ\n
-    Y - コピー\n
-    Z - 既読/未読のマーク\n
-    G - フラグ\n
-    O - ソート種別\n
-    I - ソート順\n
-    Q - アカウント情報へ\n
-    J, P - 前に 本文\n
-    K, N - 次へ
-  </string>
-  <string name="folder_list_help_key">
-    1 - 1st クラスフォルダ表示\u000A
-    2 - 1st と 2nd クラスフォルダ表示\u000A
-    3 - 2nd クラスフォルダを除くすべて表示\u000A
-    4 - 全フォルダ表示\u000A
-    Q - アカウント設定に戻る\u000A
-    S - アカウント設定編集</string>
+  <string name="message_list_help_key">Del (or D) - 削除\nR - 返信\nA - 全員に返信\nC - 作成\nF - 転送\nM - 移動\nV - アーカイブ\nY - コピー\nZ - 既読/未読のマーク\nG - フラグ\nO - ソート種別\nI - ソート順\nQ - アカウント情報へ\nJ, P - 前に 本文\nK, N - 次へ</string>
+  <string name="folder_list_help_key">1 - 1st クラスフォルダ表示\n2 - 1st と 2nd クラスフォルダ表示\n3 - 2nd クラスフォルダを除くすべて表示\n4 - 全フォルダ表示\nQ - アカウント設定に戻る\nS - アカウント設定編集</string>
   <string name="folder_list_filter_hint">フォルダ名に含まれる文字</string>
   <string name="folder_list_display_mode_label">フォルダ表示…</string>
   <string name="folder_list_display_mode_all">全フォルダ</string>
@@ -730,6 +720,8 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="font_size_message_view_subject">件名</string>
   <string name="font_size_message_view_date">日時</string>
   <string name="font_size_message_view_content">本文</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">メッセージ作成</string>
   <string name="font_size_message_compose_input">入力テキスト</string>
   <string name="font_size_default">デフォルト</string>
@@ -771,14 +763,12 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="dialog_confirm_delete_title">削除の確認</string>
   <string name="dialog_confirm_delete_message">このメッセージを削除しますか？</string>
   <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">本当にこのメッセージを削除しますか？</item>
-    <item quantity="other">本当に<xliff:g id="message_count">%1$d</xliff:g>件のメッセージを削除しますか？</item>
+    <item quantity="other">本当に<xliff:g id="message_count">%1$d</xliff:g>件のメッセージを削除\nしますか？</item>
   </plurals>
   <string name="dialog_confirm_delete_confirm_button">はい</string>
   <string name="dialog_confirm_delete_cancel_button">いいえ</string>
   <string name="dialog_confirm_spam_title">迷惑メールフォルダへの移動の確認</string>
   <plurals name="dialog_confirm_spam_message">
-    <item quantity="one">本当にこのメッセージを迷惑メールフォルダに移動しますか？</item>
     <item quantity="other">本当にこれら<xliff:g id="message_count">%1$d</xliff:g>件のメッセージを迷惑メールフォルダに移動しますか？</item>
   </plurals>
   <string name="dialog_confirm_spam_confirm_button">はい</string>
@@ -803,7 +793,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="settings_import_global_settings_success">グローバル設定を <xliff:g id="filename">%s</xliff:g> からインポートしました。</string>
   <string name="settings_import_success"><xliff:g id="accounts">%s</xliff:g> の設定を <xliff:g id="filename">%s</xliff:g> からインポートしました。</string>
   <plurals name="settings_import_accounts">
-    <item quantity="one">1 アカウント</item>
     <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> アカウント</item>
   </plurals>
   <string name="settings_export_failure">設定のエクスポートが失敗しました。</string>
@@ -815,14 +804,12 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="settings_import_activate_account_header">アカウントを有効化</string>
   <string name="settings_import_activate_account_intro">アカウント \"<xliff:g id="account">%s</xliff:g>\" を有効にするために、<xliff:g id="server_passwords">%s</xliff:g> を入力してください</string>
   <plurals name="settings_import_server_passwords">
-    <item quantity="one">サーバのパスワード</item>
     <item quantity="other">サーバのパスワード</item>
   </plurals>
   <string name="settings_import_incoming_server">受信メールサーバ (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">送信メールサーバ (<xliff:g id="hostname">%s</xliff:g>):</string>
   <plurals name="settings_import_setting_passwords">
-    <item quantity="one">パスワードを設定…</item>
-    <item quantity="other">パスワードを設定…</item>
+    <item quantity="other">サーバのパスワード</item>
   </plurals>
   <string name="settings_import_use_incoming_server_password">受信メールサーバパスワードを利用</string>
   <string name="activate_account_action">有効</string>

res/values-ko/strings.xml

@@ -394,9 +394,12 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <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">서버에 안전하게 연결할 수 없습니다.\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_auth_message_fmt">아이디 혹은 비밀번호가 틀림.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">서버에 안전하게 연결할 수 없습니다.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">서버에 연결할 수 없습니다.
+(<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>
@@ -608,31 +611,8 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="account_setup_failed_dlg_invalid_certificate_title">잘못된 인증 정보</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">키 허용</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">키 거부</string>
-  <string name="message_list_help_key">
-    Del (또는 D) - 삭제\n
-    R - 회신\n
-    A - 전체 회신\n
-    C - 작성\n
-    F - 전달\n
-    M - 이동\n
-    V - 보관\n
-    Y - 복사\n
-    Z - 읽(지 않)은 것으로 표시\n
-    G - 별표(즐겨찾기)\n
-    O - 정렬 방법\n
-    I - 정렬 순서\n
-    Q - 폴더로 돌아가기\n
-    S - 선택/선택해제\n
-    J, P - 이전 메시지\n
-    K, N - 다음 메시지
-  </string>
-  <string name="folder_list_help_key">
-    1 - 제 1종 폴더만 보기\u000A
-    2 - 제 1종 및 2종 폴더 보기\u000A
-    3 - 제 2종 외 폴더 모두 보기\u000A
-    4 - 모든 폴더 보기\u000A
-    Q - 계정 변경\u000A
-    S - 계정 설정 변경</string>
+  <string name="message_list_help_key">Del (또는 D) - 삭제\nR - 회신\nA - 전체 회신\nC - 작성\nF - 전달\nM - 이동\nV - 보관\nY - 복사\nZ - 읽(지 않)은 것으로 표시\nG - 별표(즐겨찾기)\nO - 정렬 방법\nI - 정렬 순서\nQ - 폴더로 돌아가기\nS - 선택/선택해제\nJ, P - 이전 메시지\nK, N - 다음 메시지</string>
+  <string name="folder_list_help_key">1 - 제 1종 폴더만 보기\n2 - 제 1종 및 2종 폴더 보기\n3 - 제 2종 외 폴더 모두 보기\n4 - 모든 폴더 보기\nQ - 계정 변경\nS - 계정 설정 변경</string>
   <string name="folder_list_filter_hint">폴더 이름의 내용</string>
   <string name="folder_list_display_mode_label">폴더</string>
   <string name="folder_list_display_mode_all">모든 폴더 표시</string>
@@ -769,17 +749,9 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="select_text_now">복사할 텍스트 선택</string>
   <string name="dialog_confirm_delete_title">삭제 확인</string>
   <string name="dialog_confirm_delete_message">이 메시지를 삭제하시겠습니까?</string>
-  <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">정말 이 메시지를 삭제하겠습니까?</item>
-    <item quantity="other">정말 <xliff:g id="message_count">%1$d</xliff:g> 통의 메시지를 삭제하겠습니까?</item>
-  </plurals>
   <string name="dialog_confirm_delete_confirm_button">삭제함</string>
   <string name="dialog_confirm_delete_cancel_button">삭제하지 않음</string>
   <string name="dialog_confirm_spam_title">스팸폴더로 이동 확인</string>
-  <plurals name="dialog_confirm_spam_message">
-    <item quantity="one">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</item>
-    <item quantity="other">정말 메시지 <xliff:g id="message_count">%1$d</xliff:g>를 스팸폴더로 옮기시겠습니까?</item>
-  </plurals>
   <string name="dialog_confirm_spam_confirm_button">예</string>
   <string name="dialog_confirm_spam_cancel_button">아니오</string>
   <string name="dialog_attachment_progress_title">첨부 파일 다운로드 중</string>
@@ -801,10 +773,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="settings_export_success">설정을 파일 <xliff:g id="filename">%s</xliff:g>로 내보냄</string>
   <string name="settings_import_global_settings_success">설정을 <xliff:g id="filename">%s</xliff:g>로부터 가져옴</string>
   <string name="settings_import_success"><xliff:g id="filename">%s</xliff:g>에서 <xliff:g id="accounts">%s</xliff:g>를 가져옴</string>
-  <plurals name="settings_import_accounts">
-    <item quantity="one">계정 하나</item>
-    <item quantity="other">계정 <xliff:g id="numAccounts">%s</xliff:g> 개</item>
-  </plurals>
   <string name="settings_export_failure">설정 내보내기 실패</string>
   <string name="settings_import_failure"><xliff:g id="filename">%s</xliff:g>로부터 설정 가져오기 실패</string>
   <string name="settings_export_success_header">내보내기 성공</string>
@@ -813,16 +781,8 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="settings_import_failed_header">가져오기 실패</string>
   <string name="settings_import_activate_account_header">계정 활성화</string>
   <string name="settings_import_activate_account_intro">계정 \"<xliff:g id="account">%s</xliff:g>\"을 활성화하기 위해 <xliff:g id="server_passwords">%s</xliff:g>를 입력하십시오.</string>
-  <plurals name="settings_import_server_passwords">
-    <item quantity="one">서버 비밀번호</item>
-    <item quantity="other">각 서버의 비밀번호</item>
-  </plurals>
   <string name="settings_import_incoming_server">수신 서버 (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">발신 서버 (<xliff:g id="hostname">%s</xliff:g>):</string>
-  <plurals name="settings_import_setting_passwords">
-    <item quantity="one">비밀번호 설정 중…</item>
-    <item quantity="other">각 비밀번호 설정 중…</item>
-  </plurals>
   <string name="settings_import_use_incoming_server_password">수신 서버 비밀번호 사용</string>
   <string name="activate_account_action">활성화</string>
   <string name="account_unavailable">\"<xliff:g id="account">%s</xliff:g>\" 계정을 이용할 수 없습니다. 저장장치를 확인하십시오.</string>

res/values-lt/strings.xml

@@ -208,7 +208,8 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="message_compose_quote_header_from">Nuo:</string>
   <string name="message_compose_quote_header_to">Kam:</string>
   <string name="message_compose_quote_header_cc">Cc:</string>
-  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> rašė:\n</string>
+  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> rašė:
+</string>
   <string name="message_compose_error_no_recipients">Turite pridėti bent vieną gavėją.</string>
   <string name="error_contact_address_not_found">Nepavyko rasti šio kontakto el. pašto adreso.</string>
   <string name="message_compose_attachments_skipped_toast">Kai kurių priedų negalima persiųsti, nes jie nebuvo parsiųsti.</string>
@@ -287,6 +288,7 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="account_setup_basics_email_hint">El. pašto adresas</string>
   <string name="account_setup_basics_password_hint">Slaptažodis</string>
   <string name="account_setup_basics_manual_setup_action">Rankinis nustatymas</string>
+  <string name="account_setup_check_settings_title"/>
   <string name="account_setup_check_settings_retr_info_msg">Gaunama paskyros informacija…</string>
   <string name="account_setup_check_settings_check_incoming_msg">Tikrinami gaunamųjų serverio nustatymai…</string>
   <string name="account_setup_check_settings_check_outgoing_msg">Tikrinami siunčiamųjų serverio nustatymai…</string>
@@ -394,9 +396,13 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="account_setup_options_mail_display_count_all">visi laiškai</string>
   <string name="move_copy_cannot_copy_unsynced_message">Neįmanoma kopijuoti ar perkelti laiškų kurie nesinchronizuoti su serveriu</string>
   <string name="account_setup_failed_dlg_title">Nepavyko baigti nustatymo</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Neteisingas naudotojo vardas arba slaptažodis.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Serveris pateikė netinkamą sertifikatą. Kartais tai nutinka dėl neteisingos serverio konfigūracijos. Kartais tai nutinka kai kažkas bando užpulti jus ar jūsų pašto serverį. Jei nesate tikri kame bėda, paspauskite „Atmesti“ ir susisiekite su serverio administracija.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Nepavyko prisijungti prie serverio.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Neteisingas naudotojo vardas arba slaptažodis.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Serveris pateikė netinkamą sertifikatą. Kartais tai nutinka dėl neteisingos serverio konfigūracijos. Kartais tai nutinka kai kažkas bando užpulti jus ar jūsų pašto serverį. Jei nesate tikri kame bėda, paspauskite „Atmesti“ ir susisiekite su serverio administracija.
+
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Nepavyko prisijungti prie serverio.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Keisti detales</string>
   <string name="account_setup_failed_dlg_continue_action">Tęsti</string>
   <string name="account_settings_push_advanced_title">Išplėstinis</string>
@@ -608,8 +614,8 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="account_setup_failed_dlg_invalid_certificate_title">Neatpažintas sertifikatas</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Priimti raktą</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Atmesti raktą</string>
-  <string name="message_list_help_key">Del (ar D) - Šalinti\n R - Atsakyti\n A - Atsakyti visiems\n C - Kurti\n F - Persiųsti\n M - Perkelti\n V - Archyvas\n Y - Kopijuoti\n Z - Pažymėti (Ne)skaitytą\n G - Žvaigždutė\n O - Rikiavimo tipas\n I - Rikiavimo tvarka\n Q - Grįžti į aplankus\n S - Pasirinkti/nepasirinkti\n J or P - Ankstesnis laiškas\n K or N - Sekantis laiškas\n</string>
-  <string name="folder_list_help_key">1 - Rodyti tik 1 klasės aplankus\n 2 - Rodyti 1 ir 2 klasės aplankus\n 3 - Rodyti visus išskyrus 2 klasės aplankus\n 4 - Rodyti visus aplankus\n Q - Grįžti į paskyras\n S - Keisti paskyros nustatymus</string>
+  <string name="message_list_help_key">Del (ar D) - Šalinti\nR - Atsakyti\nA - Atsakyti visiems\nC - Kurti\nF - Persiųsti\nM - Perkelti\nV - Archyvas\nY - Kopijuoti\nZ - Pažymėti (Ne)skaitytą\nG - Žvaigždutė\nO - Rikiavimo tipas\nI - Rikiavimo tvarka\nQ - Grįžti į aplankus\nS - Pasirinkti/nepasirinkti\nJ or P - Ankstesnis laiškas\nK or N - Sekantis laiškas</string>
+  <string name="folder_list_help_key">1 - Rodyti tik 1 klasės aplankus\n2 - Rodyti 1 ir 2 klasės aplankus\n3 - Rodyti visus išskyrus 2 klasės aplankus\n4 - Rodyti visus aplankus\nQ - Grįžti į paskyras\nS - Keisti paskyros nustatymus</string>
   <string name="folder_list_filter_hint">aplanko varde yra</string>
   <string name="folder_list_display_mode_label">Rodyti aplankus…</string>
   <string name="folder_list_display_mode_all">Visus aplankus</string>
@@ -746,12 +752,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="select_text_now">Pasirinkti tesktą kopijavimui.</string>
   <string name="dialog_confirm_delete_title">Patvirtinti šalinimą</string>
   <string name="dialog_confirm_delete_message">Ar tikrai norite pašalinti laišką?</string>
-  <!--NEW:
-  <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Do you really want to delete this message?</item>
-    <item quantity="other">Do you really want to delete <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
-  </plurals>
--->
   <string name="dialog_confirm_delete_confirm_button">Taip</string>
   <string name="dialog_confirm_delete_cancel_button">Ne</string>
   <string name="dialog_confirm_spam_title">Patvirtinti perkėlimą į brukalo aplanką</string>
@@ -781,12 +781,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="settings_export_success">Eksportuoti nustatymai išsaugoti <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_global_settings_success">Importuoti globalius nustatymus iš <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_success">Importuota <xliff:g id="accounts">%s</xliff:g> iš <xliff:g id="filename">%s</xliff:g></string>
-  <!--NEW:
-  <plurals name="settings_import_accounts">
-    <item quantity="one">1 account</item>
-    <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
-  </plurals>
--->
   <string name="settings_export_failure">Eksportuoti nustatymų nepavyko</string>
   <string name="settings_import_failure">Nustatymų iš <xliff:g id="filename">%s</xliff:g> importuoti nepavyko</string>
   <string name="settings_export_success_header">Eksportuota sėkmingai</string>

res/values-nl/strings.xml

@@ -395,9 +395,12 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="account_setup_options_mail_display_count_all">alle berichten</string>
   <string name="move_copy_cannot_copy_unsynced_message">Kan bericht niet kopiëren of verplaatsen omdat deze niet gesynchroniseerd is met de server</string>
   <string name="account_setup_failed_dlg_title">Setup kon niet afronden</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Gebruikersnaam of wachtwoord ongeldig.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Kan niet veilig verbinden met server.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Kan geen verbinding maken met server.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Gebruikersnaam of wachtwoord ongeldig.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Kan niet veilig verbinden met server.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Kan geen verbinding maken met server.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Aanpassen details</string>
   <string name="account_setup_failed_dlg_continue_action">Doorgaan</string>
   <string name="account_settings_push_advanced_title">Geavanceerd</string>
@@ -609,31 +612,8 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="account_setup_failed_dlg_invalid_certificate_title">Onbekend Certificaat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepteer Sleutel</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Verwerp Sleutel</string>
-  <string name="message_list_help_key"><!--NEW: V, Z untranslated-->
-    Del (or D) - Verwijder\n
-    R - Antwoord\n
-    A - Antwoord Alle\n
-    C - Ontwerp\n
-    F - Doorsturen\n
-    M - Verplaats\n
-    V - Archive\n
-    Y - Kopieer\n
-    Z - Mark (Un)read\n
-    G - Ster\n
-    O - Sort type\n
-    I - Sort grootte\n
-    Q - Terug naar Mappen\n
-    S - Selecteer/de-selecteer\n
-    J, V - Vorige Bericht\n
-    K, N - Volgende bericht
-  </string>
-  <string name="folder_list_help_key">
-    1 - Laat alleen 1 klasse mappen zien\u000A
-    2 - Laat 1e en 2e klasse mappen zien\u000A
-    3 - Laat alles zien behalve 2e klasse mappen\u000A
-    4 - Laat alle mappen zien\u000A
-    Q - Terug naar Accounts\u000A
-    S - Aanpassen Account Instellingen</string>
+  <string name="message_list_help_key">Del (or D) - Verwijder\nR - Antwoord\nA - Antwoord Alle\nC - Ontwerp\nF - Doorsturen\nM - Verplaats\nV - Archive\nY - Kopieer\nZ - Mark (Un)read\nG - Ster\nO - Sort type\nI - Sort grootte\nQ - Terug naar Mappen\nS - Selecteer/de-selecteer\nJ, V - Vorige Bericht\nK, N - Volgende bericht</string>
+  <string name="folder_list_help_key">1 - Laat alleen 1 klasse mappen zien\n2 - Laat 1e en 2e klasse mappen zien\n3 - Laat alles zien behalve 2e klasse mappen\n4 - Laat alle mappen zien\nQ - Terug naar Accounts\nS - Aanpassen Account Instellingen</string>
   <string name="folder_list_filter_hint">map naam bevat</string>
   <string name="folder_list_display_mode_label">Mappen</string>
   <string name="folder_list_display_mode_all">Laat alle mappen zien</string>

res/values-pl/strings.xml

@@ -1,15 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--####################################################################################-->
-<!--##                                                                                ##-->
-<!--##         Polska wersja jezykowa: Marcin Orlowski <carlos@wfmh.org.pl>           ##-->
-<!--##                                                                                ##-->
-<!--## Latest update: (YYYY-MM-DD): 2013.10.30                                        ##-->
-<!--## Modified by rabbbit, 2011.03.03                                                ##-->
-<!--## Updated by Błażej Jeżewski, 2012.04.10                                         ##-->
-<!--## Updated by Mirosław Lach, 2013.07.15                                           ##-->
-<!--## Updated by Jacek Sowiński, 2013.10.30                                          ##-->
-<!--##                                                                                ##-->
-<!--####################################################################################-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!--=== App-specific strings =============================================================-->
   <!--This should make it easier for forks to change the branding-->
@@ -44,7 +33,7 @@ Najistotniejsze ulepszenia wprowadzone w K-9 względem systemowej aplikacji, to:
   <li>Skróty klawiszowe</li>
   <li>Lepsza obsługa protokołu IMAP</li>
   <li>Zapisywanie załączników na kartę SD</li>
-  <li>Opróźnianie folderu \"Trash\"</li>
+  <li>Opróźnianie folderu "Trash"</li>
   <li>Sortowanie wiadomości</li>
   <li>… i wiele innych</li>
 </ul>
@@ -406,9 +395,12 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="account_setup_options_mail_display_count_all">Wszystkie wiadomości</string>
   <string name="move_copy_cannot_copy_unsynced_message">Nie mogę skopiować ani przenieść wiadomości, która nie jest zsynchronizowana z serwerem</string>
   <string name="account_setup_failed_dlg_title">Wystąpił błąd</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Podany identyfikator lub hasło jest nieprawidłowe.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Nie mogę nawiązać bezpiecznego połączenia z serwerem.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Nie mogę połączyć się z serwerem.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Podany identyfikator lub hasło jest nieprawidłowe.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Nie mogę nawiązać bezpiecznego połączenia z serwerem.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Nie mogę połączyć się z serwerem.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Popraw ustawienia</string>
   <string name="account_setup_failed_dlg_continue_action">Kontynuuj</string>
   <string name="account_settings_push_advanced_title">Zaawansowane</string>
@@ -620,31 +612,8 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odrzuć</string>
-  <string name="message_list_help_key">
-        Del lub D - Usuń\n
-        R - Odpowiedz\n
-        A - Odp. wszystkim\n
-        C - Napisz\n
-        F - Przekaż\n
-        M - Przenieś\n
-        V - Archiwizuj\n
-        Y - Skopiuj\n
-        Z - Przełącz przeczytane/nieprzeczytane\n
-        G - Gwiazdka\n
-        O - Typ sortowania\n
-        I - Porządek sortowania\n
-        Q - Widok folderów\n
-        S - Zaznacz/odznacz\n
-        J lub P - Poprzednia wiadomość\n
-        K lub N - Następna wiadomość
-  </string>
-  <string name="folder_list_help_key">
-    1 - Wyśw. tylko foldery 1szej klasy\n
-    2 - Wyśw. foldery 1szej i 2giej klasy\n
-    3 - Wyśw. wszystkie poza folderami 2giej klasy\n
-    4 - Wyświetl wszystkie foldery\n
-    Q - Lista kont\n
-    S - Edytuj ustawienia konta</string>
+  <string name="message_list_help_key">Del lub D - Usuń\nR - Odpowiedz\nA - Odp. wszystkim\nC - Napisz\nF - Przekaż\nM - Przenieś\nV - Archiwizuj\nY - Skopiuj\nZ - Przełącz przeczytane/nieprzeczytane\nG - Gwiazdka\nO - Typ sortowania\nI - Porządek sortowania\nQ - Widok folderów\nS - Zaznacz/odznacz\nJ lub P - Poprzednia wiadomość\nK lub N - Następna wiadomość</string>
+  <string name="folder_list_help_key">1 - Wyśw. tylko foldery 1szej klasy\n2 - Wyśw. foldery 1szej i 2giej klasy\n3 - Wyśw. wszystkie poza folderami 2giej klasy\n4 - Wyświetl wszystkie foldery\nQ - Lista kont\nS - Edytuj ustawienia konta</string>
   <string name="folder_list_filter_hint">Wpisz nazwę folderu</string>
   <string name="folder_list_display_mode_label">Wyświetlanie folderów</string>
   <string name="folder_list_display_mode_all">Wszystkie</string>
@@ -781,17 +750,9 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="select_text_now">Wybierz tekst do skopiowania.</string>
   <string name="dialog_confirm_delete_title">Potwiedź usunięcie</string>
   <string name="dialog_confirm_delete_message">Czy chcesz usunąć tą wiadomość?</string>
-  <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Na pewno chcesz usunąć wiadomość?</item>
-    <item quantity="other">Na pewno chcesz usunąć <xliff:g id="message_count">%1$d</xliff:g> wiadomości?</item>
-  </plurals>
   <string name="dialog_confirm_delete_confirm_button">Usuń</string>
   <string name="dialog_confirm_delete_cancel_button">Nie usuwaj</string>
   <string name="dialog_confirm_spam_title">Potwierdź przeniesienie do spamu</string>
-  <plurals name="dialog_confirm_spam_message">
-    <item quantity="one">Na pewno przenieść wiadomość do spamu?</item>
-    <item quantity="other">Na pewno przenieść <xliff:g id="message_count">%1$d</xliff:g> wiadomości do spamu?</item>
-  </plurals>
   <string name="dialog_confirm_spam_confirm_button">Tak</string>
   <string name="dialog_confirm_spam_cancel_button">Nie</string>
   <string name="dialog_attachment_progress_title">Pobieranie załącznika</string>
@@ -813,10 +774,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="settings_export_success">Zapisano ustawienia do <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_global_settings_success">Importowano ustawienia z <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_success">Importowano <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
-  <plurals name="settings_import_accounts">
-    <item quantity="one">1 konto</item>
-    <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> kont</item>
-  </plurals>
   <string name="settings_export_failure">Błąd eksportu</string>
   <string name="settings_import_failure">Błąd importu z <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_export_success_header">Eksport udany</string>
@@ -825,16 +782,8 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="settings_import_failed_header">Import nieudany</string>
   <string name="settings_import_activate_account_header">Aktywuj konto</string>
   <string name="settings_import_activate_account_intro">Żeby użwyać konta \"<xliff:g id="account">%s</xliff:g>\" musisz zapewnić <xliff:g id="server_passwords">%s</xliff:g>.</string>
-  <plurals name="settings_import_server_passwords">
-    <item quantity="one">hasło serwera</item>
-    <item quantity="other">hasła serwera</item>
-  </plurals>
   <string name="settings_import_incoming_server">Serwer przychodzący (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">Serwer wychodzący (<xliff:g id="hostname">%s</xliff:g>):</string>
-  <plurals name="settings_import_setting_passwords">
-    <item quantity="one">Ustawiam hasło…</item>
-    <item quantity="other">Ustawiam hasła…</item>
-  </plurals>
   <string name="settings_import_use_incoming_server_password">Użyj hasła serwera przychodzącego</string>
   <string name="activate_account_action">Aktywuj</string>
   <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" jest niedostępne; sprawdź dostępną pamięć</string>

res/values-pt-rBR/strings.xml

@@ -394,9 +394,12 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="account_setup_options_mail_display_count_all">Todas as Mensagens</string>
   <string name="move_copy_cannot_copy_unsynced_message">Não é possível copiar ou mover uma mensagem que não foi sincronizada com o servidor</string>
   <string name="account_setup_failed_dlg_title">A configuração não pode ser concluída</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Usuário ou senha incorretos.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Não é possível conectar com segurança ao servidor.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Não é possível conectar ao servidor.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Usuário ou senha incorretos.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Não é possível conectar com segurança ao servidor.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Não é possível conectar ao servidor.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Editar detalhes</string>
   <string name="account_setup_failed_dlg_continue_action">Continuar</string>
   <string name="account_settings_push_advanced_title">Avançado</string>
@@ -605,31 +608,8 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconhecido</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceitar chave</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Recusar chave</string>
-  <string name="message_list_help_key">
-    Del (or D) - Excluir\n
-    R - Responder\n
-    A - Responder a todos\n
-    C - Escrever\n
-    F - Encaminhar\n
-    M - Mover\n
-    V - Arquivar\n
-    Y - Copiar\n
-    Z - Marcar como não-lida\n
-    G - Favoritar\n
-    O - Tipo de ordenação\n
-    I - Ordernar\n
-    Q - Retornar à pastas\n
-    S - Selecionar/deselecionar\n
-    J, P - Mensagem anterior\n
-    K, N - Próxima mensagem
-  </string>
-  <string name="folder_list_help_key">
-    1 - Mostrar apenas pastas de Primeira Classe\u000A
-    2 - Mostrar pastas de Primeira e Segunda Classe\u000A
-    3 - Mostrar todas exceto as de Segunda Classe\u000A
-    4 - Mostrar todas as pastas\u000A
-    Q - Retornar para contas\u000A
-    S - Editar Configurações de Conta</string>
+  <string name="message_list_help_key">Del (or D) - Excluir\nR - Responder\nA - Responder a todos\nC - Escrever\nF - Encaminhar\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar como não-lida\nG - Favoritar\nO - Tipo de ordenação\nI - Ordernar\nQ - Retornar à pastas\nS - Selecionar/deselecionar\nJ, P - Mensagem anterior\nK, N - Próxima mensagem</string>
+  <string name="folder_list_help_key">1 - Mostrar apenas pastas de Primeira Classe\n2 - Mostrar pastas de Primeira e Segunda Classe\n3 - Mostrar todas exceto as de Segunda Classe\n4 - Mostrar todas as pastas\nQ - Retornar para contas\nS - Editar Configurações de Conta</string>
   <string name="folder_list_filter_hint">o nome da pasta contém</string>
   <string name="folder_list_display_mode_label">Pastas</string>
   <string name="folder_list_display_mode_all">Mostrar todas as pastas</string>

res/values-ru/strings.xml

@@ -303,6 +303,9 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_setup_account_type_pop_action">POP3</string>
   <string name="account_setup_account_type_imap_action">IMAP</string>
   <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+  <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_incoming_title">Сервер входящей почты</string>
   <string name="account_setup_incoming_username_label">Логин</string>
   <string name="account_setup_incoming_password_label">Пароль</string>
@@ -313,6 +316,8 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_setup_incoming_security_label">Безопасность</string>
   <string name="account_setup_incoming_auth_type_label">Аутентификация</string>
   <string name="account_setup_incoming_security_none_label">Нет</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">Удалённое, на сервере</string>
   <string name="account_setup_incoming_delete_policy_never_label">Оставить</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Удалить</string>
@@ -393,12 +398,18 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_setup_options_mail_display_count_250">250</string>
   <string name="account_setup_options_mail_display_count_500">500</string>
   <string name="account_setup_options_mail_display_count_1000">1000</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 сообщений</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 сообщений</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 сообщений</string>
   <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">Сбой безопасного подключения к серверу.\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_auth_message_fmt">Неверные логин или пароль.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Сбой безопасного подключения к серверу.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Сбой подключения к серверу.
+(<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>
@@ -610,31 +621,8 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_setup_failed_dlg_invalid_certificate_title">Неверный сертификат сервера</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Принять</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Отклонить</string>
-  <string name="message_list_help_key">
-    Del, D - Удалить\n
-    R - Ответить\n
-    A - Ответить всем\n
-    C - Новое\n
-    F - Переслать\n
-    M - Переместить\n
-    V - В архив\n
-    Y - Копия\n
-    Z - Прочитано\n
-    G - Важность\n
-    O - Признак сортировки\n
-    I - Порядок сортировки\n
-    Q - Папки\n
-    S - Выделение\n
-    J, P - Назад\n
-    K, N - Далее
-  </string>
-  <string name="folder_list_help_key">
-    1 - Папки 1 класса\u000A
-    2 - Папки 1 и 2 классов\u000A
-    3 - Все папки, кроме 2 класса\u000A
-    4 - Все папки\u000A
-    Q - К списку ящиков\u000A
-    S - Настройки ящика</string>
+  <string name="message_list_help_key">Del, D - Удалить\nR - Ответить\nA - Ответить всем\nC - Новое\nF - Переслать\nM - Переместить\nV - В архив\nY - Копия\nZ - Прочитано\nG - Важность\nO - Признак сортировки\nI - Порядок сортировки\nQ - Папки\nS - Выделение\nJ, P - Назад\nK, N - Далее</string>
+  <string name="folder_list_help_key">1 - Папки 1 класса\n2 - Папки 1 и 2 классов\n3 - Все папки, кроме 2 класса\n4 - Все папки\nQ - К списку ящиков\nS - Настройки ящика</string>
   <string name="folder_list_filter_hint">Поиск папки</string>
   <string name="folder_list_display_mode_label">Видимость папок</string>
   <string name="folder_list_display_mode_all">Все папки</string>
@@ -731,6 +719,8 @@ K-9 Mail — почтовый клиент для Android.
   <string name="font_size_message_view_subject">Тема</string>
   <string name="font_size_message_view_date">Дата и время</string>
   <string name="font_size_message_view_content">Тело сообщения</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">Редактор сообщения</string>
   <string name="font_size_message_compose_input">Формы ввода</string>
   <string name="font_size_default">По умолчанию</string>
@@ -773,6 +763,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="dialog_confirm_delete_message">Сообщение будет удалено. Продолжить?</string>
   <plurals name="dialog_confirm_delete_messages">
     <item quantity="one">Сообщение будет удалено. Продолжить?</item>
+    <item quantity="few">Сообщения (<xliff:g id="message_count">%1$d</xliff:g> шт.) будут удалены. Продолжить?</item>
     <item quantity="other">Сообщения (<xliff:g id="message_count">%1$d</xliff:g> шт.) будут удалены. Продолжить?</item>
   </plurals>
   <string name="dialog_confirm_delete_confirm_button">ОК</string>
@@ -780,6 +771,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="dialog_confirm_spam_title">Перемещение в спам</string>
   <plurals name="dialog_confirm_spam_message">
     <item quantity="one">Сообщение будет перемещено в Спам. Продолжить?</item>
+    <item quantity="few">Сообщения (<xliff:g id="message_count">%1$d</xliff:g> шт.) будут перемещены в Спам. Продолжить?</item>
     <item quantity="other">Сообщения (<xliff:g id="message_count">%1$d</xliff:g> шт.) будут перемещены в Спам. Продолжить?</item>
   </plurals>
   <string name="dialog_confirm_spam_confirm_button">ОК</string>
@@ -825,6 +817,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="settings_import_outgoing_server">Сервер исходящей почты (<xliff:g id="hostname">%s</xliff:g>):</string>
   <plurals name="settings_import_setting_passwords">
     <item quantity="one">Проверка пароля…</item>
+    <item quantity="few">Проверка паролей…</item>
     <item quantity="other">Проверка паролей…</item>
   </plurals>
   <string name="settings_import_use_incoming_server_password">Как для входящей</string>
@@ -911,4 +904,17 @@ K-9 Mail — почтовый клиент для Android.
   <string name="fetching_attachment_dialog_title_save">Сохранение черновика</string>
   <string name="fetching_attachment_dialog_message">Получение вложений…</string>
   <!--=== OpenPGP specific ==================================================================-->
+  <string name="openpgp_decrypting_verifying">Дешифрование или проверка…</string>
+  <string name="openpgp_successful_decryption">Дешифрование выполнено</string>
+  <string name="openpgp_signature_valid_certified">Подпись действительна (проверено)</string>
+  <string name="openpgp_signature_valid_uncertified">Подпись действительна, не проверено</string>
+  <string name="openpgp_signature_unknown">Подписант неизвестен</string>
+  <string name="openpgp_signature_invalid">Подпись недействительна</string>
+  <string name="openpgp_signature_unknown_text">Нет открытого ключа для этой подписи</string>
+  <string name="openpgp_successful_decryption_valid_signature_certified">Дешифрование выполнено, подпись действительна (проверено)</string>
+  <string name="openpgp_successful_decryption_valid_signature_uncertified">Дешифрование выполнено, подпись действительна, но не проверена</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Дешифрование выполнено, но отсутствует открытый ключ</string>
+  <string name="openpgp_get_key">Поиск отсутствующего ключа</string>
+  <string name="openpgp_error">Ошибка OpenPGP:</string>
+  <string name="openpgp_user_id">ID пользователя</string>
 </resources>

res/values-sk/strings.xml

@@ -7,8 +7,8 @@
   <string name="beta_app_name">K-9 Mail BETA</string>
   <string name="shortcuts_title">K-9 Účty</string>
   <string name="unread_widget_label">K-9 Neprečítaná</string>
-  <string name="remote_control_label">Diaľkové ovládanie aplikácie K-9 Mail</string>
-  <string name="remote_control_desc">Umožní tejto aplikácii ovládať aktivity a nastavenia aplikácie K-9 Mail.</string>
+  <string name="remote_control_label">diaľkové ovládanie K-9 Mail</string>
+  <string name="remote_control_desc">Umožňuje tejto aplikácii ovládať aktivity a nastavenia K-9 Mail.</string>
   <!--Used in the about dialog-->
   <string name="app_authors">Google, The K-9 Dog Walkers.</string>
   <string name="app_copyright_fmt">Autorské práva 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
@@ -17,7 +17,7 @@
   <string name="welcome_message_title">Vitajte v K-9 Mail</string>
   <string name="accounts_welcome"><![CDATA[
 <p>
-K-9 Mail je výkonný e-mailový klient pre Android a navyše je zadarmo.
+K-9 Mail je výkonný a bezplatný e-mailový klient pre Android.
 </p><p>
 Jeho vylepšené funkcie zahŕňajú:
 </p>
@@ -27,18 +27,18 @@ Jeho vylepšené funkcie zahŕňajú:
   <li>Doplňovanie správ</li>
   <li>Podpisy správ</li>
   <li>Skrytá kópia sebe</li>
-  <li>Odoberané priečinky</li>
+  <li>Odbery priečinkov</li>
   <li>Synchronizácia všetkých priečinkov</li>
   <li>Nastavenie spiatočnej adresy</li>
   <li>Klávesové skratky</li>
   <li>Lepšia podpora pre IMAP</li>
   <li>Ukladanie príloh na kartu SD</li>
   <li>Vyprázdňovanie koša</li>
-  <li>Triedenie správ</li>
+  <li>Zoraďovanie správ</li>
   <li>…a ďalšie</li>
 </ul>
 <p>
-Vezmite prosím na vedomie, že K-9 nepodporuje väčšinu Hotmail účtov a ako mnoho ďalších e-mailových klientov vykazuje zvláštnosti pri komunikácii s Microsoft Exchange.
+Vezmite, prosím, na vedomie, že K-9 Mail nepodporuje väčšinu bezplatných účtov Hotmail a ako mnoho ďalších e-mailových klientov vykazuje zvláštnosti pri komunikácii s Microsoft Exchange.
 </p><p>
 Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte sa na
 <a href="http://k9mail.googlecode.com/">http://k9mail.googlecode.com/</a>.
@@ -48,11 +48,11 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="default_signature">-- \nOdoslané z môjho Android zariadenia pomocou K-9 Mail.</string>
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstránený z K-9 Mail.</string>
-  <string name="account_recreate_dlg_instructions_fmt">Všetky dáta pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú však zachované.</string>
+  <string name="account_recreate_dlg_instructions_fmt">Všetky lokálne údaje pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú zachované.</string>
   <string name="account_clear_dlg_instructions_fmt">Všetky správy pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú však zachované.</string>
-  <string name="insufficient_apg_permissions">K-9 nemá povolenia k plnému prístupu k APG, pre opravu prosím, preinštalujte K-9 Mail.</string>
+  <string name="insufficient_apg_permissions">K-9 nemá povolenia k plnému prístupu k APG. Prosím, preinštalujte K-9 Mail na opravu tohto problému.</string>
   <!--=== App Store-specific strings =======================================================-->
-  <string name="import_dialog_error_message">Prosím, nainštalujte správcu súborov pre pokračovanie v tomto importovaní.</string>
+  <string name="import_dialog_error_message">Nainštalujte, prosím, správcu súborov pre pokračovanie v tomto importovaní.</string>
   <string name="open_market">Otvoriť Obchod Play</string>
   <!--=== General strings ==================================================================-->
   <string name="app_authors_fmt">Autori: <xliff:g id="app_authors">%s</xliff:g></string>
@@ -60,11 +60,11 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="app_libraries">Používame tieto knižnice tretích strán: <xliff:g id="app_libraries_list">%s</xliff:g></string>
   <string name="app_emoji_icons">Ikony Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
   <string name="read_attachment_label">čítať prílohy správ</string>
-  <string name="read_attachment_desc">Povolí tejto aplikácii čítať prílohy Vašich správ.</string>
+  <string name="read_attachment_desc">Umožňuje tejto aplikácii čítať prílohy vašich e-mailov.</string>
   <string name="read_messages_label">čítať správy</string>
-  <string name="read_messages_desc">Povolí tejto aplikácii čítať Vaše správy.</string>
+  <string name="read_messages_desc">Umožňuje tejto aplikácii čítať vaše e-maily.</string>
   <string name="delete_messages_label">mazať správy</string>
-  <string name="delete_messages_desc">Povolí tejto aplikácii mazať Vaše správy.</string>
+  <string name="delete_messages_desc">Umožňuje tejto aplikácii mazať vaše e-maily.</string>
   <string name="about_title_fmt">O aplikácii <xliff:g id="app_name">%s</xliff:g></string>
   <string name="accounts_title">Účty</string>
   <string name="folders_title">Priečinky</string>
@@ -209,6 +209,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="message_compose_quote_header_to">Komu:</string>
   <string name="message_compose_quote_header_cc">Kópia:</string>
   <string name="message_compose_reply_header_fmt">Používateľ <xliff:g id="sender">%s</xliff:g> napísal:</string>
+  <string name="message_compose_reply_header_fmt_with_date">Dňa <xliff:g id="sent_date">%1$s</xliff:g> používateľ <xliff:g id="sender">%2$s</xliff:g> napísal:</string>
   <string name="message_compose_error_no_recipients">Musíte pridať aspoň jedného príjemcu.</string>
   <string name="error_contact_address_not_found">Nebola nájdená žiadna e-mailová adresa pre tento kontakt.</string>
   <string name="message_compose_attachments_skipped_toast">Niektoré prílohy nemožno preposlať, pretože neboli stiahnuté.</string>
@@ -253,7 +254,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="global_settings_show_contact_name_summary">Použiť mená príjemcov z kontaktov, ak sú k dispozícii</string>
   <string name="global_settings_registered_name_color_label">Zafarbiť kontakty</string>
   <string name="global_settings_registered_name_color_default">Nepoužívať zafarbenie mien v zozname kontaktov</string>
-  <string name="global_settings_registered_name_color_changed">Zafarbiť mená vo Vašom zozname kontaktov</string>
+  <string name="global_settings_registered_name_color_changed">Zafarbiť mená v zozname kontaktov</string>
   <string name="global_settings_folderlist_wrap_folder_names_label">Skracovať dlhé názvy priečinkov</string>
   <string name="global_settings_folderlist_wrap_folder_names_summary">Použiť viac riadkov pre zobrazenie dlhých názvov priečinkov</string>
   <string name="global_settings_messageview_fixedwidth_label">Písma s pevnou šírkou</string>
@@ -296,12 +297,15 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_check_settings_canceling_msg">Rušenie\u2026</string>
   <string name="account_setup_names_title">Takmer hotovo!</string>
   <string name="account_setup_names_account_name_label">Pomenovať tento účet (voliteľné):</string>
-  <string name="account_setup_names_user_name_label">Zadajte Vaše meno (zobrazí sa v odchádzajúcich správach):</string>
+  <string name="account_setup_names_user_name_label">Zadajte vaše meno (zobrazí sa v odchádzajúcich správach):</string>
   <string name="account_setup_account_type_title">Typ účtu</string>
   <string name="account_setup_account_type_instructions">Typ účtu</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
   <string name="account_setup_account_type_imap_action">IMAP</string>
   <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+  <string name="account_setup_auth_type_normal_password">Normálne heslo</string>
+  <string name="account_setup_auth_type_insecure_password">Heslo, prenášané nezabezpečene</string>
+  <string name="account_setup_auth_type_encrypted_password">Šifrované heslo</string>
   <string name="account_setup_incoming_title">Nastavenia servera prichádzajúcej pošty</string>
   <string name="account_setup_incoming_username_label">Používateľské meno</string>
   <string name="account_setup_incoming_password_label">Heslo</string>
@@ -312,6 +316,8 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_incoming_security_label">Zabezpečenie</string>
   <string name="account_setup_incoming_auth_type_label">Overenie</string>
   <string name="account_setup_incoming_security_none_label">Žiadne</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">Akcia po vymazaní správy</string>
   <string name="account_setup_incoming_delete_policy_never_label">Ponechať na serveri</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Vymazať na serveri</string>
@@ -355,7 +361,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_options_title">Možnosti účtu</string>
   <string name="compact_action">Zmenšiť účet</string>
   <string name="clear_action">Vyčistiť správy (nebezpečné)</string>
-  <string name="recreate_action">Obnoviť dáta (posledná možnosť)</string>
+  <string name="recreate_action">Obnoviť údaje (posledná možnosť)</string>
   <string name="account_setup_options_mail_check_frequency_label">Frekvencia synchronizácie priečinkov</string>
   <string name="account_setup_options_mail_check_frequency_never">Nikdy</string>
   <string name="account_setup_options_mail_check_frequency_1min">Každú minútu</string>
@@ -392,12 +398,18 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_options_mail_display_count_250">250 správ</string>
   <string name="account_setup_options_mail_display_count_500">500 správ</string>
   <string name="account_setup_options_mail_display_count_1000">1000 správ</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 správ</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 správ</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 správ</string>
   <string name="account_setup_options_mail_display_count_all">Všetky správy</string>
   <string name="move_copy_cannot_copy_unsynced_message">Nemožno skopírovať alebo presunúť správu, ktorá nie je synchronizovaná so serverom</string>
   <string name="account_setup_failed_dlg_title">Nastavenie nemohlo byť dokončené</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Používateľské meno alebo heslo je nesprávne.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Nemožno sa bezpečne pripojiť k serveru.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Nemožno sa pripojiť k serveru.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Používateľské meno alebo heslo je nesprávne.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Nemožno sa bezpečne pripojiť k serveru. Server predložil neplatný certifikát SSL.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Nemožno sa pripojiť k serveru.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Upraviť podrobnosti</string>
   <string name="account_setup_failed_dlg_continue_action">Pokračovať</string>
   <string name="account_settings_push_advanced_title">Pokročilé</string>
@@ -423,9 +435,9 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_show_pictures_always">Od každého</string>
   <string name="account_settings_composition">Odosielanie správ</string>
   <string name="account_settings_default_quoted_text_shown_label">Citovať správu pri odpovedi</string>
-  <string name="account_settings_default_quoted_text_shown_summary">Zahrnúť pôvodnú správu do Vašej odpovede</string>
+  <string name="account_settings_default_quoted_text_shown_summary">Zahrnúť pôvodnú správu do vašej odpovede</string>
   <string name="account_settings_reply_after_quote_label">Odpovedať za citovaným textom</string>
-  <string name="account_settings_reply_after_quote_summary">Pôvodná správa bude umiestnená nad Vašou odpoveďou</string>
+  <string name="account_settings_reply_after_quote_summary">Pôvodná správa bude umiestnená nad vašou odpoveďou</string>
   <string name="account_settings_strip_signature_label">Odstrániť podpis z citovanej odpovedi</string>
   <string name="account_settings_strip_signature_summary">Podpisy budú odstránené z citovaných správ</string>
   <string name="account_settings_message_format_label">Formát správy</string>
@@ -609,31 +621,8 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_setup_failed_dlg_invalid_certificate_title">Neznámy certifikát</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Prijať kľúč</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odmietnuť kľúč</string>
-  <string name="message_list_help_key">
-    Del (alebo D) - Vymazať\n
-    R - Odpovedať\n
-    A - Odpovedať všetkým\n
-    C - Vytvoriť\n
-    F - Preposlať\n
-    M - Presunúť\n
-    V - Archivovať\n
-    Y - Kopírovať\n
-    Z - Označiť ako (ne)prečítané\n
-    G - Hviezdička\n
-    O - Typ zoradenia\n
-    I - Poradie zoradenia\n
-    Q - Návrat do priečinkov\n
-    S - Označiť/odznačiť\n
-    J alebo P - Predchádzajúca správa\n
-    K alebo N - Ďalšia správa\n
-  </string>
-  <string name="folder_list_help_key">
-    1 - Zobrazí len priečinky 1. triedy\u000A
-    2 - Zobrazí priečinky 1. a 2. triedy\u000A
-    3 - Zobrazí všetky okrem priečinkov 2. triedy\u000A
-    4 - Zobrazí všetky priečinky\u000A
-    Q - Návrat do účtov\u000A
-    S - Úprava nastavení účtu</string>
+  <string name="message_list_help_key">Del (alebo D) - Vymazať\nR - Odpovedať\nA - Odpovedať všetkým\nC - Vytvoriť\nF - Preposlať\nM - Presunúť\nV - Archivovať\nY - Kopírovať\nZ - Označiť ako (ne)prečítané\nG - Hviezdička\nO - Typ zoradenia\nI - Poradie zoradenia\nQ - Návrat do priečinkov\nS - Označiť/odznačiť\nJ alebo P - Predchádzajúca správa\nK alebo N - Ďalšia správa</string>
+  <string name="folder_list_help_key">1 - Zobrazí len priečinky 1. triedy\n2 - Zobrazí priečinky 1. a 2. triedy\n3 - Zobrazí všetky okrem priečinkov 2. triedy\n4 - Zobrazí všetky priečinky\nQ - Návrat do účtov\nS - Úprava nastavení účtu</string>
   <string name="folder_list_filter_hint">názov priečinka obsahuje</string>
   <string name="folder_list_display_mode_label">Zobraziť priečinky…</string>
   <string name="folder_list_display_mode_all">Všetky priečinky</string>
@@ -665,7 +654,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="settings_message_theme_selection_summary_on">Použiť pevnú tému pri prehliadaní správ</string>
   <string name="settings_messageview_mobile_layout_label">Úprava usporiadania</string>
   <string name="settings_messageview_mobile_layout_summary">Preformátovať HTML správy pre menšie obrazovky</string>
-  <string name="setting_language_system">Systémový</string>
+  <string name="setting_language_system">Predvolený systémom</string>
   <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>
@@ -730,16 +719,18 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="font_size_message_view_subject">Skrytá kópia</string>
   <string name="font_size_message_view_date">Čas a dátum</string>
   <string name="font_size_message_view_content">Telo správy</string>
+  <string name="font_size_message_view_content_summary"><xliff:g id="fontsize">%d</xliff:g>%%</string>
+  <string name="font_size_message_view_content_dialog_title"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
   <string name="font_size_message_compose">Písanie správy</string>
   <string name="font_size_message_compose_input">Pole na zadávanie textu</string>
-  <string name="font_size_default">Predvolená</string>
-  <string name="font_size_tiniest">Najmenšia</string>
-  <string name="font_size_tiny">Maličká</string>
-  <string name="font_size_smaller">Menšia</string>
-  <string name="font_size_small">Malá</string>
-  <string name="font_size_medium">Stredná</string>
-  <string name="font_size_large">Veľká</string>
-  <string name="font_size_larger">Väčší</string>
+  <string name="font_size_default">Predvolené</string>
+  <string name="font_size_tiniest">Najmenšie</string>
+  <string name="font_size_tiny">Maličké</string>
+  <string name="font_size_smaller">Menšie</string>
+  <string name="font_size_small">Malé</string>
+  <string name="font_size_medium">Stredné</string>
+  <string name="font_size_large">Veľké</string>
+  <string name="font_size_larger">Väčšie</string>
   <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
   <string name="message_compose_buggy_gallery">Skontrolujte \"Nastavenia\" -&gt; \"Používať riešenie chyby pre Galériu\", aby ste boli schopný pripojiť obrázky alebo videá pomocou Galérie 3D.</string>
   <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
@@ -760,9 +751,9 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="attachment_encryption_unsupported">Varovanie: prílohy zatiaľ nie je možné podpísať či šifrovať.</string>
   <string name="send_aborted">Odosielanie prerušené.</string>
   <string name="save_or_discard_draft_message_dlg_title">Uložiť koncept správy?</string>
-  <string name="save_or_discard_draft_message_instructions_fmt">Ste si istí, že chcete uložiť túto správu?</string>
+  <string name="save_or_discard_draft_message_instructions_fmt">Uložiť alebo zahodiť túto správu?</string>
   <string name="confirm_discard_draft_message_title">Zahodiť správu?</string>
-  <string name="confirm_discard_draft_message">Ste si istí, že chcete zahodiť túto správu?</string>
+  <string name="confirm_discard_draft_message">Ste si istý, že chcete zahodiť túto správu?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Odmietnuť uloženie konceptu správy.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Odmietnuť uloženie konceptu zašifrovanej správy.</string>
   <string name="continue_without_public_key_dlg_title">Pokračovať bez verejného kľúča?</string>
@@ -771,7 +762,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="dialog_confirm_delete_title">Potvrdiť vymazanie</string>
   <string name="dialog_confirm_delete_message">Chcete vymazať túto správu?</string>
   <plurals name="dialog_confirm_delete_messages">
-  <item quantity="one">Vymazať túto správu?</item>
+    <item quantity="one">Vymazať túto správu?</item>
     <item quantity="few">Vymmazať <xliff:g id="message_count">%1$d</xliff:g> správy?</item>
     <item quantity="other">Vymazať <xliff:g id="message_count">%1$d</xliff:g> správ?</item>
   </plurals>
@@ -779,7 +770,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="dialog_confirm_delete_cancel_button">Nie</string>
   <string name="dialog_confirm_spam_title">Potvrdiť presun do priečinka Nevyžiadaná</string>
   <plurals name="dialog_confirm_spam_message">
-  <item quantity="one">Presunúť túto správu do priečinka Nevyžiadaná?</item>
+    <item quantity="one">Presunúť túto správu do priečinka Nevyžiadaná?</item>
     <item quantity="few">Presunúť <xliff:g id="message_count">%1$d</xliff:g> správy do priečinka Nevyžiadaná?</item>
     <item quantity="other">Presunúť <xliff:g id="message_count">%1$d</xliff:g> správ do priečinka Nevyžiadaná?</item>
   </plurals>
@@ -790,22 +781,22 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="messagelist_sent_to_me_sigil">»</string>
   <string name="messagelist_sent_cc_me_sigil">›</string>
   <string name="error_unable_to_connect">Nemožno pripojiť.</string>
-  <string name="import_export_action">Import &amp; export nastavení</string>
+  <string name="import_export_action">Importovať &amp; exportovať nastavenia</string>
   <string name="settings_export_account">Exportovať nastavenia účtu</string>
   <string name="settings_export_all">Exportovať nastavenia a účty</string>
-  <string name="settings_import_dialog_title">Import</string>
-  <string name="settings_export_dialog_title">Export</string>
-  <string name="settings_import">Import nastavení</string>
-  <string name="settings_import_selection">Výber importu</string>
+  <string name="settings_import_dialog_title">Importovať</string>
+  <string name="settings_export_dialog_title">Exportovať</string>
+  <string name="settings_import">Importovať nastavenia</string>
+  <string name="settings_import_selection">Výber importovania</string>
   <string name="settings_import_global_settings">Všeobecné nastavenia</string>
   <string name="settings_exporting">Exportovanie nastavení…</string>
   <string name="settings_importing">Importovanie nastavení…</string>
   <string name="settings_import_scanning_file">Skenovanie súboru…</string>
   <string name="settings_export_success">Exportované nastavenia boli uložené do <xliff:g id="filename">%s</xliff:g></string>
   <string name="settings_import_global_settings_success">Importované všeobecné nastavenia z <xliff:g id="filename">%s</xliff:g></string>
-  <string name="settings_import_success">Importované: <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
+  <string name="settings_import_success">Importované <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
   <plurals name="settings_import_accounts">
-  <item quantity="one">1 účet</item>
+    <item quantity="one">1 účet</item>
     <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> účty</item>
     <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> účtov</item>
   </plurals>
@@ -818,15 +809,16 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="settings_import_activate_account_header">Aktivovať účet</string>
   <string name="settings_import_activate_account_intro">Pre používanie účtu \"<xliff:g id="account">%s</xliff:g>\" je potrebné poskytnúť <xliff:g id="server_passwords">%s</xliff:g>.</string>
   <plurals name="settings_import_server_passwords">
-  <item quantity="one">heslo</item>
+    <item quantity="one">heslo</item>
     <item quantity="few">heslá</item>
     <item quantity="other">hesiel</item>
   </plurals>
   <string name="settings_import_incoming_server">Server prichádzajúcej pošty (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">Server odchádzajúcej pošty (<xliff:g id="hostname">%s</xliff:g>):</string>
   <plurals name="settings_import_setting_passwords">
-  <item quantity="one">Nastaviť heslo…</item>
-    <item quantity="other">Nastaviť heslá…</item>
+    <item quantity="one">Nastavovanie hesla…</item>
+    <item quantity="few">Nastavovanie hesiel…</item>
+    <item quantity="other">Nastavovanie hesiel…</item>
   </plurals>
   <string name="settings_import_use_incoming_server_password">Použiť heslo pre server prichádzajúcej pošty</string>
   <string name="activate_account_action">Aktivovať</string>
@@ -879,7 +871,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="remote_search_error">Vzdialené vyhľadávanie sa nepodarilo</string>
   <string name="account_settings_search">Vyhľadávanie</string>
   <string name="account_settings_remote_search_enabled">Povoliť vyhľadávanie na serveri</string>
-  <string name="account_settings_remote_search_enabled_summary">Hľadať správy na serveri, okrem tých na Vašom zariadení</string>
+  <string name="account_settings_remote_search_enabled_summary">Hľadať správy na serveri, okrem tých na vašom zariadení</string>
   <string name="action_remote_search">Vyhľadávať správy na serveri</string>
   <string name="pull_to_refresh_remote_search_from_local_search_pull">Potiahnite pre vyhľadávanie na serveri…</string>
   <string name="pull_to_refresh_remote_search_from_local_search_release">Uvoľnite pre vyhľadávanie na serveri…</string>
@@ -912,4 +904,16 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="fetching_attachment_dialog_title_save">Ukladám koncept</string>
   <string name="fetching_attachment_dialog_message">Sťahujem prílohu…</string>
   <!--=== OpenPGP specific ==================================================================-->
+  <string name="openpgp_decrypting_verifying">Dešifrovanie/overovanie...</string>
+  <string name="openpgp_successful_decryption">Úspešne dešifrované</string>
+  <string name="openpgp_signature_valid_certified">Platný podpis (certifikovaný)</string>
+  <string name="openpgp_signature_valid_uncertified">Platný podpis, ale necertifikovaný</string>
+  <string name="openpgp_signature_unknown">Neznámy podpisovateľ</string>
+  <string name="openpgp_signature_invalid">Neplatný podpis</string>
+  <string name="openpgp_signature_unknown_text">Chýbajúci verejný kľúč pre tento podpis</string>
+  <string name="openpgp_successful_decryption_valid_signature_certified">Úspešne dešifrované a platný podpis (certifikovaný)</string>
+  <string name="openpgp_successful_decryption_valid_signature_uncertified">Úspešne dešifrované a platný podpis, ale necertifikovaný</string>
+  <string name="openpgp_successful_decryption_unknown_signature">Úspešne dešifrované, ale chýbajúci verejný kľúč</string>
+  <string name="openpgp_get_key">Vyhľadať chýbajúci kľúč</string>
+  <string name="openpgp_error">Chyba OpenPGP:</string>
 </resources>

res/values-sv/strings.xml

@@ -396,9 +396,12 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <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">Kan inte upprätta säker anslutning till servern.\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_auth_message_fmt">Felaktigt användarnamn eller lösenord.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Kan inte upprätta säker anslutning till servern.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Kan inte ansluta till servern.
+(<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>
@@ -610,31 +613,8 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <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) - Radera\n
-    R - Svara\n
-    A - Svara alla\n
-    C - Skriv\n
-    F - Vidarebefordra\n
-    M - Flytta\n
-    V - Arkivera\n
-    Y - Kopiera\n
-    Z - Markera som oläst\n
-    G - Stjärna\n
-    O - Sorteringstyp\n
-    I - Sorteringsordning\n
-    Q - Återvänd till mappar\n
-    S - Markera/avmarkera\n
-    J eller P - Föregående brev\n
-    K eller N - Nästa brev
-  </string>
-  <string name="folder_list_help_key">
-    1 - Visa endast första klassens mappar\u000A
-    2 - Visa första och andra klassens mappar\u000A
-    3 - Visa alla förutom andra klassens mappar\u000A
-    4 - Visa alla mappar\u000A
-    Q - Återvänd till konton\u000A
-    S - Redigera kontoinställningar</string>
+  <string name="message_list_help_key">Del (eller D) - Radera\nR - Svara\nA - Svara alla\nC - Skriv\nF - Vidarebefordra\nM - Flytta\nV - Arkivera\nY - Kopiera\nZ - Markera som oläst\nG - Stjärna\nO - Sorteringstyp\nI - Sorteringsordning\nQ - Återvänd till mappar\nS - Markera/avmarkera\nJ eller P - Föregående brev\nK eller N - Nästa brev</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 förutom 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">Mappar</string>
   <string name="folder_list_display_mode_all">Visa alla mappar</string>
@@ -815,14 +795,8 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <string name="settings_import_failed_header">Import misslyckades</string>
   <string name="settings_import_activate_account_header">Activera konto</string>
   <string name="settings_import_activate_account_intro">För att kunna använda kontot \"<xliff:g id="account">%s</xliff:g>\" måste du ange <xliff:g id="server_passwords">%s</xliff:g>.</string>
-  <plurals name="settings_import_server_passwords">
-    <item quantity="other">lösenord för servern</item>
-  </plurals>
   <string name="settings_import_incoming_server">Inkommande server (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">Utgående server (<xliff:g id="hostname">%s</xliff:g>):</string>
-  <plurals name="settings_import_setting_passwords">
-    <item quantity="other">Sätter lösenord…</item>
-  </plurals>
   <string name="settings_import_use_incoming_server_password">Använd lösenordet för inkommande server</string>
   <string name="activate_account_action">Activera</string>
   <string name="account_unavailable">Kontot \"<xliff:g id="account">%s</xliff:g>\" är inte tillgängligt; kontrollera lagring</string>

res/values-tr/strings.xml

@@ -360,9 +360,12 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="account_setup_options_mail_display_count_all">Bütün mesajlar</string>
   <string name="move_copy_cannot_copy_unsynced_message">Sunucu ile eşleştirilmemiş bir mesaj kopyalanamaz veya taşınamaz.</string>
   <string name="account_setup_failed_dlg_title">Kurulum bitirilmedi</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Kullanıcı Adı veya şifre doğru değil.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Sunucuya güvenli bağlantı kurulamadı.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Sunucuya bağlanılamadı.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Kullanıcı Adı veya şifre doğru değil.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Sunucuya güvenli bağlantı kurulamadı.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Sunucuya bağlanılamadı.
+(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_edit_details_action">Ayrıntıları düzenle</string>
   <string name="account_setup_failed_dlg_continue_action">Devam</string>
   <string name="account_settings_push_advanced_title">Gelişmiş</string>
@@ -568,31 +571,8 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="account_setup_failed_dlg_invalid_certificate_title">Tanınmayan Sertifika</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Kabul Tuşu</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Reddetme Tuşu</string>
-  <string name="message_list_help_key"><!--NEW: V untranslated-->
-    Del (veya D) - Sil\n
-    R - Cevapla\n
-    A - Hepsini cevapla\n
-    C - Oluştur\n
-    F - İlet\n
-    M - Taşı\n
-    V - Archive\n
-    Y - Kopyala\n
-    Z - Geçiş oku/okuma\n
-    G - Yıldız\n
-    O - Sıralama tipi\n
-    I - Sıralama şekli\n
-    Q - Klasörlere dön\n
-    S - Seç/seçme\n
-    J, P - Önceki Mesaj\n
-    K, N - Sonraki Mesaj
-  </string>
-  <string name="folder_list_help_key">
-    1 - Yalnız 1. sınıf klasörleri göster\u000A
-    2 - Yalnız 1. ve 2. sınıf klasörleri göster\u000A
-    3 - 2. Sınıf klasörler hariç hepsini göster\u000A
-    4 - Bütün klasörleri göster\u000A
-    Q - Hesaplara dön\u000A
-    S - Hesap ayarlarını düzenle</string>
+  <string name="message_list_help_key">Del (veya D) - Sil\nR - Cevapla\nA - Hepsini cevapla\nC - Oluştur\nF - İlet\nM - Taşı\nV - Archive\nY - Kopyala\nZ - Geçiş oku/okuma\nG - Yıldız\nO - Sıralama tipi\nI - Sıralama şekli\nQ - Klasörlere dön\nS - Seç/seçme\nJ, P - Önceki Mesaj\nK, N - Sonraki Mesaj</string>
+  <string name="folder_list_help_key">1 - Yalnız 1. sınıf klasörleri göster\n2 - Yalnız 1. ve 2. sınıf klasörleri göster\n3 - 2. Sınıf klasörler hariç hepsini göster\n4 - Bütün klasörleri göster\nQ - Hesaplara dön\nS - Hesap ayarlarını düzenle</string>
   <string name="folder_list_filter_hint">klasör adı şunu içeriyor</string>
   <string name="folder_list_display_mode_label">Klasörler</string>
   <string name="folder_list_display_mode_all">Bütün klasörleri göster</string>
@@ -720,12 +700,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="select_text_now">Kopyalamak için metni seç.</string>
   <string name="dialog_confirm_delete_title">Silmeyi onayla</string>
   <string name="dialog_confirm_delete_message">Bu mesajı silmek istiyor musunuz?</string>
-  <!--NEW:
-  <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Do you really want to delete this message?</item>
-    <item quantity="other">Do you really want to delete <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
-  </plurals>
--->
   <string name="dialog_confirm_delete_confirm_button">Sil</string>
   <string name="dialog_confirm_delete_cancel_button">Silme</string>
   <string name="dialog_confirm_spam_title">Spam klasörüne taşımayı onayla</string>

res/values-uk/strings.xml

@@ -14,6 +14,7 @@
   <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
   <string name="app_license">Ліцензія Apache License, Version 2.0.</string>
   <!--Welcome message-->
+  <string name="welcome_message_title">Ласкаво просимо до K-9 Mail</string>
   <string name="accounts_welcome"><![CDATA[
 <p>
 K-9 Mail це поштовий клієнт з відкритим вихідним кодом для Android, який базується на основі стадартної програми Android Mail client.
@@ -66,9 +67,13 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="delete_messages_desc">Дозволити цій програмі видаляти ваші листи.</string>
   <string name="about_title_fmt">Про <xliff:g id="app_name">%s</xliff:g></string>
   <string name="accounts_title">Облікові записи</string>
+  <string name="folders_title">Папки</string>
   <string name="advanced">Додатково</string>
   <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
   <string name="compose_title_compose">Написати новий лист</string>
+  <string name="compose_title_reply">Відповісти</string>
+  <string name="compose_title_reply_all">Відповісти всім</string>
+  <string name="compose_title_forward">Переслати</string>
   <string name="choose_folder_title">Вибрати папку</string>
   <string name="status_loading_account_folder">Запит <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
   <string name="status_loading_account_folder_headers">Отримання заголовків <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
@@ -77,6 +82,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
   <string name="status_next_poll">Наступний запит <xliff:g id="nexttime">%s</xliff:g></string>
   <string name="status_syncing_off">Синхронізація заборонена</string>
+  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> вибраний</string>
   <string name="next_action">Наступний</string>
   <string name="previous_action">Попередній</string>
   <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
@@ -93,6 +99,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="spam_action">Спам</string>
   <string name="forward_action">Переслати</string>
   <string name="move_action">Перемістити</string>
+  <string name="single_message_options_action">Надіслати</string>
   <string name="continue_action">Продовжити</string>
   <string name="back_action">Назад</string>
   <string name="done_action">Готово</string>
@@ -119,6 +126,10 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="unflag_action">Видалити зірочку</string>
   <string name="copy_action">Копіювати</string>
   <string name="select_text_action">Вибрати текст</string>
+  <string name="show_headers_action">Відображати заголовки</string>
+  <string name="hide_headers_action">Приховувати заголовки</string>
+  <string name="message_view_theme_action_dark">Застосувати темну тему</string>
+  <string name="message_view_theme_action_light">Застосувати світлу тему</string>
   <string name="mark_as_unread_action">Відмітити як непрочитаний</string>
   <string name="add_cc_bcc_action">Додати копію/приховану</string>
   <string name="read_receipt">Повідомлення про прочитання</string>
@@ -151,7 +162,14 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <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>
+  <string name="notification_new_messages_title"><xliff:g id="new_message_count">%d</xliff:g> нові повідомлення</string>
   <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>
+  <string name="notification_action_mark_as_read">Позначити як прочитаний</string>
+  <string name="notification_action_delete">Видалити</string>
+  <string name="notification_certificate_error_title">Помилка сертифікату для <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_certificate_error_text">Перевірте налаштування вашого серверу</string>
   <string name="notification_bg_sync_ticker">Перевірка пошти: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Перевірка пошти</string>
   <string name="notification_bg_send_ticker">Надсилання пошти: <xliff:g id="account">%s</xliff:g></string>
@@ -228,13 +246,19 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="global_settings_preview_lines_label">Рядки попереднього перегляду</string>
   <string name="global_settings_show_correspondent_names_label">Показувати ім’я відправника</string>
   <string name="global_settings_show_correspondent_names_summary">Показувати ім’я відправника замість електронної адреси</string>
+  <string name="global_settings_sender_above_subject_label">Відправник вище теми</string>
+  <string name="global_settings_sender_above_subject_summary">Показувати імена відправників над темою, а не нижче теми</string>
   <string name="global_settings_show_contact_name_label">Показувати ім’я одержувача</string>
   <string name="global_settings_show_contact_name_summary">Використовувати ім’я одержувача із контактів, якщо це можливо</string>
   <string name="global_settings_registered_name_color_label">Колір контактів</string>
   <string name="global_settings_registered_name_color_default">Не розфарбовувати імена у списку контактів</string>
   <string name="global_settings_registered_name_color_changed">Розфарбовувати імена у списку контактів</string>
+  <string name="global_settings_folderlist_wrap_folder_names_label">Згорнути довгі імена папок</string>
+  <string name="global_settings_folderlist_wrap_folder_names_summary">Використовувати декілька строчок для перегляду довгих імен папок</string>
   <string name="global_settings_messageview_fixedwidth_label">Шрифти фіксованої щирини</string>
   <string name="global_settings_messageview_fixedwidth_summary">Використовувати шрифт фіксованої ширини для відображення звичайних текстових повідомлень</string>
+  <string name="global_settings_messageview_autofit_width_label">Автоматична доставка повідомлень</string>
+  <string name="global_settings_messageview_autofit_width_summary">Скорочувати повідомлення для відображення на екрані</string>
   <string name="global_settings_messageview_return_to_list_label">Повернутися до списку після вилучення</string>
   <string name="global_settings_messageview_return_to_list_summary">Повернутися до списку повідомлень після вилучення повідомлення</string>
   <string name="global_settings_messageview_show_next_label">Показувати наступне повідомлення після вилучення повідомлення</string>
@@ -244,6 +268,16 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="global_settings_confirm_action_delete">Вилучити (лише перегляд повідомлення)</string>
   <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_notification_hide_subject_title">Приховувати тему в повідомленнях</string>
+  <string name="global_settings_notification_hide_subject_never">Ніколи</string>
+  <string name="global_settings_notification_hide_subject_when_locked">Коли пристрій заблоковано</string>
+  <string name="global_settings_notification_hide_subject_always">Завжди</string>
+  <string name="global_settings_notification_quick_delete_title">Показувати кнопку \"Видалити\"</string>
+  <string name="global_settings_notification_quick_delete_never">Ніколи</string>
+  <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="quiet_time">Час беззвучного режиму</string>
   <string name="quiet_time_description">Заборонити вібрацю, дзвінок та блимання у нічний час</string>
   <string name="quiet_time_starts">Початок часу тишини</string>
@@ -360,9 +394,12 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <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">Не можна безпечно з’єднатися з сервером.\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_auth_message_fmt">Ім’я користувача або пароль неправильні.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">Не можна безпечно з’єднатися з сервером.
+(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Не можна з’єднатися з сервером.
+(<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>
@@ -397,12 +434,14 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_settings_message_format_text">Звичайний текст (не зберігати зображення та форматування)</string>
   <string name="account_settings_message_format_html">HTML (зберігати зображення та форматування)</string>
   <string name="account_settings_message_format_auto">Автоматичний (plain text unless replying to an HTML message)</string>
+  <string name="account_settings_always_show_cc_bcc_label">Завжди показувати Cc/Bcc</string>
   <string name="account_settings_message_read_receipt_label">Повідомлення про прочитання</string>
   <string name="account_settings_message_read_receipt_summary">Завжди запитувати повідомлення про прочитання</string>
   <string name="account_settings_quote_style_label">Стиль цитування</string>
   <string name="account_settings_quote_style_prefix">Префікс (наприклад Gmail, Pine)</string>
   <string name="account_settings_quote_style_header">Заголовок (наприклад Outlook, Yahoo!, Hotmail)</string>
   <string name="account_settings_general_title">Загальні налаштування</string>
+  <string name="account_settings_reading_mail">Читання повідомлення</string>
   <string name="account_settings_sync">Синхронізація пошти</string>
   <string name="account_settings_folders">Папки</string>
   <string name="account_settings_quote_prefix_label">Префікс цитованого тексту</string>
@@ -413,6 +452,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_settings_crypto_auto_signature_summary">Використовувати електронну адресу для формування ключа підпису.</string>
   <string name="account_settings_crypto_auto_encrypt">Автошифрування</string>
   <string name="account_settings_crypto_auto_encrypt_summary">Автоматична установка шифрування, якщо співпадає відкритий ключ одержувача.</string>
+  <string name="account_settings_crypto_apg_not_installed">APG не встановлено</string>
   <string name="account_settings_mail_check_frequency_label">Частота опитування папок</string>
   <string name="account_settings_storage_title">Пам’ять</string>
   <string name="account_settings_color_label">Колір облікового запису</string>
@@ -546,6 +586,8 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="sort_latest_first">Спершу нові повідомлення</string>
   <string name="sort_subject_alpha">Тема за алфавітом</string>
   <string name="sort_subject_re_alpha">Тема за алфавітом у зворотньому порядку</string>
+  <string name="sort_sender_alpha">Відправники за алфавітом</string>
+  <string name="sort_sender_re_alpha">Відправники в зворотньому порядку за алфавітом</string>
   <string name="sort_flagged_first">Спершу повідомлення із зірочками</string>
   <string name="sort_flagged_last">Спершу повідомлення без зірочок</string>
   <string name="sort_unread_first">Спершу непрочитані повідомлення</string>
@@ -556,6 +598,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="sort_by_date">датою</string>
   <string name="sort_by_arrival">Надходженням</string>
   <string name="sort_by_subject">Темою</string>
+  <string name="sort_by_sender">Відправник</string>
   <string name="sort_by_flag">Зірочкою</string>
   <string name="sort_by_unread">Прочитані/непрочитані</string>
   <string name="sort_by_attach">Вкладенням</string>
@@ -568,31 +611,8 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_setup_failed_dlg_invalid_certificate_title">Сертифікат невизнано</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Прийняти сертифікат</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Відхилити сертифікат</string>
-  <string name="message_list_help_key"><!--NEW: V, Z untranslated-->
-    Del (або D) - Видалити\n
-    R - Відповісти\n
-    A - Відповісти усім\n
-    C - Написати\n
-    F - Переслати\n
-    M - Перемістити\n
-    V - Archive\n
-    Y - Копіювати\n
-    Z - Mark (Un)read\n
-    G - Зірочка\n
-    O - Тип упорядкування\n
-    I - Порядок упорядкування\n
-    Q - Повернутися до папок\n
-    S - Виділити/зняти виділення\n
-    J або P - Попереднє Повідомлення\n
-    K або N - Наступне повідомлення
-  </string>
-  <string name="folder_list_help_key">
-    1 - Відображати тільки папки 1-го класу\u000A
-    2 - Відображати папки 1-го  і 2-го класу\u000A
-    3 - Відображати усе, крім папок 2-го класу\u000A
-    4 - Відображати усі папки\u000A
-    Q - Повернутися до облікових записів\u000A
-    S - Редагувати налаштування облікового запису</string>
+  <string name="message_list_help_key">Del (або D) - Видалити\nR - Відповісти\nA - Відповісти усім\nC - Написати\nF - Переслати\nM - Перемістити\nV - Archive\nY - Копіювати\nZ - Mark (Un)read\nG - Зірочка\nO - Тип упорядкування\nI - Порядок упорядкування\nQ - Повернутися до папок\nS - Виділити/зняти виділення\nJ або P - Попереднє Повідомлення\nK або N - Наступне повідомлення</string>
+  <string name="folder_list_help_key">1 - Відображати тільки папки 1-го класу\n2 - Відображати папки 1-го  і 2-го класу\n3 - Відображати усе, крім папок 2-го класу\n4 - Відображати усі папки\nQ - Повернутися до облікових записів\nS - Редагувати налаштування облікового запису</string>
   <string name="folder_list_filter_hint">ім’я папки містить</string>
   <string name="folder_list_display_mode_label">Папки</string>
   <string name="folder_list_display_mode_all">Відображати усі папки</string>
@@ -602,6 +622,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_settings_signature__location_label">Розташування підпису</string>
   <string name="account_settings_signature__location_before_quoted_text">перед цитатою</string>
   <string name="account_settings_signature__location_after_quoted_text">після цитати</string>
+  <string name="setting_theme_global">Використовувати тему додатку</string>
   <string name="setting_theme_dark">Темно</string>
   <string name="setting_theme_light">Світло</string>
   <string name="display_preferences">Екран</string>
@@ -613,8 +634,13 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="accountlist_preferences">Список облікових записів</string>
   <string name="messagelist_preferences">Список повідомлень</string>
   <string name="messageview_preferences">Повідомлення</string>
+  <string name="folderlist_preferences">Список папок</string>
   <string name="settings_theme_label">Тема</string>
+  <string name="settings_message_theme_label">Перегляд теми повідомлень</string>
+  <string name="settings_compose_theme_label">Написати тему</string>
   <string name="settings_language_label">Мова</string>
+  <string name="settings_message_theme_selection_label">Встановити тему повідомлення</string>
+  <string name="settings_message_theme_selection_summary_off">Виберіть перегляд теми повідомлення під час перегляду повідомлення</string>
   <string name="settings_messageview_mobile_layout_label">режим одного стовпця</string>
   <string name="settings_messageview_mobile_layout_summary">Форматування HTML повідомлення для маленького екрану</string>
   <string name="setting_language_system">Системна по замовчуванню</string>
@@ -623,6 +649,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="background_ops_always">Завжди</string>
   <string name="background_ops_enabled">Коли \'Фонові дані\' включено</string>
   <string name="background_ops_auto_sync">Коли \'Фонові дані\' та \'Автосинхронізація\' включено</string>
+  <string name="background_ops_auto_sync_only">Коли \"Автосинхронізація\" увімкнена</string>
   <string name="batch_select_all">Вибрати усе</string>
   <string name="account_setup_push_limit_label">Найбільша кількість папок для перевірки з push</string>
   <string name="account_setup_push_limit_10">10 папок</string>
@@ -683,6 +710,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="font_size_message_view_content">Тіло повідомлення</string>
   <string name="font_size_message_compose">Створення повідомлень</string>
   <string name="font_size_message_compose_input">Поля для вводу тексту</string>
+  <string name="font_size_default">типовий</string>
   <string name="font_size_tiniest">Найдрібніший</string>
   <string name="font_size_tiny">Дрібний</string>
   <string name="font_size_smaller">Менший</string>
@@ -720,19 +748,9 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="select_text_now">Виберіть текст для копіювання.</string>
   <string name="dialog_confirm_delete_title">Підтвердіть вилучення</string>
   <string name="dialog_confirm_delete_message">Ви хочете вилучити це повідомлення?</string>
-  <!--NEW:
-  <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Do you really want to delete this message?</item>
-    <item quantity="other">Do you really want to delete <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
-  </plurals>
--->
   <string name="dialog_confirm_delete_confirm_button">Вилучати</string>
   <string name="dialog_confirm_delete_cancel_button">Не вилучати</string>
   <string name="dialog_confirm_spam_title">Підтвердіть перенесення у папку „Спам“</string>
-  <plurals name="dialog_confirm_spam_message">
-    <item quantity="one">Ви дійсно хочете перемістити це повідомлення у папку „Спам“?</item>
-    <item quantity="other">Ви дійсно хочете перемістити <xliff:g id="message_count">%1$d</xliff:g> повідомлень у папку „Спам“?</item>
-  </plurals>
   <string name="dialog_confirm_spam_confirm_button">Так</string>
   <string name="dialog_confirm_spam_cancel_button">Ні</string>
   <string name="dialog_attachment_progress_title">Завантаження вкладення</string>
@@ -774,10 +792,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   </plurals>
   <string name="settings_import_incoming_server">Сервер вхідної пошти (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">Сервер вихідної пошти (<xliff:g id="hostname">%s</xliff:g>):</string>
-  <plurals name="settings_import_setting_passwords">
-    <item quantity="one">Установка пароля…</item>
-    <item quantity="other">Установка паролів…</item>
-  </plurals>
   <string name="settings_import_use_incoming_server_password">Використовувати пароль сервера вхідної пошти</string>
   <string name="activate_account_action">Активувати</string>
   <string name="account_unavailable">Обліковий запис \"<xliff:g id="account">%s</xliff:g>\" недоступний; перевірте пам’ять</string>
@@ -811,5 +825,53 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="webview_contextmenu_email_clipboard_label">Електронна адреса</string>
   <string name="image_saved_as">Зберегти зображеня як \"<xliff:g id="filename">%s</xliff:g>\"</string>
   <string name="image_saving_failed">Збереження зображення скасовано.</string>
+  <string name="account_settings_remote_search_num_results_entries_all">Всі</string>
+  <string name="account_settings_remote_search_num_results_entries_10">10</string>
+  <string name="account_settings_remote_search_num_results_entries_25">25</string>
+  <string name="account_settings_remote_search_num_results_entries_50">50</string>
+  <string name="account_settings_remote_search_num_results_entries_100">100</string>
+  <string name="account_settings_remote_search_num_results_entries_250">250</string>
+  <string name="account_settings_remote_search_num_results_entries_500">500</string>
+  <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
+  <string name="account_settings_remote_search_num_label">Межа серверу</string>
+  <string name="account_settings_remote_search_num_summary">Пошук зупинити після знаходження <xliff:g id="num_results">%s</xliff:g> результатів.</string>
+  <string name="account_settings_remote_search_full_text">Включити текст повідомлення в пошуку на сервері</string>
+  <string name="account_settings_remote_search_full_text_summary">Пошук повного тексту буде повільним</string>
+  <string name="remote_search_sending_query">Відправлення запиту до сервера</string>
+  <string name="remote_search_downloading">Відібрано  %d результатів</string>
+  <string name="remote_search_downloading_limited">Відібрано %1$d з %2$d результатів</string>
+  <string name="remote_search_error">Віддалений пошук не вдався</string>
+  <string name="account_settings_search">Пошук</string>
+  <string name="account_settings_remote_search_enabled">Увімкнути пошук серверу</string>
+  <string name="account_settings_remote_search_enabled_summary">Шукати повідомлення на сервері додатково до тих, що у вас на пристрої</string>
+  <string name="action_remote_search">Шукати повідомлення на сервері</string>
+  <string name="pull_to_refresh_remote_search_from_local_search_pull">Потягніть для пошуку на сервері</string>
+  <string name="pull_to_refresh_remote_search_from_local_search_release">Відпустіть для пошуку на сервері</string>
+  <string name="remote_search_unavailable_no_network">Для пошуку на сервері необхідно приєднатись до мережі.</string>
+  <string name="global_settings_background_as_unread_indicator_summary">Затемнити повідомлення після прочитання</string>
+  <string name="global_settings_threaded_view_label">Режим перегляду</string>
+  <string name="global_settings_threaded_view_summary">Групувати повідомлення по розмові</string>
+  <string name="upgrade_databases_title">Поновити базу даних</string>
+  <string name="upgrade_databases_unspecified">Поновити базу даних...</string>
+  <string name="upgrade_database_format">Поновити базу даних з облікового запису \"<xliff:g id="account">%s</xliff:g>\" </string>
+  <string name="message_list_loading">Завантаження...</string>
+  <string name="global_settings_splitview_mode_label">Перегляд розділеного екрану</string>
+  <string name="global_settings_splitview_always">Завжди</string>
+  <string name="global_settings_splitview_never">Ніколи</string>
+  <string name="global_settings_splitview_when_in_landscape">Коли в альбомній орієнтації</string>
+  <string name="message_view_empty">Будь ласка, виберіть повідомлення зліва</string>
+  <string name="global_settings_show_contact_picture_label">Показувати зображення контактів</string>
+  <string name="global_settings_show_contact_picture_summary">Показувати зображення контактів в списку повідомлень</string>
+  <string name="last_refresh_time_format">Оновлення <xliff:g id="formatted_time">%s</xliff:g></string>
+  <string name="last_refresh_time_format_with_push">Оновлення <xliff:g id="time_with_preposition">%s</xliff:g> (Push активні)</string>
+  <string name="preposition_for_date">на <xliff:g id="date">%s</xliff:g></string>
+  <string name="mark_all_as_read">Помітити прочитаним</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Кольорові зображення контактів</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Видимі дії повідомлення</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Показувати вибрані дії в меню перегляду повідомлень</string>
+  <string name="loading_attachment">Завантаження вкладень...</string>
+  <string name="fetching_attachment_dialog_title_send">Збереження повідомлення</string>
+  <string name="fetching_attachment_dialog_title_save">Збереження чернетки</string>
+  <string name="fetching_attachment_dialog_message">Отримання вкладення...</string>
   <!--=== OpenPGP specific ==================================================================-->
 </resources>

res/values-zh-rCN/strings.xml

@@ -12,7 +12,9 @@
   <!--Used in the about dialog-->
   <string name="app_authors">谷歌以及帮着遛K-9的小朋友们。</string>
   <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
+  <string name="app_license">根据Apache License 2.0 协议授权。</string>
   <!--Welcome message-->
+  <string name="welcome_message_title">欢迎来到K-9 Mail</string>
   <string name="accounts_welcome"><![CDATA[
 <p>
 K-9 Mail是Android下的开源电子邮件客户端，其最初的代码来自Android默认的电子邮件程序。
@@ -64,9 +66,13 @@ K-9改进的功能包括：
   <string name="delete_messages_desc">允许该程序删除邮件。</string>
   <string name="about_title_fmt">关于<xliff:g id="app_name">%s</xliff:g></string>
   <string name="accounts_title">账户</string>
+  <string name="folders_title">文件夹</string>
   <string name="advanced">高级</string>
   <string name="message_list_title"><xliff:g id="account">%s</xliff:g>：<xliff:g id="folder">%s</xliff:g></string>
   <string name="compose_title_compose">新邮件</string>
+  <string name="compose_title_reply">回复</string>
+  <string name="compose_title_reply_all">回复全部</string>
+  <string name="compose_title_forward">转发</string>
   <string name="choose_folder_title">选择文件夹</string>
   <string name="status_loading_account_folder">\u0020（正在接收<xliff:g id="account">%s</xliff:g>：<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>）</string>
   <string name="status_loading_account_folder_headers">\u0020（正在接收邮件信息<xliff:g id="account">%s</xliff:g>：<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>）</string>
@@ -75,6 +81,7 @@ K-9改进的功能包括：
   <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
   <string name="status_next_poll">\u0020（下次接收时间：<xliff:g id="nexttime">%s</xliff:g>）</string>
   <string name="status_syncing_off">同步关闭</string>
+  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> 个已选择</string>
   <string name="next_action">下一步</string>
   <string name="previous_action">上一步</string>
   <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
@@ -91,6 +98,8 @@ K-9改进的功能包括：
   <string name="spam_action">标记为垃圾</string>
   <string name="forward_action">转发</string>
   <string name="move_action">移动</string>
+  <string name="single_message_options_action">发送...</string>
+  <string name="refile_action">重新归档...</string>
   <string name="continue_action">继续</string>
   <string name="back_action">返回</string>
   <string name="done_action">完成</string>
@@ -117,6 +126,10 @@ K-9改进的功能包括：
   <string name="unflag_action">移除星标</string>
   <string name="copy_action">拷贝</string>
   <string name="select_text_action">选择文本</string>
+  <string name="show_headers_action">显示邮件头</string>
+  <string name="hide_headers_action">隐藏邮件头</string>
+  <string name="message_view_theme_action_dark">切换到黑色主题</string>
+  <string name="message_view_theme_action_light">切换到明亮主题</string>
   <string name="mark_as_unread_action">标记为未读</string>
   <string name="add_cc_bcc_action">添加抄送/暗送</string>
   <string name="read_receipt">已读回执</string>
@@ -149,7 +162,14 @@ 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>
+  <string name="notification_new_messages_title"><xliff:g id="new_message_count">%d</xliff:g> 新邮件</string>
   <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>
+  <string name="notification_action_mark_as_read">标记为已读</string>
+  <string name="notification_action_delete">删除</string>
+  <string name="notification_certificate_error_title"><xliff:g id="account">%s</xliff:g> 认证错误</string>
+  <string name="notification_certificate_error_text">请检查您的服务器设置</string>
   <string name="notification_bg_sync_ticker">正在检查邮件：<xliff:g id="account">%s</xliff:g>：<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">正在检查邮件</string>
   <string name="notification_bg_send_ticker">正在发送邮件：<xliff:g id="account">%s</xliff:g></string>
@@ -187,11 +207,11 @@ K-9改进的功能包括：
   <string name="message_compose_quote_header_from">发件人：</string>
   <string name="message_compose_quote_header_to">收件人：</string>
   <string name="message_compose_quote_header_cc">抄送：</string>
-  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g>写到：</string>
+  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> 写到：</string>
   <string name="message_compose_error_no_recipients">您必须添加至少一个收件人。</string>
-  <string name="error_contact_address_not_found">没有找到收件地址。</string>
+  <string name="error_contact_address_not_found">没有找到该联系人的邮件地址。</string>
   <string name="message_compose_attachments_skipped_toast">由于一些附件还没有被下载，因此无法转发这些附件。</string>
-  <string name="message_compose_show_quoted_text_action">引用文字</string>
+  <string name="message_compose_show_quoted_text_action">引用消息</string>
   <string name="message_compose_description_add_to">增加收件人（To）</string>
   <string name="message_compose_description_add_cc">增加收件人（CC）</string>
   <string name="message_compose_description_add_bcc">增加收件人（BCC）</string>
@@ -226,13 +246,19 @@ K-9改进的功能包括：
   <string name="global_settings_preview_lines_label">预览行数</string>
   <string name="global_settings_show_correspondent_names_label">显示收件人姓名</string>
   <string name="global_settings_show_correspondent_names_summary">如果可能则使用收件人姓名代替收件地址</string>
+  <string name="global_settings_sender_above_subject_label">联系人在主题上方</string>
+  <string name="global_settings_sender_above_subject_summary">在主题上方显示联系人姓名，而不是下方</string>
   <string name="global_settings_show_contact_name_label">显示联系人姓名</string>
   <string name="global_settings_show_contact_name_summary">如果可能则使用联系人姓名代替收件地址</string>
   <string name="global_settings_registered_name_color_label">使用颜色标记联系人</string>
   <string name="global_settings_registered_name_color_default">不使用颜色标记联系人列表</string>
   <string name="global_settings_registered_name_color_changed">使用颜色标记联系人列表</string>
+  <string name="global_settings_folderlist_wrap_folder_names_label">长文件夹名换行</string>
+  <string name="global_settings_folderlist_wrap_folder_names_summary">使用多行显示长文件夹名</string>
   <string name="global_settings_messageview_fixedwidth_label">定宽字体</string>
   <string name="global_settings_messageview_fixedwidth_summary">使用定宽字体显示纯文本邮件</string>
+  <string name="global_settings_messageview_autofit_width_label">消息自适应</string>
+  <string name="global_settings_messageview_autofit_width_summary">缩小消息以适应屏幕</string>
   <string name="global_settings_messageview_return_to_list_label">删除后回到自动返回到列表</string>
   <string name="global_settings_messageview_return_to_list_summary">邮件删除后自动返回到邮件列表</string>
   <string name="global_settings_messageview_show_next_label">删除后显示下一封邮件</string>
@@ -242,6 +268,16 @@ K-9改进的功能包括：
   <string name="global_settings_confirm_action_delete">删除（仅在邮件视图里）</string>
   <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_notification_hide_subject_title">在通知中隐藏主题</string>
+  <string name="global_settings_notification_hide_subject_never">从不</string>
+  <string name="global_settings_notification_hide_subject_when_locked">当设备锁定时</string>
+  <string name="global_settings_notification_hide_subject_always">总是</string>
+  <string name="global_settings_notification_quick_delete_title">显示“删除”按钮</string>
+  <string name="global_settings_notification_quick_delete_never">从不</string>
+  <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="quiet_time">安静时间</string>
   <string name="quiet_time_description">禁止铃声，震动以及闪光</string>
   <string name="quiet_time_starts">安静时间开始</string>
@@ -358,9 +394,12 @@ K-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">无法使用加密方法连接到服务器。\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_auth_message_fmt">用户名或密码错误。
+（<xliff:g id="error">%s</xliff:g>）</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">无法使用加密方法连接到服务器。
+（<xliff:g id="error">%s</xliff:g>）</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">无法连接到服务器。
+（<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>
@@ -395,12 +434,14 @@ K-9改进的功能包括：
   <string name="account_settings_message_format_text">纯文本（图片和排版将被删除）</string>
   <string name="account_settings_message_format_html">HTML（图片和排版将被保留）</string>
   <string name="account_settings_message_format_auto">自动（纯文本，除非是在回复HTML邮件）</string>
+  <string name="account_settings_always_show_cc_bcc_label">总是显示抄送/暗送(CC/BCC)</string>
   <string name="account_settings_message_read_receipt_label">已读回执</string>
   <string name="account_settings_message_read_receipt_summary">总是要求已读回执</string>
   <string name="account_settings_quote_style_label">回复时引用格式</string>
   <string name="account_settings_quote_style_prefix">引用前缀（类似Gmail，Pine）</string>
   <string name="account_settings_quote_style_header">引用头（类似Outlook，Yahoo!，Hotmail）</string>
   <string name="account_settings_general_title">一般设置</string>
+  <string name="account_settings_reading_mail">读邮件</string>
   <string name="account_settings_sync">正在接收邮件</string>
   <string name="account_settings_folders">文件夹</string>
   <string name="account_settings_quote_prefix_label">引用文本前缀</string>
@@ -411,6 +452,7 @@ K-9改进的功能包括：
   <string name="account_settings_crypto_auto_signature_summary">使用账户的电子邮件地址自动猜测签名密钥。</string>
   <string name="account_settings_crypto_auto_encrypt">自动加密</string>
   <string name="account_settings_crypto_auto_encrypt_summary">如果找到收件人的公钥，则自动加密。</string>
+  <string name="account_settings_crypto_apg_not_installed">未安装APG加密</string>
   <string name="account_settings_mail_check_frequency_label">文件夹检查频率</string>
   <string name="account_settings_storage_title">存储</string>
   <string name="account_settings_color_label">账户颜色</string>
@@ -544,6 +586,8 @@ K-9改进的功能包括：
   <string name="sort_latest_first">优先显示最近的邮件</string>
   <string name="sort_subject_alpha">按主题升序</string>
   <string name="sort_subject_re_alpha">按主题降序</string>
+  <string name="sort_sender_alpha">发件人字母</string>
+  <string name="sort_sender_re_alpha">发件人字母反序</string>
   <string name="sort_flagged_first">优先显示带有星标的邮件</string>
   <string name="sort_flagged_last">优先显示没有星标的邮件</string>
   <string name="sort_unread_first">优先显示未读邮件</string>
@@ -554,42 +598,21 @@ K-9改进的功能包括：
   <string name="sort_by_date">日期</string>
   <string name="sort_by_arrival">到达时间</string>
   <string name="sort_by_subject">主题</string>
+  <string name="sort_by_sender">发件人</string>
   <string name="sort_by_flag">星标</string>
   <string name="sort_by_unread">已读/未读</string>
   <string name="sort_by_attach">附件</string>
   <string name="account_delete_dlg_title">删除账户</string>
   <string name="account_recreate_dlg_title">重建账户</string>
   <string name="account_clear_dlg_title">清除账户</string>
+  <string name="provider_note_auonejp">请确保在 au one邮件设置中开启了IMAP和POP3.</string>
   <string name="provider_note_naver">如果您想使用IMAP或者POP3，请在Naver mail的设置页面设置允许IMAP或者POP3。</string>
   <string name="provider_note_hanmail">如果您想使用IMAP或者POP3，请在Hanmail(Daum) mail的设置页面设置允许IMAP或者POP3。</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">无法识别的证书信息</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">接收密钥</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">拒绝密钥</string>
-  <string name="message_list_help_key"><!--NEW: V, Z untranslated-->
-    Del (or D) - 删除\n
-    R - 回复\n
-    A - 全部回复\n
-    C - 新邮件\n
-    F - 转发\n
-    M - 移动\n
-    V - Archive\n
-    Y - 拷贝\n
-    Z - Mark (Un)read\n
-    G - 星标\n
-    O - 排序方式\n
-    I - 升序/降序\n
-    Q - 返回文件夹\n
-    S - 选择/取消选择\n
-    J, P - 上一封邮件\n
-    K, N - 下一封邮件
-  </string>
-  <string name="folder_list_help_key">
-    1 - 只显示初级文件夹\u000A
-    2 - 显示初级和次级文件夹\u000A
-    3 - 仅不显示次级文件夹\u000A
-    4 - 显示全部文件夹\u000A
-    Q - 返回全部账户\u000A
-    S - 编辑账户设置</string>
+  <string name="message_list_help_key">Del (or D) - 删除\nR - 回复\nA - 全部回复\nC - 新邮件\nF - 转发\nM - 移动\nV - Archive\nY - 拷贝\nZ - Mark (Un)read\nG - 星标\nO - 排序方式\nI - 升序/降序\nQ - 返回文件夹\nS - 选择/取消选择\nJ, P - 上一封邮件\nK, N - 下一封邮件</string>
+  <string name="folder_list_help_key">1 - 只显示初级文件夹\n2 - 显示初级和次级文件夹\n3 - 仅不显示次级文件夹\n4 - 显示全部文件夹\nQ - 返回全部账户\nS - 编辑账户设置</string>
   <string name="folder_list_filter_hint">文件夹名字里包含</string>
   <string name="folder_list_display_mode_label">文件夹</string>
   <string name="folder_list_display_mode_all">显示全部文件夹</string>
@@ -599,6 +622,7 @@ K-9改进的功能包括：
   <string name="account_settings_signature__location_label">签名位置</string>
   <string name="account_settings_signature__location_before_quoted_text">在引用的文本之前</string>
   <string name="account_settings_signature__location_after_quoted_text">在引用的文本之后</string>
+  <string name="setting_theme_global">使用应用程序主题</string>
   <string name="setting_theme_dark">灰暗</string>
   <string name="setting_theme_light">明亮</string>
   <string name="display_preferences">显示</string>
@@ -610,8 +634,14 @@ K-9改进的功能包括：
   <string name="accountlist_preferences">账户列表</string>
   <string name="messagelist_preferences">邮件列表</string>
   <string name="messageview_preferences">邮件</string>
+  <string name="folderlist_preferences">文件夹列表</string>
   <string name="settings_theme_label">主题</string>
+  <string name="settings_message_theme_label">消息查看主题</string>
+  <string name="settings_compose_theme_label">编辑器主题</string>
   <string name="settings_language_label">语言</string>
+  <string name="settings_message_theme_selection_label">固定消息主题</string>
+  <string name="settings_message_theme_selection_summary_off">在查看消息时选择消息查看主题</string>
+  <string name="settings_message_theme_selection_summary_on">使用固定消息查看主题</string>
   <string name="settings_messageview_mobile_layout_label">单列布局</string>
   <string name="settings_messageview_mobile_layout_summary">为小屏幕重新布局HTML邮件</string>
   <string name="setting_language_system">系统默认值</string>
@@ -620,6 +650,7 @@ K-9改进的功能包括：
   <string name="background_ops_always">总是</string>
   <string name="background_ops_enabled">当“后台数据”被选中</string>
   <string name="background_ops_auto_sync">当“后台数据”&amp;“自动同步”被选中</string>
+  <string name="background_ops_auto_sync_only">当“自动同步”已选定</string>
   <string name="batch_select_all">选择全部</string>
   <string name="account_setup_push_limit_label">推送时最多检查文件夹数量</string>
   <string name="account_setup_push_limit_10">十个文件夹</string>
@@ -680,6 +711,7 @@ K-9改进的功能包括：
   <string name="font_size_message_view_content">邮件内容</string>
   <string name="font_size_message_compose">撰写邮件</string>
   <string name="font_size_message_compose_input">文本输入框</string>
+  <string name="font_size_default">默认</string>
   <string name="font_size_tiniest">最小</string>
   <string name="font_size_tiny">更小</string>
   <string name="font_size_smaller">小</string>
@@ -717,18 +749,14 @@ K-9改进的功能包括：
   <string name="select_text_now">选择需要拷贝的文本。</string>
   <string name="dialog_confirm_delete_title">删除确认</string>
   <string name="dialog_confirm_delete_message">你确定要删除这封邮件么？</string>
-  <!--NEW:
   <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Do you really want to delete this message?</item>
-    <item quantity="other">Do you really want to delete <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
+    <item quantity="other">您确定要删除 <xliff:g id="message_count">%1$d</xliff:g> 条消息吗?</item>
   </plurals>
--->
   <string name="dialog_confirm_delete_confirm_button">删除</string>
   <string name="dialog_confirm_delete_cancel_button">不要删除</string>
   <string name="dialog_confirm_spam_title">确认移动到垃圾邮件文件夹</string>
   <plurals name="dialog_confirm_spam_message">
-    <item quantity="one">确认移动该邮件到垃圾邮件文件夹？</item>
-    <item quantity="other">确认移动<xliff:g id="message_count">%1$d</xliff:g>邮件到垃圾邮件文件夹？</item>
+    <item quantity="other">您确定要移动 <xliff:g id="message_count">%1$d</xliff:g> 条消息到垃圾箱吗?</item>
   </plurals>
   <string name="dialog_confirm_spam_confirm_button">是</string>
   <string name="dialog_confirm_spam_cancel_button">否</string>
@@ -752,8 +780,7 @@ K-9改进的功能包括：
   <string name="settings_import_global_settings_success">全局设置已自<xliff:g id="filename">%s</xliff:g>导入</string>
   <string name="settings_import_success">账户<xliff:g id="accounts">%s</xliff:g>已自<xliff:g id="filename">%s</xliff:g>导入</string>
   <plurals name="settings_import_accounts">
-    <item quantity="one">单个账户</item>
-    <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> 账户</item>
+    <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> 个账户</item>
   </plurals>
   <string name="settings_export_failure">导出设置失败</string>
   <string name="settings_import_failure">自<xliff:g id="filename">%s</xliff:g>导入设置失败</string>
@@ -764,14 +791,12 @@ K-9改进的功能包括：
   <string name="settings_import_activate_account_header">激活账户</string>
   <string name="settings_import_activate_account_intro">使用账户\"<xliff:g id="account">%s</xliff:g>\"，您需要提供<xliff:g id="server_passwords">%s</xliff:g></string>
   <plurals name="settings_import_server_passwords">
-    <item quantity="one">服务器密码</item>
     <item quantity="other">服务器密码</item>
   </plurals>
   <string name="settings_import_incoming_server">接收邮件服务器 (<xliff:g id="hostname">%s</xliff:g>):</string>
   <string name="settings_import_outgoing_server">发送邮件服务器 (<xliff:g id="hostname">%s</xliff:g>):</string>
   <plurals name="settings_import_setting_passwords">
-    <item quantity="one">正在设置密码…</item>
-    <item quantity="other">正在设置密码…</item>
+    <item quantity="other">设置密码...</item>
   </plurals>
   <string name="settings_import_use_incoming_server_password">使用接受邮件服务器的密码</string>
   <string name="activate_account_action">激活</string>
@@ -782,7 +807,7 @@ K-9改进的功能包括：
   <string name="manage_accounts_move_up_action">向上移动</string>
   <string name="manage_accounts_move_down_action">向下移动</string>
   <string name="manage_accounts_moving_message">正在移动账户…</string>
-  <string name="unread_widget_select_account">显示未读数</string>
+  <string name="unread_widget_select_account">显示未读数...</string>
   <string name="import_dialog_error_title">没有找到文件管理器</string>
   <string name="close">关闭</string>
   <string name="webview_empty_message">没有文本</string>
@@ -799,12 +824,62 @@ K-9改进的功能包括：
   <string name="webview_contextmenu_phone_call_action">拨打号码</string>
   <string name="webview_contextmenu_phone_save_action">保存号码到通讯录</string>
   <string name="webview_contextmenu_phone_copy_action">复制号码到剪贴板</string>
-  <string name="webview_contextmenu_phone_clipboard_label">号码</string>
+  <string name="webview_contextmenu_phone_clipboard_label">电话号码</string>
   <string name="webview_contextmenu_email_send_action">发送邮件</string>
   <string name="webview_contextmenu_email_save_action">保存到通讯录</string>
   <string name="webview_contextmenu_email_copy_action">复制邮件地址到通讯录</string>
   <string name="webview_contextmenu_email_clipboard_label">邮件地址</string>
   <string name="image_saved_as">保存图片到文件 \"<xliff:g id="filename">%s</xliff:g>\"</string>
   <string name="image_saving_failed">保存图片失败</string>
+  <string name="account_settings_remote_search_num_results_entries_all">全部</string>
+  <string name="account_settings_remote_search_num_results_entries_10">10</string>
+  <string name="account_settings_remote_search_num_results_entries_25">25</string>
+  <string name="account_settings_remote_search_num_results_entries_50">50</string>
+  <string name="account_settings_remote_search_num_results_entries_100">100</string>
+  <string name="account_settings_remote_search_num_results_entries_250">250</string>
+  <string name="account_settings_remote_search_num_results_entries_500">500</string>
+  <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
+  <string name="account_settings_remote_search_num_label">服务器查找限制</string>
+  <string name="account_settings_remote_search_num_summary">查找将在找到 <xliff:g id="num_results">%s</xliff:g> 条结果后停止。</string>
+  <string name="account_settings_remote_search_full_text">在服务器搜索中包含邮件正文</string>
+  <string name="account_settings_remote_search_full_text_summary">全文搜索会影响速度。</string>
+  <string name="remote_search_sending_query">正在向服务器发送查询</string>
+  <string name="remote_search_downloading">正在获取 %d 条结果</string>
+  <string name="remote_search_downloading_limited">正在获取 %2$d 个中的 第%1$d 个结果</string>
+  <string name="remote_search_error">远程搜索失败</string>
+  <string name="account_settings_search">搜索</string>
+  <string name="account_settings_remote_search_enabled">启用服务器搜索</string>
+  <string name="account_settings_remote_search_enabled_summary">除了您的设备之外也在服务器上进行搜索</string>
+  <string name="action_remote_search">在服务器上搜索</string>
+  <string name="pull_to_refresh_remote_search_from_local_search_pull">向搜索服务器发送查询...</string>
+  <string name="pull_to_refresh_remote_search_from_local_search_release">从搜索服务器释放查询...</string>
+  <string name="remote_search_unavailable_no_network">服务器搜索需要网络连接。</string>
+  <string name="global_settings_background_as_unread_indicator_label">已读邮件变暗显示</string>
+  <string name="global_settings_background_as_unread_indicator_summary">灰色背景表示消息已读</string>
+  <string name="global_settings_threaded_view_label">按话题显示</string>
+  <string name="global_settings_threaded_view_summary">按照话题对消息进行组合</string>
+  <string name="upgrade_databases_title">更新数据库</string>
+  <string name="upgrade_databases_unspecified">正在更新数据库...</string>
+  <string name="upgrade_database_format">正在更新账户 <xliff:g id="account">%s</xliff:g> 的数据库</string>
+  <string name="message_list_loading">加载中...</string>
+  <string name="global_settings_splitview_mode_label">分屏显示</string>
+  <string name="global_settings_splitview_always">总是</string>
+  <string name="global_settings_splitview_never">从不</string>
+  <string name="global_settings_splitview_when_in_landscape">当以横向显示时</string>
+  <string name="message_view_empty">请在左侧选择消息</string>
+  <string name="global_settings_show_contact_picture_label">显示联系人图片</string>
+  <string name="global_settings_show_contact_picture_summary">在消息列表中显示联系人图片</string>
+  <string name="last_refresh_time_format">上次刷新 <xliff:g id="formatted_time">%s</xliff:g></string>
+  <string name="last_refresh_time_format_with_push">上次刷新时间 <xliff:g id="time_with_preposition">%s</xliff:g> (主动推送)</string>
+  <string name="preposition_for_date">日期 <xliff:g id="date">%s</xliff:g></string>
+  <string name="mark_all_as_read">全部标记为已读</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">以彩色显示联系人图片</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">以彩色显示缺少的联系人图片</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">可见的消息动作</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">在消息查看菜单显示选定的动作</string>
+  <string name="loading_attachment">附件加载中...</string>
+  <string name="fetching_attachment_dialog_title_send">消息正在发送</string>
+  <string name="fetching_attachment_dialog_title_save">正在保存草稿</string>
+  <string name="fetching_attachment_dialog_message">正在获取附件...</string>
   <!--=== OpenPGP specific ==================================================================-->
 </resources>

res/values-zh-rTW/strings.xml

@@ -11,51 +11,50 @@
   <string name="remote_control_desc">在遠端透過此程式可控制K-9 Mail的執行或變更設定。</string>
   <!--Used in the about dialog-->
   <string name="app_authors">谷歌以及幫著遛K-9的小朋友們。</string>
-  <string name="app_copyright_fmt" formatted="false">版權所有 2008-%s The K-9 Dog Walkers. Portions Copyright 2006-%s the Android Open Source Project.</string>
+  <string name="app_copyright_fmt">版權所有 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
   <string name="app_license">依據 Apache Version 2.0.規範授權</string>
   <!--Welcome message-->
   <string name="welcome_message_title">歡迎使用K-9 Mail</string>
   <string name="accounts_welcome">&lt;p&gt; K-9 Mail是Android系統的開放原始碼的電子郵件客戶端，原始程式碼來自Android內建的電子郵件程式。 &lt;/p&gt;&lt;p&gt; K-9改良的功能包括： &lt;/p&gt; &lt;ul&gt; &lt;li&gt;利用IMAP IDEL進行Push mail&lt;/li&gt; &lt;li&gt;更好的執行效率&lt;/li&gt; &lt;li&gt;重新發送郵件&lt;/li&gt; &lt;li&gt;郵件簽名&lt;/li&gt; &lt;li&gt;密件副本給自己&lt;/li&gt; &lt;li&gt;信件匣訂閱&lt;/li&gt; &lt;li&gt;同步全部信件匣&lt;/li&gt; &lt;li&gt;可以編輯回信收件人地址&lt;/li&gt; &lt;li&gt;鍵盤捷徑鍵&lt;/li&gt; &lt;li&gt;更完整支援IMAP&lt;/li&gt; &lt;li&gt;儲存附件到記憶卡&lt;/li&gt; &lt;li&gt;清空垃圾桶&lt;/li&gt; &lt;li&gt;郵件排序&lt;/li&gt; &lt;li&gt;以及其他很多功能～&lt;/li&gt; &lt;/ul&gt; &lt;p&gt; 請注意：K-9不支援絕大多數免費Hotmail帳戶。跟其他的電子郵件客戶端一樣，在和Microsoft Exchange伺服器溝通的時候存在一些詭異的問題。 &lt;/p&gt;&lt;p&gt; 請到&lt;a href=http://k9mail.googlecode.com/&gt;http://k9mail.googlecode.com/&lt;/a&gt;提交錯誤報告、建議新功能或提出您的問題。 &lt;/p&gt;</string>
   <!--Default signature-->
-  <string name="default_signature">"--
-抱歉暫時無法詳細說明。這份郵件是由安裝有K-9 Mail的Android手持設備寄送的。"</string>
+  <string name="default_signature">--\n抱歉暫時無法詳細說明。這份郵件是由安裝有K-9 Mail的Android手持設備寄送的。</string>
   <!--General strings that include the app name-->
-  <string name="account_delete_dlg_instructions_fmt">帳戶「%s」將從K-9 Mail中刪除。</string>
-  <string name="account_recreate_dlg_instructions_fmt">帳戶「%s」的所有相關資料將從K-9 Mail中刪除，僅保留帳戶設定。</string>
-  <string name="account_clear_dlg_instructions_fmt">帳戶「%s」的所有郵件將從K-9 Mail中刪除，僅保留帳戶設定。</string>
+  <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>
+  <string name="account_clear_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」的所有郵件將從K-9 Mail中刪除，僅保留帳戶設定。</string>
   <string name="insufficient_apg_permissions">K-9沒有被允許存取APG，請重新安裝K-9嘗試修復問題。</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">沒有找到合適的應用程式來處理匯入操作。請從GOOGLE PLAY商店下載安裝檔案管理應用程式。</string>
   <string name="open_market">開啟GOOGLE PLAY商店</string>
   <!--=== General strings ==================================================================-->
-  <string name="app_authors_fmt">作者: %s</string>
-  <string name="app_revision_fmt">更新日誌: %s</string>
-  <string name="app_libraries">我們目前使用第三方的函式庫: %s</string>
-  <string name="app_emoji_icons">表情符號圖示: %s</string>
+  <string name="app_authors_fmt">作者: <xliff:g id="app_authors">%s</xliff:g></string>
+  <string name="app_revision_fmt">更新日誌: <xliff:g id="app_revision_url">%s</xliff:g></string>
+  <string name="app_libraries">我們目前使用第三方的函式庫: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+  <string name="app_emoji_icons">表情符號圖示: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
   <string name="read_attachment_label">顯示附件</string>
   <string name="read_attachment_desc">允許該程式讀取附件。</string>
   <string name="read_messages_label">顯示郵件</string>
   <string name="read_messages_desc">允許該程式讀取郵件。</string>
   <string name="delete_messages_label">刪除郵件</string>
   <string name="delete_messages_desc">允許該程式刪除郵件。</string>
-  <string name="about_title_fmt">關於%s</string>
+  <string name="about_title_fmt">關於<xliff:g id="app_name">%s</xliff:g></string>
   <string name="accounts_title">帳戶</string>
   <string name="folders_title">信件匣</string>
   <string name="advanced">進階</string>
-  <string name="message_list_title" formatted="false">%s:%s</string>
+  <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
   <string name="compose_title_compose">新郵件</string>
   <string name="compose_title_reply">回覆</string>
   <string name="compose_title_reply_all">全部回覆</string>
   <string name="compose_title_forward">引用</string>
   <string name="choose_folder_title">選擇信件匣</string>
-  <string name="status_loading_account_folder" formatted="false">正在接收%s:%s%s</string>
-  <string name="status_loading_account_folder_headers" formatted="false">正在接收郵件訊息%s:%s%s</string>
-  <string name="status_sending_account" formatted="false">正在寄送%s%s</string>
-  <string name="status_processing_account" formatted="false">正在處理%s:%s%s</string>
-  <string name="folder_progress" formatted="false">" %s/%s"</string>
-  <string name="status_next_poll">下次接收時間 @ %s</string>
+  <string name="status_loading_account_folder">正在接收<xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="status_loading_account_folder_headers">正在接收郵件訊息<xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="status_sending_account">正在寄送<xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="status_processing_account">正在處理<xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
+  <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
+  <string name="status_next_poll">下次接收時間 @ <xliff:g id="nexttime">%s</xliff:g></string>
   <string name="status_syncing_off">同步已停用</string>
-  <string name="actionbar_selected">%d 已選擇</string>
+  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> 已選擇</string>
   <string name="next_action">下一步</string>
   <string name="previous_action">上一步</string>
   <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
@@ -125,27 +124,27 @@
   <string name="status_network_error">網路連接錯誤</string>
   <string name="status_invalid_id_error">沒有找到郵件</string>
   <string name="status_loading_more_failed">再次嘗試載入更多郵件</string>
-  <string name="load_more_messages_fmt">再載入%d封郵件</string>
+  <string name="load_more_messages_fmt">再載入<xliff:g id="messages_to_load">%d</xliff:g>封郵件</string>
   <string name="abbrev_gigabytes">GB</string>
   <string name="abbrev_megabytes">MB</string>
   <string name="abbrev_kilobytes">KB</string>
   <string name="abbrev_bytes">B</string>
-  <string name="account_size_changed" formatted="false">帳戶「%s」已從%s縮小到%s</string>
-  <string name="compacting_account">正在壓縮帳戶「%s」</string>
-  <string name="clearing_account">正在清理帳戶「%s」</string>
-  <string name="recreating_account">正在重建帳戶「%s」</string>
+  <string name="account_size_changed">帳戶「<xliff:g id="account">%s</xliff:g>」已從<xliff:g id="oldSize">%s</xliff:g>縮小到<xliff:g id="newSize">%s</xliff:g></string>
+  <string name="compacting_account">正在壓縮帳戶「<xliff:g id="account">%s</xliff:g>」</string>
+  <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>
-  <string name="notification_new_messages_title">%d 新訊息</string>
-  <string name="notification_new_one_account_fmt" formatted="false">您有%d封未讀郵件（%s）</string>
-  <string name="notification_additional_messages" formatted="false">+ 來自%s已超過%d則訊息 </string>
+  <string name="notification_new_messages_title"><xliff:g id="new_message_count">%d</xliff:g> 新訊息</string>
+  <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="account">%s</xliff:g>已超過<xliff:g id="additional_messages">%d</xliff:g>則訊息 </string>
   <string name="notification_action_reply">回覆</string>
   <string name="notification_action_mark_as_read">開啟</string>
   <string name="notification_action_delete">刪除</string>
   <string name="notification_certificate_error_title">驗證失敗</string>
   <string name="notification_certificate_error_text">檢查你的伺服器設定</string>
-  <string name="notification_bg_sync_ticker" formatted="false">正在檢查郵件：%s:%s</string>
+  <string name="notification_bg_sync_ticker">正在檢查郵件：<xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">正在檢查郵件</string>
-  <string name="notification_bg_send_ticker">正在寄送郵件：%s</string>
+  <string name="notification_bg_send_ticker">正在寄送郵件：<xliff:g id="account">%s</xliff:g></string>
   <string name="notification_bg_send_title">正在寄送郵件</string>
   <string name="notification_bg_title_separator">：</string>
   <string name="special_mailbox_name_inbox">收件匣</string>
@@ -155,19 +154,19 @@
   <string name="special_mailbox_name_sent">寄件備份</string>
   <string name="special_mailbox_name_archive">歸檔</string>
   <string name="special_mailbox_name_spam">垃圾郵件</string>
-  <string name="special_mailbox_name_drafts_fmt">%s（草稿）</string>
-  <string name="special_mailbox_name_trash_fmt">%s（垃圾桶）</string>
-  <string name="special_mailbox_name_sent_fmt">%s（已寄送）</string>
-  <string name="special_mailbox_name_archive_fmt">%s（歸檔）</string>
-  <string name="special_mailbox_name_spam_fmt">%s（垃圾郵件）</string>
+  <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g>（草稿）</string>
+  <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g>（垃圾桶）</string>
+  <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g>（已寄送）</string>
+  <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g>（歸檔）</string>
+  <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g>（垃圾郵件）</string>
   <string name="send_failure_subject">部分郵件沒有成功寄送</string>
-  <string name="debug_version_fmt">版本：%s</string>
+  <string name="debug_version_fmt">版本：<xliff:g id="version">%s</xliff:g></string>
   <string name="debug_enable_debug_logging_title">啟用除錯日誌</string>
   <string name="debug_enable_debug_logging_summary">記錄額外的除錯訊息</string>
   <string name="debug_enable_sensitive_logging_title">記錄敏感訊息</string>
   <string name="debug_enable_sensitive_logging_summary">允許在日誌中顯示密碼。</string>
   <string name="message_list_load_more_messages_action">載入更多郵件</string>
-  <string name="message_to_fmt">收件人：%s</string>
+  <string name="message_to_fmt">收件人：<xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_compose_to_hint">收件人</string>
   <string name="message_compose_cc_hint">副本</string>
   <string name="message_compose_bcc_hint">密件副本</string>
@@ -190,19 +189,19 @@
   <string name="message_compose_description_add_bcc">新增收件人 (密件副本)</string>
   <string name="message_compose_description_delete_quoted_text">清除引用文字內容</string>
   <string name="message_compose_description_edit_quoted_text">編輯引用文字內容</string>
-  <string name="message_view_from_format" formatted="false">寄件人：%s &lt;%s&gt;</string>
+  <string name="message_view_from_format">寄件人：<xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
   <string name="message_to_label">收件人：</string>
   <string name="message_view_cc_label">副本：</string>
   <string name="message_view_attachment_view_action">開啟</string>
   <string name="message_view_attachment_download_action">儲存</string>
-  <string name="message_view_status_attachment_saved">附件已經儲存到記憶卡：%s。</string>
+  <string name="message_view_status_attachment_saved">附件已經儲存到記憶卡：<xliff:g id="filename">%s</xliff:g>。</string>
   <string name="message_view_status_attachment_not_saved">無法將附件儲存到記憶卡。</string>
   <string name="message_view_show_pictures_action">顯示圖片</string>
   <string name="message_view_show_message_action">顯示訊息</string>
   <string name="message_view_show_attachments_action">顯示附件</string>
   <string name="message_view_show_more_attachments_action">更多…</string>
   <string name="message_view_fetching_attachment_toast">正在接收附件。</string>
-  <string name="message_view_no_viewer">無法開啟%s。找不到可以開啟該附件的程式。</string>
+  <string name="message_view_no_viewer">無法開啟<xliff:g id="mimetype">%s</xliff:g>。找不到可以開啟該附件的程式。</string>
   <string name="message_view_download_remainder">下載完整郵件</string>
   <string name="message_view_downloading">正在下載…</string>
   <!--NOTE: The following message refers to strings with id account_setup_incoming_save_all_headers_label and account_setup_incoming_title-->
@@ -246,7 +245,7 @@
   <string name="global_settings_notification_hide_subject_never">絕不</string>
   <string name="global_settings_notification_hide_subject_when_locked">當手持設備上鎖時</string>
   <string name="global_settings_notification_hide_subject_always">預設</string>
-  <string name="global_settings_notification_quick_delete_title">"顯示'刪除'鈕"</string>
+  <string name="global_settings_notification_quick_delete_title">顯示\'刪除\'鈕</string>
   <string name="global_settings_notification_quick_delete_never">絕不</string>
   <string name="global_settings_notification_quick_delete_when_single_msg">針對單一訊息通知</string>
   <string name="global_settings_notification_quick_delete_always">預設</string>
@@ -323,7 +322,7 @@
   <string name="account_setup_outgoing_username_label">用戶名</string>
   <string name="account_setup_outgoing_password_label">密碼</string>
   <string name="account_setup_outgoing_authentication_label">身份驗證方法</string>
-  <string name="account_setup_bad_uri">無效的設定：%s</string>
+  <string name="account_setup_bad_uri">無效的設定：<xliff:g id="err_mess">%s</xliff:g></string>
   <string name="account_setup_options_title">帳戶選項</string>
   <string name="compact_action">壓縮</string>
   <string name="clear_action">清除郵件（慎用）</string>
@@ -367,12 +366,12 @@
   <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">"使用者名稱或密碼錯誤。
-（%s）"</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">"無法使用指定的加密類型連接到伺服器。
-（%s）"</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">"無法連接到伺服器。
-（%s）"</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">使用者名稱或密碼錯誤。
+（<xliff:g id="error">%s</xliff:g>）</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">無法使用指定的加密類型連接到伺服器。
+（<xliff:g id="error">%s</xliff:g>）</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">無法連接到伺服器。
+（<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>
@@ -584,24 +583,8 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">無法識別的授權認證</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">接收金鑰</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">拒絕金鑰</string>
-  <string name="message_list_help_key">"Del (or D) - 刪除
- R - 回覆
- A - 全部回覆
- C - 新郵件
- F - 轉寄
- M - 移動
- Y - 複製
- G - 星號
- O - 排序方式
- I - 升冪/降冪
- Q - 返回信件匣
- S - 選擇/取消選擇"</string>
-  <string name="folder_list_help_key">"1 - 只顯示上層信件匣
- 2 - 顯示上層和下層信件匣
- 3 - 不包括下層信件匣
- 4 - 顯示全部信件匣
- Q - 返回全部帳戶
- S - 編輯帳戶設定"</string>
+  <string name="message_list_help_key">Del (or D) - 刪除\nR - 回覆\nA - 全部回覆\nC - 新郵件\nF - 轉寄\nM - 移動\nV - Archive\nY - 複製\nZ - Mark (Un)read\nG - 星號\nO - 排序方式\nI - 升冪/降冪\nQ - 返回信件匣\nS - 選擇/取消選擇\nJ or P - Previous Message\nK or N - Next Message</string>
+  <string name="folder_list_help_key">1 - 只顯示上層信件匣\n2 - 顯示上層和下層信件匣\n3 - 不包括下層信件匣\n4 - 顯示全部信件匣\nQ - 返回全部帳戶\nS - 編輯帳戶設定</string>
   <string name="folder_list_filter_hint">信件匣名稱包括</string>
   <string name="folder_list_display_mode_label">信件匣</string>
   <string name="folder_list_display_mode_all">顯示全部信件匣</string>
@@ -663,7 +646,7 @@
   <string name="count_search_summary">關閉該功能以便加快顯示速度</string>
   <string name="hide_special_accounts_title">隱藏特殊帳戶</string>
   <string name="hide_special_accounts_summary">隱藏收件匣與郵件帳戶名稱</string>
-  <string name="search_title" formatted="false">%s %s</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">- 星號</string>
   <string name="unread_modifier">- 未讀</string>
   <string name="search_all_messages_title">所有郵件</string>
@@ -739,15 +722,13 @@
   <string name="dialog_confirm_delete_title">刪除確認</string>
   <string name="dialog_confirm_delete_message">你確定要刪除這封郵件？</string>
   <plurals name="dialog_confirm_delete_messages">
-    <item quantity="other">確定要刪除 %1$d 則訊息?</item>
-    <item quantity="one">確定要刪除此訊息?</item>
+    <item quantity="other">確定要刪除 <xliff:g id="message_count">%1$d</xliff:g> 則訊息?</item>
   </plurals>
   <string name="dialog_confirm_delete_confirm_button">刪除</string>
   <string name="dialog_confirm_delete_cancel_button">不要刪除</string>
   <string name="dialog_confirm_spam_title">移至垃圾桶時確認</string>
   <plurals name="dialog_confirm_spam_message">
-    <item quantity="other">確定要將選取的 %1$d 封郵件移至垃圾桶嗎？</item>
-    <item quantity="one">確定要將郵件移至垃圾桶嗎？</item>
+    <item quantity="other">確定要將選取的 <xliff:g id="message_count">%1$d</xliff:g> 封郵件移至垃圾桶嗎？</item>
   </plurals>
   <string name="dialog_confirm_spam_confirm_button">是</string>
   <string name="dialog_confirm_spam_cancel_button">否</string>
@@ -767,34 +748,31 @@
   <string name="settings_exporting">正在匯出設定…</string>
   <string name="settings_importing">正在匯入設定…</string>
   <string name="settings_import_scanning_file">檢查檔案…</string>
-  <string name="settings_export_success">匯出的設定檔案已經儲存到 %s</string>
-  <string name="settings_import_global_settings_success">從 %s 匯入全域設定檔案</string>
-  <string name="settings_import_success" formatted="false">成功匯入 %s 從 %s</string>
+  <string name="settings_export_success">匯出的設定檔案已經儲存到 <xliff:g id="filename">%s</xliff:g></string>
+  <string name="settings_import_global_settings_success">從 <xliff:g id="filename">%s</xliff:g> 匯入全域設定檔案</string>
+  <string name="settings_import_success">成功匯入 <xliff:g id="accounts">%s</xliff:g> 從 <xliff:g id="filename">%s</xliff:g></string>
   <plurals name="settings_import_accounts">
-    <item quantity="other">%s 帳號</item>
-    <item quantity="one">1 帳號</item>
+    <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> 帳號</item>
   </plurals>
   <string name="settings_export_failure">匯出設定失敗</string>
-  <string name="settings_import_failure">從 %s 匯入設定檔案失敗</string>
+  <string name="settings_import_failure">從 <xliff:g id="filename">%s</xliff:g> 匯入設定檔案失敗</string>
   <string name="settings_export_success_header">已成功匯出</string>
   <string name="settings_export_failed_header">匯出失敗</string>
   <string name="settings_import_success_header">已成功匯入</string>
   <string name="settings_import_failed_header">匯入失敗</string>
   <string name="settings_import_activate_account_header">以啟用的帳戶</string>
-  <string name="settings_import_activate_account_intro" formatted="false">為了使用帳戶 \"%s\" ，你必須提供 %s</string>
+  <string name="settings_import_activate_account_intro">為了使用帳戶 \"<xliff:g id="account">%s</xliff:g>\" ，你必須提供 <xliff:g id="server_passwords">%s</xliff:g></string>
   <plurals name="settings_import_server_passwords">
     <item quantity="other">伺服器密碼</item>
-    <item quantity="one">伺服器密碼</item>
   </plurals>
-  <string name="settings_import_incoming_server">內送伺服器 (%s):</string>
-  <string name="settings_import_outgoing_server">外寄伺服器 (%s):</string>
+  <string name="settings_import_incoming_server">內送伺服器 (<xliff:g id="hostname">%s</xliff:g>):</string>
+  <string name="settings_import_outgoing_server">外寄伺服器 (<xliff:g id="hostname">%s</xliff:g>):</string>
   <plurals name="settings_import_setting_passwords">
     <item quantity="other">正在設定密碼…</item>
-    <item quantity="one">正在設定密碼…</item>
   </plurals>
   <string name="settings_import_use_incoming_server_password">使用內送伺服器密碼</string>
   <string name="activate_account_action">啟動</string>
-  <string name="account_unavailable">帳戶 \"%s\" 目前無法使用; 請檢查儲存空間</string>
+  <string name="account_unavailable">帳戶 \"<xliff:g id="account">%s</xliff:g>\" 目前無法使用; 請檢查儲存空間</string>
   <string name="settings_attachment_default_path">另存附件…</string>
   <string name="attachment_save_title">儲存附件</string>
   <string name="attachment_save_desc">找不到檔案瀏覽器，您要將附件儲存到哪裡？</string>
@@ -823,7 +801,7 @@
   <string name="webview_contextmenu_email_save_action">儲存到聯絡人</string>
   <string name="webview_contextmenu_email_copy_action">複製電子郵件地址到剪貼簿</string>
   <string name="webview_contextmenu_email_clipboard_label">電子郵件地址</string>
-  <string name="image_saved_as">將圖片另存為 \"%s\"</string>
+  <string name="image_saved_as">將圖片另存為 \"<xliff:g id="filename">%s</xliff:g>\"</string>
   <string name="image_saving_failed">儲存圖片失敗</string>
   <string name="account_settings_remote_search_num_results_entries_all">全部</string>
   <string name="account_settings_remote_search_num_results_entries_10">10</string>
@@ -834,7 +812,7 @@
   <string name="account_settings_remote_search_num_results_entries_500">500</string>
   <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
   <string name="account_settings_remote_search_num_label">伺服器搜尋結果項目上限</string>
-  <string name="account_settings_remote_search_num_summary">找到 %s 個符合項目後，搜尋將自動停止。</string>
+  <string name="account_settings_remote_search_num_summary">找到 <xliff:g id="num_results">%s</xliff:g> 個符合項目後，搜尋將自動停止。</string>
   <string name="account_settings_remote_search_full_text">搜尋伺服器時，包括搜尋文字內容</string>
   <string name="account_settings_remote_search_full_text_summary">搜尋所有文字內容，需要更多時間</string>
   <string name="remote_search_sending_query">向伺服器發送查詢</string>
@@ -854,7 +832,7 @@
   <string name="global_settings_threaded_view_summary">群組訊息交談內容</string>
   <string name="upgrade_databases_title">更新資料庫</string>
   <string name="upgrade_databases_unspecified">正在更新資料庫…</string>
-  <string name="upgrade_database_format">正在更新帳號 \"%s\"的資料庫</string>
+  <string name="upgrade_database_format">正在更新帳號 \"<xliff:g id="account">%s</xliff:g>\"的資料庫</string>
   <string name="message_list_loading">載入中…</string>
   <string name="global_settings_splitview_mode_label">顯示分割畫面</string>
   <string name="global_settings_splitview_always">預設</string>
@@ -863,9 +841,9 @@
   <string name="message_view_empty">請從左方選擇訊息</string>
   <string name="global_settings_show_contact_picture_label">顯示聯絡人頭像</string>
   <string name="global_settings_show_contact_picture_summary">在訊息列表上顯示聯絡人頭像</string>
-  <string name="last_refresh_time_format">最後更新 %s</string>
-  <string name="last_refresh_time_format_with_push">最後更新 %s (啟用推送)</string>
-  <string name="preposition_for_date">於 %s</string>
+  <string name="last_refresh_time_format">最後更新 <xliff:g id="formatted_time">%s</xliff:g></string>
+  <string name="last_refresh_time_format_with_push">最後更新 <xliff:g id="time_with_preposition">%s</xliff:g> (啟用推送)</string>
+  <string name="preposition_for_date">於 <xliff:g id="date">%s</xliff:g></string>
   <string name="mark_all_as_read">標記全部為已讀</string>
   <!--=== OpenPGP specific ==================================================================-->
 </resources>