Merge branch 'strings_reformat' into HEAD

res/values-cs/strings.xml

@@ -8,10 +8,14 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Autoři: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Číst přílohy zpráv</string>
     <string name="read_attachment_desc">Povolit této aplikaci číst přílohy vašich zpráv.</string>
@@ -43,6 +47,7 @@
     <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(Příští dotaz @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Další</string> <!-- Used as part of a multi-step process -->
@@ -128,7 +133,6 @@
     <string name="folder_context_menu_title">Možnosti složky</string>
 
     <string name="general_no_subject">(Bez předmětu)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
     <string name="general_no_sender">Bez odesílatele</string>
     <string name="status_loading">Dotazování</string>
     <string name="status_loading_folder">(Dotazování <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -262,6 +266,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="message_compose_content_hint">Text zprávy</string>
     <string name="message_compose_quote_header_separator">-------- Původní zpráva --------</string>
     <string name="message_compose_quote_header_subject">Předmět:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">Odesílatel:</string>
     <string name="message_compose_quote_header_to">Komu:</string>
     <string name="message_compose_quote_header_cc">Kopie:</string>
@@ -326,6 +331,8 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="global_settings_touchable_label">Náhledy zpráv</string>
     <string name="global_settings_touchable_summary">Prostornější seznam položek s náhledy zpráv</string>
     <string name="global_settings_preview_lines_label">Počet řádků náhledu</string>
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
     <string name="global_settings_show_contact_name_label">Zobrazit jména kontaktů</string>
     <string name="global_settings_show_contact_name_summary">Použít jména příjemců ze Seznamu kontaktů, je-li to možné</string>
     <string name="global_settings_registered_name_color_label">Obarvit kontakty</string>
@@ -543,6 +550,8 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="account_settings_notify_self_summary">Oznamovat i v případě odeslání pošty s identitou účtu</string>
     <string name="account_settings_notification_opens_unread_label">Oznámení otevírá nepřečtené zprávy</string>
     <string name="account_settings_notification_opens_unread_summary">Vyhledává nepřečtené zprávy, je-li otevřeno oznámení</string>
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Posunovat navigační tlačítka</string>
     <string name="account_settings_hide_buttons_never">Nikdy</string>
@@ -563,6 +572,14 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="account_settings_reply_after_quote_label">Odpovědět za citovaným textem</string>
     <string name="account_settings_reply_after_quote_summary">Při odpovídání na zprávu se původní zpráva objeví ned vaší odpovědí.</string>
 
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
     <string name="account_settings_general_title">Hlavní nastavení</string>
     <string name="account_settings_display_prefs_title">Zobrazení</string>
     <string name="account_settings_sync">Stahování pošty</string>
@@ -823,6 +840,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="setting_theme_dark">Tmavé</string>
     <string name="setting_theme_light">Světlé</string>
     <string name="display_preferences">Zobrazení</string>
+    <!-- NEW: <string name="global_preferences">Global</string>-->
     <string name="debug_preferences">Ladění</string>
     <string name="privacy_preferences">Soukromí</string>
     <string name="network_preferences">Síť</string>
@@ -890,6 +908,9 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="gestures_title">Gesta</string>
     <string name="gestures_summary">Používat ovládání gesty</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Navigace tlačítky hlasitosti</string>
     <string name="volume_navigation_summary">Přeskakovat přes položky při použití ovladačů hlasitosti</string>
     <string name="volume_navigation_message">Zobrazení zpráv</string>
@@ -945,6 +966,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="font_size_message_list_subject">Předmět zprávy</string>
     <string name="font_size_message_list_sender">Odesílatel zprávy</string>
     <string name="font_size_message_list_date">Datum zprávy</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">Zobrazení zprávy</string>
     <string name="font_size_message_view_sender">Odesílatel zprávy</string>

res/values-de/strings.xml

@@ -3,11 +3,14 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, das K-9-Team und viele Weitere.</string>
+    <!-- NEW: <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">Lizensiert unter der Apache License, Version 2.0.</string>
     <string name="app_authors_fmt">Autoren: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Versionsinformationen: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Anlagen der Nachricht lesen</string>
     <string name="read_attachment_desc">Dieser Anwendung erlauben die Anlagen Ihrer Nachrichten zu lesen.</string>
@@ -467,8 +470,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="account_setup_options_title">Kontoeinstellungen</string>
 
     <string name="compact_action">Komprimieren</string>
-   <string name="clear_action">Alle Daten löschen (Achtung!)</string>
+    <string name="clear_action">Alle Daten löschen (Achtung!)</string>
-   <string name="recreate_action">Daten wiederherstellen (Letzter Ausweg!)</string>
+    <string name="recreate_action">Daten wiederherstellen (Letzter Ausweg!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">E-Mail-Abfrage</string>
     <!-- Frequency also used in account_settings_* -->

res/values-es/strings.xml

@@ -3,10 +3,14 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Leer adjuntos del Email</string>
     <string name="read_attachment_desc">Permitir a esta aplicación leer adjuntos de tu correo</string>
@@ -38,6 +42,7 @@
     <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(Próxima comprobación @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Siguiente</string> <!-- Used as part of a multi-step process -->
@@ -122,7 +127,7 @@
     <string name="folder_context_menu_title">Opciones de carpeta</string>
 
     <string name="general_no_subject">(sin Asunto)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Sin Remitente</string>
     <string name="status_loading">Conectando</string>
     <string name="status_loading_folder">(Conexión <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -254,6 +259,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="message_compose_content_hint">Texto del Mensaje</string>
     <string name="message_compose_quote_header_separator">-------- Mensaje Origianl --------</string>
     <string name="message_compose_quote_header_subject">Asunto:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">Desde:</string>
     <string name="message_compose_quote_header_to">Para:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
@@ -318,6 +324,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="global_settings_touchable_label">Previsualizar mensaje</string>
     <string name="global_settings_touchable_summary">Listas espaciadas con previsualización de mensajes</string>
     <string name="global_settings_preview_lines_label">Previsualizar lineas</string>
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
     <string name="global_settings_show_contact_name_label">Ver nombre de contactos</string>
     <string name="global_settings_show_contact_name_summary">Utilizar nombre de destinatario desde contactos cuando esté disponible</string>
     <string name="global_settings_registered_name_color_label">Colorear contactos</string>
@@ -463,8 +471,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="account_setup_options_title">Opciones de cuenta</string>
 
     <string name="compact_action">Compactar</string>
-   <string name="clear_action">Limpiar mensajes (peligroso!)</string>
+    <string name="clear_action">Limpiar mensajes (peligroso!)</string>
-   <string name="recreate_action">Reconstruir mensajes (última opción!)</string>
+    <string name="recreate_action">Reconstruir mensajes (última opción!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Frecuencia de comprobación de correo</string>
     <!-- Frequency also used in account_settings_* -->
@@ -535,6 +543,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="account_settings_notify_self_summary">Mostrar notificaciones durante el envío de correo</string>
     <string name="account_settings_notification_opens_unread_label">Abrir correo no leído</string>
     <string name="account_settings_notification_opens_unread_summary">Abrir correo no leído desde la notificación</string>
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Botones de desplazamiento</string>
     <string name="account_settings_hide_buttons_never">Nunca</string>
@@ -555,6 +565,14 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="account_settings_reply_after_quote_label">Respuesta tras cita</string>
     <string name="account_settings_reply_after_quote_summary">Cuando se responda a un correo, el texto original estará por encima de su respuesta</string>
 
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
     <string name="account_settings_general_title">Configuración General</string>
     <string name="account_settings_display_prefs_title">Visualización</string>
     <string name="account_settings_sync">Configuración Entrante</string>
@@ -791,13 +809,13 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     Mover\u000AY - Copiar\u000AG - Estrella\u000AO - Tipo ordenación\u000AI - Ordenar\u000AQ
     - Volver a carpetas\u000AS - Des/Marcar</string>
 
-      <string name="folder_list_help_key">
+    <string name="folder_list_help_key">
-      1 - Ver carpetas 1a Clase\u000A
+    1 - Ver carpetas 1a Clase\u000A
-      2 - Ver carpetas 1a y 2a Clase\u000A
+    2 - Ver carpetas 1a y 2a Clase\u000A
-      3 - Ver todas excepto las de 2a Clase\u000A
+    3 - Ver todas excepto las de 2a Clase\u000A
-      4 - Ver todas las carpetas\u000A
+    4 - Ver todas las carpetas\u000A
-      Q - Volve a cuentas\u000A
+    Q - Volve a cuentas\u000A
-      S - Editar preferencias cuenta</string>
+    S - Editar preferencias cuenta</string>
 
     <string name="folder_list_display_mode_label">Carpetas</string>
     <string name="folder_list_display_mode_all">Ver todas las carpetas</string>
@@ -806,6 +824,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="folder_list_display_mode_not_second_class">Ver todas excepto las de 2a Clase</string>
 
 
+
     <string name="account_settings_signature__location_label">Posición de la Frima</string>
     <string name="account_settings_signature__location_before_quoted_text">Antes del texto citado</string>
     <string name="account_settings_signature__location_after_quoted_text">Después del texto citado</string>
@@ -880,6 +899,9 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="gestures_title">Gestos</string>
     <string name="gestures_summary">Aceptar controles gestuales</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Navegación con teclas de volumen</string>
     <string name="volume_navigation_summary">Permite moverse por las opciones utilizando los botones de volumen</string>
     <string name="volume_navigation_message">Vista de mensaje</string>
@@ -935,6 +957,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="font_size_message_list_subject">Asunto</string>
     <string name="font_size_message_list_sender">Remitente</string>
     <string name="font_size_message_list_date">Fecha</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">mensajes</string>
     <string name="font_size_message_view_sender">Remitente</string>
@@ -1001,5 +1024,4 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <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>
-
 </resources>

res/values-fi/strings.xml

@@ -11,6 +11,7 @@
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Me käytämme seuraavia kolmannen osapuolen kirjastoja: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">Emoji-kuvakkeet: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
+
     <string name="read_attachment_label">Lue sähköpostin liitteet</string>
     <string name="read_attachment_desc">Antaa sovellukselle luvan lukea sähköpostisi liitteet.</string>
     <string name="read_messages_label">lue sähköpostit</string>
@@ -23,7 +24,9 @@
     <string name="advanced">Lisävalinnat</string>
     <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
     <string name="shortcuts_title">K-9-tilit</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">Kirjoita</string>
     <string name="debug_title">Vianetsintä</string>
     <string name="choose_folder_title">Valitse kansio</string>
@@ -40,6 +43,8 @@
 
     <string name="status_next_poll">\u0020(Seuraava tarkistus @ <xliff:g id="nexttime">%s</xliff:g>)</string>
     <string name="status_polling_off">\u0020(Tarkistus pois päältä)</string>
+
+    <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Seuraava</string>
     <string name="previous_action">Edellinen</string>
     <string name="okay_action">OK</string>
@@ -79,6 +84,9 @@
     <string name="global_settings_action">Yleiset asetukset</string>
     <string name="remove_account_action">Poista tili</string>
     <string name="clear_pending_action">Tyhjennä odottavat toimenpiteet (vaara!)</string>
+
+
+
     <string name="accounts_action">Tilit</string>
     <string name="back_to_accounts_action">◀</string>
     <string name="back_to_folder_list_action">◀</string>
@@ -86,15 +94,18 @@
     <string name="mark_as_read_action">Merkitse luetuksi</string>
     <string name="send_alternate_action">Jaa</string>
     <string name="send_alternate_chooser_title">Valitse lähettäjä</string>
+
     <string name="mark_all_as_read_dlg_title">Merkitse kaikki viestit luetuksi</string>
     <string name="mark_all_as_read_dlg_instructions_fmt">Merkitse kaikki viestit kansiossa \'<xliff:g id="folder">%s</xliff:g>\' luetuksi? (myös
       viestit jotka ovat kansioissa joita ei näytetä K-9 ohjelmassa)</string>
+
     <string name="flag_action">Lisää tähti</string>
     <string name="unflag_action">Poista tähti</string>
     <string name="copy_action">Kopio</string>
     <string name="show_full_header_action">Näytä täydet otsikkotiedot</string>
     <string name="hide_full_header_action">Piilota täydet otsikkotiedot</string>
     <string name="select_text_action">Valitse teksti</string>
+
     <string name="mark_as_unread_action">Merkitse Lukemattomaksi</string>
     <string name="move_to_action">Siirrä</string>
     <string name="folders_action">Kansiot</string>
@@ -111,9 +122,11 @@
     <string name="set_sort_action">Valitse lajittelu</string>
     <string name="reverse_sort_action">Käänteinen järjestys</string>
     <string name="about_action">Tietoja</string>
+
     <string name="prefs_title">Asetukset</string>
     <string name="accounts_context_menu_title">Tilin asetukset</string>
     <string name="folder_context_menu_title">Kansion asetukset</string>
+
     <string name="general_no_subject">(Ei aihetta)</string>
     <string name="general_no_date">Ei päivämäärää</string>
     <string name="general_no_sender">Ei lähettäjää</string>
@@ -124,44 +137,57 @@
     <string name="status_invalid_id_error">Viestiä ei löydy</string>
     <string name="status_error">Virhe</string>
     <string name="status_sending">Lähettää</string>
+
     <string name="status_loading_more_failed">Yritä ladata lisää viestejä</string>
+
     <string name="load_more_messages_fmt">Lataa
        <xliff:g id="messages_to_load">%d</xliff:g> lisää</string>
+
     <string name="abbrev_gigabytes">Gt</string>
     <string name="abbrev_megabytes">Mt</string>
     <string name="abbrev_kilobytes">kt</string>
     <string name="abbrev_bytes">t</string>
+
     <string name="account_size_changed"> Tilin \"<xliff:g id="account">%s</xliff:g>\" vanha koko
       <xliff:g id="oldSize">%s</xliff:g>
       on nyt
-      <xliff:g id="newSize">%s</xliff:g></string>
+      <xliff:g id="newSize">%s</xliff:g>
+    </string>
+
     <string name="compacting_account">Pakkaa tiliä \"<xliff:g id="account">%s</xliff:g>\"</string>
     <string name="clearing_account">Tyhjentää tiliä \"<xliff:g id="account">%s</xliff:g>\"</string>
     <string name="recreating_account">Luodaan uudelleen tiliä \"<xliff:g id="account">%s</xliff:g>\"</string>
+
     <string name="notification_new_title">Uusi posti</string>
     <string name="notification_new_scrolling">Uusi posti, lähettäjä <xliff:g id="sender">%s</xliff:g></string>
     <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Lukematonta (<xliff:g id="account">%s</xliff:g></string>
     <string name="notification_new_one_account_unknown_unread_count_fmt"><xliff:g id="new_message_count">%d</xliff:g> Uutta posti(a) (<xliff:g id="account">%s</xliff:g>)</string>
     <string name="notification_new_multi_account_fmt"><xliff:g id="number_accounts">%d</xliff:g> tilillä</string>
     <string name="notification_unsent_title">Viestiä ei ole lähetetty</string>
+
     <string name="notification_bg_sync_ticker">Tarkistaa: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
     <string name="notification_bg_sync_title">Tarkistaa posteja</string>
     <string name="notification_bg_send_ticker">Lähettää: <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_bg_send_title">Lähettää viestejä</string>
     <string name="notification_bg_title_separator">:</string>
+
     <string name="special_mailbox_name_inbox">Saapuneet</string>
     <string name="special_mailbox_name_outbox">Lähtevät</string>
+    <!-- The following mailbox names will be used if the user has not specified one from the server -->
     <string name="special_mailbox_name_drafts">Luonnokset</string>
     <string name="special_mailbox_name_trash">Roskakori</string>
     <string name="special_mailbox_name_sent">Lähetetyt</string>
     <string name="special_mailbox_name_archive">Arkisto</string>
     <string name="special_mailbox_name_spam">Roskaposti</string>
+    <!-- Mailbox names displayed to user -->
+
     <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Lähtevät)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Luonnokset)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Roskakori)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Lähetetyt)</string>
     <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Arkisto)</string>
     <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Roskaposti)</string>
+
     <string name="send_failure_subject">Kaikkia viestejä ei onnistuttu lähettämään</string>
     <string name="send_failure_body_abbrev">Katso <xliff:g id="errorFolder">%s</xliff:g> kansiosta lisätietoja.</string>
     <string name="send_failure_body_fmt">K-9 epäonnistui joidenkin viestien lähettämisessä.
@@ -171,42 +197,51 @@
       Jos poistat tähdet, K-9 yrittää lähettää viestit uudelleen.
       Paina pitkään Lähtevät-kansiota avataksesi \"Lähetä viestit\"-toiminta, jolloin viestien lähetystä yritetään uudelleen.\u000A\u000a
       The <xliff:g id="errorFolder">%s</xliff:g> kansiossa saattaa olla virheilmoituksia epäonnistumisesta.</string>
+
     <string name="alert_header">K-9-hälytys</string>
     <string name="no_connection_alert">Synkronointi ja lähetys pysäytetty verkon hitauden vuoksi.</string>
+
     <string name="end_of_folder">Ei enää viestejä</string>
-    <string name="accounts_welcome">Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiakasohjelma Android-käyttöjärjestelmälle. Ohjelma perustuu standardiin Androidin sähköpostiasiakasohjelmaan.
+
-  \n
+    <string name="accounts_welcome">
-  \n\nK-9:n parannetut ominaisuudet sisältävät:
+Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiakasohjelma Android-käyttöjärjestelmälle. Ohjelma perustuu standardiin Androidin sähköpostiasiakasohjelmaan.
-  \n * \"Push\"-viestit IMAP IDLE -ominaisuuden avulla
+\n
-  \n * Parempi suorituskyky
+\n\nK-9:n parannetut ominaisuudet sisältävät:
-  \n * Sähköpostin allekirjoitukset
+\n * \"Push\"-viestit IMAP IDLE -ominaisuuden avulla
-  \n * Piilokopion lähetys itselle
+\n * Parempi suorituskyky
-  \n * Kaikkien kansioiden synkronointi
+\n * Sähköpostin allekirjoitukset
-  \n * Vastaus-osoitteen määrittely
+\n * Piilokopion lähetys itselle
-  \n * Näppäimistoyhdistelmä
+\n * Kaikkien kansioiden synkronointi
-  \n * Parempi IMAP-tuki
+\n * Vastaus-osoitteen määrittely
-  \n * Liitetiedostojen tallennus SD-kortille
+\n * Näppäimistoyhdistelmä
-  \n * Roskakorin tyhjennys
+\n * Parempi IMAP-tuki
-  \n * Viestien lajittelu
+\n * Liitetiedostojen tallennus SD-kortille
-  \n * ...ja paljon muuta
+\n * Roskakorin tyhjennys
-  \n
+\n * Viestien lajittelu
-  \n Valitettavasti K-9 ei sisällä tukea yleisimmille ilmaisille web-sähköposteille (esim hotmail). Lisäksi monien muiden sähköpostiasiakasohjelmien lailla tässä on ongelmia Microsoft Exchange -toimivuudessa.
+\n * ...ja paljon muuta
-  \n
+\n
-  \n Virheilmoitukset, osallistuminen projektiin ja kysymykset: Mene osoitteeseen http://k9mail.googlecode.com/</string>
+\n Valitettavasti K-9 ei sisällä tukea yleisimmille ilmaisille web-sähköposteille (esim hotmail). Lisäksi monien muiden sähköpostiasiakasohjelmien lailla tässä on ongelmia Microsoft Exchange -toimivuudessa.
+\n
+\n Virheilmoitukset, osallistuminen projektiin ja kysymykset: Mene osoitteeseen http://k9mail.googlecode.com/
+</string>
+
     <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
     <string name="debug_enable_debug_logging_title">Ota vianselvityksen lokikirjoituksen käyttöön</string>
     <string name="debug_enable_debug_logging_summary">Kirjoita lokiin laajempi kuvaus ongelmista</string>
     <string name="debug_enable_sensitive_logging_title">Kirjoita lokiin arkaluontoisia tietoja</string>
     <string name="debug_enable_sensitive_logging_summary">Salasanat saattavat näkyä lokeissa.</string>
+
     <string name="message_header_mua">K-9 Mail Androidille</string>
+
     <string name="combined_inbox_title">Kaikki postit</string>
     <string name="combined_inbox_label">Viimeisimmät viestit kaikilta tileiltä</string>
     <string name="combined_inbox_list_title">Saapuneet</string>
+
     <string name="message_list_title_fmt"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g>
-                         <xliff:g id="unread_count">%s</xliff:g>
+                       <xliff:g id="unread_count">%s</xliff:g>
-                         <xliff:g id="polling">%s</xliff:g>
+                       <xliff:g id="polling">%s</xliff:g>
-                         <xliff:g id="sending">%s</xliff:g>
+                       <xliff:g id="sending">%s</xliff:g>
-                         <xliff:g id="push">%s</xliff:g></string>
+                       <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Hae lisää viestejä</string>
     <string name="message_to_fmt">Vastaanottja: <xliff:g id="counterParty"> %s </xliff:g></string>
     <string name="message_list_delete_action">Poista</string>
@@ -214,6 +249,7 @@
     <string name="message_list_mark_unread_action">Merkitse lukemattomaksi</string>
     <string name="message_list_flag_action">Lisää tähti</string>
     <string name="message_list_unflag_action">Poista tähti</string>
+
     <string name="message_compose_to_hint">Vastaanottaja</string>
     <string name="message_compose_cc_hint">Kopio</string>
     <string name="message_compose_bcc_hint">Piilokopio</string>
@@ -293,6 +329,7 @@
     <string name="global_settings_registered_name_color_label">Väritä yhteystiedot</string>
     <string name="global_settings_registered_name_color_default">Älä väritä nimet yhteystiedoissa</string>
     <string name="global_settings_registered_name_color_changed">Väritä nimet yhteystiedoissa</string>
+
     <string name="global_settings_messageview_fixedwidth_label">Kiinteä kirjasinleveys</string>
     <string name="global_settings_messageview_fixedwidth_summary">Käytä kiinteää kirjasinleveyttä muotoilemattomille viesteille</string>
     <string name="global_settings_messageview_return_to_list_label">Palaa poiston jälkeen listanäkymään</string>
@@ -304,12 +341,17 @@
     <string name="global_settings_confirm_action_delete">Poista (vain viestilistassa)</string>
     <string name="global_settings_confirm_action_spam">Roskaposti</string>
     <string name="global_settings_confirm_action_send">Lähetä</string>
+
     <string name="global_settings_privacy_mode_title">Lukitusnäytön ilmoitukset</string>
     <string name="global_settings_privacy_mode_summary">Älä näytä viestin aihetta ilmoituspalkissa jos laite on lukittuna</string>
+
+
     <string name="quiet_time">Hiljainen aika</string>
     <string name="quiet_time_description">Poista käytöstä soittoäänen pirinä, pärinä ja vilkkuminen yöllä</string>
     <string name="quiet_time_starts">Hiljainen aika alkaa</string>
     <string name="quiet_time_ends">Hiljainen aika päättyy</string>
+
+
     <string name="account_setup_basics_title">Lisää uusi tili</string>
     <string name="account_setup_basics_instructions">Anna tilin sähköpostiosoite:</string>
     <string name="account_setup_basics_instructions2_fmt">(Voit lisätä vielä <xliff:g id="number_accounts">%d</xliff:g> tiliä.)</string>
@@ -333,6 +375,7 @@
     <string name="account_setup_names_instructions">Tilisi on määritetty ja postit ovat jo matkalla!</string>
     <string name="account_setup_names_account_name_label">Anna tilin nimi (ei pakollinen):</string>
     <string name="account_setup_names_user_name_label">Anna nimesi (näkyy lähtevissä viesteissä):</string>
+
     <string name="account_setup_finished_toast">Tilisi on määritetty!\n\nHaen posteja\u2026</string>
 
     <string name="account_setup_account_type_title">Tilin tyyppi</string>
@@ -369,24 +412,30 @@
 
     <string name="account_setup_incoming_save_all_headers_title">Viestien otsikkotietojen lataus</string>
     <string name="account_setup_incoming_save_all_headers_label">Tallenna kaikki otsikkotiedot</string>
+
     <string name="local_storage_provider_external_label">Ulkoinen tallennus (SD-kortti)</string>
     <string name="local_storage_provider_internal_label">Säännöllinen sisäinen tallennus</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s toinen sisäinen muisti</string>
     <string name="local_storage_provider_label">Tallennuspaikka</string>
+
     <string name="account_setup_expunge_policy_label">Poista poistetut viestit</string>
     <string name="account_setup_expunge_policy_immediately">Välittömästi</string>
     <string name="account_setup_expunge_policy_on_poll">Jokaisen tarkistuksen aikana</string>
     <string name="account_setup_expunge_policy_manual">Vain manuaalisesti</string>
+
     <string name="account_setup_incoming_imap_path_prefix_label">IMAP -polun etuliite</string>
     <string name="account_setup_incoming_imap_path_prefix_hint">(Automaattinen, käytä NIMITILAA jos on käytettävissä)</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>
     <string name="archive_folder_label">Arkisto-kansio</string>
     <string name="spam_folder_label">Roskaposti-kansio</string>
     <string name="outbox_folder_label">Lähtevät-kansio</string>
+
     <string name="account_setup_incoming_subscribed_folders_only_label">Näytä vain tilatut kansiot</string>
     <string name="account_setup_auto_expand_folder">Aukaise kansio automaattisesti</string>
+
     <string name="account_setup_incoming_webdav_path_prefix_label">OWA-polku</string>
     <string name="account_setup_incoming_webdav_path_prefix_hint">Valinnainen</string>
 
@@ -413,11 +462,15 @@
     <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP ennen SMTP:tä</string>
     <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP ennen SMTP:tä</string>
     <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) ennen SMTP:tä</string>
+
     <string name="account_setup_bad_uri">Virheellinen asetus: <xliff:g id="err_mess">%s</xliff:g></string>
+
     <string name="account_setup_options_title">Tilin valinnat</string>
+
     <string name="compact_action">Tiivistä</string>
     <string name="clear_action">Tyhjennä viestit (vaarallinen!)</string>
     <string name="recreate_action">Luo tiedot uudestaan (viimeinen keino!)</string>
+
     <string name="account_setup_options_mail_check_frequency_label">Kansion tarkastusväli</string>
     <string name="account_setup_options_mail_check_frequency_never">Ei koskaan</string>
     <string name="account_setup_options_mail_check_frequency_1min">Joka minuutti</string>
@@ -460,13 +513,17 @@
     <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_all">Kaikki viestit</string>
+
+
     <string name="move_copy_cannot_copy_unsynced_message">Viestiä ei voi kopioida tai siirtää koska se 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_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>
     <string name="account_settings_title_fmt">Yleiset asetukset</string>
     <string name="account_settings_default">Oletustili</string>
@@ -484,10 +541,12 @@
     <string name="account_settings_notification_opens_unread_summary">Etsii lukemattomia viestejä kun ilmoitukset avataan</string>
     <string name="account_settings_notification_unread_count_label">Näytä lukemattomien viestien määrä</string>
     <string name="account_settings_notification_unread_count_summary">Näytä lukemattomien viestien määrä osoiterivillä.</string>
+
     <string name="account_settings_hide_buttons_label">Selauksen painikkeet</string>
     <string name="account_settings_hide_buttons_never">Ei koskaan</string>
     <string name="account_settings_hide_buttons_keyboard_avail">Kun näppäimistö on käytettävissä</string>
     <string name="account_settings_hide_buttons_always">Aina</string>
+
     <string name="account_settings_enable_move_buttons_label">Ota käyttöön Siirrä-painikkeet</string>
     <string name="account_settings_enable_move_buttons_summary">Näytä Arkistoi-, Siirrä- ja Roskaposti-painikkeet.</string>
     <string name="account_settings_hide_move_buttons_label">Vieritä Siirrä painikkeet</string>
@@ -496,15 +555,20 @@
     <string name="account_settings_show_pictures_never">Ei koskaan</string>
     <string name="account_settings_show_pictures_only_from_contacts">Vain yhteystiedot listan lähettäjiltä</string>
     <string name="account_settings_show_pictures_always">Keneltä tahansa</string>
+
     <string name="account_settings_composition">Lähetetään postia</string>
+
     <string name="account_settings_reply_after_quote_label">Vastaa lainauksen jälkeen</string>
     <string name="account_settings_reply_after_quote_summary">Kun viestiin vastataan, alkuperäinen viesti on vastauksesi yläpuolella.</string>
+
     <string name="account_settings_message_format_label">Viestimuoto</string>
     <string name="account_settings_message_format_text">Pelkkä teksti (kuvat ja muotoilu on poistettu)</string>
     <string name="account_settings_message_format_html">HTML (kuvat ja muotoilu säilytetään)</string>
+
     <string name="account_settings_quote_style_label">Vastaa lainaamalla tyyli</string>
     <string name="account_settings_quote_style_prefix">Etuliite (kuten Gmail, Pine)</string>
     <string name="account_settings_quote_style_header">Otsikko (kuten Outlook, Yahoo!, Hotmail)</string>
+
     <string name="account_settings_general_title">Yleisasetukset</string>
     <string name="account_settings_display_prefs_title">Näytä</string>
     <string name="account_settings_sync">Haetaan viestejä</string>
@@ -521,9 +585,13 @@
 
     <string name="account_settings_mail_check_frequency_label">Kansion tarkastusväli</string>
     <string name="account_settings_second_class_check_frequency_label">2. luokan tarkistuksen väli</string>
+
     <string name="account_settings_storage_title">Tallennus</string>
+
+
     <string name="account_settings_color_label">Tilin väri</string>
     <string name="account_settings_color_summary">Valitse väri tilin kansio- ja tililistaukseen</string>
+
     <string name="account_settings_led_color_label">Ilmoitusvalon (LED) väri</string>
     <string name="account_settings_led_color_summary">Valitse väri, jota puhelimesi LED vilkuttaa tälle tilille</string>
 
@@ -557,6 +625,8 @@
     <string name="account_settings_message_age_3_months">viimeiset 3 kuukautta</string>
     <string name="account_settings_message_age_6_months">viimeiset 6 kuukautta</string>
     <string name="account_settings_message_age_1_year">viime vuonna</string>
+
+
     <string name="account_settings_folder_display_mode_label">Näytä kansiot</string>
     <string name="account_settings_folder_display_mode_all">Kaikki</string>
     <string name="account_settings_folder_display_mode_first_class">Vain 1. luokan kansiot</string>
@@ -630,11 +700,14 @@
     <string name="account_settings_ringtone">Uuden viestin ilmoitusääni</string>
     <string name="account_settings_led_label">Merkkivalo vilkkuu</string>
     <string name="account_settings_led_summary">Viestin saapuessa merkkivalo vilkkuu</string>
+
+
     <string name="account_settings_servers">Palvelimen asetukset</string>
 
     <string name="account_settings_composition_title">Viestin kirjoituksen asetukset</string>
     <string name="account_settings_composition_label">Kirjoituksen oletusasetukset</string>
     <string name="account_settings_composition_summary">Aseta oletusarvot: lähettäjä, piilokopio ja allekirjoitus</string>
+
     <string name="account_settings_identities_label">Hallitse identiteettejä</string>
     <string name="account_settings_identities_summary">Aseta vaihtoehtoinen \'Lähettäjä\' osoitteet ja allekirjoitukset</string>
 
@@ -668,12 +741,15 @@
     <string name="account_settings_signature_use_label">Käytä allekirjoitusta</string>
     <string name="account_settings_signature_label">Allekirjoitus</string>
     <string name="account_settings_signature_summary">Lisää allekirjoitus jokaiseen lähetettävään viestiin</string>
+
     <string name="default_signature">-- \nLähetetty Android-puhelimestani K-9 Mail:lla.</string>
     <string name="default_identity_description">Oletusidentiteetti</string>
     <string name="choose_identity">Valitse identiteetti</string>
     <string name="choose_identity_title">Valitse identiteetti</string>
     <string name="choose_account_title">Valitse tili/identiteetti</string>
     <string name="send_as">Lähetä</string>
+
+
     <string name="no_identities">Mene tilin asetuksiin -> Hallitse identiteettejä luodaksesi identiteetin</string>
     <string name="no_removable_identity">Et voi poistaa ainoaa identiteettiäsi</string>
     <string name="identity_has_no_email">Identiteettiä ei voi käyttää ilman sähköpostiosoitetta</string>
@@ -703,18 +779,24 @@
 
     <string name="account_delete_dlg_title">Poista tili</string>
     <string name="account_delete_dlg_instructions_fmt">Tili \"<xliff:g id="account">%s</xliff:g>\" poistetaan K-9 Mail -ohjelmasta.</string>
+
     <string name="account_recreate_dlg_title">Luo tili uudelleen</string>
     <string name="account_recreate_dlg_instructions_fmt">Kaikki tiedot tililtä \"<xliff:g id="account">%s</xliff:g>\" poistetaan K-9 Mail -ohjelmasta, mutta tilin asetukset säilyvät.</string>
+
     <string name="account_clear_dlg_title">Siivoa tili</string>
     <string name="account_clear_dlg_instructions_fmt">Kaikki viestit tililtä \"<xliff:g id="account">%s</xliff:g>\" poistetaan K-9 Mail -ohjelmasta, mutta tilin asetukset säilyvät.</string>
+
     <string name="provider_note_live">Vain jotkut \"Plus\" tilit sisältävät POP-yhteyden
-          joka sallii tämän ohjelman ottaa yhteyden. Jos et voi kirjautua
+        joka sallii tämän ohjelman ottaa yhteyden. Jos et voi kirjautua
-          oikealla sähköpostiosoitteella ja salasanalla, sinulla ei voi olla maksullista
+        oikealla sähköpostiosoitteella ja salasanalla, sinulla ei voi olla maksullista
-          \"Plus\"-tiliä. Ole hyvä ja käytä www-selainta käyttääksesi niihin sähköpostitileihin.</string>
+        \"Plus\"-tiliä. Ole hyvä ja käytä www-selainta käyttääksesi niihin sähköpostitileihin.</string>
+
     <string name="provider_note_yahoojp">Jos haluat käyttää tämän palveluntarjoajan POP3:a, sinun tulee sallia käyttää POP3 Yahoon sähköpostin asetukset-sivulla.</string>
+
     <string name="account_setup_failed_dlg_invalid_certificate_title">Tunnistamaton sertifikaatti</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_help_key">Del (tai D) - Poista\u000AR -
       Vastaa\u000AA - Vastaa kaikille\u000AF - Välitä\u000AJ tai P - Edellinen
       Viesti\u000AK, N - Seuraava Viesti\u000AM - Siirrä\u000AY - Kopioi\u000AZ - Pienennä\u000AShift-Z -
@@ -723,6 +805,7 @@
       Vastaa\u000AA - Vastaa kaikille\u000AC - Kirjoita\u000AF - Välitä\u000aM -
       Siirrä\u000AY - Kopioi\u000AG - Tähti\u000AO - Lajittelutyyppi\u000AI - Lajittelujärjestys\u000AQ
       - Palaa kansioihin\u000AS - Valitse/poista valinta</string>
+
     <string name="folder_list_help_key">
         1 - Näytä vain 1. luokan kansiot\u000A
         2 - Näytä 1. ja 2. luokan kansiot\u000A
@@ -730,6 +813,7 @@
         4 - Näytä kaikki kansiot\u000A
         Q - Palaa tileihin\u000A
         S - Muokkaa tilin asetuksia</string>
+
     <string name="folder_list_display_mode_label">Kansiot</string>
     <string name="folder_list_display_mode_all">Näytä kaikki kansiot</string>
     <string name="folder_list_display_mode_first_class">Näytä vain 1. luokan kansiot</string>
@@ -754,10 +838,14 @@
     <string name="messageview_preferences">Viestit</string>
     <string name="settings_theme_label">Teema</string>
     <string name="settings_language_label">Kieli</string>
+
     <string name="settings_messageview_mobile_layout_label">Yhden sarakkeen asettelu</string>
     <string name="settings_messageview_mobile_layout_summary">Uudelleenmuotoile HTML-viestit pienemälle näytölle</string>
     <string name="settings_messageview_zoom_controls_label">Järjestelmän zoomin ohjaus</string>
     <string name="settings_messageview_zoom_controls_summary">Ota widgetin zoomaus tai nipistys-zoomaus, jos laite tukee</string>
+
+
+
     <string name="setting_language_system">Järjestelmän oletus</string>
 
     <string name="background_ops_label">Synkronointi taustalla</string>
@@ -793,6 +881,7 @@
     <string name="batch_plain_mode">Pelkistetty tila</string>
     <string name="batch_select_all">Valitse kaikki</string>
     <string name="batch_deselect_all">>Poista kaikki valinnat</string>
+
     <string name="account_setup_push_limit_label">\"Push\" -tilassa tarkistettavien kansioiden max määrä</string>
     <string name="account_setup_push_limit_10">10 kansiota</string>
     <string name="account_setup_push_limit_25">25 kansiota</string>
@@ -801,51 +890,72 @@
     <string name="account_setup_push_limit_250">250 kansiota</string>
     <string name="account_setup_push_limit_500">500 kansiota</string>
     <string name="account_setup_push_limit_1000">1000 kansiota</string>
+
     <string name="animations_title">Animaatio</string>
     <string name="animations_summary">Kirjavat animaatiot</string>
     <string name="gestures_title">Eleet</string>
     <string name="gestures_summary">Hyväksy eleohjaus</string>
+
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Äänenvoimakkuus ylös/alas navigointi</string>
     <string name="volume_navigation_summary">Selaa käyttämällä äänenvoimakkuuskytkintä</string>
     <string name="volume_navigation_message">Viestinäkymä</string>
     <string name="volume_navigation_list">Erilaisia listanäkymiä</string>
+
     <string name="manage_back_title">Määritä \"Takaisin\"-painike</string>
     <string name="manage_back_summary">Pakota \"Takaisin\" siirtämään aina ylemmälle tasolle</string>
+
     <string name="start_integrated_inbox_title">Yhdistetty Saapuneet -laatikko aloituksessa</string>
     <string name="start_integrated_inbox_summary">Näytä Yhdistetty Saapuneet -laatikko aloituksen jälkeen</string>
+
     <string name="measure_accounts_title">Näytä tilin koko</string>
     <string name="measure_accounts_summary">Jos pois päältä, näyttö tulee nopeammin</string>
+
     <string name="count_search_title">Laske haun tulokset</string>
     <string name="count_search_summary">Jos pois päältä, näyttö tulee nopeammin</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"> - Tähdet</string>
     <string name="unread_modifier"> - Lukemattomat</string>
+
     <string name="search_all_messages_title">Kaikki viestit</string>
     <string name="search_all_messages_detail">Kaikki viestit kansioissa, joihin voidaan tehdä hakuja</string>
+
     <string name="integrated_inbox_title">Yhdistetty Saapuneet -laatikko</string>
     <string name="integrated_inbox_detail">Kaikki viestit yhdistetyssä Saapuneet -kansiossa</string>
+
     <string name="tap_hint">Kosketa kirjekuorta tai tähteä nähdäksesi tähdellä merkityt lukemattomat viestit</string>
+
     <string name="folder_settings_include_in_integrated_inbox_label">Yhdistä</string>
     <string name="folder_settings_include_in_integrated_inbox_summary">Lukemattomat viestit näytetään Yhdistetyssä Saapuneet -laatikossa</string>
+
     <string name="account_settings_searchable_label">Etsi kansioista</string>
     <string name="account_settings_searchable_all">Kaikki</string>
     <string name="account_settings_searchable_displayable">Näytettävissä olevat</string>
     <string name="account_settings_searchable_none">Ei mitään</string>
+
     <string name="remote_control_label">K-9 Mail:n etäkäyttö</string>
     <string name="remote_control_desc">Antaa sovellukselle luvan käyttää K-9 Mail toimintoja ja asetuksia.</string>
+
     <string name="font_size_settings_title">Kirjasimen koko</string>
     <string name="font_size_settings_description">Määritä kirjasimen koko</string>
+
     <string name="font_size_account_list">Tililista</string>
     <string name="font_size_account_name">Tilin nimi</string>
     <string name="font_size_account_description">Tilin kuvaus</string>
+
     <string name="font_size_folder_list">Kansiolistat</string>
     <string name="font_size_folder_name">Kansion nimi</string>
     <string name="font_size_folder_status">Kansion tila</string>
+
     <string name="font_size_message_list">Viestilistat</string>
     <string name="font_size_message_list_subject">Viestin aihe</string>
     <string name="font_size_message_list_sender">Lähettäjä</string>
     <string name="font_size_message_list_date">Päiväys</string>
     <string name="font_size_message_list_preview">Esikatselu</string>
+
     <string name="font_size_message_view">Viestinäkymä</string>
     <string name="font_size_message_view_sender">Lähettäjä</string>
     <string name="font_size_message_view_to">Vastaanottaja</string>
@@ -855,6 +965,7 @@
     <string name="font_size_message_view_time">Aika</string>
     <string name="font_size_message_view_date">Päiväys</string>
     <string name="font_size_message_view_content">Viestin sisältö</string>
+
     <string name="font_size_tiniest">Kaikkein pienin</string>
     <string name="font_size_tiny">Erittäin pieni</string>
     <string name="font_size_smaller">Pienempi</string>
@@ -862,16 +973,24 @@
     <string name="font_size_medium">Keskikoko</string>
     <string name="font_size_large">Suuri</string>
     <string name="font_size_larger">Suurin</string>
+
     <string name="font_size_webview_smaller">Pienin</string>
     <string name="font_size_webview_small">Pienempi</string>
     <string name="font_size_webview_normal">Normaali</string>
     <string name="font_size_webview_large">Suurempi</string>
     <string name="font_size_webview_larger">Suurin</string>
+
+    <!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
     <string name="message_compose_buggy_gallery">Tarkista \"Asetukset\" -> \"Ota käyttöön Gallery -bugin kierto\" mahdollistaaksesi kuvien tai videoiden liittämisen Gallery 3D -ohjelmalla.</string>
+
+    <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
     <string name="message_compose_use_workaround">Käytä \"Lisää liite (Kuva\" tai \"Lisää liite (Video)\" toimintoa Gallery 3D:n kuvan tai videon liittämiseksi.</string>
+
     <string name="miscellaneous_preferences">Muut</string>
     <string name="misc_preferences_attachment_title">Ota käyttöön Gallery -bugin kierto</string>
     <string name="misc_preferences_attachment_description">Näytä painikkeet kuvan/videon liitteen lisäämiseksi (Gallery 3D bug-kiertäminen)</string>
+
+    <!-- APG related -->
     <string name="error_activity_not_found">Toiminnolle ei löytynyt soveltuvaa ohjelmaa.</string>
     <string name="error_apg_version_not_supported">Asennettu APG-versio ei ole tuettu.</string>
     <string name="btn_crypto_sign">Allekirjoitus</string>
@@ -884,15 +1003,21 @@
     <string name="pgp_mime_unsupported">PGP/MIME -viestit eivät ole vielä tuettu.</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_instructions_fmt">Tallenna tai hylkää tämä viesti?</string>
+
     <string name="charset_not_found">Viestiä ei voi näyttää koska merkistöä \"<xliff:g id="charset">%s</xliff:g>\" ei löytynyt.</string>
+
     <string name="select_text_now">Valitse kopioitava teksti.</string>
+
     <string name="dialog_confirm_delete_title">Vahvista poisto</string>
     <string name="dialog_confirm_delete_message">Haluatko poistaa tämän viestin?</string>
     <string name="dialog_confirm_delete_confirm_button">Poista</string>
     <string name="dialog_confirm_delete_cancel_button">Älä poista</string>
+
     <string name="debug_logging_enabled">Vianselvitys lokikirjoitus Androidin lokiin otettu käyttöön</string>
+
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Yhteyden muodostus epäonnistui.</string>

res/values-gl/strings.xml

@@ -127,7 +127,7 @@
     <string name="folder_context_menu_title">Opcións de carpeta</string>
 
     <string name="general_no_subject">(sen Asunto)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Sen Remitente</string>
     <string name="status_loading">Conectando</string>
     <string name="status_loading_folder">(Conexión <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -259,6 +259,7 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="message_compose_content_hint">Texto da Mensaxe</string>
     <string name="message_compose_quote_header_separator">-------- Mensaxe Orixianl --------</string>
     <string name="message_compose_quote_header_subject">Asunto:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">Dende:</string>
     <string name="message_compose_quote_header_to">Para:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
@@ -323,6 +324,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="global_settings_touchable_label">Previsualizar mensaxe</string>
     <string name="global_settings_touchable_summary">Listas espaciadas con previsualización de mensaxes</string>
     <string name="global_settings_preview_lines_label">Previsualizar liñas</string>
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
     <string name="global_settings_show_contact_name_label">Ver nome de contactos</string>
     <string name="global_settings_show_contact_name_summary">Usar nome de destinatario dende contactos cando esté dispoñible</string>
     <string name="global_settings_registered_name_color_label">Colorear contactos</string>
@@ -468,8 +471,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="account_setup_options_title">Opcións de conta</string>
 
     <string name="compact_action">Compactar</string>
-   <string name="clear_action">Limpar mensaxes (perigroso!)</string>
+    <string name="clear_action">Limpar mensaxes (perigroso!)</string>
-   <string name="recreate_action">Reconstruir mensaxes (última opción!)</string>
+    <string name="recreate_action">Reconstruir mensaxes (última opción!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Frecuencia de comprobación de correo</string>
     <!-- Frequency also used in account_settings_* -->
@@ -540,6 +543,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="account_settings_notify_self_summary">Amosar notificacións durante o envío de correo</string>
     <string name="account_settings_notification_opens_unread_label">Abrir correo non lido</string>
     <string name="account_settings_notification_opens_unread_summary">Abrir correo non lido dende a notificación</string>
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Botóns de desprazamento</string>
     <string name="account_settings_hide_buttons_never">Nunca</string>
@@ -560,6 +565,14 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="account_settings_reply_after_quote_label">Resposta tras cita</string>
     <string name="account_settings_reply_after_quote_summary">Cando se responda a un correo, o texto orixinal estará por riba da sua resposta</string>
 
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
     <string name="account_settings_general_title">Configuración Xeral</string>
     <string name="account_settings_display_prefs_title">Visualización</string>
     <string name="account_settings_sync">Configuración Entrante</string>
@@ -811,6 +824,7 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="folder_list_display_mode_not_second_class">Ver todas agás as de 2a Clase</string>
 
 
+
     <string name="account_settings_signature__location_label">Posición da sinatura</string>
     <string name="account_settings_signature__location_before_quoted_text">Antes do texto citado</string>
     <string name="account_settings_signature__location_after_quoted_text">Despois do texto citado</string>
@@ -885,6 +899,9 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="gestures_title">Xestos</string>
     <string name="gestures_summary">Aceptar controles xestuáis</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Navegación con teclas de volume</string>
     <string name="volume_navigation_summary">Permite moverse polas opcións usando os botóns de volume</string>
     <string name="volume_navigation_message">Vista de mensaxe</string>
@@ -940,6 +957,7 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="font_size_message_list_subject">Asunto</string>
     <string name="font_size_message_list_sender">Remitente</string>
     <string name="font_size_message_list_date">Data</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">mensaxes</string>
     <string name="font_size_message_view_sender">Remitente</string>
@@ -1006,5 +1024,4 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <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>
-
 </resources>

res/values-it/strings.xml

@@ -42,6 +42,7 @@
     <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(Prossima verifica alle <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Successivo</string> <!-- Used as part of a multi-step process -->
@@ -127,7 +128,7 @@
     <string name="folder_context_menu_title">Opzioni cartella</string>
 
     <string name="general_no_subject">(Nessun oggetto)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Nessun mittente</string>
     <string name="status_loading">Recupero in corso</string>
     <string name="status_loading_folder">(Verifica di <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -325,7 +326,7 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="global_settings_touchable_label">Anteprima messaggi</string>
     <string name="global_settings_touchable_summary">Voci di elenco più ampie con anteprima messaggio</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_label">Mostra nome mittente</string>
     <string name="global_settings_show_correspondent_names_summary">Mostra il nome del mittente al posto dell\'indirizzo e-mail</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>
@@ -472,8 +473,8 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="account_setup_options_title">Opzioni dell\'account</string>
 
     <string name="compact_action">Compatta</string>
-   <string name="clear_action">Cancella i messaggi (pericolo!)</string>
+    <string name="clear_action">Cancella i messaggi (pericolo!)</string>
-   <string name="recreate_action">Ricrea dati (ultima spiaggia!)</string>
+    <string name="recreate_action">Ricrea dati (ultima spiaggia!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Frequenza verifica posta</string>
     <!-- Frequency also used in account_settings_* -->
@@ -812,13 +813,13 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     Sposta\u000AY - Copia\u000AG - Stella\u000AO - Tipo ordinamento\u000AI - Verso ordinamento\u000AQ
     - Ritorna alle cartelle\u000AS - Seleziona/deseleziona</string>
 
-      <string name="folder_list_help_key">
+    <string name="folder_list_help_key">
-      1 - Visualizza soltanto cartelle di 1a Classe\u000A
+    1 - Visualizza soltanto cartelle di 1a Classe\u000A
-      2 - Visualizza cartelle di 1a e 2a Classe\u000A
+    2 - Visualizza cartelle di 1a e 2a Classe\u000A
-      3 - Visualizza tutte eccetto le cartelle di 2a Classe\u000A
+    3 - Visualizza tutte eccetto le cartelle di 2a Classe\u000A
-      4 - Visualizza tutte le cartelle\u000A
+    4 - Visualizza tutte le cartelle\u000A
-      Q - Ritorna agli Account\u000A
+    Q - Ritorna agli Account\u000A
-      S - Modifica le impostazioni dell\'account</string>
+    S - Modifica le impostazioni dell\'account</string>
 
     <string name="folder_list_display_mode_label">Cartelle</string>
     <string name="folder_list_display_mode_all">Visualizza tutte le cartelle</string>
@@ -902,6 +903,9 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="gestures_title">Gestione con tocco</string>
     <string name="gestures_summary">Attiva la gestione con il tocco dei controlli</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Navigazione tasti volume</string>
     <string name="volume_navigation_summary">Scorri elementi utilizzando i controlli del volume</string>
     <string name="volume_navigation_message">Visualizzazione messaggi</string>
@@ -957,7 +961,7 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <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>
-	<string name="font_size_message_list_preview">Anteprima</string>
+    <string name="font_size_message_list_preview">Anteprima</string>
 
     <string name="font_size_message_view">Messaggi</string>
     <string name="font_size_message_view_sender">Mittente</string>

res/values-ja/strings.xml

@@ -127,7 +127,6 @@
     <string name="folder_context_menu_title">フォルダオプション</string>
 
     <string name="general_no_subject">(件名なし)</string>
-
     <string name="general_no_date">日付なし</string>
     <string name="general_no_sender">送信者なし</string>
     <string name="status_loading">取込中</string>
@@ -261,6 +260,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="message_compose_content_hint">本文</string>
     <string name="message_compose_quote_header_separator">-------- 元メール --------</string>
     <string name="message_compose_quote_header_subject">件名:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">送信者:</string>
     <string name="message_compose_quote_header_to">宛先:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
@@ -347,11 +347,13 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="global_settings_privacy_mode_title">スクリーンロック時の通知</string>
     <string name="global_settings_privacy_mode_summary">システムがロックされているときは通知バーにメッセージの表題を表示しない</string>
 
+
     <string name="quiet_time">夜間時間帯</string>
     <string name="quiet_time_description">夜間での各種通知や表示を抑制する時間帯を設定します．</string>
     <string name="quiet_time_starts">開始時刻</string>
     <string name="quiet_time_ends">終了時刻</string>
 
+
     <string name="account_setup_basics_title">電子メールセットアップ</string>
     <string name="account_setup_basics_instructions">このアカウントで使用するメールアドレスを入力して下さい</string>
     <string name="account_setup_basics_instructions2_fmt">(追加する場合は <xliff:g id="number_accounts">%d</xliff:g> と異なるメールアドレスを入力して下さい)</string>
@@ -363,7 +365,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_setup_basics_manual_setup_action">手動設定</string>
 
     <string name="account_setup_check_settings_title"></string>
-<string name="account_setup_check_settings_retr_info_msg">アカウント情報を取得中\u2026</string>
+    <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>
     <string name="account_setup_check_settings_authenticate">認証中\u2026</string>
@@ -841,6 +843,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="settings_messageview_zoom_controls_label">ズーム制御</string>
     <string name="settings_messageview_zoom_controls_summary">デバイスが対応するならば、ズームウィジェットやピンチズームを有効にします</string>
 
+
+
     <string name="setting_language_system">システム設定</string>
 
     <string name="background_ops_label">バックグラウンド同期</string>
@@ -1001,6 +1005,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="save_or_discard_draft_message_dlg_title">メッセージの下書き保存</string>
     <string name="save_or_discard_draft_message_instructions_fmt">メッセージを保存しますか？</string>
+
     <string name="charset_not_found">このメッセージに使われている文字セット \"<xliff:g id="charset">%s</xliff:g>\" は存在していません</string>
 
     <string name="select_text_now">選択したテキストをコピーします</string>

res/values-nl/strings.xml

@@ -3,10 +3,14 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Auteurs: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revisie Informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Lees Email bijlage</string>
     <string name="read_attachment_desc">Sta deze applicatie toe de bijlage van emails te lezen.</string>
@@ -38,12 +42,15 @@
     <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(Volgende poll @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Volgende</string> <!-- Used as part of a multi-step process -->
+    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Annuleer</string>
     <string name="send_action">Verzenden</string>
+    <!-- NEW: <string name="send_again_action">Send Again</string>-->
     <string name="select_action">Selecteren</string>
     <string name="deselect_action">Annuleer selectie</string>
     <string name="reply_action">Antwoorden</string>
@@ -110,6 +117,7 @@
     <string name="dump_settings_action">Gooi instellingen weg</string>
     <string name="empty_trash_action">Prullenbak legen</string>
     <string name="expunge_action">Wissen</string>
+    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
     <string name="set_sort_action">Kies sortering</string>
     <string name="reverse_sort_action">Omgekeerd sorteren</string>
     <string name="about_action">Over</string>
@@ -119,7 +127,7 @@
     <string name="folder_context_menu_title">Map opties</string>
 
     <string name="general_no_subject">(Geen onderwerp)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Geen afzender</string>
     <string name="status_loading">Polling</string>
     <string name="status_loading_folder">(Poll <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -252,6 +260,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="message_compose_content_hint">Bericht tekst</string>
     <string name="message_compose_quote_header_separator">-------- Origineel bericht --------</string>
     <string name="message_compose_quote_header_subject">Subject:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">From:</string>
     <string name="message_compose_quote_header_to">To:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
@@ -288,6 +297,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="message_additional_headers_not_downloaded">Niet alle headers zijn gedownload of opgeslagen. Selecteer \"Sla alle headers lokaal op\" in de account\'s inkomende server instellingen om dit in te schakelen voor de toekomst.</string>
     <string name="message_no_additional_headers_available">Alle headers zijn gedownload, maar er zijn geen extra headers aan te tonen.</string>
     <string name="message_additional_headers_retrieval_failed">Het ophalen van extra headers uit de database of e-mail server is mislukt.</string>
+
     <string name="mailbox_select_dlg_title">Mappen</string>
     <string name="mailbox_select_dlg_new_mailbox_action">Nieuwe map</string>
 
@@ -314,7 +324,11 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="global_settings_checkbox_summary">Laat altijd multi-selecteer selectieboxen zien</string>
     <string name="global_settings_touchable_label">Berichten voorbeelden</string>
     <string name="global_settings_touchable_summary">Ruimere lijst items met bericht voorbeelden</string>
-
+    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
     <string name="global_settings_registered_name_color_label">Kleuren contacten</string>
     <string name="global_settings_registered_name_color_default">Niet kleuren van namen in uw lijst met contactpersonen</string>
     <string name="global_settings_registered_name_color_changed">Kleuren van namen in uw lijst met contactpersonen</string>
@@ -334,6 +348,13 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="global_settings_privacy_mode_title">Lock-screen meldingen</string>
     <string name="global_settings_privacy_mode_summary">Niet weergegeven onderwerp van het bericht in de notificatie bar als het systeem is vergrendeld</string>
 
+
+    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
+    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
+    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
+    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+
+
     <string name="account_setup_basics_title">Een nieuwe account instellen</string>
     <string name="account_setup_basics_instructions">Toets het email adres in van deze account:</string>
     <string name="account_setup_basics_instructions2_fmt">(Je mag meer <xliff:g id="number_accounts">%d</xliff:g> accounts toevoegen.)</string>
@@ -348,6 +369,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_check_settings_retr_info_msg">Ophalen account informatie\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Controleren van inkomende serverinstellingen\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Controleren van uitgaande serverinstellingen\u2026</string>
+    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
+    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
     <string name="account_setup_check_settings_finishing_msg">Afronden\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Annuleren\u2026</string>
 
@@ -393,6 +416,11 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_incoming_save_all_headers_title">Downloaden van email headers</string>
     <string name="account_setup_incoming_save_all_headers_label">Sla alle headers lokaal op</string>
 
+    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
+    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+
     <string name="account_setup_expunge_policy_label">Wissen berichten</string>
     <string name="account_setup_expunge_policy_immediately">Onmiddellijk na verwijderen of verplaatsen</string>
     <string name="account_setup_expunge_policy_on_poll">Tijdens iedere poll</string>
@@ -444,8 +472,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_options_title">Account opties</string>
 
     <string name="compact_action">Compact</string>
-   <string name="clear_action">Clear berichten (gevaar!)</string>
+    <string name="clear_action">Clear berichten (gevaar!)</string>
-   <string name="recreate_action">Recreeren gegevens (Laatste mogelijkheid!)</string>
+    <string name="recreate_action">Recreeren gegevens (Laatste mogelijkheid!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Map poll controleer frequentie</string>
     <!-- Frequency also used in account_settings_* -->
@@ -489,6 +517,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_options_mail_display_count_250">250 berichten</string>
     <string name="account_setup_options_mail_display_count_500">500 berichten</string>
     <string name="account_setup_options_mail_display_count_1000">1000 berichten</string>
+    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</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>
@@ -500,6 +529,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_failed_dlg_edit_details_action">Aanpassen details</string>
     <string name="account_setup_failed_dlg_continue_action">Doorgaan</string>
 
+    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
     <string name="account_settings_title_fmt">Algemene instellingen</string>
     <string name="account_settings_default">Standaard account</string>
     <string name="account_settings_default_label">Standaard account</string>
@@ -513,8 +543,9 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_notify_self_label">Notificatie voor mail welke ik verstuur</string>
     <string name="account_settings_notify_self_summary">Notificatie ook voor mail verzonden vanaf een identiteit</string>
     <string name="account_settings_notification_opens_unread_label">Notificatie opent ongelezen berichten</string>
-    <string name="account_settings_notification_opens_unread_summary">Zoekt voor ongelezen berichten wanneer Notificatie is geopend
+    <string name="account_settings_notification_opens_unread_summary">Zoekt voor ongelezen berichten wanneer Notificatie is geopend</string>
-</string>
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Scroll navigatie knoppen</string>
     <string name="account_settings_hide_buttons_never">Nooit</string>
@@ -535,7 +566,16 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_reply_after_quote_label">Antwoorden na quote</string>
     <string name="account_settings_reply_after_quote_summary">Wanneer u antwoord op berichten, zal het originele bericht boven uw antwoord staan.</string>
 
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
 
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
+    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
+    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
     <string name="account_settings_sync">Synchroniseren van mappen</string>
     <string name="account_settings_folders">Mappen</string>
     <string name="account_settings_message_lists">Lijst berichten</string>
@@ -551,12 +591,14 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_mail_check_frequency_label">Mappen poll controleer frequentie</string>
     <string name="account_settings_second_class_check_frequency_label">2e klasse controleer frequentie</string>
 
+    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+
+
     <string name="account_settings_color_label">Account kleur</string>
     <string name="account_settings_color_summary">Kies de kleur van het account gebruikt in mappen en account lijst</string>
 
     <string name="account_settings_led_color_label">Notificatie LED kleur</string>
-    <string name="account_settings_led_color_summary">Kies de LED kleur van de telefoon, welke moet knipperen voor deze account
+    <string name="account_settings_led_color_summary">Kies de LED kleur van de telefoon, welke moet knipperen voor deze account</string>
-</string>
 
     <string name="account_settings_mail_display_count_label">Aantal berichten om te laten zien</string>
 
@@ -663,8 +705,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_ringtone">Nieuwe mail beltoon</string>
     <string name="account_settings_led_label">Knipper LED</string>
     <string name="account_settings_led_summary">Knipper LED wanneer mail binnenkomt</string>
-    
+
-    
+
     <string name="account_settings_servers">Server instellingen</string>
 
     <string name="account_settings_composition_title">Bericht samenstelling opties</string>
@@ -710,6 +752,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="choose_identity">Kies identiteit</string>
     <string name="choose_identity_title">Kies identiteit</string>
     <string name="choose_account_title">Kies account/identiteit</string>
+    <!-- NEW: <string name="send_as">Send as</string>-->
+
 
     <string name="no_identities">Ga naar Account Instellingen -&gt; Beheer identiteiten om identiteiten aan te maken</string>
     <string name="no_removable_identity">Je kan je eigen identiteit niet verwijderen</string>
@@ -750,6 +794,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="provider_note_live">Alleen sommige \"Plus\" accounts staan POP access
  toe om verbinding te krijgen met dit programma. Als het niet mogelijk is om in te loggen met de juiste gebruikersnaam en wachtwoord, heb je misschien geen betaalde \"Plus\" account.  Start de webbrowser om de toegang tot deze e-mailaccount te krijgen.</string>
 
+    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+
     <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>
@@ -785,13 +831,24 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="setting_theme_dark">Donker</string>
     <string name="setting_theme_light">Licht</string>
     <string name="display_preferences">Algemene instellingen</string>
+    <!-- NEW: <string name="global_preferences">Global</string>-->
     <string name="debug_preferences">Verwijderen van fouten</string>
+    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
+    <!-- NEW: <string name="network_preferences">Network</string>-->
+    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
     <string name="accountlist_preferences">Account Lijst</string>
     <string name="messagelist_preferences">Berichten Lijst</string>
     <string name="messageview_preferences">Berichten</string>
     <string name="settings_theme_label">Thema</string>
     <string name="settings_language_label">Taal</string>
 
+    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
+    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+
+
+
     <string name="setting_language_system">Volgens systeem</string>
 
     <string name="background_ops_label">Achtergrond sync</string>
@@ -842,6 +899,9 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="gestures_title">Gebaren</string>
     <string name="gestures_summary">Accepteer gebaren sturing</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Volume op/neer navigatie</string>
     <string name="volume_navigation_summary">Spring tussen items door gebruik van de volumeknoppen</string>
     <string name="volume_navigation_message">Bericht beeld</string>
@@ -897,6 +957,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="font_size_message_list_subject">Bericht onderwerp</string>
     <string name="font_size_message_list_sender">bericht afzender</string>
     <string name="font_size_message_list_date">Bericht datum</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">Beeld berichten</string>
     <string name="font_size_message_view_sender">bericht afzender</string>
@@ -958,7 +1019,9 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="dialog_confirm_delete_confirm_button">Verwijder</string>
     <string name="dialog_confirm_delete_cancel_button">Niet verwijderen</string>
 
-    <string name="debug_logging_enabled">Debug logging van Android logging systeem ingeschakeld
+    <string name="debug_logging_enabled">Debug logging van Android logging systeem ingeschakeld</string>
-</string>
 
+    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
+    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
 </resources>

res/values-pl/strings.xml

@@ -15,47 +15,61 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Autorzy: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Historia zmian: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Odczyt załączników</string>
     <string name="read_attachment_desc">Zezwalaj tej aplikacji na czytanie załaczników z Twoich maili.</string>
+    <!-- NEW: <string name="read_messages_label">read Emails</string>-->
+    <!-- NEW: <string name="read_messages_desc">Allows this application to read your Emails.</string>-->
+    <!-- NEW: <string name="delete_messages_label">Delete Emails</string>-->
+    <!-- NEW: <string name="delete_messages_desc">Allows this application to delete your Emails.</string>-->
 
     <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string>
     <string name="accounts_title">Konta</string>
     <string name="advanced">Zaawansowane</string>
-       <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
+    <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
-       <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
+    <!-- NEW: <string name="shortcuts_title">K-9 Accounts</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">Nie</string>
     <string name="debug_title">Debug</string>
     <string name="choose_folder_title">Wybierz folder</string>
     <string name="choose_color_title">Wybierz kolor</string>
 
-
     <string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
 
     <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
     <string name="status_loading_account_folder">\u0020(Pobieram <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_loading_account_folder_headers">\u0020(Fetching 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">\u0020(Wysyłam <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
     <string name="status_processing_account">\u0020(Przetw. <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">\u0020(Sprawdzę o <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Dalej</string> <!-- Used as part of a multi-step process -->
+    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Anuluj</string>
     <string name="send_action">Wyślij</string>
+    <!-- NEW: <string name="send_again_action">Send Again</string>-->
     <string name="select_action">Zaznacz</string>
     <string name="deselect_action">Odznacz</string>
     <string name="reply_action">Odpowiedz</string>
     <string name="reply_all_action">Odpowiedz wszystkim</string>
     <string name="delete_action">Usuń</string>
     <string name="archive_action">Archiwizuj</string>
+    <!-- NEW: <string name="spam_action">Spam</string>-->
     <string name="delete_all_action">Wyczyśc folder</string>
     <string name="forward_action">Prześlij dalej</string>
     <string name="move_action">Przenieś</string>
@@ -79,6 +93,7 @@
     <string name="open_action">Otwórz</string>
     <string name="account_settings_action">Ustawienia konta</string>
     <string name="folder_settings_action">Ustawienia folderu</string>
+    <!-- NEW: <string name="global_settings_action">Global settings</string>-->
     <string name="remove_account_action">Usuń konto</string>
     <string name="clear_pending_action">Anuluj oczekujące zadania (niebezpieczne!)</string>
 
@@ -101,7 +116,7 @@
     <string name="copy_action">Skopiuj</string>
     <string name="show_full_header_action">Pokaż pełne nagłówki</string>
     <string name="hide_full_header_action">Ukryj pełne nagłówki</string>
-
+    <!-- NEW: <string name="select_text_action">Select text</string>-->
 
     <string name="mark_as_unread_action">Jako nieprzeczytane</string>
     <string name="move_to_action">Przenieś do</string>
@@ -112,10 +127,10 @@
     <string name="add_attachment_action">Dodaj załącznik</string>
     <string name="add_attachment_action_image">Dodaj załącznik (Zdjęcie)</string>
     <string name="add_attachment_action_video">Add załącznik (Film)</string>
-
     <string name="dump_settings_action">Zapisz ustawienia</string>
     <string name="empty_trash_action">Opróżnij śmietnik</string>
     <string name="expunge_action">Expunge</string> <!-- FIXME -->
+    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
     <string name="set_sort_action">Wybierz sortowanie</string>
     <string name="reverse_sort_action">Sortuj malejąco</string>
     <string name="about_action">O programie</string>
@@ -125,7 +140,7 @@
     <string name="folder_context_menu_title">Opcje folderu</string>
 
     <string name="general_no_subject">(Brak tematu)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Brak nadawcy</string>
     <string name="status_loading">Poll <xliff:g id="progress">%s</xliff:g></string>
     <string name="status_loading_folder">(Poll <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -170,12 +185,16 @@
     <string name="special_mailbox_name_drafts">Drafts</string>
     <string name="special_mailbox_name_trash">Trash</string>
     <string name="special_mailbox_name_sent">Sent</string>
+    <!-- NEW: <string name="special_mailbox_name_archive">Archive</string>-->
+    <!-- NEW: <string name="special_mailbox_name_spam">Spam</string>-->
     <!-- Mailbox names displayed to user -->
 
     <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Do wysłania)</string>
     <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Szkice)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Śmietnik)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Wysłane)</string>
+    <!-- NEW: <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>-->
+    <!-- NEW: <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>-->
 
     <string name="send_failure_subject">Niektóre wiadomości nie zostały wysłane</string>
     <string name="send_failure_body_abbrev">Dalsze informacje znajdziesz w folderze <xliff:g id="errorFolder">%s</xliff:g>.</string>
@@ -251,6 +270,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_compose_content_hint">Treść wiadomości</string>
     <string name="message_compose_quote_header_separator">-------- Wiadomość oryginalna --------</string>
     <string name="message_compose_quote_header_subject">Temat:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">Od:</string>
     <string name="message_compose_quote_header_to">Do:</string>
     <string name="message_compose_quote_header_cc">DW:</string>
@@ -260,6 +280,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_compose_downloading_attachments_toast">Niektóre załączniki nie zostały pobrane. Zostaną pobrane automatycznie przed wysłaniem tej wiadomości.</string>
     <string name="message_compose_attachments_skipped_toast">Niektóre załączniki nie mogą byc przesłane dalej ponieważ nie zostały wcześniej pobrane.</string>
 
+
+
     <string name="message_view_from_format">Od: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
     <string name="message_to_label">Do:</string>
     <string name="message_view_cc_label">DW:</string>
@@ -267,6 +289,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_view_attachment_download_action">Zapisz</string>
     <string name="message_view_prev_action">\u25BC</string>
     <string name="message_view_next_action">\u25B2</string>
+    <!-- NEW: <string name="message_view_archive_action">Archive</string>-->
+    <!-- NEW: <string name="message_view_move_action">Move</string>-->
+    <!-- NEW: <string name="message_view_spam_action">Spam</string>-->
     <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
     <string name="message_view_status_attachment_saved">Załącznik zapisano na karcie SD jako <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Zapisywanie załącznika na karcie SD nie powiodło się.</string>
@@ -275,6 +300,10 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_view_fetching_attachment_toast">Pobieram załącznik...</string>
     <string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
 
+
+    <!-- NEW: <string name="message_view_download_remainder">Download complete message</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">Nie wszystkie nagłówki zostały pobrane lub zapisane. Wybierz \"Zapisuj nagłówki lokalnie\" w ustawieniach serwera poczty przychodzącej aby tę funcje aktywować</string>
     <string name="message_no_additional_headers_available">Wszystkie nagłówki pobrano, niemniej nie znaleziono żadnych dodatkowych do wyświetlenia.</string>
     <string name="message_additional_headers_retrieval_failed">Pobieranie nagłówkow nie powiodło się.</string>
@@ -305,12 +334,37 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="global_settings_checkbox_summary">Opcja zaznaczania dostępna zawsze w trybie wielokrotnego wyboru</string>
     <string name="global_settings_touchable_label">Widok Touch-friendly</string>
     <string name="global_settings_touchable_summary">Lista z podglądem treści wiadomości</string>
+    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
 
     <string name="global_settings_messageview_fixedwidth_label">Czcionka o stałej szer.</string>
     <string name="global_settings_messageview_fixedwidth_summary">Użyj czcionki o stałej szerokości do wyświetlania maili tekstowych</string>
     <string name="global_settings_messageview_return_to_list_label">Skasuj i wróć do listy</string>
     <string name="global_settings_messageview_return_to_list_summary">Wraca do listy wiadomości po usunięciu danego maila</string>
 
+    <!-- NEW: <string name="global_settings_confirm_actions_title">Confirm actions</string>-->
+    <!-- NEW: <string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_archive">Archive</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_delete">Delete (message view only)</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_spam">Spam</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_send">Send</string>-->
+
+    <!-- NEW: <string name="global_settings_privacy_mode_title">Lock-screen notifications</string>-->
+    <!-- NEW: <string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string>-->
+
+
+    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
+    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
+    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
+    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+
+
     <string name="account_setup_basics_title">Dodaj konto</string>
     <string name="account_setup_basics_instructions">Wpisz dane konta</string>
     <string name="account_setup_basics_instructions2_fmt">(Możesz utworzyć <xliff:g id="number_accounts">%d</xliff:g> dodatkowych kont.)</string>
@@ -325,6 +379,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_check_settings_retr_info_msg">Pobieram informacje\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Sprawdzam ustawienia serwera\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Sprawdzam ustawienia serwera\u2026</string>
+    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
+    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
     <string name="account_setup_check_settings_finishing_msg">Kończę\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Przerywam\u2026</string>
 
@@ -370,6 +426,11 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_incoming_save_all_headers_title">Pobieranie nagłówków wiadomości</string>
     <string name="account_setup_incoming_save_all_headers_label">Zapisuj nagłówki lokalnie</string>
 
+    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
+    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>
+
     <string name="account_setup_expunge_policy_label">Usuwanie wiadomości</string>
     <string name="account_setup_expunge_policy_immediately">Od razu po skasowaniu lub przeniesieniu</string>
     <string name="account_setup_expunge_policy_on_poll">Podczas każdego pobrania</string>
@@ -381,6 +442,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="drafts_folder_label">Drafts folder name</string>
     <string name="sent_folder_label">Sent folder name</string>
     <string name="trash_folder_label">Trash folder name</string>
+    <!-- NEW: <string name="archive_folder_label">Archive folder</string>-->
+    <!-- NEW: <string name="spam_folder_label">Spam folder</string>-->
     <string name="outbox_folder_label">Outbox folder name</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Pokaż tylko subskrybowane foldery</string>
@@ -406,8 +469,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_outgoing_username_label">Identyfikator</string>
     <string name="account_setup_outgoing_password_label">Haslo</string>
     <string name="account_setup_outgoing_authentication_label">Rodzaj autentykacji</string>
-    <!-- The authentication strings below are for a planned (hopefully) change to the above username and password options
+    <!-- The authentication strings below are for a planned (hopefully) change to the above username and password options -->
--->
     <string name="account_setup_outgoing_authentication_basic_label">Login i hasło</string>
     <string name="account_setup_outgoing_authentication_basic_username_label">Identyfikator</string>
     <string name="account_setup_outgoing_authentication_basic_password_label">Hasło</string>
@@ -423,7 +485,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="clear_action">Usuń wszystkie dane (niebezpieczne!)</string>
     <string name="recreate_action">Odtwórz dane (ostatnia szansa!)</string>
 
-
     <string name="account_setup_options_mail_check_frequency_label">Pobieranie maili</string>
     <!-- Frequency also used in account_settings_* -->
     <string name="account_setup_options_mail_check_frequency_never">Nigdy</string>
@@ -466,6 +527,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_options_mail_display_count_250">250 wiadomości</string>
     <string name="account_setup_options_mail_display_count_500">500 wiadomości</string>
     <string name="account_setup_options_mail_display_count_1000">1000 wiadomości</string>
+    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
+
 
     <string name="move_copy_cannot_copy_unsynced_message">Nie mogę skopiować ani przenieść wiadomości, która nie jest zsynchronizowana z serwerem</string>
 
@@ -476,6 +539,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_failed_dlg_edit_details_action">Popraw ustawienia</string>
     <string name="account_setup_failed_dlg_continue_action">Kontynuuj</string>
 
+    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
     <string name="account_settings_title_fmt">Ustawienia ogólne</string>
     <string name="account_settings_default">Konto domyślne</string>
     <string name="account_settings_default_label">Konto domyślne</string>
@@ -490,22 +554,56 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_notify_self_summary">Powiadamiaj o mailach wysłanych przeze mnie</string>
     <string name="account_settings_notification_opens_unread_label">Notyfikacja otwiera nieprz. wiadomości</string> <!-- FIXME -->
     <string name="account_settings_notification_opens_unread_summary">Notifikacja wyszukuje nieprz. wiadomości</string> <!-- FIXME -->
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Przyciski nawigacyjne</string>
     <string name="account_settings_hide_buttons_never">Przyciski nie są nigdy przesuwalne</string>
     <string name="account_settings_hide_buttons_keyboard_avail">Przesuwalne, gdy jest klawiatura</string>
     <string name="account_settings_hide_buttons_always">Przyciski są zawsze przesuwalne</string>
 
+    <!-- NEW: <string name="account_settings_enable_move_buttons_label">Enable refile buttons</string>-->
+    <!-- NEW: <string name="account_settings_enable_move_buttons_summary">Show the Archive, Move, and Spam buttons.</string>-->
+    <!-- NEW: <string name="account_settings_hide_move_buttons_label">Scroll refile buttons</string>-->
+
+    <!-- NEW: <string name="account_settings_show_pictures_label">Always show images</string>-->
+    <!-- NEW: <string name="account_settings_show_pictures_never">No</string>-->
+    <!-- NEW: <string name="account_settings_show_pictures_only_from_contacts">From contacts</string>-->
+    <!-- NEW: <string name="account_settings_show_pictures_always">From anyone</string>-->
+
     <string name="account_settings_composition">Tworzenie wiadomości</string>
+
+    <!-- NEW: <string name="account_settings_reply_after_quote_label">Reply after quoted text</string>-->
+    <!-- NEW: <string name="account_settings_reply_after_quote_summary">When replying to messages, the original message will appear above your reply.</string>-->
+
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
+    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
+    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
     <string name="account_settings_sync">Synchronizacja folderów</string>
     <string name="account_settings_folders">Foldery</string>
     <string name="account_settings_message_lists">Lista wiadomości</string>
     <string name="account_settings_message_view">Wyświetlanie wiadomości</string>
     <string name="account_settings_quote_prefix_label">Prefiks cytowania</string>
+    <!-- NEW: <string name="account_settings_crypto">Cryptography</string>-->
+    <!-- NEW: <string name="account_settings_crypto_app">OpenPGP Provider</string>-->
+    <!-- NEW: <string name="account_settings_crypto_app_none">None</string>-->
+    <!-- NEW: <string name="account_settings_crypto_app_not_available">not available</string>-->
+    <!-- NEW: <string name="account_settings_crypto_auto_signature">Auto-sign</string>-->
+    <!-- NEW: <string name="account_settings_crypto_auto_signature_summary">Use the account\'s email address to guess the signature key.</string>-->
 
     <string name="account_settings_mail_check_frequency_label">Sprawdzanie konta</string>
     <string name="account_settings_second_class_check_frequency_label">Cykliczne sprawdzanie folderów klasy 2</string>
 
+    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+
+
     <string name="account_settings_color_label">Kolor konta</string>
     <string name="account_settings_color_summary">Wybierz kolor, który będzie użyty przy wyświetlaniu folderów i listy kont</string>
 
@@ -514,6 +612,21 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
 
     <string name="account_settings_mail_display_count_label">Liczba wiadomości</string>
 
+    <!-- NEW: <string name="account_settings_autodownload_message_size_label">Fetch messages up to</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_1">1Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_2">2Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_4">4Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_8">8Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_16">16Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_32">32Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_64">64Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_128">128Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_256">256Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_512">512Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_1024">1Mb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_2048">2Mb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_any">any size (no limit)</string>-->
+
     <string name="account_settings_message_age_label">Synchronizuj nowsze niż</string>
     <string name="account_settings_message_age_any">Wielki Wybuch</string>
     <string name="account_settings_message_age_0">1 dzień</string>
@@ -528,6 +641,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_message_age_6_months">ostatnie 6 miesięcy</string>
     <string name="account_settings_message_age_1_year">ostatni rok</string>
 
+
     <string name="account_settings_folder_display_mode_label">Wyświetlaj foldery</string>
     <string name="account_settings_folder_display_mode_all">Wszystkie</string>
     <string name="account_settings_folder_display_mode_first_class">Tylko foldery klasy 1</string>
@@ -554,6 +668,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_folder_target_mode_first_and_second_class">Foldery klasy 1 oraz 2</string>
     <string name="account_settings_folder_target_mode_not_second_class">Wszystkich poza klasą 2</string>
 
+    <!-- NEW: <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>-->
+    <!-- NEW: <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>-->
+
     <string name="folder_settings_title">Ustawienia folderu</string>
 
     <string name="folder_settings_in_top_group_label">Umieść na początku</string>
@@ -596,6 +713,10 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_vibrate_pattern_5">Schemat 5</string>
     <string name="account_settings_vibrate_times">Liczba wibracji</string>
     <string name="account_settings_ringtone">Sygnał dzwiękowy</string>
+    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
+    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
+
+
     <string name="account_settings_servers">Ustawienia serwera</string>
 
     <string name="account_settings_composition_title">Opcje tworzenia wiadomości</string>
@@ -640,6 +761,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="default_identity_description">Tożsamość domyślna</string>
     <string name="choose_identity">Wybierz tożsamość</string>
     <string name="choose_identity_title">Wybierz tożsamość</string>
+    <!-- NEW: <string name="choose_account_title">Choose account/identity</string>-->
+    <!-- NEW: <string name="send_as">Send as</string>-->
+
 
     <string name="no_identities">Przejdź do "Ustawienia Konta" -&gt; "Tożsamości" aby utworzyć tożsamość</string>
     <string name="no_removable_identity">Nie możesz usunąć jedynej tożsamości</string>
@@ -683,6 +807,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
         nie masz płatnego konta typu \"Plus\". W takim przypadku musisz z poczty
         korzystać w dotychczasowy sposób, za pośrednictwem przeglądarki.</string>
 
+    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+
     <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>
@@ -718,11 +844,25 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="setting_theme_dark">Ciemna</string>
     <string name="setting_theme_light">Jasna</string>
     <string name="display_preferences">Ustawienia globalne</string>
+    <!-- NEW: <string name="global_preferences">Global</string>-->
     <string name="debug_preferences">Debugging</string>
+    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
+    <!-- NEW: <string name="network_preferences">Network</string>-->
+    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
     <string name="accountlist_preferences">Lista kont</string>
     <string name="messagelist_preferences">Listy widomości</string>
     <string name="messageview_preferences">Wiadomości</string>
     <string name="settings_theme_label">Kolorystyka</string>
+    <!-- NEW: <string name="settings_language_label">Language</string>-->
+
+    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
+    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+
+
+
+    <!-- NEW: <string name="setting_language_system">System default</string>-->
 
     <string name="background_ops_label">Synchronizacja w tle</string>
     <string name="background_ops_never">Nigdy</string>
@@ -740,13 +880,14 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="date_format_common">dd-MMM-yyyy</string>
     <string name="date_format_iso8601">yyyy-MM-dd</string>
 
-
     <string name="batch_ops">Operacje grupowe</string>
     <string name="batch_delete_op">Usuń zaznaczone</string>
     <string name="batch_mark_read_op">Zazn. jako przeczytane</string>
     <string name="batch_mark_unread_op">Ustaw jako nieprzeczytane</string>
     <string name="batch_flag_op">Dodaj gwiazdkę</string>
     <string name="batch_unflag_op">Usuń gwiazdkę</string>
+    <!-- NEW: <string name="batch_archive_op">Move selected to Archive</string>-->
+    <!-- NEW: <string name="batch_spam_op">Move selected to Spam</string>-->
     <string name="batch_move_op">Przenieś</string>
     <string name="batch_copy_op">Skopiuj</string>
     <string name="batch_flag_mode">Star mode</string>
@@ -769,6 +910,14 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="gestures_title">Gesty</string>
     <string name="gestures_summary">Pozwól na sterowanie gestami</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
+    <!-- NEW: <string name="volume_navigation_title">Volume key navigation</string>-->
+    <!-- NEW: <string name="volume_navigation_summary">Flip through items using the volume controls</string>-->
+    <!-- NEW: <string name="volume_navigation_message">Message view</string>-->
+    <!-- NEW: <string name="volume_navigation_list">Various list views</string>-->
+
     <string name="manage_back_title">Przycisk \"Cofnij\"</string>
     <string name="manage_back_summary">Przycisk \"Cofnij\" zawsze cofa o jeden poziom wyżej</string>
 
@@ -788,11 +937,11 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="search_all_messages_title">Wszystkie wiadomości</string>
     <string name="search_all_messages_detail">Wiadomości w przeszukiwalnych folderach</string>
 
-    <string name="tap_hint">Dotknij koperty lub gwiazdki by wyświetlić wiadomości nieprzeczytane lub oznaczone gwiazdką.</string>
-
     <string name="integrated_inbox_title">Zintegrowany Inbox</string>
     <string name="integrated_inbox_detail">Nieprzeczytane wiadomości ze wszystkich kont</string>
 
+    <string name="tap_hint">Dotknij koperty lub gwiazdki by wyświetlić wiadomości nieprzeczytane lub oznaczone gwiazdką.</string>
+
     <string name="folder_settings_include_in_integrated_inbox_label">Zintegruj</string>
     <string name="folder_settings_include_in_integrated_inbox_summary">Pokazuj nieprzeczytane wiadomości w zintegrowanym widoku</string>
 
@@ -804,7 +953,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="remote_control_label">K-9 Mail zdalne sterowanie</string>
     <string name="remote_control_desc">Zezwalaj tej aplikacji na sterowanie K-9 i jego ustawieniami.</string>
 
-
     <string name="font_size_settings_title">Rozmiar czcionki</string>
     <string name="font_size_settings_description">Ustawienia rozmiarów czcionek</string>
 
@@ -820,6 +968,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="font_size_message_list_subject">Temat</string>
     <string name="font_size_message_list_sender">Nadawca</string>
     <string name="font_size_message_list_date">Data wiadomości</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">Wyświetlanie wiadomość</string>
     <string name="font_size_message_view_sender">Nadawca</string>
@@ -855,4 +1004,35 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="misc_preferences_attachment_title">Obejdź błędy w Galerii</string>
     <string name="misc_preferences_attachment_description">Wyświetla przyciski dodawania zdjęć oraz filmów jako załączników</string>
 
+    <!-- APG related -->
+    <!-- NEW: <string name="error_activity_not_found">No suitable application for this action found.</string>-->
+    <!-- NEW: <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>-->
+    <!-- NEW: <string name="btn_crypto_sign">Sign</string>-->
+    <!-- NEW: <string name="btn_encrypt">Encrypt</string>-->
+    <!-- NEW: <string name="btn_decrypt">Decrypt</string>-->
+    <!-- NEW: <string name="btn_verify">Verify</string>-->
+    <!-- NEW: <string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>-->
+    <!-- NEW: <string name="key_id">id: %s</string>-->
+    <!-- NEW: <string name="insufficient_apg_permissions">K-9 doesn\'t have permission to access APG fully, please reinstall K-9 to fix that.</string>-->
+    <!-- NEW: <string name="pgp_mime_unsupported">PGP/MIME messages are not supported yet.</string>-->
+    <!-- NEW: <string name="attachment_encryption_unsupported">Warning: attachments are NOT signed or encrypted yet.</string>-->
+    <!-- NEW: <string name="send_aborted">Send aborted.</string>-->
+
+    <!-- NEW: <string name="save_or_discard_draft_message_dlg_title">Save draft message?</string>-->
+    <!-- NEW: <string name="save_or_discard_draft_message_instructions_fmt">Save or Discard this message?</string>-->
+
+    <!-- NEW: <string name="charset_not_found">This message can\'t be displayed because the charset \"<xliff:g id="charset">%s</xliff:g>\" wasn\'t found.</string>-->
+
+    <!-- NEW: <string name="select_text_now">Select text to copy.</string>-->
+
+    <!-- NEW: <string name="dialog_confirm_delete_title">Confirm deletion</string>-->
+    <!-- NEW: <string name="dialog_confirm_delete_message">Do you want to delete this message?</string>-->
+    <!-- NEW: <string name="dialog_confirm_delete_confirm_button">Delete</string>-->
+    <!-- NEW: <string name="dialog_confirm_delete_cancel_button">Do not delete</string>-->
+
+    <!-- NEW: <string name="debug_logging_enabled">Debug logging to Android logging system enabled</string>-->
+
+    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
+    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
 </resources>

res/values-ru/strings.xml

@@ -3,46 +3,61 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Авторы: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Информация об изменениях: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">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>
+    <!-- NEW: <string name="read_messages_label">read Emails</string>-->
+    <!-- NEW: <string name="read_messages_desc">Allows this application to read your Emails.</string>-->
+    <!-- NEW: <string name="delete_messages_label">Delete Emails</string>-->
+    <!-- NEW: <string name="delete_messages_desc">Allows this application to delete your Emails.</string>-->
 
     <string name="about_title_fmt">О программе <xliff:g id="app_name">%s</xliff:g></string>
     <string name="accounts_title">Адреса</string>
     <string name="advanced">Дополнительные параметры</string>
     <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
+    <!-- NEW: <string name="shortcuts_title">K-9 Accounts</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">Написать новое письмо</string>
     <string name="debug_title">Отлажки</string>
     <string name="choose_folder_title">Выбрать Папку</string>
+    <!-- NEW: <string name="choose_color_title">Choose a Color</string>-->
 
     <string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
 
     <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</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>
+    <!-- NEW: <string name="status_loading_account_folder_headers">\u0020(Fetching 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">\u0020(Отправка <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
     <string name="status_processing_account">\u0020(Обработка <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">\u0020(Следующий запрос @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Следующий</string> <!-- Used as part of a multi-step process -->
+    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
     <string name="okay_action">ОК</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Отменить</string>
     <string name="send_action">Отослать</string>
+    <!-- NEW: <string name="send_again_action">Send Again</string>-->
     <string name="select_action">Выбрать</string>
     <string name="deselect_action">Сброс выбора</string>
     <string name="reply_action">Ответить</string>
     <string name="reply_all_action">Ответить всем</string>
     <string name="delete_action">Удалить</string>
     <string name="archive_action">Архивировать</string>
+    <!-- NEW: <string name="spam_action">Spam</string>-->
     <string name="delete_all_action">Очистить папку</string>
     <string name="forward_action">Переслать</string>
     <string name="move_action">Переместить</string>
@@ -66,9 +81,12 @@
     <string name="open_action">Открыть</string>
     <string name="account_settings_action">Почтовые настройки</string>
     <string name="folder_settings_action">Настройки папки</string>
+    <!-- NEW: <string name="global_settings_action">Global settings</string>-->
     <string name="remove_account_action">Удалить адрес</string>
     <string name="clear_pending_action">Остановить незаконченные действия (опасность!)</string>
 
+
+
     <string name="accounts_action">Список почтовых ящиков</string>
     <string name="back_to_accounts_action">◀</string>
     <string name="back_to_folder_list_action">◀</string>
@@ -84,6 +102,9 @@
     <string name="flag_action">Добавить звезду</string>
     <string name="unflag_action">Удалить звезду</string>
     <string name="copy_action">Копировать</string>
+    <!-- NEW: <string name="show_full_header_action">Show full header</string>-->
+    <!-- NEW: <string name="hide_full_header_action">Hide full header</string>-->
+    <!-- NEW: <string name="select_text_action">Select text</string>-->
 
     <string name="mark_as_unread_action">Отметить как непрочитанное</string>
     <string name="move_to_action">Переместить в</string>
@@ -92,9 +113,12 @@
     <string name="add_cc_bcc_action">Добавить Копию/СК</string>
     <string name="edit_subject_action">Редактировать тему</string>
     <string name="add_attachment_action">Добавить вложение</string>
+    <!-- NEW: <string name="add_attachment_action_image">Add attachment (Image)</string>-->
+    <!-- NEW: <string name="add_attachment_action_video">Add attachment (Video)</string>-->
     <string name="dump_settings_action">Сброс настроек</string>
     <string name="empty_trash_action">Опустошить Мусор</string>
     <string name="expunge_action">Стереть</string>
+    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
     <string name="set_sort_action">Выбрать сортировку</string>
     <string name="reverse_sort_action">Обратный порядок сортировки</string>
     <string name="about_action">О Программе</string>
@@ -104,7 +128,7 @@
     <string name="folder_context_menu_title">Параметры папок</string>
 
     <string name="general_no_subject">(Без темы)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Отправитель отсуствует</string>
     <string name="status_loading">Запрос<xliff:g id="progress">%s</xliff:g></string>
     <string name="status_loading_folder">(Запрос <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -133,6 +157,7 @@
 
     <string name="compacting_account">Сжатие ящика \"<xliff:g id="account">%s</xliff:g>\"</string>
     <string name="clearing_account">Очистка ящика \"<xliff:g id="account">%s</xliff:g>\"</string>
+    <!-- NEW: <string name="recreating_account">Recreating account \"<xliff:g id="account">%s</xliff:g>\"</string>-->
 
     <string name="notification_new_title">Новые сообщения</string>
     <string name="notification_new_scrolling">Новое сообщение от <xliff:g id="sender">%s</xliff:g></string>
@@ -153,12 +178,16 @@
     <string name="special_mailbox_name_drafts">Черновики</string>
     <string name="special_mailbox_name_trash">Мусор</string>
     <string name="special_mailbox_name_sent">Отправленные</string>
+    <!-- NEW: <string name="special_mailbox_name_archive">Archive</string>-->
+    <!-- NEW: <string name="special_mailbox_name_spam">Spam</string>-->
     <!-- Mailbox names displayed to user -->
 
     <string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Исходящие)</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>
+    <!-- NEW: <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>-->
+    <!-- NEW: <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>-->
 
     <string name="send_failure_subject">Не удалось отправить несколько сообщений</string>
     <string name="send_failure_body_abbrev">Смотрите папку <xliff:g id="errorFolder">%s</xliff:g> для подробностей.</string>
@@ -230,6 +259,7 @@
     <string name="message_compose_content_hint">Текст сообщения</string>
     <string name="message_compose_quote_header_separator">-------- Исходное сообщение --------</string>
     <string name="message_compose_quote_header_subject">Тема:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">От:</string>
     <string name="message_compose_quote_header_to">Для:</string>
     <string name="message_compose_quote_header_cc">Копия:</string>
@@ -239,6 +269,8 @@
     <string name="message_compose_downloading_attachments_toast">Некоторые вложения не были загружены. Они будут автоматически загружены перед отправкой этого сообщения.</string>
     <string name="message_compose_attachments_skipped_toast">Некоторые вложения не могут быть пересланы, поскольку они не загрузились.</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>
@@ -246,6 +278,9 @@
     <string name="message_view_attachment_download_action">Сохранить</string>
     <string name="message_view_prev_action">\u25BC</string>
     <string name="message_view_next_action">\u25B2</string>
+    <!-- NEW: <string name="message_view_archive_action">Archive</string>-->
+    <!-- NEW: <string name="message_view_move_action">Move</string>-->
+    <!-- NEW: <string name="message_view_spam_action">Spam</string>-->
     <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
     <string name="message_view_status_attachment_saved">Вложение сохранено на карту SD под именем <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Не удалось сохранить вложение на карту SD.</string>
@@ -254,6 +289,14 @@
     <string name="message_view_fetching_attachment_toast">Загрузка вложения.</string>
     <string name="message_view_no_viewer">Приложение просмотра не найдено для <xliff:g id="mimetype">%s</xliff:g>.</string>
 
+
+    <!-- NEW: <string name="message_view_download_remainder">Download complete message</string>-->
+
+    <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
+    <!-- NEW: <string name="message_additional_headers_not_downloaded">Not all headers have been downloaded or saved. Select \"Save all headers locally\" in the account\'s incoming server settings to enable this for the future.</string>-->
+    <!-- NEW: <string name="message_no_additional_headers_available">All headers have been downloaded, but there are no additional headers to show.</string>-->
+    <!-- NEW: <string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>-->
+
     <string name="mailbox_select_dlg_title">Папки</string>
     <string name="mailbox_select_dlg_new_mailbox_action">Новая папка</string>
 
@@ -261,6 +304,8 @@
 
     <string name="folder_push_active_symbol">(Push)</string>
 
+    <!-- NEW: <string name="from_same_sender">More from this sender</string>-->
+
     <string name="message_copied_toast">Сообщение скопировано</string>
     <string name="message_moved_toast">Сообщение перенесено</string>
     <string name="message_deleted_toast">Сообщение удалено</string>
@@ -271,11 +316,43 @@
     <string name="about_header">О Программе <xliff:g id="app_name">%s</xliff:g></string>
     <string name="about_version">Версия: <xliff:g id="version">%s</xliff:g></string>
 
+
     <string name="global_settings_flag_label">Начало сообщения</string>
     <string name="global_settings_flag_summary">Звезды указывают отмеченные сообщения</string>
     <string name="global_settings_checkbox_label">Флажки множественного выбора</string>
     <string name="global_settings_checkbox_summary">Всегда показывать Флажки множественного выбора</string>
     <string name="global_settings_touchable_label">Отображение удобное для управления пальцами</string>
+    <!-- NEW: <string name="global_settings_touchable_summary">Roomier list items with message previews</string>-->
+    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
+
+    <!-- NEW: <string name="global_settings_messageview_fixedwidth_label">Fixed-width fonts</string>-->
+    <!-- NEW: <string name="global_settings_messageview_fixedwidth_summary">Use a fixed-width font when showing plain-text messages</string>-->
+    <!-- NEW: <string name="global_settings_messageview_return_to_list_label">Return to list after delete</string>-->
+    <!-- NEW: <string name="global_settings_messageview_return_to_list_summary">Return to message list after message deletion</string>-->
+
+    <!-- NEW: <string name="global_settings_confirm_actions_title">Confirm actions</string>-->
+    <!-- NEW: <string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_archive">Archive</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_delete">Delete (message view only)</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_spam">Spam</string>-->
+    <!-- NEW: <string name="global_settings_confirm_action_send">Send</string>-->
+
+    <!-- NEW: <string name="global_settings_privacy_mode_title">Lock-screen notifications</string>-->
+    <!-- NEW: <string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string>-->
+
+
+    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
+    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
+    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
+    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+
 
     <string name="account_setup_basics_title">Установить новый адрес</string>
     <string name="account_setup_basics_instructions">Введите адрес электронной почты:</string>
@@ -291,6 +368,8 @@
     <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>
+    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
+    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
     <string name="account_setup_check_settings_finishing_msg">Завершение\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Отмена\u2026</string>
 
@@ -333,6 +412,14 @@
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Другие</string>
 
+    <!-- NEW: <string name="account_setup_incoming_save_all_headers_title">Download headers</string>-->
+    <!-- NEW: <string name="account_setup_incoming_save_all_headers_label">Save all message headers locally</string>-->
+
+    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
+    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+
     <string name="account_setup_expunge_policy_label">Стирать сообщения</string>
     <string name="account_setup_expunge_policy_immediately">Сразу же после удаления или перемещения</string>
     <string name="account_setup_expunge_policy_on_poll">В ходе каждого запроса</string>
@@ -344,8 +431,11 @@
     <string name="drafts_folder_label">Имя папки Черновиков</string>
     <string name="sent_folder_label">Имя папки Отправленныx</string>
     <string name="trash_folder_label">Имя папки Мусора</string>
+    <!-- NEW: <string name="archive_folder_label">Archive folder</string>-->
+    <!-- NEW: <string name="spam_folder_label">Spam folder</string>-->
     <string name="outbox_folder_label">Имя папки Исходящиx</string>
 
+    <!-- NEW: <string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>-->
     <string name="account_setup_auto_expand_folder">Автоматически открывать папку</string>
 
     <string name="account_setup_incoming_webdav_path_prefix_label">Путь для WebDAV (Exchange)</string>
@@ -376,12 +466,13 @@
     <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP прежде SMTP</string>
     <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) прежде SMTP</string>
 
-     <string name="account_setup_bad_uri">Неверная установка: <xliff:g id="err_mess">%s</xliff:g></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>
+    <!-- NEW: <string name="recreate_action">Recreate data (Last Resort!)</string>-->
 
     <string name="account_setup_options_mail_check_frequency_label">Частота опроса папок</string>
     <!-- Frequency also used in account_settings_* -->
@@ -398,8 +489,19 @@
     <string name="account_setup_options_mail_check_frequency_12hour">Каждых 12 часов</string>
     <string name="account_setup_options_mail_check_frequency_24hour">Каждых 24 часа</string>
 
+    <!-- NEW: <string name="push_poll_on_connect_label">Poll when connecting for push</string>-->
     <string name="account_setup_options_enable_push_label">Использовать Push Mail</string>
     <string name="account_setup_options_enable_push_summary">Если ваш сервер поддерживает такую возможность, новые сообщения появляются мгновенно. Эта опция может существенно улучшить или ухудшить скорость и эффективность всей системы.</string>
+    <!-- NEW: <string name="idle_refresh_period_label">Refresh IDLE connection</string>-->
+    <!-- NEW: <string name="idle_refresh_period_1min">Every minute</string>-->
+    <!-- NEW: <string name="idle_refresh_period_2min">Every 2 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_3min">Every 3 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_6min">Every 6 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_12min">Every 12 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_24min">Every 24 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_36min">Every 36 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_48min">Every 48 minutes</string>-->
+    <!-- NEW: <string name="idle_refresh_period_60min">Every 60 minutes</string>-->
 
     <string name="account_setup_options_default_label">Отправлять сообщения с этого ящика по умолчанию</string>
     <string name="account_setup_options_notify_label">Оповещать о прибытии новой почты</string>
@@ -414,6 +516,8 @@
     <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>
+    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
+
 
     <string name="move_copy_cannot_copy_unsynced_message">Не удалось скопировать или переместить сообщение, которое не было синхронизированно с сервером</string>
 
@@ -424,6 +528,7 @@
     <string name="account_setup_failed_dlg_edit_details_action">Изменить данные</string>
     <string name="account_setup_failed_dlg_continue_action">Продолжить</string>
 
+    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
     <string name="account_settings_title_fmt">Общие настройки</string>
     <string name="account_settings_default">Ящик по умолчанию</string>
     <string name="account_settings_default_label">Ящик по умолчанию</string>
@@ -436,23 +541,96 @@
     <string name="account_settings_show_combined_label">Показать комбинированную папку Входящих сообщений</string>
     <string name="account_settings_notify_self_label">Уведомлять о посланных мною сообщений</string>
     <string name="account_settings_notify_self_summary">Уведомлять даже о сообщениях, отправленных из личной почты</string>
+    <!-- NEW: <string name="account_settings_notification_opens_unread_label">Notification opens unread messages</string>-->
+    <!-- NEW: <string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Прокрутка навигационных кнопок</string>
     <string name="account_settings_hide_buttons_never">Никогда</string>
     <string name="account_settings_hide_buttons_keyboard_avail">Когда присутствует клавиатура</string>
     <string name="account_settings_hide_buttons_always">Всегда</string>
 
+    <!-- NEW: <string name="account_settings_enable_move_buttons_label">Enable refile buttons</string>-->
+    <!-- NEW: <string name="account_settings_enable_move_buttons_summary">Show the Archive, Move, and Spam buttons.</string>-->
+    <!-- NEW: <string name="account_settings_hide_move_buttons_label">Scroll refile buttons</string>-->
+
+    <!-- NEW: <string name="account_settings_show_pictures_label">Always show images</string>-->
+    <!-- NEW: <string name="account_settings_show_pictures_never">No</string>-->
+    <!-- NEW: <string name="account_settings_show_pictures_only_from_contacts">From contacts</string>-->
+    <!-- NEW: <string name="account_settings_show_pictures_always">From anyone</string>-->
+
     <string name="account_settings_composition">Написание сообщений</string>
-     <string name="account_settings_sync">Синхронизация папок</string>
+
+    <!-- NEW: <string name="account_settings_reply_after_quote_label">Reply after quoted text</string>-->
+    <!-- NEW: <string name="account_settings_reply_after_quote_summary">When replying to messages, the original message will appear above your reply.</string>-->
+
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
+    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
+    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
+    <string name="account_settings_sync">Синхронизация папок</string>
     <string name="account_settings_folders">Папки</string>
-     <string name="account_settings_message_lists">Список сообщений</string>
+    <string name="account_settings_message_lists">Список сообщений</string>
-     <string name="account_settings_message_view">Просмотр сообщений</string>
+    <string name="account_settings_message_view">Просмотр сообщений</string>
+    <!-- NEW: <string name="account_settings_quote_prefix_label">Quoted text prefix</string>-->
+    <!-- NEW: <string name="account_settings_crypto">Cryptography</string>-->
+    <!-- NEW: <string name="account_settings_crypto_app">OpenPGP Provider</string>-->
+    <!-- NEW: <string name="account_settings_crypto_app_none">None</string>-->
+    <!-- NEW: <string name="account_settings_crypto_app_not_available">not available</string>-->
+    <!-- NEW: <string name="account_settings_crypto_auto_signature">Auto-sign</string>-->
+    <!-- NEW: <string name="account_settings_crypto_auto_signature_summary">Use the account\'s email address to guess the signature key.</string>-->
 
     <string name="account_settings_mail_check_frequency_label">Частота опроса папок</string>
     <string name="account_settings_second_class_check_frequency_label">Частота опроса папок 2-го класса</string>
 
+    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+
+
+    <!-- NEW: <string name="account_settings_color_label">Account color</string>-->
+    <!-- NEW: <string name="account_settings_color_summary">Choose the color of the account used in folder and account list</string>-->
+
+    <!-- NEW: <string name="account_settings_led_color_label">Notification LED color</string>-->
+    <!-- NEW: <string name="account_settings_led_color_summary">Choose the color your phone LED should blink for this account</string>-->
+
     <string name="account_settings_mail_display_count_label">Количество показываемых сообщений</string>
 
+    <!-- NEW: <string name="account_settings_autodownload_message_size_label">Fetch messages up to</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_1">1Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_2">2Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_4">4Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_8">8Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_16">16Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_32">32Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_64">64Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_128">128Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_256">256Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_512">512Kb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_1024">1Mb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_2048">2Mb</string>-->
+    <!-- NEW: <string name="account_settings_autodownload_message_size_any">any size (no limit)</string>-->
+
+    <!-- NEW: <string name="account_settings_message_age_label">Sync messages from</string>-->
+    <!-- NEW: <string name="account_settings_message_age_any">any time (no limit)</string>-->
+    <!-- NEW: <string name="account_settings_message_age_0">today</string>-->
+    <!-- NEW: <string name="account_settings_message_age_1">the last 2 days</string>-->
+    <!-- NEW: <string name="account_settings_message_age_2">the last 3 days</string>-->
+    <!-- NEW: <string name="account_settings_message_age_7">the last week</string>-->
+    <!-- NEW: <string name="account_settings_message_age_14">the last 2 weeks</string>-->
+    <!-- NEW: <string name="account_settings_message_age_21">the last 3 weeks</string>-->
+    <!-- NEW: <string name="account_settings_message_age_1_month">the last month</string>-->
+    <!-- NEW: <string name="account_settings_message_age_2_months">the last 2 months</string>-->
+    <!-- NEW: <string name="account_settings_message_age_3_months">the last 3 months</string>-->
+    <!-- NEW: <string name="account_settings_message_age_6_months">the last 6 months</string>-->
+    <!-- NEW: <string name="account_settings_message_age_1_year">the last year</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">Только папки 1-го класса</string>
@@ -479,6 +657,9 @@
     <string name="account_settings_folder_target_mode_first_and_second_class">Папки 1-го и 2-го класса</string>
     <string name="account_settings_folder_target_mode_not_second_class">Все, кроме папок 2-го класса</string>
 
+    <!-- NEW: <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>-->
+    <!-- NEW: <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>-->
+
     <string name="folder_settings_title">Настройки папок</string>
 
     <string name="folder_settings_in_top_group_label">Показывать в верхней группе</string>
@@ -512,7 +693,19 @@
     <string name="account_settings_ring_summary">Звонок при новых сообщениях</string>
     <string name="account_settings_vibrate_enable">Вибрация</string>
     <string name="account_settings_vibrate_summary">Вибрация при новых сообщениях</string>
+    <!-- NEW: <string name="account_settings_vibrate_pattern_label">Vibration patterns</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_pattern_default">default</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_pattern_1">pattern 1</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_pattern_2">pattern 2</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_pattern_3">pattern 3</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_pattern_4">pattern 4</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_pattern_5">pattern 5</string>-->
+    <!-- NEW: <string name="account_settings_vibrate_times">Repeat vibration</string>-->
     <string name="account_settings_ringtone">Выбор мелодии</string>
+    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
+    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
+
+
     <string name="account_settings_servers">Настройки сервера</string>
 
     <string name="account_settings_composition_title">Настройки составления сообщений</string>
@@ -527,16 +720,16 @@
     <string name="manage_identities_context_menu_title">Управление личностью</string>
 
     <string name="edit_identity_title">Редактировать личность</string>
-     <string name="new_identity_action">Новая личность</string>
+    <string name="new_identity_action">Новая личность</string>
 
     <string name="account_settings_always_bcc_label">СК все сообщения</string>
     <string name="account_settings_always_bcc_summary">Отправить на этот адрес копии всех исходящих сообщений</string>
 
-     <string name="manage_identities_edit_action">Редактировать</string>
+    <string name="manage_identities_edit_action">Редактировать</string>
-     <string name="manage_identities_move_up_action">Передвинуть выше</string>
+    <string name="manage_identities_move_up_action">Передвинуть выше</string>
-     <string name="manage_identities_move_down_action">Передвинуть ниже</string>
+    <string name="manage_identities_move_down_action">Передвинуть ниже</string>
-     <string name="manage_identities_move_top_action">Передвинуть к началу / пометить как по умолчанию</string>
+    <string name="manage_identities_move_top_action">Передвинуть к началу / пометить как по умолчанию</string>
-     <string name="manage_identities_remove_action">Удалить</string>
+    <string name="manage_identities_remove_action">Удалить</string>
 
     <string name="edit_identity_description_label">Описание личности</string>
     <string name="edit_identity_description_hint">(Необязательныо)</string>
@@ -544,6 +737,8 @@
     <string name="edit_identity_name_hint">(Необязательныо)</string>
     <string name="edit_identity_email_label">Адрес электронной почты</string>
     <string name="edit_identity_email_hint">(Обязательный)</string>
+    <!-- NEW: <string name="edit_identity_reply_to_label">Reply-to address</string>-->
+    <!-- NEW: <string name="edit_identity_reply_to_hint">(Optional)</string>-->
     <string name="edit_identity_signature_label">Подпись</string>
     <string name="edit_identity_signature_hint">(Необязательныо)</string>
 
@@ -555,24 +750,27 @@
     <string name="default_identity_description">Первоначальная личность</string>
     <string name="choose_identity">Выбрать личность</string>
     <string name="choose_identity_title">Выбрать личность</string>
+    <!-- NEW: <string name="choose_account_title">Choose account/identity</string>-->
+    <!-- NEW: <string name="send_as">Send as</string>-->
+
 
     <string name="no_identities">Добавить личность можно в Настройке Ящиков -&gt; Управление личностями</string>
     <string name="no_removable_identity">Нельзя удалить единственную личность.</string>
     <string name="identity_has_no_email">Личность без адреса электронной почты не позволяется.</string>
     <string name="identity_will_not_be_saved">Ваш выбор личности и изменения подписи не будут сохранены.</string>
 
-    <string name="sort_earliest_first">Earliest messages first</string>
+    <!-- NEW: <string name="sort_earliest_first">Earliest messages first</string>-->
-    <string name="sort_latest_first">Latest messages first</string>
+    <!-- NEW: <string name="sort_latest_first">Latest messages first</string>-->
-    <string name="sort_sender_alpha">Sender alphabetical</string>
+    <!-- NEW: <string name="sort_sender_alpha">Sender alphabetical</string>-->
-    <string name="sort_sender_re_alpha">Sender reverse alphabetical</string>
+    <!-- NEW: <string name="sort_sender_re_alpha">Sender reverse alphabetical</string>-->
-    <string name="sort_subject_alpha">Subject alphabetical</string>
+    <!-- NEW: <string name="sort_subject_alpha">Subject alphabetical</string>-->
-    <string name="sort_subject_re_alpha">Subject reverse alphabetical</string>
+    <!-- NEW: <string name="sort_subject_re_alpha">Subject reverse alphabetical</string>-->
-    <string name="sort_flagged_first">Starred messages first</string>
+    <!-- NEW: <string name="sort_flagged_first">Starred messages first</string>-->
-    <string name="sort_flagged_last">Unstarred messages first</string>
+    <!-- NEW: <string name="sort_flagged_last">Unstarred messages first</string>-->
-    <string name="sort_unread_first">Unread messages first</string>
+    <!-- NEW: <string name="sort_unread_first">Unread messages first</string>-->
-    <string name="sort_unread_last">Read messages first</string>
+    <!-- NEW: <string name="sort_unread_last">Read messages first</string>-->
-    <string name="sort_attach_first">Messages with attachments first</string>
+    <!-- NEW: <string name="sort_attach_first">Messages with attachments first</string>-->
-    <string name="sort_unattached_first">Messages without attachments first</string>
+    <!-- NEW: <string name="sort_unattached_first">Messages without attachments first</string>-->
 
     <string name="sort_by">Сортировка по...</string>
     <string name="sort_by_date">Дате</string>
@@ -586,11 +784,19 @@
     <string name="account_delete_dlg_title">Удалить</string>
     <string name="account_delete_dlg_instructions_fmt">Почтовой ящик \"<xliff:g id="account">%s</xliff:g>\" будет удален.</string>
 
+    <!-- NEW: <string name="account_recreate_dlg_title">Recreate Account</string>-->
+    <!-- NEW: <string name="account_recreate_dlg_instructions_fmt">All data for \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>-->
+
+    <!-- NEW: <string name="account_clear_dlg_title">Clear Account</string>-->
+    <!-- NEW: <string name="account_clear_dlg_instructions_fmt">All messages in \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>-->
+
     <string name="provider_note_live">Только избранные \"Plus\" ящики поддерживают получения электронной почты через \"POP"
         и таким образом работают с этой программой. Если вы не можете подключится
         с верными данными, то ваш тип почтового ящика не имеет такого доступа.
         Пожалуйста, пользуйтесь мобильной версией Yahoo! Mail для получения сообщений.</string>
 
+    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</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>
@@ -618,20 +824,39 @@
     <string name="folder_list_display_mode_first_and_second_class">Показывать папки 1-го и 2-го классов</string>
     <string name="folder_list_display_mode_not_second_class">Показывать все папки, за исключением 2-го класса</string>
 
+
+
     <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_dark">Темное</string>
     <string name="setting_theme_light">Светлое</string>
     <string name="display_preferences">Глобальные настройки</string>
+    <!-- NEW: <string name="global_preferences">Global</string>-->
     <string name="debug_preferences">Отладка</string>
+    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
+    <!-- NEW: <string name="network_preferences">Network</string>-->
+    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
+    <!-- NEW: <string name="accountlist_preferences">Account list</string>-->
     <string name="messagelist_preferences">Списки Сообщений</string>
+    <!-- NEW: <string name="messageview_preferences">Messages</string>-->
     <string name="settings_theme_label">Изображение</string>
+    <!-- NEW: <string name="settings_language_label">Language</string>-->
+
+    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
+    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+
+
+
+    <!-- NEW: <string name="setting_language_system">System default</string>-->
 
     <string name="background_ops_label">Синхронизация в фоновом режиме</string>
     <string name="background_ops_never">Никогда</string>
     <string name="background_ops_always">Всегда</string>
     <string name="background_ops_enabled">Когда \'Фоноввый режим\' включен</string>
+    <!-- NEW: <string name="background_ops_auto_sync">When \'Background data\' &amp; \'Auto-sync\' are checked</string>-->
 
     <string name="no_message_seletected_toast">Никаких сообщшний не выбранно</string>
 
@@ -644,6 +869,8 @@
     <string name="batch_mark_unread_op">Пометить выбранное как не прочитанное</string>
     <string name="batch_flag_op">Пометить выбранное звездами</string>
     <string name="batch_unflag_op">Удалить звезды с выбранных</string>
+    <!-- NEW: <string name="batch_archive_op">Move selected to Archive</string>-->
+    <!-- NEW: <string name="batch_spam_op">Move selected to Spam</string>-->
     <string name="batch_move_op">Переместить выбранное</string>
     <string name="batch_copy_op">Скопировать выбранное</string>
     <string name="batch_flag_mode">Режим звезд</string>
@@ -666,9 +893,38 @@
     <string name="gestures_title">Жесты</string>
     <string name="gestures_summary">Принимать контроль жестами</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
+    <!-- NEW: <string name="volume_navigation_title">Volume key navigation</string>-->
+    <!-- NEW: <string name="volume_navigation_summary">Flip through items using the volume controls</string>-->
+    <!-- NEW: <string name="volume_navigation_message">Message view</string>-->
+    <!-- NEW: <string name="volume_navigation_list">Various list views</string>-->
+
+    <!-- NEW: <string name="manage_back_title">Manage \"Back\" button</string>-->
+    <!-- NEW: <string name="manage_back_summary">Make \"Back\" always go up a level</string>-->
+
+    <!-- NEW: <string name="start_integrated_inbox_title">Start in Unified Inbox</string>-->
+    <!-- NEW: <string name="start_integrated_inbox_summary">Show the Unified Inbox after startup</string>-->
+
+    <!-- NEW: <string name="measure_accounts_title">Show account size</string>-->
+    <!-- NEW: <string name="measure_accounts_summary">Turn off for faster display</string>-->
+
+    <!-- NEW: <string name="count_search_title">Count search results</string>-->
+    <!-- NEW: <string name="count_search_summary">Turn off for faster display</string>-->
+
+    <!-- NEW: <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>-->
+    <!-- NEW: <string name="flagged_modifier"> - Starred</string>-->
+    <!-- NEW: <string name="unread_modifier"> - Unread</string>-->
+
+    <!-- NEW: <string name="search_all_messages_title">All messages</string>-->
+    <!-- NEW: <string name="search_all_messages_detail">All messages in searchable folders</string>-->
+
     <string name="integrated_inbox_title">Объединенная папка входящей почты (непрочитанное)</string>
     <string name="integrated_inbox_detail">Все непрочитанные сообщения в объединенных папках</string>
 
+    <!-- NEW: <string name="tap_hint">Tap envelope or star for unread or starred messages</string>-->
+
     <string name="folder_settings_include_in_integrated_inbox_label">Объединить</string>
     <string name="folder_settings_include_in_integrated_inbox_summary">Показывать непрочитанные сообщения в объединенной папке</string>
 
@@ -679,4 +935,87 @@
 
     <string name="remote_control_label">Дистанционное управление K-9 Mail</string>
     <string name="remote_control_desc">Позволяет этому приложению управлеть деятельностью и настройками K-9 Mail.</string>
+
+    <!-- NEW: <string name="font_size_settings_title">Font size</string>-->
+    <!-- NEW: <string name="font_size_settings_description">Configure font size</string>-->
+
+    <!-- NEW: <string name="font_size_account_list">Account list</string>-->
+    <!-- NEW: <string name="font_size_account_name">Account name</string>-->
+    <!-- NEW: <string name="font_size_account_description">Account description</string>-->
+
+    <!-- NEW: <string name="font_size_folder_list">Folder lists</string>-->
+    <!-- NEW: <string name="font_size_folder_name">Folder name</string>-->
+    <!-- NEW: <string name="font_size_folder_status">Folder status</string>-->
+
+    <!-- NEW: <string name="font_size_message_list">Message lists</string>-->
+    <!-- NEW: <string name="font_size_message_list_subject">Subject</string>-->
+    <!-- NEW: <string name="font_size_message_list_sender">Sender</string>-->
+    <!-- NEW: <string name="font_size_message_list_date">Date</string>-->
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+
+    <!-- NEW: <string name="font_size_message_view">Messages</string>-->
+    <!-- NEW: <string name="font_size_message_view_sender">Sender</string>-->
+    <!-- NEW: <string name="font_size_message_view_to">To</string>-->
+    <!-- NEW: <string name="font_size_message_view_cc">Cc</string>-->
+    <!-- NEW: <string name="font_size_message_view_additional_headers">Additional headers</string>-->
+    <!-- NEW: <string name="font_size_message_view_subject">Subject</string>-->
+    <!-- NEW: <string name="font_size_message_view_time">Time</string>-->
+    <!-- NEW: <string name="font_size_message_view_date">Date</string>-->
+    <!-- NEW: <string name="font_size_message_view_content">Message body</string>-->
+
+    <!-- NEW: <string name="font_size_tiniest">Tiniest</string>-->
+    <!-- NEW: <string name="font_size_tiny">Tiny</string>-->
+    <!-- NEW: <string name="font_size_smaller">Smaller</string>-->
+    <!-- NEW: <string name="font_size_small">Small</string>-->
+    <!-- NEW: <string name="font_size_medium">Medium</string>-->
+    <!-- NEW: <string name="font_size_large">Large</string>-->
+    <!-- NEW: <string name="font_size_larger">Larger</string>-->
+
+    <!-- NEW: <string name="font_size_webview_smaller">Smallest</string>-->
+    <!-- NEW: <string name="font_size_webview_small">Smaller</string>-->
+    <!-- NEW: <string name="font_size_webview_normal">Normal</string>-->
+    <!-- NEW: <string name="font_size_webview_large">Larger</string>-->
+    <!-- NEW: <string name="font_size_webview_larger">Largest</string>-->
+
+    <!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
+    <!-- NEW: <string name="message_compose_buggy_gallery">Check \"Settings\" -&gt; \"Use Gallery bug work-around\" to be able to attach images or videos using Gallery 3D.</string>-->
+
+    <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
+    <!-- NEW: <string name="message_compose_use_workaround">Use \"Add attachment (Image)\" or \"Add attachment (Video)\" to attach images or videos with Gallery 3D.</string>-->
+
+    <!-- NEW: <string name="miscellaneous_preferences">Miscellaneous</string>-->
+    <!-- NEW: <string name="misc_preferences_attachment_title">Use Gallery bug work-around</string>-->
+    <!-- NEW: <string name="misc_preferences_attachment_description">Show buttons to add image/video attachments (to work around a Gallery 3D bug)</string>-->
+
+    <!-- APG related -->
+    <!-- NEW: <string name="error_activity_not_found">No suitable application for this action found.</string>-->
+    <!-- NEW: <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>-->
+    <!-- NEW: <string name="btn_crypto_sign">Sign</string>-->
+    <!-- NEW: <string name="btn_encrypt">Encrypt</string>-->
+    <!-- NEW: <string name="btn_decrypt">Decrypt</string>-->
+    <!-- NEW: <string name="btn_verify">Verify</string>-->
+    <!-- NEW: <string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>-->
+    <!-- NEW: <string name="key_id">id: %s</string>-->
+    <!-- NEW: <string name="insufficient_apg_permissions">K-9 doesn\'t have permission to access APG fully, please reinstall K-9 to fix that.</string>-->
+    <!-- NEW: <string name="pgp_mime_unsupported">PGP/MIME messages are not supported yet.</string>-->
+    <!-- NEW: <string name="attachment_encryption_unsupported">Warning: attachments are NOT signed or encrypted yet.</string>-->
+    <!-- NEW: <string name="send_aborted">Send aborted.</string>-->
+
+    <!-- NEW: <string name="save_or_discard_draft_message_dlg_title">Save draft message?</string>-->
+    <!-- NEW: <string name="save_or_discard_draft_message_instructions_fmt">Save or Discard this message?</string>-->
+
+    <!-- NEW: <string name="charset_not_found">This message can\'t be displayed because the charset \"<xliff:g id="charset">%s</xliff:g>\" wasn\'t found.</string>-->
+
+    <!-- NEW: <string name="select_text_now">Select text to copy.</string>-->
+
+    <!-- NEW: <string name="dialog_confirm_delete_title">Confirm deletion</string>-->
+    <!-- NEW: <string name="dialog_confirm_delete_message">Do you want to delete this message?</string>-->
+    <!-- NEW: <string name="dialog_confirm_delete_confirm_button">Delete</string>-->
+    <!-- NEW: <string name="dialog_confirm_delete_cancel_button">Do not delete</string>-->
+
+    <!-- NEW: <string name="debug_logging_enabled">Debug logging to Android logging system enabled</string>-->
+
+    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
+    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
 </resources>

res/values-sv/strings.xml

@@ -3,10 +3,14 @@
     <string name="app_name">K-9 E-post</string>
     <string name="beta_app_name">K-9 E-post BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Upphovsmän: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revisionsinformation: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Läs bilagor</string>
     <string name="read_attachment_desc">Tillåter denna applikation att läsa bifogade filer.</string>
@@ -38,12 +42,15 @@
     <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(Nästa kontroll @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Nästa</string> <!-- Used as part of a multi-step process -->
+    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Avbryt</string>
     <string name="send_action">Skicka</string>
+    <!-- NEW: <string name="send_again_action">Send Again</string>-->
     <string name="select_action">Markera</string>
     <string name="deselect_action">Avmarkera</string>
     <string name="reply_action">Svara</string>
@@ -111,6 +118,7 @@
     <string name="dump_settings_action">Dumpa inställningar</string>
     <string name="empty_trash_action">Töm papperskorg</string>
     <string name="expunge_action">Utplåna</string>
+    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
     <string name="set_sort_action">Välj sortering</string>
     <string name="reverse_sort_action">Omvänd sortering</string>
     <string name="about_action">Om</string>
@@ -120,7 +128,7 @@
     <string name="folder_context_menu_title">Mappinställningar</string>
 
     <string name="general_no_subject">(Inget ämne)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Ingen avsändare</string>
     <string name="status_loading">Kontrollerar</string>
     <string name="status_loading_folder">(Kontrollerar <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -253,6 +261,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="message_compose_content_hint">Meddelandetext</string>
     <string name="message_compose_quote_header_separator">-------- Originalmeddelande --------</string>
     <string name="message_compose_quote_header_subject">Ämne:</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">Från:</string>
     <string name="message_compose_quote_header_to">Till:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
@@ -316,6 +325,14 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="global_settings_checkbox_summary">Visa alltid checkboxar för flerval</string>
     <string name="global_settings_touchable_label">Touch-vänlig vy</string>
     <string name="global_settings_touchable_summary">Rymligare listobjekt med förhandsgranskningar</string>
+    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
+    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
+    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
 
     <string name="global_settings_messageview_fixedwidth_label">Teckensnitt med fast bredd</string>
     <string name="global_settings_messageview_fixedwidth_summary">Använd ett teckensnitt med fast bredd för att visa brev med enbart text</string>
@@ -332,6 +349,13 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="global_settings_privacy_mode_title">Privatläge</string>
     <string name="global_settings_privacy_mode_summary">Visa inte e-postens ämnen i notifieringsytan när systemet är låst</string>
 
+
+    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
+    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
+    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
+    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+
+
     <string name="account_setup_basics_title">Konfigurera ett nytt konto</string>
     <string name="account_setup_basics_instructions">Ange detta kontos e-post-adress:</string>
     <string name="account_setup_basics_instructions2_fmt">(Du kan lägga till ytterligare<xliff:g id="number_accounts">%d</xliff:g> konton.)</string>
@@ -346,6 +370,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_check_settings_retr_info_msg">Hämtar kontoinformation\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Kontrollerar inställningar för inkommande server\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Kontrollerar inställningar för utgående server\u2026</string>
+    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
+    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
     <string name="account_setup_check_settings_finishing_msg">Avslutar\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Avbryter\u2026</string>
 
@@ -391,6 +417,11 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_incoming_save_all_headers_title">Nerladdning av e-post-huvuden</string>
     <string name="account_setup_incoming_save_all_headers_label">Spara alla huvuden lokalt</string>
 
+    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
+    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+
     <string name="account_setup_expunge_policy_label">Utplåna e-post</string>
     <string name="account_setup_expunge_policy_immediately">Direkt efter radering eller flytt</string>
     <string name="account_setup_expunge_policy_on_poll">Vid varje e-post-kontroll</string>
@@ -442,8 +473,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_options_title">Kontoinställningar</string>
 
     <string name="compact_action">Komprimera</string>
-   <string name="clear_action">Rensa e-post (farligt!)</string>
+    <string name="clear_action">Rensa e-post (farligt!)</string>
-   <string name="recreate_action">Återskapa data (Sista utvägen!)</string>
+    <string name="recreate_action">Återskapa data (Sista utvägen!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Frekvens för kontroll av mappar</string>
     <!-- Frequency also used in account_settings_* -->
@@ -487,6 +518,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_options_mail_display_count_250">250 brev</string>
     <string name="account_setup_options_mail_display_count_500">500 brev</string>
     <string name="account_setup_options_mail_display_count_1000">1000 brev</string>
+    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
 
 
     <string name="move_copy_cannot_copy_unsynced_message">Kan inte kopiera eller flytta ett brev som inte är synkroniserat med servern</string>
@@ -498,6 +530,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_failed_dlg_edit_details_action">Redigera detaljer</string>
     <string name="account_setup_failed_dlg_continue_action">Fortsätt</string>
 
+    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
     <string name="account_settings_title_fmt">Allmänna inställningar</string>
     <string name="account_settings_default">Standardkonto</string>
     <string name="account_settings_default_label">Standardkonto</string>
@@ -512,6 +545,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_notify_self_summary">Notifiera även för e-post som jag själv har skickat</string>
     <string name="account_settings_notification_opens_unread_label">Notifieringar öppnar oläst e-post</string>
     <string name="account_settings_notification_opens_unread_summary">Letar efter oläst e-post när notifieringen öppnas</string>
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">Scrolla navigationsknappar</string>
     <string name="account_settings_hide_buttons_never">Aldrig</string>
@@ -532,7 +567,16 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_reply_after_quote_label">Svar efter citat</string>
     <string name="account_settings_reply_after_quote_summary">Vid svar på e-post placeras originalmeddelandet ovanför ditt svar.</string>
 
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
 
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
+    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
+    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
     <string name="account_settings_sync">Mappsynkronisering</string>
     <string name="account_settings_folders">Mappar</string>
     <string name="account_settings_message_lists">Lista e-post</string>
@@ -548,6 +592,9 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_mail_check_frequency_label">Frekvens för att kontrollera mappar</string>
     <string name="account_settings_second_class_check_frequency_label">Frekvens för kontroll av andra klass</string>
 
+    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+
+
     <string name="account_settings_color_label">Kontofärg</string>
     <string name="account_settings_color_summary">Välj färg för att visa detta konto i mappar och kontolistor</string>
 
@@ -657,6 +704,10 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_vibrate_pattern_5">mönster 5</string>
     <string name="account_settings_vibrate_times">Antal vibrationer</string>
     <string name="account_settings_ringtone">Ringsignal för ny e-post</string>
+    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
+    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
+
+
     <string name="account_settings_servers">Serverinställningar</string>
 
     <string name="account_settings_composition_title">Inställningar för att skriva brev</string>
@@ -702,6 +753,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="choose_identity">Välj identitet</string>
     <string name="choose_identity_title">Välj identitet</string>
     <string name="choose_account_title">Välj konto/identitet</string>
+    <!-- NEW: <string name="send_as">Send as</string>-->
+
 
     <string name="no_identities">Gå till Kontoinställningar -&gt; Hantera identiteter för att skapa en identitet</string>
     <string name="no_removable_identity">Du kan inte radera din enda identitet</string>
@@ -744,6 +797,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
         med din korrekta adress och lösenord så kanske du inte har ett betalt
         \"Plus\"-konto. Vänligen starta webbläsaren för att komma åt dessa konton.</string>
 
+    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+
     <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>
@@ -757,13 +812,13 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     Flytta\u000AY - Kopiera\u000AG - Stjärna\u000AO - Sorteringstyp\u000AI - Sorteringsordning\u000AQ
     - Återvänd till mappar\u000AS - Markera/avmarkera</string>
 
-      <string name="folder_list_help_key">
+    <string name="folder_list_help_key">
-      1 - Visa endast första klassens mappar\u000A
+    1 - Visa endast första klassens mappar\u000A
-      2 - Visa första och andra klassens mappar\u000A
+    2 - Visa första och andra klassens mappar\u000A
-      3 - Visa alla förutom andra klassens mappar\u000A
+    3 - Visa alla förutom andra klassens mappar\u000A
-      4 - Visa alla mappar\u000A
+    4 - Visa alla mappar\u000A
-      Q - Återvänd till konton\u000A
+    Q - Återvänd till konton\u000A
-      S - Redigera kontoinställningar</string>
+    S - Redigera kontoinställningar</string>
 
     <string name="folder_list_display_mode_label">Mappar</string>
     <string name="folder_list_display_mode_all">Visa alla mappar</string>
@@ -778,14 +833,25 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_signature__location_after_quoted_text">Efter citerad text</string>
     <string name="setting_theme_dark">Mörk</string>
     <string name="setting_theme_light">Ljus</string>
-    <string name="display_preferences">Globala inställningar</string>
+    <!-- NEW: <string name="display_preferences">Display</string>-->
+    <!-- NEW: <string name="global_preferences">Global</string>-->
     <string name="debug_preferences">Debugging</string>
+    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
+    <!-- NEW: <string name="network_preferences">Network</string>-->
+    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
     <string name="accountlist_preferences">Kontolista</string>
     <string name="messagelist_preferences">E-post-listor</string>
     <string name="messageview_preferences">Brev</string>
     <string name="settings_theme_label">Tema</string>
     <string name="settings_language_label">Språk</string>
 
+    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
+    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
+    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+
+
+
     <string name="setting_language_system">Systemstandard</string>
 
     <string name="background_ops_label">Bakgrundssynkronisering</string>
@@ -836,6 +902,9 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="gestures_title">Gester</string>
     <string name="gestures_summary">Acceptera gestkontroll</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">Volym upp/ner-navigering</string>
     <string name="volume_navigation_summary">Växla mellan val med hjälp av volymkontrollerna</string>
     <string name="volume_navigation_message">E-post-vy</string>
@@ -891,6 +960,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="font_size_message_list_subject">Ämne</string>
     <string name="font_size_message_list_sender">Avsändare</string>
     <string name="font_size_message_list_date">Datum</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">E-post-vy</string>
     <string name="font_size_message_view_sender">Avsändare</string>
@@ -954,4 +1024,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
 
     <string name="debug_logging_enabled">Debug-loggning till Androids loggsystem är aktiverat</string>
 
+    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
+    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
 </resources>

res/values-zh-rCN/strings.xml

@@ -3,10 +3,14 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail测试版</string>
     <string name="app_authors">谷歌以及帮着遛K-9的小朋友们。</string>
+    <!-- NEW: <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>-->
+    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">作者: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">更新日志: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
+    <!-- NEW: <string name="app_emoji_icons">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>
@@ -38,12 +42,15 @@
     <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>
+    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">下一步</string> <!-- Used as part of a multi-step process -->
+    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
     <string name="okay_action">确定</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">取消</string>
     <string name="send_action">发送</string>
+    <!-- NEW: <string name="send_again_action">Send Again</string>-->
     <string name="select_action">选择</string>
     <string name="deselect_action">取消选择</string>
     <string name="reply_action">回复</string>
@@ -110,6 +117,7 @@
     <string name="dump_settings_action">导出设置</string>
     <string name="empty_trash_action">清空垃圾箱</string>
     <string name="expunge_action">删除</string>
+    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
     <string name="set_sort_action">选择排序方式</string>
     <string name="reverse_sort_action">逆序</string>
     <string name="about_action">关于</string>
@@ -119,7 +127,7 @@
     <string name="folder_context_menu_title">文件夹选项</string>
 
     <string name="general_no_subject">（无主题）</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">无发件人</string>
     <string name="status_loading">正在接收</string>
     <string name="status_loading_folder">（正在接收<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>）</string>
@@ -240,6 +248,7 @@
     <string name="message_compose_content_hint">邮件内容</string>
     <string name="message_compose_quote_header_separator">--------原始邮件--------</string>
     <string name="message_compose_quote_header_subject">主题：</string>
+    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
     <string name="message_compose_quote_header_from">发件人：</string>
     <string name="message_compose_quote_header_to">收件人：</string>
     <string name="message_compose_quote_header_cc">抄送：</string>
@@ -303,7 +312,9 @@
     <string name="global_settings_checkbox_summary">总是显示多选框</string>
     <string name="global_settings_touchable_label">邮件预览</string>
     <string name="global_settings_touchable_summary">在列表中显示邮件预览</string>
-
+    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
+    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</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>
@@ -325,6 +336,13 @@
     <string name="global_settings_privacy_mode_title">锁屏通知</string>
     <string name="global_settings_privacy_mode_summary">屏幕锁定时不要在通知栏中显示邮件主题</string>
 
+
+    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
+    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
+    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
+    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+
+
     <string name="account_setup_basics_title">设置新账户</string>
     <string name="account_setup_basics_instructions">输入该账户的电子邮件地址：</string>
     <string name="account_setup_basics_instructions2_fmt">（你还可以再添加<xliff:g id="number_accounts">%d</xliff:g>个账户）</string>
@@ -339,6 +357,8 @@
     <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>
+    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
+    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
     <string name="account_setup_check_settings_finishing_msg">正在完成最后的操作\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">正在取消\u2026</string>
 
@@ -384,6 +404,11 @@
     <string name="account_setup_incoming_save_all_headers_title">下载邮件信息</string>
     <string name="account_setup_incoming_save_all_headers_label">在本地保存全部邮件的信息</string>
 
+    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
+    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
+    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+
     <string name="account_setup_expunge_policy_label">抹掉删除的邮件</string>
     <string name="account_setup_expunge_policy_immediately">立刻</string>
     <string name="account_setup_expunge_policy_on_poll">接收邮件时</string>
@@ -435,8 +460,8 @@
     <string name="account_setup_options_title">账户选项</string>
 
     <string name="compact_action">压缩</string>
-   <string name="clear_action">清除邮件（慎用）</string>
+    <string name="clear_action">清除邮件（慎用）</string>
-   <string name="recreate_action">重建数据（最后的杀手锏）</string>
+    <string name="recreate_action">重建数据（最后的杀手锏）</string>
 
     <string name="account_setup_options_mail_check_frequency_label">文件夹检查频率</string>
     <!-- Frequency also used in account_settings_* -->
@@ -480,6 +505,7 @@
     <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>
+    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
 
 
     <string name="move_copy_cannot_copy_unsynced_message">没有与服务器同步的邮件无法进行拷贝或移动</string>
@@ -506,6 +532,8 @@
     <string name="account_settings_notify_self_summary">发送邮件时显示通知</string>
     <string name="account_settings_notification_opens_unread_label">点击通知后打开未读邮件</string>
     <string name="account_settings_notification_opens_unread_summary">点击通知后搜索未读邮件</string>
+    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
+    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
 
     <string name="account_settings_hide_buttons_label">滚动导航按钮</string>
     <string name="account_settings_hide_buttons_never">从不</string>
@@ -526,7 +554,15 @@
     <string name="account_settings_reply_after_quote_label">在引用的文本后进行回复</string>
     <string name="account_settings_reply_after_quote_summary">回复邮件时，原始邮件会显示在您的邮件的上方。</string>
 
+    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
+    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
+    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
 
+    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
+    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+
+    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
     <string name="account_settings_display_prefs_title">显示</string>
     <string name="account_settings_sync">正在接受邮件</string>
     <string name="account_settings_folders">文件夹</string>
@@ -543,6 +579,9 @@
     <string name="account_settings_mail_check_frequency_label">文件夹检查频率</string>
     <string name="account_settings_second_class_check_frequency_label">第二组检查频率</string>
 
+    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+
+
     <string name="account_settings_color_label">账户颜色</string>
     <string name="account_settings_color_summary">选择账户在文件夹和账户列表中显示时所使用的颜色</string>
 
@@ -701,6 +740,8 @@
     <string name="choose_identity">选择身份标识</string>
     <string name="choose_identity_title">选择身份标识</string>
     <string name="choose_account_title">选择账户/身份标识</string>
+    <!-- NEW: <string name="send_as">Send as</string>-->
+
 
     <string name="no_identities">请使用“账户设置”-&gt;“管理身份标识”来创建身份标识</string>
     <string name="no_removable_identity">您必须保留一个身份标识</string>
@@ -740,6 +781,8 @@
 
     <string name="provider_note_live">只有一些“高级账户”允许POP访问并允许该程序连接。如果您使用了正确的用户名和密码却仍旧无法登录，则您可能没有购买这些“高级账户”。请使用浏览器来访问这些账户。</string>
 
+    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</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>
@@ -752,13 +795,13 @@
     移动\u000AY - 拷贝\u000AG - 星标\u000AO - 排序方式\u000AI - 升序/降序\u000AQ
     - 返回文件夹\u000AS - 选择/取消选择</string>
 
-      <string name="folder_list_help_key">
+    <string name="folder_list_help_key">
-      1 - 只显示初级文件夹\u000A
+    1 - 只显示初级文件夹\u000A
-      2 - 显示初级和次级文件夹\u000A
+    2 - 显示初级和次级文件夹\u000A
-      3 - 仅不显示次级文件夹\u000A
+    3 - 仅不显示次级文件夹\u000A
-      4 - 显示全部文件夹\u000A
+    4 - 显示全部文件夹\u000A
-      Q - 返回全部账户\u000A
+    Q - 返回全部账户\u000A
-      S - 编辑账户设置</string>
+    S - 编辑账户设置</string>
 
     <string name="folder_list_display_mode_label">文件夹</string>
     <string name="folder_list_display_mode_all">显示全部文件夹</string>
@@ -840,6 +883,9 @@
     <string name="gestures_title">手势</string>
     <string name="gestures_summary">接收手势控制</string>
 
+    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
+    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+
     <string name="volume_navigation_title">音量键导航</string>
     <string name="volume_navigation_summary">利用音量键选择项目</string>
     <string name="volume_navigation_message">信息视图</string>
@@ -895,6 +941,7 @@
     <string name="font_size_message_list_subject">主题</string>
     <string name="font_size_message_list_sender">发件人</string>
     <string name="font_size_message_list_date">日期</string>
+    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
 
     <string name="font_size_message_view">邮件</string>
     <string name="font_size_message_view_sender">发件人</string>
@@ -958,4 +1005,7 @@
 
     <string name="debug_logging_enabled">已经启用将调试日志写入Andorid日志系统</string>
 
+    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
+    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
 </resources>

res/values/strings.xml

@@ -192,7 +192,7 @@
     <string name="send_failure_subject">Failed to send some messages</string>
     <string name="send_failure_body_abbrev">See your <xliff:g id="errorFolder">%s</xliff:g> folder for details.</string>
     <string name="send_failure_body_fmt">K-9 encountered a problem sending some of your messages.
-     However, due to the nature of the problem, K-9 cannot be certain if the messages
+    However, due to the nature of the problem, K-9 cannot be certain if the messages
     were sent or not.  The recipients may have already received copies of the message.
     \u000a\u000aThe messages for which this type of problem occurred are now starred in your Outbox.
     If you remove the stars, K-9 will try to send the messages again.
@@ -473,8 +473,8 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_setup_options_title">Account options</string>
 
     <string name="compact_action">Compact</string>
-   <string name="clear_action">Clear messages (danger!)</string>
+    <string name="clear_action">Clear messages (danger!)</string>
-   <string name="recreate_action">Recreate data (Last Resort!)</string>
+    <string name="recreate_action">Recreate data (Last Resort!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Folder poll frequency</string>
     <!-- Frequency also used in account_settings_* -->
@@ -813,13 +813,13 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     Move\u000AY - Copy\u000AG - Star\u000AO - Sort type\u000AI - Sort order\u000AQ
     - Return to Folders\u000AS - Select/deselect</string>
 
-      <string name="folder_list_help_key">
+    <string name="folder_list_help_key">
-      1 - Display only 1st Class folders\u000A
+    1 - Display only 1st Class folders\u000A
-      2 - Display 1st and 2nd Class folders\u000A
+    2 - Display 1st and 2nd Class folders\u000A
-      3 - Display all except 2nd Class folders\u000A
+    3 - Display all except 2nd Class folders\u000A
-      4 - Display all folders\u000A
+    4 - Display all folders\u000A
-      Q - Return to Accounts\u000A
+    Q - Return to Accounts\u000A
-      S - Edit Account Settings</string>
+    S - Edit Account Settings</string>
 
     <string name="folder_list_display_mode_label">Folders</string>
     <string name="folder_list_display_mode_all">Display all folders</string>
@@ -902,7 +902,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="animations_summary">Use gaudy visual effects</string>
     <string name="gestures_title">Gestures</string>
     <string name="gestures_summary">Accept gesture control</string>
-    
+
     <string name="compact_layouts_title">Compact layouts</string>
     <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>