From 4e8c8e35de1afb9ec926edaae9fcd8fde892d584 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 19 Nov 2012 08:06:57 +0100
Subject: [PATCH] Remove unused strings

---
 res/values-ca/strings.xml     | 63 ---------------------------------
 res/values-cs/strings.xml     | 64 ----------------------------------
 res/values-da/strings.xml     | 64 ----------------------------------
 res/values-de/strings.xml     | 64 ----------------------------------
 res/values-el/strings.xml     | 64 ----------------------------------
 res/values-es/strings.xml     | 64 ----------------------------------
 res/values-fi/strings.xml     | 65 -----------------------------------
 res/values-fr-rCA/strings.xml |  2 --
 res/values-fr/strings.xml     | 65 -----------------------------------
 res/values-gl/strings.xml     | 64 ----------------------------------
 res/values-hu/strings.xml     | 63 ---------------------------------
 res/values-it/strings.xml     | 64 ----------------------------------
 res/values-iw/strings.xml     | 64 ----------------------------------
 res/values-ja/strings.xml     | 65 -----------------------------------
 res/values-ko/strings.xml     | 64 ----------------------------------
 res/values-nl/strings.xml     | 64 ----------------------------------
 res/values-pl/strings.xml     | 64 ----------------------------------
 res/values-pt-rBR/strings.xml | 64 ----------------------------------
 res/values-ru/strings.xml     | 64 ----------------------------------
 res/values-sv/strings.xml     | 64 ----------------------------------
 res/values-tr/strings.xml     | 64 ----------------------------------
 res/values-uk/strings.xml     | 64 ----------------------------------
 res/values-zh-rCN/strings.xml | 64 ----------------------------------
 res/values-zh-rTW/strings.xml | 64 ----------------------------------
 res/values/strings.xml        | 65 -----------------------------------
 25 files changed, 1540 deletions(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4e6778ebe..7ffe02d32 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -53,7 +53,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Marca missatges a \'<xliff:g id="folder">%s</xliff:g>\' com ha llegits?  (incloent-hi missatges de la carpeta que no són mostrats a K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">El compte \"<xliff:g id="account">%s</xliff:g>\" serà esborrat de K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Totes les dades de \"<xliff:g id="account">%s</xliff:g>\" seran esborrades de K-9 Mail, però la configuració del compte romandrà.</string>
     <string name="account_clear_dlg_instructions_fmt">Tots els missatges a \"<xliff:g id="account">%s</xliff:g>\" seran esborrats de K-9 Mail, però la configuració del compte romandrà.</string>
@@ -86,7 +85,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Comptes</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Avançat</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>
 
@@ -112,14 +110,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Cancel·la</string>
     <string name="send_action">Envia</string>
     <string name="send_again_action">Torna a enviar</string>
-    <string name="select_action">Selecciona</string>
-    <string name="deselect_action">Desselecciona</string>
     <string name="reply_action">Respon</string>
     <string name="reply_all_action">Respon a tothom</string>
     <string name="delete_action">Esborra</string>
     <string name="archive_action">Arxiva</string>
     <string name="spam_action">Brossa</string>
-    <string name="delete_all_action">Buida la carpeta</string>
     <string name="forward_action">Reenvia</string>
     <string name="move_action">Mou</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -128,38 +123,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Fet</string>
     <string name="discard_action">Descarta</string>
     <string name="save_draft_action">Desa com a esborrany</string>
-    <string name="retry_action">Reintenta</string>
-    <string name="refresh_action">Refresca</string>
     <string name="check_mail_action">Comprova el correu</string>
     <string name="send_messages_action">Envia missatges</string>
-    <string name="list_folders_action">Llista de carpetes</string>
     <string name="refresh_folders_action">Refresca carpetes</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">Marca missatges com a llegits</string>
     <string name="add_account_action">Afegeix un compte nou</string>
     <string name="compose_action">Redacta</string>
     <string name="search_action">Cerca</string>
     <string name="search_results">Cerca resultats</string>
     <string name="preferences_action">Configuració</string>
-    <string name="open_action">Obre</string>
     <string name="account_settings_action">Configuració del compte</string>
     <string name="folder_settings_action">Configuració de la carpeta</string>
     <string name="global_settings_action">Configuració global</string>
     <string name="remove_account_action">Esborra el compte</string>
     <string name="clear_pending_action">Suprimeix totes les accions pendents (Compte!)</string>
 
-    <string name="accounts_action">Comptes</string>
     <string name="mark_as_read_action">Marca com a llegit</string>
     <string name="send_alternate_action">Comparteix</string>
     <string name="send_alternate_chooser_title">Selecciona remitent</string>
 
-    <string name="mark_all_as_read_dlg_title">Marca missatges com a llegits</string>
-
     <string name="flag_action">Afegeix un estel</string>
     <string name="unflag_action">Treu l’estel</string>
     <string name="copy_action">Copia</string>
-    <string name="show_full_header_action">Ensenya la capçalera sencera</string>
-    <string name="hide_full_header_action">Amaga tota la capçalera</string>
     <string name="select_text_action">Selecciona text</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -182,7 +167,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Opcions del compte</string>
 
     <string name="general_no_subject">(Sense assumpte)</string>
-    <string name="general_no_date">Sense data</string>
     <string name="general_no_sender">Sense remitent</string>
     <string name="status_loading">Comprovant</string>
     <string name="status_loading_more">S’estan carregant els missatges\u2026</string>
@@ -276,11 +260,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">A/c:</string>
     <string name="message_view_attachment_view_action">Obre</string>
     <string name="message_view_attachment_download_action">Desa</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arxiu</string>
-    <string name="message_view_move_action">Mou</string>
-    <string name="message_view_spam_action">Brossa</string>
     <string name="message_view_status_attachment_saved">Adjunt desat a la SD com a <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">No s’ha pogut desar l’adjunt a la SD.</string>
     <string name="message_view_show_pictures_action">Mostra fotos</string>
@@ -305,12 +284,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">S’ha descartat el missatge</string>
     <string name="message_saved_toast">S’ha desat el missatge com a esborrany</string>
 
-    <string name="global_settings_flag_label">Mostra estels</string>
-    <string name="global_settings_flag_summary">Els estels indiquen els missatges senyalats</string>
     <string name="global_settings_checkbox_label">Selecció múltiple</string>
     <string name="global_settings_checkbox_summary">Ensenya sempre la selecció múltiple</string>
-    <string name="global_settings_touchable_label">Previsualització missatges</string>
-    <string name="global_settings_touchable_summary">Llista més espaiosa amb previsualització de missatges</string>
     <string name="global_settings_preview_lines_label">Previsualització de línies</string>
     <string name="global_settings_show_correspondent_names_label">Mostra noms dels contactes</string>
     <string name="global_settings_show_correspondent_names_summary">Mostra noms dels contactes enlloc dels correus</string>
@@ -333,12 +308,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Confirma accions</string>
     <string name="global_settings_confirm_actions_summary">Mostra un diàleg cada vegada que executis accions seleccionades</string>
-    <string name="global_settings_confirm_action_archive">Arxiva</string>
     <string name="global_settings_confirm_action_delete">Esborra (només la vista del missatge)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">Brossa</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Maca\'ls tots com a llegits</string>
-    <string name="global_settings_confirm_action_send">Envia</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -361,10 +333,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Mode silenciós acaba</string>
 
     <string name="account_setup_basics_title">Configura un compte nou</string>
-    <string name="account_setup_basics_instructions">Entra l’adreça de correu d’aquest compte:</string>
     <string name="account_setup_basics_email_hint">Adreça de correu electrònic</string>
     <string name="account_setup_basics_password_hint">Contrasenya</string>
-    <string name="account_setup_basics_default_label">Envia el correu per defecte des d’aquest compte</string>
     <string name="account_setup_basics_manual_setup_action">Configuració manual</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -376,7 +346,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">S’està cancel·lant\u2026</string>
 
     <string name="account_setup_names_title">Ja està gairebé fet!</string>
-    <string name="account_setup_names_instructions">S’ha configurat el compte, s’està comprovant correu nou!</string>
     <string name="account_setup_names_account_name_label">Dóna un nom a aquest compte (opcional):</string>
     <string name="account_setup_names_user_name_label">Escriu el teu nom (és el que es mostrarà en els missatges sortints):</string>
 
@@ -411,9 +380,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Un altre</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Descarrega capçaleres</string>
-    <string name="account_setup_incoming_save_all_headers_label">Desa localment totes les capçaleres dels missatges</string>
-
     <string name="local_storage_provider_external_label">Emmagatzematge extern (targeta SD)</string>
     <string name="local_storage_provider_internal_label">Emmagatzematge intern</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s emmagatzematge intern addicional</string>
@@ -448,20 +414,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Servidor SMTP</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Tipus de seguretat</string>
-    <string name="account_setup_outgoing_security_none_label">Cap</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (si és disponible)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (sempre)</string>
     <string name="account_setup_outgoing_require_login_label">Requereix inici de sessió.</string>
     <string name="account_setup_outgoing_username_label">Nom d’usuari</string>
     <string name="account_setup_outgoing_password_label">Contrasenya</string>
     <string name="account_setup_outgoing_authentication_label">Tipus d’autenticació</string>
-    <string name="account_setup_outgoing_authentication_basic_label">Nom d’usuari i contrasenya</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Nom d’usuari</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Contrasenya</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP abans de SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP abans de SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) abans de SMTP</string>
 
     <string name="account_setup_bad_uri">Configuració invàlida: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -744,7 +700,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Identitat inicial</string>
     <string name="choose_identity_title">Tria identitat</string>
-    <string name="choose_account_title">Tria compte/identitat</string>
     <string name="send_as">Envia com</string>
 
     <string name="no_removable_identity">No pots esborrar una identitat si només en tens una</string>
@@ -752,8 +707,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Missatges més antics primer</string>
     <string name="sort_latest_first">Darrers missatges primer</string>
-    <string name="sort_sender_alpha">Remitent alfabètic</string>
-    <string name="sort_sender_re_alpha">Remitent en ordre alfabètic invers</string>
     <string name="sort_subject_alpha">Assumpte alfabètic</string>
     <string name="sort_subject_re_alpha">Assumpte en ordre alfabètic invers</string>
     <string name="sort_flagged_first">Missatges senyalats primer</string>
@@ -766,7 +719,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Ordenat per…</string>
     <string name="sort_by_date">Data</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">Remitent</string>
     <string name="sort_by_subject">Assumpte</string>
     <string name="sort_by_flag">Estel</string>
     <string name="sort_by_unread">Llegit/no llegit</string>
@@ -848,8 +800,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Quan s’està comprovant \'Dades en segon pla\' i \'Auto sincronització\'</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">No s’ha seleccionat cap missatge</string>
-
     <string name="date_format_label">Format de la data</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -857,20 +807,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Operacions en lot</string>
-    <string name="batch_delete_op">Esborra les seleccions</string>
-    <string name="batch_mark_read_op">Marca com a ha llegit les seleccion</string>
-    <string name="batch_mark_unread_op">Marca com a no llegit les seleccions</string>
-    <string name="batch_flag_op">Afegeix un estel a les seleccions</string>
-    <string name="batch_unflag_op">Treu l’estel del que s’ha seleccionat</string>
-    <string name="batch_archive_op">Mou les seleccions a l’arxiu</string>
-    <string name="batch_spam_op">Mou les seleccions a la brossa</string>
-    <string name="batch_move_op">Mou les seleccions</string>
-    <string name="batch_copy_op">Copia les seleccions</string>
-    <string name="batch_flag_mode">Mode estel</string>
-    <string name="batch_plain_mode">Mode net</string>
     <string name="batch_select_all">Selecciona-ho tot</string>
-    <string name="batch_deselect_all">Desselecciona-ho tot</string>
 
     <string name="account_setup_push_limit_label">Carpetes màximes a comprovar</string>
     <string name="account_setup_push_limit_10">10 carpetes</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2a4c3b53e..cb85b1c09 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -59,7 +59,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Označit všechny zprávy ve složce \'<xliff:g id="folder">%s</xliff:g>\' jako přečtené? (včetně zpráv, které v té složce nejsou zobrazeny v K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstraněn z pošty K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Všechna data účtu \"<xliff:g id="account">%s</xliff:g>\" budou z pošty K-9 Mail odstraněna, ale nastavení účtu bude zachováno.</string>
     <string name="account_clear_dlg_instructions_fmt">Všechny zprávy v účtu \"<xliff:g id="account">%s</xliff:g>\" budou z pošty K-9 Mail odstraněny, ale nastavení účtu bude zachováno.</string>
@@ -92,7 +91,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Účty</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Pokročilé</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>
 
@@ -118,14 +116,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Zrušit</string>
     <string name="send_action">Odeslat</string>
     <string name="send_again_action">Odeslat znovu</string>
-    <string name="select_action">Vybrat</string>
-    <string name="deselect_action">Zrušit výběr</string>
     <string name="reply_action">Odpovědět</string>
     <string name="reply_all_action">Odpovědět všem</string>
     <string name="delete_action">Smazat</string>
     <string name="archive_action">Archivovat</string>
     <string name="spam_action">Nevyžádaná</string>
-    <string name="delete_all_action">Vyčistit složku</string>
     <string name="forward_action">Přeposlat</string>
     <string name="move_action">Přesunout</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -134,38 +129,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Hotovo</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Zrušit</string>
     <string name="save_draft_action">Uložit jako koncept</string>
-    <string name="retry_action">Opakovat</string>
-    <string name="refresh_action">Obnovit</string>
     <string name="check_mail_action">Zkontrolovat poštu</string>
     <string name="send_messages_action">Odeslat zprávy</string>
-    <string name="list_folders_action">Seznam složek</string>
     <string name="refresh_folders_action">Obnovit složky</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">Označit vše jako přečtené</string>
     <string name="add_account_action">Přidat účet</string>
     <string name="compose_action">Nová</string>
     <string name="search_action">Hledat</string>
     <string name="search_results">Výsledky hledání</string>
     <string name="preferences_action">Možnosti</string>
-    <string name="open_action">Otevřít</string>
     <string name="account_settings_action">Nastavení účtu</string>
     <string name="folder_settings_action">Nastavení složky</string>
     <string name="global_settings_action">Globální možnosti</string>
     <string name="remove_account_action">Odstranit účet</string>
     <string name="clear_pending_action">Vynulovat nevyřízené akce (nebezpečné!)</string>
 
-    <string name="accounts_action">Účty</string>
     <string name="mark_as_read_action">Označit jako přečtené</string>
     <string name="send_alternate_action">Sdílet</string>
     <string name="send_alternate_chooser_title">Vybrat odesílatele</string>
 
-    <string name="mark_all_as_read_dlg_title">Označit všechny zprávy jako přečtené</string>
-
     <string name="flag_action">Přidat \u2605</string>
     <string name="unflag_action">Odebrat \u2606</string>
     <string name="copy_action">Kopírovat</string>
-    <string name="show_full_header_action">Zobrazit úplné záhlaví</string>
-    <string name="hide_full_header_action">Skrýt úplné záhlaví</string>
     <string name="select_text_action">Vybrat text</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -188,7 +173,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Možnosti účtů</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. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Bez odesílatele</string>
     <string name="status_loading">Dotazování</string>
     <string name="status_loading_more">Načítání zpráv\u2026</string>
@@ -282,11 +266,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Kopie:</string>
     <string name="message_view_attachment_view_action">Otevřít</string>
     <string name="message_view_attachment_download_action">Uložit</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archív</string>
-    <string name="message_view_move_action">Přesunout</string>
-    <string name="message_view_spam_action">Nevyžádaná</string>
     <string name="message_view_status_attachment_saved">Příloha byla uložena na SD kartu jako <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Nelze uložit přílohu na SD kartu.</string>
     <string name="message_view_show_pictures_action">Zobrazovat obrázky</string>
@@ -310,12 +289,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Zpráva byla zrušena</string>
     <string name="message_saved_toast">Zpráva byla uložena jako koncept</string>
 
-    <string name="global_settings_flag_label">Zprávy s \u2605</string>
-    <string name="global_settings_flag_summary">Hvězdička indikuje označenou zprávu</string>
     <string name="global_settings_checkbox_label">Výběrová zaškrtávací pole</string>
     <string name="global_settings_checkbox_summary">Vždy zobrazovat výběrová zaškrtávací pole</string>
-    <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>-->
@@ -338,12 +313,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Potvrzování akcí</string>
     <string name="global_settings_confirm_actions_summary">Zobrazit dialog, když provádíte zvolené akce</string>
-    <string name="global_settings_confirm_action_archive">Archivace</string>
     <string name="global_settings_confirm_action_delete">Mazání (jen v zobrazení zpráv)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">Nevyžádaná</string>
-    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
-    <string name="global_settings_confirm_action_send">Odesílání</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -366,10 +338,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Doba klidu končí</string>
 
     <string name="account_setup_basics_title">Založit nový účet</string>
-    <string name="account_setup_basics_instructions">Zadejte emailovou adresu tohoto účtu:</string>
     <string name="account_setup_basics_email_hint">Emailová adresa</string>
     <string name="account_setup_basics_password_hint">Heslo</string>
-    <string name="account_setup_basics_default_label">Odesílat poštu z tohoto účtu jako výchozí</string>
     <string name="account_setup_basics_manual_setup_action">Ruční nastavení</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -381,7 +351,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Rušení\u2026</string>
 
     <string name="account_setup_names_title">Téměř hotovo!</string>
-    <string name="account_setup_names_instructions">Váš účet je nastaven a pošta je na cestě!</string>
     <string name="account_setup_names_account_name_label">Pojmenujte tento účet (volitelné):</string>
     <string name="account_setup_names_user_name_label">Zadejte vaše jméno (zobrazuje se v odchozích zprávách):</string>
 
@@ -416,9 +385,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Jiná</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Stahovat záhlaví zpráv</string>
-    <string name="account_setup_incoming_save_all_headers_label">Ukládat všechna záhlaví lokálně</string>
-
     <string name="local_storage_provider_external_label">Externí úložiště (SD karta)</string>
     <string name="local_storage_provider_internal_label">Obvyklé vnitřní úložiště</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s přídavné vnitřní úložiště</string>
@@ -453,21 +419,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Server SMTP</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Typ zabezpečení</string>
-    <string name="account_setup_outgoing_security_none_label">Žádné</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (je-li dostupné)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (vždy)</string>
     <string name="account_setup_outgoing_require_login_label">Požadovat přihlášení.</string>
     <string name="account_setup_outgoing_username_label">Uživatelské jméno</string>
     <string name="account_setup_outgoing_password_label">Heslo</string>
     <string name="account_setup_outgoing_authentication_label">Typ ověření</string>
-    <!-- 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">Uživatelské jméno a heslo</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Uživatelské jméno</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Heslo</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP před SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP před SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) před SMTP</string>
 
     <string name="account_setup_bad_uri">Neplatné nastavení: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -750,7 +705,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Prvotní identita</string>
     <string name="choose_identity_title">Vyberte identitu</string>
-    <string name="choose_account_title">Vyberte účet/identitu</string>
     <string name="send_as">Odeslat jako</string>
 
     <string name="no_removable_identity">Nemůžete odebrat vaši jedinou zbývající identitu</string>
@@ -758,8 +712,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Nejstarší zprávy první</string>
     <string name="sort_latest_first">Nejnovější zprávy první</string>
-    <string name="sort_sender_alpha">Odesílatel abecedně A-&gt;Z</string>
-    <string name="sort_sender_re_alpha">Odesílatel abecedně Z-&gt;A</string>
     <string name="sort_subject_alpha">Předmět abecedně A-&gt;Z</string>
     <string name="sort_subject_re_alpha">Předmět abecedně Z-&gt;A</string>
     <string name="sort_flagged_first">S \u2605 první</string>
@@ -772,7 +724,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Třídit podle položky…</string>
     <string name="sort_by_date">Datum</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">Odesílatel</string>
     <string name="sort_by_subject">Předmět</string>
     <string name="sort_by_flag">Hvězdička</string>
     <string name="sort_by_unread">Přečtená/Nepřečtená</string>
@@ -854,8 +805,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Jsou-li \'Data na pozadí\' a \'Aut. synchronizace\' zaškrtnuty</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Žádná zpráva není vybrána</string>
-
     <string name="date_format_label">Formát data</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -863,20 +812,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd. MMMM yyyy</string>
 
-    <string name="batch_ops">Dávkové operace</string>
-    <string name="batch_delete_op">Smazat vybrané</string>
-    <string name="batch_mark_read_op">Označit vybrané jako přečtené</string>
-    <string name="batch_mark_unread_op">Označit vybrané jako nepřečtené</string>
-    <string name="batch_flag_op">Přidat \u2605 vybraným</string>
-    <string name="batch_unflag_op">Odebrat \u2606 vybraným</string>
-    <string name="batch_archive_op">Přesunout vybrané do Archívu</string>
-    <string name="batch_spam_op">Přesunout vybrané do Nevyžádané</string>
-    <string name="batch_move_op">Přesunout vybrané</string>
-    <string name="batch_copy_op">Kopírovat vybrané</string>
-    <string name="batch_flag_mode">Režim hvězdiček</string>
-    <string name="batch_plain_mode">Normální režim</string>
     <string name="batch_select_all">Vybrat vše</string>
-    <string name="batch_deselect_all">Zrušit všechny výběry</string>
 
     <string name="account_setup_push_limit_label">Max. počet složek řízených PUSH</string>
     <string name="account_setup_push_limit_10">10 složek</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ed2e303a8..1c70c319a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -53,7 +53,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Marker alle mails i \'<xliff:g id="folder">%s</xliff:g>\' som læst?  (incl. mails i mappe som ikke er vist i K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">Kontoen  \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet fra K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Alle mails, vedhæftede filer, mapper og mappe-indstillinger for \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet fra K-9 Mail, men kontoindstillinger vil blive husket.</string>
     <string name="account_clear_dlg_instructions_fmt">Alle mails i \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet, men kontoindstillinger vil blive husket.</string>
@@ -86,7 +85,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Konti</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Advanceret</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>
 
@@ -112,14 +110,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Fortryd</string>
     <string name="send_action">Send</string>
     <string name="send_again_action">Send igen</string>
-    <string name="select_action">Vælg</string>
-    <string name="deselect_action">Fravælg</string>
     <string name="reply_action">Svar</string>
     <string name="reply_all_action">Svar alle</string>
     <string name="delete_action">Slet</string>
     <string name="archive_action">Arkiver</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Tøm mappe</string>
     <string name="forward_action">Videresend</string>
     <string name="move_action">Flyt</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -128,38 +123,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Afslut</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Slet</string>
     <string name="save_draft_action">Gem som kladde</string>
-    <string name="retry_action">Forsøg igen</string>
-    <string name="refresh_action">Genindlæs</string>
     <string name="check_mail_action">Synkroniser mails</string>
     <string name="send_messages_action">Send mails</string>
-    <string name="list_folders_action">Mappeliste</string>
     <string name="refresh_folders_action">Genindlæs mapper</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">Marker alle mails som læst</string>
     <string name="add_account_action">Tilføj konto</string>
     <string name="compose_action">Skriv</string>
     <string name="search_action">Søg</string>
     <string name="search_results">Søgeresultater</string>
     <string name="preferences_action">Indstillinger</string>
-    <string name="open_action">Åbn</string>
     <string name="account_settings_action">Konto indstillinger</string>
     <string name="folder_settings_action">Mappe indstillinger</string>
     <string name="global_settings_action">Globale indstillinger</string>
     <string name="remove_account_action">Slet konto</string>
     <string name="clear_pending_action">Afbryd igangværende handlinger (farligt!)</string>
 
-    <string name="accounts_action">Konti</string>
     <string name="mark_as_read_action">Marker som læst</string>
     <string name="send_alternate_action">Del</string>
     <string name="send_alternate_chooser_title">Vælg afsender</string>
 
-    <string name="mark_all_as_read_dlg_title">Marker alle mails som læst</string>
-
     <string name="flag_action">Tilføj stjernemarkering</string>
     <string name="unflag_action">Fjern stjernemarkering</string>
     <string name="copy_action">Kopier</string>
-    <string name="show_full_header_action">Vis hele headeren</string>
-    <string name="hide_full_header_action">Skjul header</string>
     <string name="select_text_action">Vælg tekst</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -182,7 +167,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Kontoindstillinger</string>
 
     <string name="general_no_subject">(Intet emne)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">Ingen dato</string>
     <string name="general_no_sender">Ingen afsender</string>
     <string name="status_loading">Synkroniserer</string>
     <string name="status_loading_more">Henter mails\u2026</string>
@@ -276,11 +260,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Åben</string>
     <string name="message_view_attachment_download_action">Gem</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arkiver</string>
-    <string name="message_view_move_action">Flyt</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Vedhæftning gemt på SD kort som <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Kan ikke gemme vedhæftning på SD kort.</string>
     <string name="message_view_show_pictures_action">Vis billeder</string>
@@ -304,12 +283,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Mail kasseret</string>
     <string name="message_saved_toast">Mail gemt som kladde</string>
 
-    <string name="global_settings_flag_label">Vis stjerner</string>
-    <string name="global_settings_flag_summary">Stjerne indikerer mails med flag</string>
     <string name="global_settings_checkbox_label">Checkbokse for multible valg</string>
     <string name="global_settings_checkbox_summary">Vis altid checkbokse for multible valg</string>
-    <string name="global_settings_touchable_label">Touch venlig visning</string>
-    <string name="global_settings_touchable_summary">Rummeligere listning i forhåndsvisning</string>
     <string name="global_settings_preview_lines_label">Linier i forhåndsvisning</string>
     <string name="global_settings_show_correspondent_names_label">Vis afsenders navne</string>
     <string name="global_settings_show_correspondent_names_summary">Vis afsendernavn fremfor deres mailaddresse</string>
@@ -332,12 +307,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Bekræft handlinger</string>
     <string name="global_settings_confirm_actions_summary">Vis dialogvindue når du udfører valgte handlinger</string>
-    <string name="global_settings_confirm_action_archive">Arkiver</string>
     <string name="global_settings_confirm_action_delete">Slet mail (kun i forb. med visning af mails)</string>
     <string name="global_settings_confirm_action_delete_starred">Slet stjernemarkeringer (kun i forb. med visning af mails)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Marker alle som læst</string>
-    <string name="global_settings_confirm_action_send">Send</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -360,10 +332,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Slut tid</string>
 
     <string name="account_setup_basics_title">Opsætning af ny konto</string>
-    <string name="account_setup_basics_instructions">Indtast denne konto\'s mail-addresse:</string>
     <string name="account_setup_basics_email_hint">Mail addresse</string>
     <string name="account_setup_basics_password_hint">Password</string>
-    <string name="account_setup_basics_default_label">Send mail fra denne konto som standard</string>
     <string name="account_setup_basics_manual_setup_action">Manuel opsætning</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -375,7 +345,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Afbryder\u2026</string>
 
     <string name="account_setup_names_title">Næsten færdig!</string>
-    <string name="account_setup_names_instructions">Din konto er nu konfigureret, og mails er på vej!</string>
     <string name="account_setup_names_account_name_label">Giv denne konto et navn (frivilligt):</string>
     <string name="account_setup_names_user_name_label">Indtast dit navn (vises på udgående mails):</string>
 
@@ -410,9 +379,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Andet</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Hentning af mail headers</string>
-    <string name="account_setup_incoming_save_all_headers_label">Gem alle mail headers lokalt</string>
-
     <string name="local_storage_provider_external_label">Eksternt lager (SD kort)</string>
     <string name="local_storage_provider_internal_label">Almindelig internt lager</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s yderligere internt lager</string>
@@ -447,21 +413,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">SMTP server</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Sikkerhedstype</string>
-    <string name="account_setup_outgoing_security_none_label">Aldrig</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (hvis tilgængeligt)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (altid)</string>
     <string name="account_setup_outgoing_require_login_label">Kræv login.</string>
     <string name="account_setup_outgoing_username_label">Brugernavn</string>
     <string name="account_setup_outgoing_password_label">Password</string>
     <string name="account_setup_outgoing_authentication_label">Autentifikationstype</string>
-    <!-- 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">Brugernavn &amp; password</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Brugernavn</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Password</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP før SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP før SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) før SMTP</string>
 
     <string name="account_setup_bad_uri">Ugyldig opsætning: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -744,7 +699,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Oprindelige identitet</string>
     <string name="choose_identity_title">Vælg identitet</string>
-    <string name="choose_account_title">Vælg konto/identitet</string>
     <string name="send_as">Send som</string>
 
     <string name="no_removable_identity">Du kan ikke slette din eneste identitet</string>
@@ -752,8 +706,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Ældste mails ført</string>
     <string name="sort_latest_first">Nyeste mails først</string>
-    <string name="sort_sender_alpha">Sorter efter afsender</string>
-    <string name="sort_sender_re_alpha">Sorter after afsender omvendt alfabetisk</string>
     <string name="sort_subject_alpha">Sorter efter emne</string>
     <string name="sort_subject_re_alpha">Sorter efter emne omvendt alfabetisk</string>
     <string name="sort_flagged_first">Stjernemarkerede mails først</string>
@@ -766,7 +718,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Sorter efter…</string>
     <string name="sort_by_date">Dato</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">Afsender</string>
     <string name="sort_by_subject">Emne</string>
     <string name="sort_by_flag">Stjernemarkering</string>
     <string name="sort_by_unread">Læst/ulæst</string>
@@ -847,8 +798,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Når \"Baggrundsdata\" &amp; \"Auto-sync\" er aktiveret</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Ingen mail valgt</string>
-
     <string name="date_format_label">Datoformat</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -856,20 +805,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Batch operationer</string>
-    <string name="batch_delete_op">Slet valgte</string>
-    <string name="batch_mark_read_op">Marker valgte som læst</string>
-    <string name="batch_mark_unread_op">Marker valgte som ulæst</string>
-    <string name="batch_flag_op">Tilføj stjerne til valgte</string>
-    <string name="batch_unflag_op">Fjern stjerne fra valgte</string>
-    <string name="batch_archive_op">Flyt valgte til arkiv</string>
-    <string name="batch_spam_op">Flyt valgte til mappen Spam</string>
-    <string name="batch_move_op">Flyt valgte</string>
-    <string name="batch_copy_op">Kopier valgte</string>
-    <string name="batch_flag_mode">Stjerne tilstand</string>
-    <string name="batch_plain_mode">Standard tilstand</string>
     <string name="batch_select_all">Vælg alle</string>
-    <string name="batch_deselect_all">Fravælg alle</string>
 
     <string name="account_setup_push_limit_label">Max antal mapper som skal kontrolleres ved push</string>
     <string name="account_setup_push_limit_10">10 mapper</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cbb67d371..c21bdf955 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -53,7 +53,6 @@ http://k9mail.googlecode.com/.
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Alle Nachrichten in \'<xliff:g id="folder">%s</xliff:g>\' als gelesen markieren? (inklusive Nachrichten in diesem Ordner, die nicht von K-9 dargestellt werden)</string>
     <string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird gelöscht.</string>
     <string name="account_recreate_dlg_instructions_fmt">Alle Daten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>
     <string name="account_clear_dlg_instructions_fmt">Alle Nachrichten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>
@@ -86,7 +85,6 @@ http://k9mail.googlecode.com/.
     <string name="accounts_title">Ihre Konten</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Erweitert</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>
 
@@ -112,14 +110,11 @@ http://k9mail.googlecode.com/.
     <string name="cancel_action">Abbrechen</string>
     <string name="send_action">Senden</string>
     <string name="send_again_action">Erneut senden</string>
-    <string name="select_action">Auswählen</string>
-    <string name="deselect_action">Abwählen</string>
     <string name="reply_action">Antworten</string>
     <string name="reply_all_action">Allen antworten</string>
     <string name="delete_action">Löschen</string>
     <string name="archive_action">Archivieren</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Ordner leeren</string>
     <string name="forward_action">Weiterleiten</string>
     <string name="move_action">Verschieben</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -128,38 +123,28 @@ http://k9mail.googlecode.com/.
     <string name="done_action">Fertig</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Verwerfen</string>
     <string name="save_draft_action">Speichern</string>
-    <string name="retry_action">Erneut versuchen</string>
-    <string name="refresh_action">Aktualisieren</string>
     <string name="check_mail_action">Nachrichten abrufen</string>
     <string name="send_messages_action">Nachricht senden</string>
-    <string name="list_folders_action">Ordnerliste</string>
     <string name="refresh_folders_action">Ordnerliste aktualisieren</string>
     <string name="filter_folders_action">Finde Ordner</string>
-    <string name="mark_all_as_read_action">Alle als gelesen markieren</string>
     <string name="add_account_action">Konto hinzufügen</string>
     <string name="compose_action">Verfassen</string>
     <string name="search_action">Suchen</string>
     <string name="search_results">Suchergebnisse</string>
     <string name="preferences_action">Einstellungen</string>
-    <string name="open_action">Öffnen</string>
     <string name="account_settings_action">Kontoeinstellungen</string>
     <string name="folder_settings_action">Ordnereinstellungen</string>
     <string name="global_settings_action">Globale Einstellungen</string>
     <string name="remove_account_action">Konto entfernen</string>
     <string name="clear_pending_action">Ausstehende Aktionen abbrechen (Warnung!)</string>
 
-    <string name="accounts_action">Konten</string>
     <string name="mark_as_read_action">Als gelesen markieren</string>
     <string name="send_alternate_action">Weiterleiten (Alternativ)</string>
     <string name="send_alternate_chooser_title">Absender auswählen</string>
 
-    <string name="mark_all_as_read_dlg_title">Alle Nachrichten als gelesen markieren</string>
-
     <string name="flag_action">Als wichtig markieren</string>
     <string name="unflag_action">Wichtig-Markierung entfernen</string>
     <string name="copy_action">Kopieren</string>
-    <string name="show_full_header_action">Kompletten Header anzeigen</string>
-    <string name="hide_full_header_action">Kompakten Header anzeigen</string>
     <string name="select_text_action">Text auswählen</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -182,7 +167,6 @@ http://k9mail.googlecode.com/.
     <string name="accounts_context_menu_title">Konto-Optionen</string>
 
     <string name="general_no_subject">(Kein Betreff)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">Kein Datum</string>
     <string name="general_no_sender">Kein Absender</string>
     <string name="status_loading">Lade</string>
     <string name="status_loading_more">Lade Nachrichten\u2026</string>
@@ -277,11 +261,6 @@ http://k9mail.googlecode.com/.
     <string name="message_view_cc_label">CC:</string>
     <string name="message_view_attachment_view_action">Öffnen</string>
     <string name="message_view_attachment_download_action">Speichern</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archivieren</string>
-    <string name="message_view_move_action">Verschieben</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Anhänge auf SD-Karte gespeichert als <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Anhang konnte nicht auf SD-Karte gespeichert werden.</string>
     <string name="message_view_show_pictures_action">Bilder anzeigen</string>
@@ -305,12 +284,8 @@ http://k9mail.googlecode.com/.
     <string name="message_discarded_toast">Nachricht verworfen.</string>
     <string name="message_saved_toast">Nachricht als Entwurf gespeichert.</string>
 
-    <string name="global_settings_flag_label">Wichtige Nachrichten</string>
-    <string name="global_settings_flag_summary">Sterne weisen auf wichtige Nachrichten hin.</string>
     <string name="global_settings_checkbox_label">Mehrfachauswahl</string>
     <string name="global_settings_checkbox_summary">Immer Mehrfachauswahl-Checkboxen anzeigen</string>
-    <string name="global_settings_touchable_label">Berührungsfreundliche Ansicht</string>
-    <string name="global_settings_touchable_summary">Größere Darstellung mit Nachrichten-Vorschau</string>
     <string name="global_settings_preview_lines_label">Zeilenvorschau</string>
     <string name="global_settings_show_correspondent_names_label">Name anzeigen</string>
     <string name="global_settings_show_correspondent_names_summary">Zeige Namen des Korrespondenten statt der E-Mail-Adresse</string>
@@ -333,12 +308,9 @@ http://k9mail.googlecode.com/.
 
     <string name="global_settings_confirm_actions_title">Bestätigungsdialog</string>
     <string name="global_settings_confirm_actions_summary">Verlange Bestätigung bei gewissen Aktionen</string>
-    <string name="global_settings_confirm_action_archive">Archivieren</string>
     <string name="global_settings_confirm_action_delete">Löschen (nur in Nachrichtenansicht)</string>
     <string name="global_settings_confirm_action_delete_starred">Sternmarkierte Löschen (nur in Nachrichtenansicht)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Alle als gelesen markieren</string>
-    <string name="global_settings_confirm_action_send">Senden</string>
 
     <string name="global_settings_notification_hide_subject_title">Betreff in Benachrichtigungen verbergen</string>
     <string name="global_settings_notification_hide_subject_never">Niemals</string>
@@ -361,10 +333,8 @@ http://k9mail.googlecode.com/.
     <string name="quiet_time_ends">Ruhezeit endet</string>
 
     <string name="account_setup_basics_title">E-Mail-Konto einrichten</string>
-    <string name="account_setup_basics_instructions">E-Mail-Adresse Ihres Kontos:</string>
     <string name="account_setup_basics_email_hint">E-Mail-Adresse</string>
     <string name="account_setup_basics_password_hint">Passwort</string>
-    <string name="account_setup_basics_default_label">Standardmäßig Nachrichten von diesem Konto aus senden.</string>
     <string name="account_setup_basics_manual_setup_action">Manuelle Einrichtung</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -376,7 +346,6 @@ http://k9mail.googlecode.com/.
     <string name="account_setup_check_settings_canceling_msg">Breche ab\u2026</string>
 
     <string name="account_setup_names_title">Fast fertig!</string>
-    <string name="account_setup_names_instructions">Ihr Konto ist eingerichtet, E-Mail ist auf dem Weg!</string>
     <string name="account_setup_names_account_name_label">Kontoname (optional):</string>
     <string name="account_setup_names_user_name_label">Ihr Name (Anzeige bei ausgehenden Nachrichten):</string>
 
@@ -411,9 +380,6 @@ http://k9mail.googlecode.com/.
     <string name="account_setup_incoming_wifi_label">WLAN</string>
     <string name="account_setup_incoming_other_label">Anderes</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Alle Mail-Header herunterladen</string>
-    <string name="account_setup_incoming_save_all_headers_label">Alle Header lokal speichern</string>
-
     <string name="local_storage_provider_external_label">Externes Medium (SD-Karte)</string>
     <string name="local_storage_provider_internal_label">Interner Speicher</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s zusätzlicher interner Speicher</string>
@@ -448,21 +414,10 @@ http://k9mail.googlecode.com/.
     <string name="account_setup_outgoing_smtp_server_label">SMTP-Server</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Sicherheitstyp</string>
-    <string name="account_setup_outgoing_security_none_label">Keine Verschlüsselung</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (falls verfügbar)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (immer)</string>
     <string name="account_setup_outgoing_require_login_label">Anmeldung erforderlich.</string>
     <string name="account_setup_outgoing_username_label">Benutzername</string>
     <string name="account_setup_outgoing_password_label">Passwort</string>
     <string name="account_setup_outgoing_authentication_label">Authentifizierungsmethode</string>
-    <!-- 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">Benutzername &amp; Passwort</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Benutzername</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Kennwort</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP vor SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP vor SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV(Exchange) vor SMTP</string>
 
     <string name="account_setup_bad_uri">Ungültige Einstellung: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -745,7 +700,6 @@ http://k9mail.googlecode.com/.
 
     <string name="default_identity_description">Standard-Identität</string>
     <string name="choose_identity_title">Identität auswählen</string>
-    <string name="choose_account_title">Konto/Identität auswählen</string>
     <string name="send_as">Sende als</string>
 
     <string name="no_removable_identity">Sie können Ihre einzige Identität nicht löschen</string>
@@ -753,8 +707,6 @@ http://k9mail.googlecode.com/.
 
     <string name="sort_earliest_first">Älteste Nachrichten zuerst</string>
     <string name="sort_latest_first">Neueste Nachrichten zuerst</string>
-    <string name="sort_sender_alpha">Alphabetisch nach Absender</string>
-    <string name="sort_sender_re_alpha">Umgekehrt-Alphabetisch nach Absender</string>
     <string name="sort_subject_alpha">Alphabetisch nach Betreff</string>
     <string name="sort_subject_re_alpha">Umgekehrt-Alphabetisch nach Betreff</string>
     <string name="sort_flagged_first">Markierte Nachrichten zuerst</string>
@@ -767,7 +719,6 @@ http://k9mail.googlecode.com/.
     <string name="sort_by">Sortieren nach…</string>
     <string name="sort_by_date">Datum</string>
     <string name="sort_by_arrival">Ankunftsdatum</string>
-    <string name="sort_by_sender">Absender</string>
     <string name="sort_by_subject">Betreff</string>
     <string name="sort_by_flag">Wichtigkeit</string>
     <string name="sort_by_unread">Gelesen/Ungelesen</string>
@@ -848,8 +799,6 @@ http://k9mail.googlecode.com/.
     <string name="background_ops_auto_sync">Wenn \'Hintergrunddaten\' &amp; \'Automatische Synchronisation\' aktiviert sind</string>
     <string name="background_ops_auto_sync_only">Wenn \'Automatische Synchronisation\' aktiviert ist</string>
 
-    <string name="no_message_seletected_toast">Keine Nachricht ausgewählt</string>
-
     <string name="date_format_label">Datumsformat</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -857,20 +806,7 @@ http://k9mail.googlecode.com/.
     -->
     <string name="date_format_common">dd.MMM yyyy</string>
 
-    <string name="batch_ops">Gruppenoperationen</string>
-    <string name="batch_delete_op">Gewählte löschen</string>
-    <string name="batch_mark_read_op">Gewählte als gelesen markieren</string>
-    <string name="batch_mark_unread_op">Gewählte als ungelesen markieren</string>
-    <string name="batch_flag_op">Gewählte als wichtig markieren</string>
-    <string name="batch_unflag_op">Markierung bei Gewählten entfernen</string>
-    <string name="batch_archive_op">Gewählte archivieren</string>
-    <string name="batch_spam_op">Gewählte als Spam markieren</string>
-    <string name="batch_move_op">Gewählte verschieben</string>
-    <string name="batch_copy_op">Gewählte kopieren</string>
-    <string name="batch_flag_mode">Stern-Modus</string>
-    <string name="batch_plain_mode">Normaler Modus</string>
     <string name="batch_select_all">Alle auswählen</string>
-    <string name="batch_deselect_all">Alle abwählen</string>
 
     <string name="account_setup_push_limit_label">Max. Ordner mit Push abrufen</string>
     <string name="account_setup_push_limit_10">10 Ordner</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7a27026d3..098e1fa5a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -53,7 +53,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Να σημανθούν όλα τα μηνύματα στο \'<xliff:g id="folder">%s</xliff:g>\' ως αναγνωσμένα; (θα συμπεριληφθούν τα μηνύματα στο φάκελο που δεν προβάλονται στο K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">Ο λογαριασμός \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφεί από το K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Όλα τα δεδομένα για το λογαριασμό \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφούν από το K-9 Mail, αλλά οι ρυθμίσεις του λογαριασμού θα διατηρηθούν.</string>
     <string name="account_clear_dlg_instructions_fmt">Όλα τα μηνύματα του λογαριασμού \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφούν από το K-9 Mail, αλλά οι ρυθμίσεις του λογαριασμού θα διατηρηθούν.</string>
@@ -86,7 +85,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Λογαριασμοί</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Προχωρημένα</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>
 
@@ -112,14 +110,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Άκυρο</string>
     <string name="send_action">Αποστολή</string>
     <string name="send_again_action">Αποστολή πάλι</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>
     <string name="spam_action">Σκουπιδοταχυδρομείο</string>
-    <string name="delete_all_action">Καθαρισμός φακέλου</string>
     <string name="forward_action">Μπροστά</string>
     <string name="move_action">Μετακίνηση</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -128,38 +123,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Συμπληρώθηκε</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Απόρριψη</string>
     <string name="save_draft_action">Αποθήκευση στα Πρόχειρα</string>
-    <string name="retry_action">Επανάληψη</string>
-    <string name="refresh_action">Ανανέωση</string>
     <string name="check_mail_action">Έλεγχος email</string>
     <string name="send_messages_action">Αποστολή μηνυμάτων</string>
-    <string name="list_folders_action">Λίστα φακέλων</string>
     <string name="refresh_folders_action">Ανανέωση φακέλων</string>
     <string name="filter_folders_action">Εύρεση φακέλου</string>
-    <string name="mark_all_as_read_action">Σήμανση όλων των μηνυμάτων ως αναγνωσμένων</string>
     <string name="add_account_action">Προσθήκη λογαριασμού</string>
     <string name="compose_action">Δημιουργία νέου</string>
     <string name="search_action">Αναζήτηση</string>
     <string name="search_results">Αποτελέσματα αναζήτησης</string>
     <string name="preferences_action">Ρυθμίσεις</string>
-    <string name="open_action">Άνοιγμα</string>
     <string name="account_settings_action">Ρυθμίσεις λογαριασμού</string>
     <string name="folder_settings_action">Ρυθμίσεις φακέλου</string>
     <string name="global_settings_action">Γενικές ρυθμίσεις</string>
     <string name="remove_account_action">Διαγραφή λογαριασμού</string>
     <string name="clear_pending_action">Καθαρισμός εκκρεμών ενεργειών (κίνδυνος!)</string>
 
-    <string name="accounts_action">Λογαριασμοί</string>
     <string name="mark_as_read_action">Σήμανση ως αναγνωσμένου</string>
     <string name="send_alternate_action">Διανομή</string>
     <string name="send_alternate_chooser_title">Επιλογή αποστολέα</string>
 
-    <string name="mark_all_as_read_dlg_title">Σήμανση όλων των μηνυμάτων ως αναγνωσμένων</string>
-
     <string name="flag_action">Προσθήκη αστεριού</string>
     <string name="unflag_action">Αφαίρεση αστεριού</string>
     <string name="copy_action">Αντιγραφή</string>
-    <string name="show_full_header_action">Προβολή πλήρους επικεφαλίδας</string>
-    <string name="hide_full_header_action">Απόκρυψη πλήρους επικεφαλίδας</string>
     <string name="select_text_action">Επιλογή κειμένου</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -182,7 +167,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_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. -->
-    <string name="general_no_date">Χωρίς ημερομηνία</string>
     <string name="general_no_sender">Χωρίς αποστολέα</string>
     <string name="status_loading">Ενημέρωση</string>
     <string name="status_loading_more">Φόρτωση μηνυμάτων\u2026</string>
@@ -272,11 +256,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Κοιν:</string>
     <string name="message_view_attachment_view_action">Άνοιγμα</string>
     <string name="message_view_attachment_download_action">Αποθήκευση</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Αρχειοθέτηση</string>
-    <string name="message_view_move_action">Μετακίνηση</string>
-    <string name="message_view_spam_action">Σκουπίδια</string>
     <string name="message_view_status_attachment_saved">Συνημμένο αποθηκεύτηκε στην κάρτα αποθήκευσης ως <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Αδύνατο να αποθηκευτεί το συνημμένο στην κάρτα αποθήκευσης.</string>
     <string name="message_view_show_pictures_action">Προβολή εικόνων</string>
@@ -300,12 +279,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Το μήνυμα αγνοήθηκε</string>
     <string name="message_saved_toast">Το μήνυμα αποθηκεύτηκε στα πρόχειρα</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>
-    <string name="global_settings_touchable_summary">Ευρύχωρες λίστες με προεπισκόπηση μηνύματος</string>
     <string name="global_settings_preview_lines_label">Προεπισκόπηση γραμμώνν</string>
     <string name="global_settings_show_correspondent_names_label">Προβολή ονόματος επιστολογράφων</string>
     <string name="global_settings_show_correspondent_names_summary">Προβολή ονόματος επιστολογράφων παρά των διευθύνσεων ηλεκτρονικού ταχυδρομείου</string>
@@ -328,12 +303,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Επιβεβαίωση ενεργειών</string>
     <string name="global_settings_confirm_actions_summary">Προβολή διαλόγου όποτε εκτελούνται επιλεγμένες ενέργειες</string>
-    <string name="global_settings_confirm_action_archive">Αρχειοθέτηση</string>
     <string name="global_settings_confirm_action_delete">Διαγραφή (προβολή μηνύματος μόνον)</string>
     <string name="global_settings_confirm_action_delete_starred">Διαγραφή με αστέρι (προβολή μηνύματος μόνον)</string>
     <string name="global_settings_confirm_action_spam">Σκουπίδια</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Σήμανση ως αναγνωσμέων</string>
-    <string name="global_settings_confirm_action_send">Αποστολή</string>
 
     <string name="global_settings_notification_hide_subject_title">Απόκρυψη θέματος στις ειδοποιήσεις</string>
     <string name="global_settings_notification_hide_subject_never">Ποτέ</string>
@@ -356,10 +328,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Λήξη ωρών ησυχίας</string>
 
     <string name="account_setup_basics_title">Ρύθμιση νέου λογαριασμού</string>
-    <string name="account_setup_basics_instructions">Email του λογαριασμού:</string>
     <string name="account_setup_basics_email_hint">Διεύθυνση email</string>
     <string name="account_setup_basics_password_hint">Συνθηματικό</string>
-    <string name="account_setup_basics_default_label">Αποστολή email από αυτό το λογαριασμό εξ ορισμού</string>
     <string name="account_setup_basics_manual_setup_action">Χειροκίνητη ρύθμιση</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -371,7 +341,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Ακύρωση\u2026</string>
 
     <string name="account_setup_names_title">Σχεδόν έτοιμο!</string>
-    <string name="account_setup_names_instructions">Ο λογαριασμός ρυθμίστηκε και τα μηνύματα έρχονται!</string>
     <string name="account_setup_names_account_name_label">Ονομασία λογαριασμού (Προαιρετικό):</string>
     <string name="account_setup_names_user_name_label">Όνομα αποστολέα (προβάλλεται στα εξερχόμενα μηνύματα):</string>
 
@@ -406,9 +375,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Ασύρματης Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Άλλο</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Ανάκτηση επικεφαλίδων</string>
-    <string name="account_setup_incoming_save_all_headers_label">Αποθήκευση επικεφαλίδων τοπικά</string>
-
     <string name="local_storage_provider_external_label">Εξωτερική αποθήκευση (SD card)</string>
     <string name="local_storage_provider_internal_label">Κανονική εσωτερική αποθήκευση</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s πρόσθετη εσωτερική αποθήκευση</string>
@@ -443,21 +409,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Εξυπηρέτης SMTP</string>
     <string name="account_setup_outgoing_port_label">Θύρα</string>
     <string name="account_setup_outgoing_security_label">Ασφάλεια</string>
-    <string name="account_setup_outgoing_security_none_label">Καμιά</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (αν υπάρχει)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (πάντοτε)</string>
     <string name="account_setup_outgoing_require_login_label">Απαιτείται πιστοποίηση.</string>
     <string name="account_setup_outgoing_username_label">Όνομα χρήστη</string>
     <string name="account_setup_outgoing_password_label">Συνθηματικό</string>
     <string name="account_setup_outgoing_authentication_label">Πιστοποίηση</string>
-    <!-- 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">Όνομα χρήστη &amp; συνθηματικό</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Όνομα χρήστη</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Συνθηματικό</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP πριν SMTP</string>
-    <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>
 
@@ -740,7 +695,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Αρχική ταυτότητα</string>
     <string name="choose_identity_title">Επιλογή ταυτότητας</string>
-    <string name="choose_account_title">Επιλογή λογαριασμού/ταυτότητας</string>
     <string name="send_as">Αποστολή ως</string>
 
     <string name="no_removable_identity">Δεν μπορείτε να διαγράψετε τη μοναδική ταυτότητα</string>
@@ -748,8 +702,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Παλαιότερα μηνύματα πρώτα</string>
     <string name="sort_latest_first">Πρόσφατα μηνύματα πρώτα</string>
-    <string name="sort_sender_alpha">Αλφαβητικά κατά αποστολέα</string>
-    <string name="sort_sender_re_alpha">Ανάποδα αλφαβητικά κατά αποστολέα</string>
     <string name="sort_subject_alpha">Αλφαβητικά κατά θέμα</string>
     <string name="sort_subject_re_alpha">Ανάποδα αλφαβητικά κατά θέμα</string>
     <string name="sort_flagged_first">Πρώτα τα μηνύματα με αστέρι</string>
@@ -762,7 +714,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Ταξινόμηση κατά…</string>
     <string name="sort_by_date">Ημερομηνία</string>
     <string name="sort_by_arrival">Άφιξη</string>
-    <string name="sort_by_sender">Αποστολέα</string>
     <string name="sort_by_subject">Θέμα</string>
     <string name="sort_by_flag">Αστέρι</string>
     <string name="sort_by_unread">Αναγνωσμένα</string>
@@ -844,8 +795,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\' &amp; \'Αυτόματο συγχρονισμός\'</string>
     <string name="background_ops_auto_sync_only">Όταν έχει επιλεγεί \'Auto-sync\'</string>
 
-    <string name="no_message_seletected_toast">Δεν επιλέχθηκε μήνυμα</string>
-
     <string name="date_format_label">Γραφή ημερομηνίας</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -853,20 +802,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Ομαδικές λειτουργίες</string>
-    <string name="batch_delete_op">Διαγραφή επιλεγμένων</string>
-    <string name="batch_mark_read_op">Σήμανση ως αναγνωσμένα</string>
-    <string name="batch_mark_unread_op">Σήμανση ως μη αναγνωσμένα</string>
-    <string name="batch_flag_op">Αστέρι στα επιλεγμένα</string>
-    <string name="batch_unflag_op">Αφαίρεση αστεριού</string>
-    <string name="batch_archive_op">Μετακίνηση στην Αρχειοθέτηση</string>
-    <string name="batch_spam_op">Μετακίνηση στα Σκουπίδια</string>
-    <string name="batch_move_op">Μετακίνηση</string>
-    <string name="batch_copy_op">Αντιγραφή επιλεγμένων</string>
-    <string name="batch_flag_mode">Αστέρι</string>
-    <string name="batch_plain_mode">Απλή επιλογή</string>
     <string name="batch_select_all">Επιλογή όλων</string>
-    <string name="batch_deselect_all">Καθαρισμός επιλεγμένων</string>
 
     <string name="account_setup_push_limit_label">Μέγιστο φακέλων για σπρώξιμο</string>
     <string name="account_setup_push_limit_10">10 φάκελοι</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a2694c9c3..e656ff426 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Marcar todos los mensajes en \'<xliff:g id="folder">%s</xliff:g>\' como leídos?  (incluidos los mensajes que no estan visualizado por K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">La cuenta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Los datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero se mantendrá su Configuración</string>
     <string name="account_clear_dlg_instructions_fmt">Todos los mensajes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero la Configuración de la cuenta se mantendrá</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Cuentas</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Avanzado</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Cancelar</string>
     <string name="send_action">Enviar</string>
     <string name="send_again_action">Volver a enviar</string>
-    <string name="select_action">Seleccionar</string>
-    <string name="deselect_action">Deseleccionar</string>
     <string name="reply_action">Responder</string>
     <string name="reply_all_action">Responder a todos</string>
     <string name="delete_action">Borrar</string>
     <string name="archive_action">Archivar</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Vaciar carpeta</string>
     <string name="forward_action">Reenviar</string>
     <string name="move_action">Mover</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Hecho</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Descartar</string>
     <string name="save_draft_action">Guardar como borrador</string>
-    <string name="retry_action">Reintentar</string>
-    <string name="refresh_action">Refrescar</string>
     <string name="check_mail_action">Sincronizar</string>
     <string name="send_messages_action">Enviar Correo</string>
-    <string name="list_folders_action">Lista de Carpetas</string>
     <string name="refresh_folders_action">Refrescar Carpetas</string>
     <string name="filter_folders_action">Buscar carpeta</string>
-    <string name="mark_all_as_read_action">Marcar todos como leídos</string>
     <string name="add_account_action">Añadir cuenta</string>
     <string name="compose_action">Redactar</string>
     <string name="search_action">Buscar</string>
     <string name="search_results">Resultados Búsqueda</string>
     <string name="preferences_action">Configuración</string>
-    <string name="open_action">Abrir</string>
     <string name="account_settings_action">Configurar cuenta</string>
     <string name="folder_settings_action">Configurar carpeta</string>
     <string name="global_settings_action">Configuración global</string>
     <string name="remove_account_action">Eliminar cuenta</string>
     <string name="clear_pending_action">Limpiar acciones pendientes (peligroso!)</string>
 
-    <string name="accounts_action">Cuentas</string>
     <string name="mark_as_read_action">Marcar como Leído</string>
     <string name="send_alternate_action">Compartir</string>
     <string name="send_alternate_chooser_title">Seleccionar Remitente</string>
 
-    <string name="mark_all_as_read_dlg_title">Marcar todos como leídos</string>
-
     <string name="flag_action">Añadir Estrella</string>
     <string name="unflag_action">Eliminar Estrella</string>
     <string name="copy_action">Copiar</string>
-    <string name="show_full_header_action">Ver todas las cabeceras</string>
-    <string name="hide_full_header_action">Ocultar todas las cabeceras</string>
     <string name="select_text_action">Seleccionar texto</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Opciones de cuenta</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. -->
-    <string name="general_no_date">Sin fecha</string>
     <string name="general_no_sender">Sin Remitente</string>
     <string name="status_loading">Conectando</string>
     <string name="status_loading_more">Cargando mensajes\u2026</string>
@@ -276,11 +260,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">CC:</string>
     <string name="message_view_attachment_view_action">Abrir</string>
     <string name="message_view_attachment_download_action">Guardar</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archivar</string>
-    <string name="message_view_move_action">Mover</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Adjunto guardado en la SD como <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Imposible guardar adjunto en la SD</string>
     <string name="message_view_show_pictures_action">Mostrar imagen</string>
@@ -304,12 +283,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Mensajes descartados</string>
     <string name="message_saved_toast">Mensaje guardado como borrador</string>
 
-    <string name="global_settings_flag_label">Ver estrellas</string>
-    <string name="global_settings_flag_summary">Las estrellas indican un mensaje destacado</string>
     <string name="global_settings_checkbox_label">Selección múltiple</string>
     <string name="global_settings_checkbox_summary">Permitir selección múltiple</string>
-    <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>
     <string name="global_settings_show_correspondent_names_label">Mostrar nombre asociado</string>
     <string name="global_settings_show_correspondent_names_summary">Mostrar nombre asociado en vez de dirección de correo</string>
@@ -332,12 +307,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Confirmar acción</string>
     <string name="global_settings_confirm_actions_summary">Mostrar un diálogo cuando se realice una de estas acciones</string>
-    <string name="global_settings_confirm_action_archive">Archivar</string>
     <string name="global_settings_confirm_action_delete">Borrar (Mensajes en la vista)</string>
     <string name="global_settings_confirm_action_delete_starred">Borrar destacado (sólo vista mensaje)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos como leídos</string>
-    <string name="global_settings_confirm_action_send">Enviados</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -360,10 +332,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Silencio termina</string>
 
     <string name="account_setup_basics_title">Configurar nueva cuenta</string>
-    <string name="account_setup_basics_instructions">Introduzca dirección de correo</string>
     <string name="account_setup_basics_email_hint">Dirección de correo</string>
     <string name="account_setup_basics_password_hint">Contraseña</string>
-    <string name="account_setup_basics_default_label">Enviar correo desde esta cuenta por defecto</string>
     <string name="account_setup_basics_manual_setup_action">Configuración Manual</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -375,7 +345,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
 
     <string name="account_setup_names_title">¡Hecho!</string>
-    <string name="account_setup_names_instructions">Tu cuenta está configurada!</string>
     <string name="account_setup_names_account_name_label">De un nombre a esta cuenta (opcional):</string>
     <string name="account_setup_names_user_name_label">Introduzca su nombre (se verá en el mensaje de salida):</string>
 
@@ -410,9 +379,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Otras</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Descargar cabeceras</string>
-    <string name="account_setup_incoming_save_all_headers_label">Guardar todas las cabeceras localmente</string>
-
     <string name="local_storage_provider_external_label">Almacenamiento externo (SD)</string>
     <string name="local_storage_provider_internal_label">Almacenamiento interno</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s almacenamiento interno adicional</string>
@@ -447,21 +413,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Servidor SMTP</string>
     <string name="account_setup_outgoing_port_label">Puerto</string>
     <string name="account_setup_outgoing_security_label">Tipo de Seguridad</string>
-    <string name="account_setup_outgoing_security_none_label">Ninguna</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (si disponible)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (siempre)</string>
     <string name="account_setup_outgoing_require_login_label">Requiere autentificación</string>
     <string name="account_setup_outgoing_username_label">Usuario</string>
     <string name="account_setup_outgoing_password_label">Contraseña</string>
     <string name="account_setup_outgoing_authentication_label">Tipo de autentificación</string>
-    <!-- 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">Usuario &amp; contraseña</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Usuario</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Contraseña</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP antes que SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP antes que SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) antes que SMTP</string>
 
     <string name="account_setup_bad_uri">Configuración inválida: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -744,7 +699,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Identidad principal</string>
     <string name="choose_identity_title">Seleccionar identidad</string>
-    <string name="choose_account_title">Seleccionar cuenta/identidad</string>
     <string name="send_as">Enviar como</string>
 
     <string name="no_removable_identity">No puedes eliminar tu única identidad</string>
@@ -752,8 +706,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Nuevos mensajes primero</string>
     <string name="sort_latest_first">Ultimos mensajes primero</string>
-    <string name="sort_sender_alpha">Remitente alfabético</string>
-    <string name="sort_sender_re_alpha">Remitente alfabético inverso</string>
     <string name="sort_subject_alpha">Asunto alfabético</string>
     <string name="sort_subject_re_alpha">Asunto alfabético inverso</string>
     <string name="sort_flagged_first">Con estrellas primero</string>
@@ -766,7 +718,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Ordenado por…</string>
     <string name="sort_by_date">Fecha</string>
     <string name="sort_by_arrival">Llegada</string>
-    <string name="sort_by_sender">Remitente</string>
     <string name="sort_by_subject">Asunto</string>
     <string name="sort_by_flag">Estrellas</string>
     <string name="sort_by_unread">Leído/Sin Leer</string>
@@ -846,8 +797,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Cuando \'Sincronización en segundo plano\' y \'Sincronización automática\' esten activos</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">No se ha seleccionado ningún mensaje</string>
-
     <string name="date_format_label">Formato de fecha</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -855,20 +804,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MM-yyyy</string>
 
-    <string name="batch_ops">Operaciones por Lotes</string>
-    <string name="batch_delete_op">Borrar seleccionados</string>
-    <string name="batch_mark_read_op">Marcar seleccionados como leídos</string>
-    <string name="batch_mark_unread_op">Marcar seleccionados como no leídos</string>
-    <string name="batch_flag_op">Añadir estrella a los seleccionados</string>
-    <string name="batch_unflag_op">Eliminar estrellas a los seleccionados</string>
-    <string name="batch_archive_op">Mover seleccionados a archivo</string>
-    <string name="batch_spam_op">Mover seleccionados a SPAM</string>
-    <string name="batch_move_op">Mover seleccionados</string>
-    <string name="batch_copy_op">Copiar seleccionados</string>
-    <string name="batch_flag_mode">Modo estrella</string>
-    <string name="batch_plain_mode">Modo plano</string>
     <string name="batch_select_all">Seleccionar todos</string>
-    <string name="batch_deselect_all">Deseleccionar todos</string>
 
     <string name="account_setup_push_limit_label">Max. subscripciones</string>
     <string name="account_setup_push_limit_10">10 carpetas</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 197f8c9c6..8eef9e540 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -56,7 +56,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Merkitäänkö kaikki viestit kansiossa \'<xliff:g id="folder">%s</xliff:g>\' luetuiksi? (myös viestit, jotka ovat kansioissa, joita ei näytetä K-9:ssä)</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_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_instructions_fmt">Kaikki viestit tililtä \"<xliff:g id="account">%s</xliff:g>\" poistetaan K-9 Mail -ohjelmasta, mutta tilin asetukset säilyvät.</string>
@@ -89,7 +88,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Tilit</string>
     <string name="folders_title">Kansiot</string>
     <string name="advanced">Lisäasetukset</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>
 
@@ -109,7 +107,6 @@ http://k9mail.googlecode.com/
     <string name="status_syncing_off">Synkronointi pois päältä</string>
 
     <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> valittu</string>
-    <string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g> valittu</string>
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Seuraava</string> <!-- Used as part of a multi-step process -->
     <string name="previous_action">Edellinen</string> <!-- Used as part of a multi-step process -->
@@ -117,14 +114,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Peruuta</string>
     <string name="send_action">Lähetä</string>
     <string name="send_again_action">Lähetä uudelleen</string>
-    <string name="select_action">Valitse</string>
-    <string name="deselect_action">Poista valinta</string>
     <string name="reply_action">Vastaa</string>
     <string name="reply_all_action">Vastaa kaikille</string>
     <string name="delete_action">Poista</string>
     <string name="archive_action">Arkistoi</string>
     <string name="spam_action">Roskaposti</string>
-    <string name="delete_all_action">Tyhjennä kansio</string>
     <string name="forward_action">Välitä</string>
     <string name="move_action">Siirrä</string>
     <string name="single_message_options_action">Viestin asetukset</string>
@@ -133,38 +127,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Valmis</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Hylkää</string>
     <string name="save_draft_action">Tallenna luonnoksena</string>
-    <string name="retry_action">Yritä uudelleen</string>
-    <string name="refresh_action">Päivitä</string>
     <string name="check_mail_action">Tarkista posti</string>
     <string name="send_messages_action">Lähetä viestit</string>
-    <string name="list_folders_action">Kansiolista</string>
     <string name="refresh_folders_action">Päivitä kansiot</string>
     <string name="filter_folders_action">Etsi kansio</string>
-    <string name="mark_all_as_read_action">Merkitse kaikki viestit luetuiksi</string>
     <string name="add_account_action">Lisää tili</string>
     <string name="compose_action">Kirjoita</string>
     <string name="search_action">Etsi</string>
     <string name="search_results">Hakutulokset</string>
     <string name="preferences_action">Asetukset</string>
-    <string name="open_action">Avaa</string>
     <string name="account_settings_action">Tilin asetukset</string>
     <string name="folder_settings_action">Kansion asetukset</string>
     <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="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 luetuiksi</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="message_view_theme_action_dark">Vaihda tummaan teemaan</string>
@@ -187,7 +171,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Tilin asetukset</string>
 
     <string name="general_no_subject">(Ei aihetta)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">Ei päivämäärää</string>
     <string name="general_no_sender">Ei lähettäjää</string>
     <string name="status_loading">Ladataan</string>
     <string name="status_loading_more">Ladataan viestejä\u2026</string>
@@ -281,11 +264,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Kopio:</string>
     <string name="message_view_attachment_view_action">Avaa</string>
     <string name="message_view_attachment_download_action">Tallenna</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arkistoi</string>
-    <string name="message_view_move_action">Siirrä</string>
-    <string name="message_view_spam_action">Roskaposti</string>
     <string name="message_view_status_attachment_saved">Liite tallennettu SD -kortille nimellä <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Liitteen tallennus SD-kortille epäonnistui.</string>
     <string name="message_view_show_pictures_action">Näytä kuvat</string>
@@ -309,12 +287,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Viesti peruutettu</string>
     <string name="message_saved_toast">Viesti tallennettu luonnoksena</string>
 
-    <string name="global_settings_flag_label">Viestin tähdet</string>
-    <string name="global_settings_flag_summary">Tähdet ilmaisevat merkityt viestit</string>
     <string name="global_settings_checkbox_label">Usean valinnan valintaruudut</string>
     <string name="global_settings_checkbox_summary">>Näytä aina usean valinnan valintaruudut</string>
-    <string name="global_settings_touchable_label">Viestin esikatselu</string>
-    <string name="global_settings_touchable_summary">tilavammat listan kohteet viestin esikatseluilla</string>
     <string name="global_settings_preview_lines_label">Rivien esikatselu</string>
     <string name="global_settings_show_correspondent_names_label">Näytä yhteyshenkilöiden nimet</string>
     <string name="global_settings_show_correspondent_names_summary">Näytä yhteyshenkilöiden nimet sähköpostiosoitteen sijaan</string>
@@ -337,12 +311,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Vahvista toimenpiteet</string>
     <string name="global_settings_confirm_actions_summary">Näytä valintaikkuna valitun toimenpiteen suorituksesta</string>
-    <string name="global_settings_confirm_action_archive">Arkistoi</string>
     <string name="global_settings_confirm_action_delete">Poista (vain viestinäkymässä)</string>
     <string name="global_settings_confirm_action_delete_starred">Poista tähdellä merkityt (vain viestinäkymässä)</string>
     <string name="global_settings_confirm_action_spam">Roskaposti</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Merkitse kaikki luetuiksi</string>
-    <string name="global_settings_confirm_action_send">Lähetä</string>
 
     <string name="global_settings_notification_hide_subject_title">Piilota aihe ilmoituksissa</string>
     <string name="global_settings_notification_hide_subject_never">Ei koskaan</string>
@@ -365,10 +336,8 @@ http://k9mail.googlecode.com/
     <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_email_hint">Sähköpostiosoite</string>
     <string name="account_setup_basics_password_hint">Salasana</string>
-    <string name="account_setup_basics_default_label">Lähetä viestit oletusarvoisesti tältä tililtä</string>
     <string name="account_setup_basics_manual_setup_action">Määritä asetukset käsin</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -380,7 +349,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Peruutetaan\u2026</string>
 
     <string name="account_setup_names_title">Melkein valmista!</string>
-    <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>
 
@@ -415,9 +383,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Muu</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Lataa otsakkeet</string>
-    <string name="account_setup_incoming_save_all_headers_label">Tallenna kaikki otsakkeet paikallisesti</string>
-
     <string name="local_storage_provider_external_label">Ulkoinen muisti (SD-kortti)</string>
     <string name="local_storage_provider_internal_label">Sisäinen muisti</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s sisäinen lisämuisti</string>
@@ -452,21 +417,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">SMTP-palvelin</string>
     <string name="account_setup_outgoing_port_label">Portti</string>
     <string name="account_setup_outgoing_security_label">Suojaus</string>
-    <string name="account_setup_outgoing_security_none_label">Ei mitään</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (jos käytettävissä)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (aina)</string>
     <string name="account_setup_outgoing_require_login_label">Edellytä kirjautumista.</string>
     <string name="account_setup_outgoing_username_label">Käyttäjätunnus</string>
     <string name="account_setup_outgoing_password_label">Salasana</string>
     <string name="account_setup_outgoing_authentication_label">Todennustapa</string>
-    <!-- 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">Käyttäjätunnus ja salasana</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Käyttäjätunnus</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Salasana</string>
-    <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>
 
@@ -749,7 +703,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Oletusidentiteetti</string>
     <string name="choose_identity_title">Valitse identiteetti</string>
-    <string name="choose_account_title">Valitse tili/identiteetti</string>
     <string name="send_as">Lähetä nimellä</string>
 
     <string name="no_removable_identity">Et voi poistaa ainoaa identiteettiäsi</string>
@@ -757,8 +710,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Vanhemmat viestit ensin</string>
     <string name="sort_latest_first">Uusimmat viestit ensin</string>
-    <string name="sort_sender_alpha">Lähettäjän mukaan aakkosjärjestyksessä</string>
-    <string name="sort_sender_re_alpha">Lähettäjän mukaan käänteisessä aakkosjärjestyksessä</string>
     <string name="sort_subject_alpha">Aiheen mukaan aakkosjärjestyksessä</string>
     <string name="sort_subject_re_alpha">Aiheen mukaan käänteisessä aakkosjärjestyksessä</string>
     <string name="sort_flagged_first">Tähdellä merkityt ensin</string>
@@ -771,7 +722,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Lajittele…</string>
     <string name="sort_by_date">Päivämäärän mukaan</string>
     <string name="sort_by_arrival">Saapumisajan mukaan</string>
-    <string name="sort_by_sender">Lähettäjän mukaan</string>
     <string name="sort_by_subject">Aiheen mukaan</string>
     <string name="sort_by_flag">Tähden mukaan</string>
     <string name="sort_by_unread">Luettujen/lukemattomien mukaan</string>
@@ -853,8 +803,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Kun \'Taustadata\' ja \'Automaattinen synkronointi\' on valittu</string>
     <string name="background_ops_auto_sync_only">Kun Automaattinen synkronointi on valittu</string>
 
-    <string name="no_message_seletected_toast">Yhtään viestiä ei ole valittu</string>
-
     <string name="date_format_label">Päivämäärän muoto</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -862,20 +810,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Ryhmätoiminnot</string>
-    <string name="batch_delete_op">Poista valitut</string>
-    <string name="batch_mark_read_op">Merkitse valitut luetuiksi</string>
-    <string name="batch_mark_unread_op">Merkitse valitut lukemattomiksi</string>
-    <string name="batch_flag_op">Merkitse valitut tähdellä</string>
-    <string name="batch_unflag_op">Poista tähti valituista</string>
-    <string name="batch_archive_op">Siirrä valitut Arkistoon</string>
-    <string name="batch_spam_op">Siirrä valitut Roskaposti-kansioon</string>
-    <string name="batch_move_op">Siirrä valitut</string>
-    <string name="batch_copy_op">Kopioi valitut</string>
-    <string name="batch_flag_mode">Tähtitila</string>
-    <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 enimmäismäärä</string>
     <string name="account_setup_push_limit_10">10 kansiota</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f0c747095..23d3664e0 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -34,10 +34,8 @@
     <string name="spam_action">Pourriel</string>
     <string name="special_mailbox_name_spam">Pourriels</string>
     <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Pourriels)</string>
-    <string name="message_view_spam_action">Pourriel</string>
     <string name="spam_folder_label">Nom du dossier des pourriels</string>
     <string name="account_settings_enable_move_buttons_summary">Montrer les boutons Archiver, Déplacer ou Pourriel</string>
-    <string name="batch_spam_op">Déplacer vers Pourriels</string>
     <string name="account_setup_push_limit_label">Maximum de dossiers poussés à vérifier</string>
     <string name="error_contact_address_not_found">Aucune adresse courriel trouvée</string>
     <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses courriel</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9be8d7024..8349db6af 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -76,7 +76,6 @@ http://k9mail.googlecode.com/ (en anglais)
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Marquer tous les messages dans \'<xliff:g id="folder">%s</xliff:g>\' comme lus\u00A0? (incluant les messages dans le dossier qui ne sont pas affichés\u00A0?)</string>
     <string name="account_delete_dlg_instructions_fmt">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» sera supprimé de K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Toutes les données du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacées de K-9 Mail, mais les paramètres seront conservés.</string>
     <string name="account_clear_dlg_instructions_fmt">Tous les messages du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacés de K-9 Mail, mais les paramètres seront conservés.</string>
@@ -109,7 +108,6 @@ http://k9mail.googlecode.com/ (en anglais)
     <string name="accounts_title">Comptes</string>
     <string name="folders_title">Dossiers</string>
     <string name="advanced">Avancé</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>
 
@@ -129,7 +127,6 @@ http://k9mail.googlecode.com/ (en anglais)
     <string name="status_syncing_off">synchronisation désactivée</string>
 
     <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> sélectionné(s)</string>
-    <string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g> sélectionné(s)</string>
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Suivant</string> <!-- Used as part of a multi-step process -->
     <string name="previous_action">Précédent</string> <!-- Used as part of a multi-step process -->
@@ -137,14 +134,11 @@ http://k9mail.googlecode.com/ (en anglais)
     <string name="cancel_action">Annuler</string>
     <string name="send_action">Envoyer</string>
     <string name="send_again_action">Envoyer à nouveau</string>
-    <string name="select_action">Sélectionner</string>
-    <string name="deselect_action">Désélectionner</string>
     <string name="reply_action">Répondre</string>
     <string name="reply_all_action">Répondre à tous</string>
     <string name="delete_action">Supprimer</string>
     <string name="archive_action">Archiver</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Vider le dossier</string>
     <string name="forward_action">Transférer</string>
     <string name="move_action">Déplacer</string>
     <string name="single_message_options_action">Options de message</string>
@@ -153,38 +147,28 @@ http://k9mail.googlecode.com/ (en anglais)
     <string name="done_action">Terminé</string>
     <string name="discard_action">Abandonner</string>
     <string name="save_draft_action">Enregistrer dans les brouillons</string>
-    <string name="retry_action">Réessayer</string>
-    <string name="refresh_action">Actualiser</string>
     <string name="check_mail_action">Vérif. messages</string>
     <string name="send_messages_action">Envoyer les messages</string>
-    <string name="list_folders_action">Liste des dossiers</string>
     <string name="refresh_folders_action">Rafraîchir les dossiers</string>
     <string name="filter_folders_action">Chercher dossier</string>
-    <string name="mark_all_as_read_action">Marquer tous les messages comme lus</string>
     <string name="add_account_action">Ajouter un compte</string>
     <string name="compose_action">Composer</string>
     <string name="search_action">Rechercher</string>
     <string name="search_results">Résultats de la recherche</string>
     <string name="preferences_action">Préférences</string>
-    <string name="open_action">Ouvrir</string>
     <string name="account_settings_action">Paramètres du compte</string>
     <string name="folder_settings_action">Paramètres du dossier</string>
     <string name="global_settings_action">Paramètres globaux</string>
     <string name="remove_account_action">Supprimer le compte</string>
     <string name="clear_pending_action">Annuler les actions en attente (Danger\u00A0!)</string>
 
-    <string name="accounts_action">Comptes</string>
     <string name="mark_as_read_action">Marquer comme lu</string>
     <string name="send_alternate_action">Transférer avec une autre application</string>
     <string name="send_alternate_chooser_title">Choisir l\'expéditeur</string>
 
-    <string name="mark_all_as_read_dlg_title">Marquer tous les messages comme lus</string>
-
     <string name="flag_action">Ajouter une étoile</string>
     <string name="unflag_action">Enlever l\'étoile</string>
     <string name="copy_action">Copier</string>
-    <string name="show_full_header_action">Montrer l\'entête complète</string>
-    <string name="hide_full_header_action">Masquer l\'entête complète</string>
     <string name="select_text_action">Sélection de texte</string>
 
     <string name="message_view_theme_action_dark">Basculer sur le thème foncé</string>
@@ -207,7 +191,6 @@ http://k9mail.googlecode.com/ (en anglais)
     <string name="accounts_context_menu_title">Options du compte</string>
 
     <string name="general_no_subject">(Aucun objet)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">Pas de date</string>
     <string name="general_no_sender">Aucun expéditeur</string>
     <string name="status_loading">Récupération\u2026</string>
     <string name="status_loading_more">Chargement des messages\u2026</string>
@@ -301,11 +284,6 @@ de plus</string>
     <string name="message_view_cc_label">Cc\u00A0:</string>
     <string name="message_view_attachment_view_action">Ouvrir</string>
     <string name="message_view_attachment_download_action">Enregistrer</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archiver</string>
-    <string name="message_view_move_action">Déplacer</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Pièce jointe enregistrée sur la carte SD en tant que <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Impossible d\'enregistrer la pièce jointe sur la carte SD.</string>
     <string name="message_view_show_pictures_action">Afficher les images</string>
@@ -329,12 +307,8 @@ de plus</string>
     <string name="message_discarded_toast">Message abandonné</string>
     <string name="message_saved_toast">Message enregistré comme brouillon</string>
 
-    <string name="global_settings_flag_label">Étoiles des messages</string>
-    <string name="global_settings_flag_summary">Les étoiles indiquent des messages suivis</string>
     <string name="global_settings_checkbox_label">Cases à cocher</string>
     <string name="global_settings_checkbox_summary">Toujours afficher les cases à cocher</string>
-    <string name="global_settings_touchable_label">Interface conviviale au toucher</string>
-    <string name="global_settings_touchable_summary">Fournit plus d\'espace dans les éléments des listes</string>
     <string name="global_settings_preview_lines_label">Lignes dʼaperçu</string>
     <string name="global_settings_show_correspondent_names_label">Afficher le nom des correspondants</string>
     <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses e-mail</string>
@@ -357,12 +331,9 @@ de plus</string>
 
     <string name="global_settings_confirm_actions_title">Confirmer les actions</string>
     <string name="global_settings_confirm_actions_summary">Demander une confirmation pour chacune des actions sélectionnées</string>
-    <string name="global_settings_confirm_action_archive">Archiver</string>
     <string name="global_settings_confirm_action_delete">Supprimer (mode lecture)</string>
     <string name="global_settings_confirm_action_delete_starred">Supprimer étoilé (mode lecture)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Marquer tout comme lu</string>
-    <string name="global_settings_confirm_action_send">Envoyer</string>
 
     <string name="global_settings_notification_hide_subject_title">Masquer le sujet du message lors de la nofication</string>
     <string name="global_settings_notification_hide_subject_never">Jamais</string>
@@ -385,10 +356,8 @@ de plus</string>
     <string name="quiet_time_ends">Fin des heures silencieuses</string>
 
     <string name="account_setup_basics_title">Configurer la messagerie</string>
-    <string name="account_setup_basics_instructions">Saisissez l\'adresse de messagerie de votre compte\u00A0:</string>
     <string name="account_setup_basics_email_hint">Adresse e-mail</string>
     <string name="account_setup_basics_password_hint">Mot de passe</string>
-    <string name="account_setup_basics_default_label">Envoyer les messages de ce compte par défaut.</string>
     <string name="account_setup_basics_manual_setup_action">Configuration manuelle</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -400,7 +369,6 @@ de plus</string>
     <string name="account_setup_check_settings_canceling_msg">Annulation\u2026</string>
 
     <string name="account_setup_names_title">Presque terminé\u00A0!</string>
-    <string name="account_setup_names_instructions">Votre compte est configuré et les messages sont en route\u00A0!</string>
     <string name="account_setup_names_account_name_label">Donnez un nom à ce compte (optionnel)\u00A0:</string>
     <string name="account_setup_names_user_name_label">Saisissez votre nom (s\'affiche sur les messages sortants)\u00A0:</string>
 
@@ -435,9 +403,6 @@ de plus</string>
     <string name="account_setup_incoming_wifi_label">Wifi</string>
     <string name="account_setup_incoming_other_label">Autre</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Téléchargement des entêtes de messages</string>
-    <string name="account_setup_incoming_save_all_headers_label">Enregistrer toutes les entêtes localement</string>
-
     <string name="local_storage_provider_external_label">Stockage externe (carte SD)</string>
     <string name="local_storage_provider_internal_label">Stockage interne</string>
     <string name="local_storage_provider_samsunggalaxy_label">Stockage additionnel %1$s</string>
@@ -472,21 +437,10 @@ de plus</string>
     <string name="account_setup_outgoing_smtp_server_label">Serveur SMTP</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Type de sécurité</string>
-    <string name="account_setup_outgoing_security_none_label">Aucune</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (si disponible)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (toujours)</string>
     <string name="account_setup_outgoing_require_login_label">Authentification requise</string>
     <string name="account_setup_outgoing_username_label">Nom d\'utilisateur</string>
     <string name="account_setup_outgoing_password_label">Mot de passe</string>
     <string name="account_setup_outgoing_authentication_label">Type d\'authentification</string>
-    <!-- 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">Nom d\'utilisateur et mot de passe</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Nom d\'utilisateur</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Mot de passe</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP avant SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP avant SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) avant SMTP</string>
 
     <string name="account_setup_bad_uri">Paramétrage incorrect\u00A0: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -769,7 +723,6 @@ de plus</string>
 
     <string name="default_identity_description">Identité initiale</string>
     <string name="choose_identity_title">Choisir l\'identité</string>
-    <string name="choose_account_title">Choisir le compte/l\'identité</string>
     <string name="send_as">Envoyer en tant que</string>
 
     <string name="no_removable_identity">Vous ne pouvez votre seule identité</string>
@@ -777,8 +730,6 @@ de plus</string>
 
     <string name="sort_earliest_first">Plus ancient en premier</string>
     <string name="sort_latest_first">Plus récents en premier</string>
-    <string name="sort_sender_alpha">A-Z par expéditeur</string>
-    <string name="sort_sender_re_alpha">Z-A par expéditeur</string>
     <string name="sort_subject_alpha">A-Z par sujet</string>
     <string name="sort_subject_re_alpha">Z-A par sujet</string>
     <string name="sort_flagged_first">Messages avec étoiles en premier</string>
@@ -791,7 +742,6 @@ de plus</string>
     <string name="sort_by">Trier…</string>
     <string name="sort_by_date">Date</string>
     <string name="sort_by_arrival">Date de réception</string>
-    <string name="sort_by_sender">Expéditeur</string>
     <string name="sort_by_subject">Sujet</string>
     <string name="sort_by_flag">Étoile</string>
     <string name="sort_by_unread">Lu/Non lu</string>
@@ -873,8 +823,6 @@ de plus</string>
     <string name="background_ops_auto_sync">Lorsque «\u00A0Données en arrière-plan\u00A0» et «\u00A0Synchronisation auto\u00A0» sont activés</string>
     <string name="background_ops_auto_sync_only">Lorsque «\u00A0Synchronisation auto\u00A0» est activée</string>
 
-    <string name="no_message_seletected_toast">Aucun message sélectionné</string>
-
     <string name="date_format_label">Format de date</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -882,20 +830,7 @@ de plus</string>
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Opérations groupées</string>
-    <string name="batch_delete_op">Supprimer la sélection</string>
-    <string name="batch_mark_read_op">Marquer la sélection comme lue</string>
-    <string name="batch_mark_unread_op">Marquer la sélection comme non lue</string>
-    <string name="batch_flag_op">Ajouter une étoile à la sélection</string>
-    <string name="batch_unflag_op">Effacer l\'étoile de la sélection</string>
-    <string name="batch_archive_op">Déplacer vers Archives</string>
-    <string name="batch_spam_op">Déplacer vers Spams</string>
-    <string name="batch_move_op">Déplacer la sélection</string>
-    <string name="batch_copy_op">Copier la sélection</string>
-    <string name="batch_flag_mode">Mode étoile</string>
-    <string name="batch_plain_mode">Mode normal</string>
     <string name="batch_select_all">Sélectionner tout</string>
-    <string name="batch_deselect_all">Désélectionner tout</string>
 
     <string name="account_setup_push_limit_label">Maximum de dossiers Push à vérifier</string>
     <string name="account_setup_push_limit_10">10 dossiers</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index fe14bdefc..da2bd1f85 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Marcar todas as mensaxes en \'<xliff:g id="folder">%s</xliff:g>\' como lidas?  (incluidas as mensaxes que non estan visualizadas por K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">Aa conta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Os datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero manterase a súa Configuración</string>
     <string name="account_clear_dlg_instructions_fmt">Todas as mensaxes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero a Configuración da conta manterase</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Contas</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Avanzado</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Cancelar</string>
     <string name="send_action">Enviar</string>
     <string name="send_again_action">Volver a enviar</string>
-    <string name="select_action">Seleccionar</string>
-    <string name="deselect_action">Deseleccionar</string>
     <string name="reply_action">Responder</string>
     <string name="reply_all_action">Responder a todos</string>
     <string name="delete_action">Borrar</string>
     <string name="archive_action">Arquivar</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">valeirar carpeta</string>
     <string name="forward_action">Reenviar</string>
     <string name="move_action">Mover</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Feito</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Descartar</string>
     <string name="save_draft_action">Gardar coma borrador</string>
-    <string name="retry_action">Reintentar</string>
-    <string name="refresh_action">Refrescar</string>
     <string name="check_mail_action">Sincronizar</string>
     <string name="send_messages_action">Enviar Correo</string>
-    <string name="list_folders_action">Lista de Carpetas</string>
     <string name="refresh_folders_action">Refrescar Carpetas</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">Marcar todos coma lidos</string>
     <string name="add_account_action">Engadir conta</string>
     <string name="compose_action">Redactar</string>
     <string name="search_action">Buscar</string>
     <string name="search_results">Resultados Búsqueda</string>
     <string name="preferences_action">Configuración</string>
-    <string name="open_action">Abrir</string>
     <string name="account_settings_action">Configurar conta</string>
     <string name="folder_settings_action">Configurar carpeta</string>
     <string name="global_settings_action">Configuración global</string>
     <string name="remove_account_action">Eliminar conta</string>
     <string name="clear_pending_action">Limpar accións pendentes (perigroso!)</string>
 
-    <string name="accounts_action">Contas</string>
     <string name="mark_as_read_action">Marcar coma Lido</string>
     <string name="send_alternate_action">Compartir</string>
     <string name="send_alternate_chooser_title">Seleccionar Remitente</string>
 
-    <string name="mark_all_as_read_dlg_title">Marcar todos coma lidos</string>
-
     <string name="flag_action">Engadir Estrela</string>
     <string name="unflag_action">Eliminar Estrela</string>
     <string name="copy_action">Copiar</string>
-    <string name="show_full_header_action">Ver todos os encabezados</string>
-    <string name="hide_full_header_action">Ocultar todos os encabezados</string>
     <string name="select_text_action">Seleccionar texto</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Opcións de conta</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. -->
-    <string name="general_no_date">Sen data</string>
     <string name="general_no_sender">Sen Remitente</string>
     <string name="status_loading">Conectando</string>
     <string name="status_loading_more">Cargando mensaxes\u2026</string>
@@ -276,11 +260,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Abrir</string>
     <string name="message_view_attachment_download_action">Gardar</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arquivar</string>
-    <string name="message_view_move_action">Mover</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Adxunto gardado na SD como <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Imposible gardar adxunto na SD</string>
     <string name="message_view_show_pictures_action">Amosar imaxe</string>
@@ -304,12 +283,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Mensaxes descartadas</string>
     <string name="message_saved_toast">Mensaxe guardada coma borrador</string>
 
-    <string name="global_settings_flag_label">Ver estrelas</string>
-    <string name="global_settings_flag_summary">As estrelas indican unha mensaxe destacada</string>
     <string name="global_settings_checkbox_label">Selección múltiple</string>
     <string name="global_settings_checkbox_summary">Permitir múltiple selección</string>
-    <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>
     <string name="global_settings_show_correspondent_names_label">Amosar os nomes correspondentes</string>
     <string name="global_settings_show_correspondent_names_summary">Amosar os nomes en lugar dos enderezos</string>
@@ -332,12 +307,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Confirmar acción</string>
     <string name="global_settings_confirm_actions_summary">Amosar un diálogo cuando se realice una de estas acciones</string>
-    <string name="global_settings_confirm_action_archive">Arquivar</string>
     <string name="global_settings_confirm_action_delete">Borrar (Mensaxes na vista)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos coma lidos</string>
-    <string name="global_settings_confirm_action_send">Enviados</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -360,10 +332,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Silencio remata</string>
 
     <string name="account_setup_basics_title">Configurar nova conta</string>
-    <string name="account_setup_basics_instructions">Introduzca enderezo de correo</string>
     <string name="account_setup_basics_email_hint">Enderezo de correo</string>
     <string name="account_setup_basics_password_hint">Contrasinal</string>
-    <string name="account_setup_basics_default_label">Enviar correo dende esta conta por defecto</string>
     <string name="account_setup_basics_manual_setup_action">Configuración Manual</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -375,7 +345,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
 
     <string name="account_setup_names_title">Feito!</string>
-    <string name="account_setup_names_instructions">A Tua conta está configurada!</string>
     <string name="account_setup_names_account_name_label">Dalle un nome a esta conta (opcional):</string>
     <string name="account_setup_names_user_name_label">Introduce o teu nome (visualizarase na mensaxe de saída):</string>
 
@@ -410,9 +379,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Outras</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Descargar encabezados</string>
-    <string name="account_setup_incoming_save_all_headers_label">Gardar todas as cabeceiras localmente</string>
-
     <string name="local_storage_provider_external_label">Almacenamento externo (SD)</string>
     <string name="local_storage_provider_internal_label">Almacenamento interno</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s almacenamento interno adicional</string>
@@ -447,21 +413,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Servidor SMTP</string>
     <string name="account_setup_outgoing_port_label">Porto</string>
     <string name="account_setup_outgoing_security_label">Tipo de Seguridade</string>
-    <string name="account_setup_outgoing_security_none_label">Ningunha</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (se disponible)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (sempre)</string>
     <string name="account_setup_outgoing_require_login_label">Require autentificación</string>
     <string name="account_setup_outgoing_username_label">Usuario</string>
     <string name="account_setup_outgoing_password_label">Contrasinal</string>
     <string name="account_setup_outgoing_authentication_label">Tipo de autentificación</string>
-    <!-- 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">Usuario &amp; contrasinal</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Usuario</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Contrasinal</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP antes que SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP antes que SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) antes que SMTP</string>
 
     <string name="account_setup_bad_uri">Configuración inválida: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -744,7 +699,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Identidade principal</string>
     <string name="choose_identity_title">Seleccionar identidade</string>
-    <string name="choose_account_title">Seleccionar conta/identidade</string>
     <string name="send_as">Enviar como</string>
 
     <string name="no_removable_identity">Non podes eliminar a túa única identidade</string>
@@ -752,8 +706,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Novas mensaxes primeiro</string>
     <string name="sort_latest_first">Últimas mensaxes primeiro</string>
-    <string name="sort_sender_alpha">Remitente alfabético</string>
-    <string name="sort_sender_re_alpha">Remitente alfabético inverso</string>
     <string name="sort_subject_alpha">Asunto alfabético</string>
     <string name="sort_subject_re_alpha">Asunto alfabético inverso</string>
     <string name="sort_flagged_first">Con estrelas primeiro</string>
@@ -766,7 +718,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Ordeado por…</string>
     <string name="sort_by_date">Data</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">Remitente</string>
     <string name="sort_by_subject">Asunto</string>
     <string name="sort_by_flag">Estrelas</string>
     <string name="sort_by_unread">Lido/Sen Ler</string>
@@ -846,8 +797,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Cando \'Sincronización en segundo plano\' e \'Sincronización automática\' estén activos</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">No foi seleccionada ningunha mensaxe</string>
-
     <string name="date_format_label">Formato de data</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -855,20 +804,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Operacións en lote</string>
-    <string name="batch_delete_op">Borrar seleccionados</string>
-    <string name="batch_mark_read_op">Marcar seleccionados coma lidos</string>
-    <string name="batch_mark_unread_op">Marcar seleccionados coma non lidos</string>
-    <string name="batch_flag_op">Engadir estrella aos seleccionados</string>
-    <string name="batch_unflag_op">Eliminar estrelas aos seleccionados</string>
-    <string name="batch_archive_op">Mover seleccionados a arquivo</string>
-    <string name="batch_spam_op">Mover seleccionados a SPAM</string>
-    <string name="batch_move_op">Mover seleccionados</string>
-    <string name="batch_copy_op">Copiar seleccionados</string>
-    <string name="batch_flag_mode">Modo estrela</string>
-    <string name="batch_plain_mode">Modo plano</string>
     <string name="batch_select_all">Seleccionar todos</string>
-    <string name="batch_deselect_all">Deseleccionar todos</string>
 
     <string name="account_setup_push_limit_label">Max. subscripcións</string>
     <string name="account_setup_push_limit_10">10 carpetas</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2b3509b9b..0749a7c85 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -54,7 +54,6 @@
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">A \'<xliff:g id="folder">%s</xliff:g>\' fiók minden üzenetét olvasottnak jelöli?</string>
     <string name="account_delete_dlg_instructions_fmt">A \"<xliff:g id="account">%s</xliff:g>\" fiók törölve a K9 Mail-ból.</string>
     <string name="account_recreate_dlg_instructions_fmt">Az összes üzenet, melléklet, mappa és beállításai törlődni fognak a \"<xliff:g id="account">%s</xliff:g>\" fiókból. A fiók beállításai megmaradnak.</string>
     <string name="account_clear_dlg_instructions_fmt">Minden levél törlődni fog a \"<xliff:g id="account">%s</xliff:g>\" fiókból, de a beállítások megmaradnak.</string>
@@ -87,7 +86,6 @@
     <string name="accounts_title">Fióklista</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Haladó beállítások</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>
 
@@ -113,14 +111,11 @@
     <string name="cancel_action">Mégse</string>
     <string name="send_action">Küldés</string>
     <string name="send_again_action">Újraküldés</string>
-    <string name="select_action">Megjelöl</string>
-    <string name="deselect_action">Nem jelöl</string>
     <string name="reply_action">Válasz</string>
     <string name="reply_all_action">Válasz mindenkinek</string>
     <string name="delete_action">Törlés</string>
     <string name="archive_action">Archiválás</string>
     <string name="spam_action">Levélszemét</string>
-    <string name="delete_all_action">Mappa törlése</string>
     <string name="forward_action">Továbbítás</string>
     <string name="move_action">Áthelyez</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@
     <string name="done_action">Rendben</string>
     <string name="discard_action">Mégsem</string>
     <string name="save_draft_action">Piszkozat</string>
-    <string name="retry_action">Újból</string>
-    <string name="refresh_action">Frissít</string>
     <string name="check_mail_action">Levelek frissítése</string>
     <string name="send_messages_action">Üzenet küldése</string>
-    <string name="list_folders_action">Mappa lista</string>
     <string name="refresh_folders_action">Mappák frissítése</string>
     <string name="filter_folders_action">Mappa keresése</string>
-    <string name="mark_all_as_read_action">Mindent olvasottnak jelöl</string>
     <string name="add_account_action">Új fiók</string>
     <string name="compose_action">Levélírás</string>
     <string name="search_action">Keresés</string>
     <string name="search_results">Keresés eredménye</string>
     <string name="preferences_action">Beállítások</string>
-    <string name="open_action">Megnyit</string>
     <string name="account_settings_action">Fiók beállításai</string>
     <string name="folder_settings_action">Mappa beállításai</string>
     <string name="global_settings_action">Általános beállítások</string>
     <string name="remove_account_action">Fiók törlése</string>
     <string name="clear_pending_action">Függőben lévők törlése</string>
 
-    <string name="accounts_action">Fiókok</string>
     <string name="mark_as_read_action">Olvasottnak jelöl</string>
     <string name="send_alternate_action">Megosztás</string>
     <string name="send_alternate_chooser_title">Küldő választása</string>
 
-    <string name="mark_all_as_read_dlg_title">Mindent olvasottnak jelöl</string>
-
     <string name="flag_action">Csillagos</string>
     <string name="unflag_action">Csillag törlése</string>
     <string name="copy_action">Másolás</string>
-    <string name="show_full_header_action">Mutassa a teljes fejlécet</string>
-    <string name="hide_full_header_action">Kompakt fejléc mutatása</string>
     <string name="select_text_action">Szöveg kijelölése</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@
     <string name="accounts_context_menu_title">Fiók beállításai</string>
 
     <string name="general_no_subject">(nincs tárgy)</string>
-    <string name="general_no_date">Nincs dátum</string>
     <string name="general_no_sender">Nincs feladó</string>
     <string name="status_loading">Letöltés</string>
     <string name="status_loading_more">Üzenetek betöltése…</string>
@@ -276,11 +260,6 @@
     <string name="message_view_cc_label">Másolat:</string>
     <string name="message_view_attachment_view_action">Megnyit</string>
     <string name="message_view_attachment_download_action">Mentés</string>
-    <string name="message_view_prev_action">▼</string>
-    <string name="message_view_next_action">▲</string>
-    <string name="message_view_archive_action">Archivál</string>
-    <string name="message_view_move_action">Áthelyez</string>
-    <string name="message_view_spam_action">Levélszemét</string>
     <string name="message_view_status_attachment_saved">%s mellékletei a SD kártyára mentve.</string>
     <string name="message_view_status_attachment_not_saved">Nem lehet a mellékletet az SD kártyára menteni.</string>
     <string name="message_view_show_pictures_action">Képek mutatása</string>
@@ -304,12 +283,8 @@
     <string name="message_discarded_toast">Levél eldobva</string>
     <string name="message_saved_toast">Levél mentve a piszkozatokba</string>
 
-    <string name="global_settings_flag_label">Csillagok</string>
-    <string name="global_settings_flag_summary">Csillag jelzi a fontos leveleket</string>
     <string name="global_settings_checkbox_label">Többszörös kijelölés</string>
     <string name="global_settings_checkbox_summary">Kijelölő négyzetet a levelek mellet</string>
-    <string name="global_settings_touchable_label">Levelek előnézete</string>
-    <string name="global_settings_touchable_summary">Üzenetek bővített előnézete</string>
     <string name="global_settings_preview_lines_label">Előnézeti sorok száma</string>
     <string name="global_settings_show_correspondent_names_label">Nevek mutatása</string>
     <string name="global_settings_show_correspondent_names_summary">Ha a címtárban szerepel az email cím, a hozzá tartozó név megjelenítése</string>
@@ -332,12 +307,9 @@
 
     <string name="global_settings_confirm_actions_title">Parancsok megerősítése</string>
     <string name="global_settings_confirm_actions_summary">Üzenet megjelenítése a parancs végrehatása előtt</string>
-    <string name="global_settings_confirm_action_archive">Archivál</string>
     <string name="global_settings_confirm_action_delete">Törlés (csak üzenetek nézet)</string>
     <string name="global_settings_confirm_action_delete_starred">Csillagozott törlése (csak olvasható üzenet)</string>
     <string name="global_settings_confirm_action_spam">Levélszemét</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Összes megjelölése olvasottként</string>
-    <string name="global_settings_confirm_action_send">Küldés</string>
 
     <string name="global_settings_notification_hide_subject_title">Tárgy elrejtése az értesítésekben</string>
     <string name="global_settings_notification_hide_subject_never">Soha</string>
@@ -360,10 +332,8 @@
     <string name="quiet_time_ends">Csendes mód vége</string>
 
     <string name="account_setup_basics_title">Új fiók létrehozása</string>
-    <string name="account_setup_basics_instructions">A fiókhoz használt email cím:</string>
     <string name="account_setup_basics_email_hint">Email cím</string>
     <string name="account_setup_basics_password_hint">Jelszó</string>
-    <string name="account_setup_basics_default_label">Ez legyen az alapértelmezett levélküldő</string>
     <string name="account_setup_basics_manual_setup_action">Kézi beállítás</string>
 
     <string name="account_setup_check_settings_title" />
@@ -375,7 +345,6 @@
     <string name="account_setup_check_settings_canceling_msg">Megszakítás…</string>
 
     <string name="account_setup_names_title">Majdnem kész!</string>
-    <string name="account_setup_names_instructions">Az ön fiókja használatra kész, még pár személyes adat hiányzik!</string>
     <string name="account_setup_names_account_name_label">Adjon a fióknak nevet (nem kötelező):</string>
     <string name="account_setup_names_user_name_label">Adja meg a nevét (elküldött leveleknél ez jelenik meg):</string>
 
@@ -410,9 +379,6 @@
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Egyéb</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Fejlécek letöltése</string>
-    <string name="account_setup_incoming_save_all_headers_label">Minden levélfejléc letöltése</string>
-
     <string name="local_storage_provider_external_label">Külső tárhely (SD kártya)</string>
     <string name="local_storage_provider_internal_label">Belső memória</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s egyéb belső tároló</string>
@@ -447,20 +413,10 @@
     <string name="account_setup_outgoing_smtp_server_label">SMTP szerver</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Kapcsolat biztonsága</string>
-    <string name="account_setup_outgoing_security_none_label">Nincs</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (ha lehetséges)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (mindig)</string>
     <string name="account_setup_outgoing_require_login_label">Bejelentkezés szükséges</string>
     <string name="account_setup_outgoing_username_label">Felhasználónév</string>
     <string name="account_setup_outgoing_password_label">Jelszó</string>
     <string name="account_setup_outgoing_authentication_label">Hitelesítés típusa</string>
-    <string name="account_setup_outgoing_authentication_basic_label">Felhasználónév &amp; jelszó</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Felhasználónév</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Jelszó</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP az SMTP előtt</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP az SMTP előtt</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) az SMTP előtt</string>
 
     <string name="account_setup_bad_uri">Hibás beállítás: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -743,7 +699,6 @@
 
     <string name="default_identity_description">Elsődleges személyazonosságom</string>
     <string name="choose_identity_title">Személyazonosság választása</string>
-    <string name="choose_account_title">Válasszon fiókot/személyazonosságot</string>
     <string name="send_as">Küldés más néven</string>
 
     <string name="no_removable_identity">Nem tudja eltávolítani, egy azonosítónak lennie kell</string>
@@ -751,8 +706,6 @@
 
     <string name="sort_earliest_first">Korábbi leveleket előre</string>
     <string name="sort_latest_first">Későbbi levelket előre</string>
-    <string name="sort_sender_alpha">Feladó szerint sorban</string>
-    <string name="sort_sender_re_alpha">Feladó szerint fordítva</string>
     <string name="sort_subject_alpha">Tárgy szerint sorban</string>
     <string name="sort_subject_re_alpha">Tárgy szerint fordítva</string>
     <string name="sort_flagged_first">Csillagos levelek előre</string>
@@ -765,7 +718,6 @@
     <string name="sort_by">Rendezés…</string>
     <string name="sort_by_date">Dátum</string>
     <string name="sort_by_arrival">Érkezés</string>
-    <string name="sort_by_sender">Feladó</string>
     <string name="sort_by_subject">Tárgy</string>
     <string name="sort_by_flag">Csillag</string>
     <string name="sort_by_unread">Olvasott</string>
@@ -843,8 +795,6 @@
     <string name="background_ops_auto_sync">"Ha a 'Háttéradatok' és 'Auto-szink' bekapcsolva"</string>
     <string name="background_ops_auto_sync_only">AMikor az \'Automatikus szinkronizáció\' be van kapcsolva</string>
 
-    <string name="no_message_seletected_toast">Nincs levél kiválasztva</string>
-
     <string name="date_format_label">Dátum formátuma</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -852,20 +802,7 @@
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Kötegelt feladatok</string>
-    <string name="batch_delete_op">Kijelöltek törlése</string>
-    <string name="batch_mark_read_op">Kijelöltek olvasottnak jelöl</string>
-    <string name="batch_mark_unread_op">Kijelöltek olvasottlannak jelöl</string>
-    <string name="batch_flag_op">Csillag hozzáadása</string>
-    <string name="batch_unflag_op">Csillag törlése</string>
-    <string name="batch_archive_op">Kijelöltek archiválása</string>
-    <string name="batch_spam_op">Kijelöltek levélszemétnek</string>
-    <string name="batch_move_op">Kijelöltek áthelyezése</string>
-    <string name="batch_copy_op">Kijelöltek másolása</string>
-    <string name="batch_flag_mode">Csillag mód</string>
-    <string name="batch_plain_mode">Egyszerű mód</string>
     <string name="batch_select_all">Mindent kijelöl</string>
-    <string name="batch_deselect_all">Kijelölések megszüntetése</string>
 
     <string name="account_setup_push_limit_label">Ellenőrízhető mappák száma</string>
     <string name="account_setup_push_limit_10">10 mappa</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d0bd5ad72..66e717b1e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Segnare tutti i messaggi in \'<xliff:g id="folder">%s</xliff:g>\' come letti? (compresi i messaggi nella cartella che non vengono visualizzati in K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">L\'account \"<xliff:g id="account">%s</xliff:g>\" sarà rimosso da K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Tutti i dati per \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
     <string name="account_clear_dlg_instructions_fmt">Tutti i messaggi in \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Account</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Avanzate</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Annulla</string>
     <string name="send_action">Invia</string>
     <string name="send_again_action">Invia di nuovo</string>
-    <string name="select_action">Seleziona</string>
-    <string name="deselect_action">Deseleziona</string>
     <string name="reply_action">Rispondi</string>
     <string name="reply_all_action">Rispondi a tutti</string>
     <string name="delete_action">Elimina</string>
     <string name="archive_action">Archivia</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Svuota cartella</string>
     <string name="forward_action">Inoltra</string>
     <string name="move_action">Sposta</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Fatto</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Ignora</string>
     <string name="save_draft_action">Salva come bozza</string>
-    <string name="retry_action">Riprova</string>
-    <string name="refresh_action">Aggiorna</string>
     <string name="check_mail_action">Controlla posta</string>
     <string name="send_messages_action">Invia messaggi</string>
-    <string name="list_folders_action">Elenca cartelle</string>
     <string name="refresh_folders_action">Aggiorna cartelle</string>
     <string name="filter_folders_action">Trova cartella</string>
-    <string name="mark_all_as_read_action">Segna tutti come letti</string>
     <string name="add_account_action">Aggiungi account</string>
     <string name="compose_action">Componi</string>
     <string name="search_action">Cerca</string>
     <string name="search_results">Risultati della ricerca</string>
     <string name="preferences_action">Impostazioni</string>
-    <string name="open_action">Apri</string>
     <string name="account_settings_action">Impostazioni account</string>
     <string name="folder_settings_action">Impostazioni cartella</string>
     <string name="global_settings_action">Impostazioni generali</string>
     <string name="remove_account_action">Rimuovi account</string>
     <string name="clear_pending_action">Annulla tutte le azioni in corso (pericolo!)</string>
 
-    <string name="accounts_action">Account</string>
     <string name="mark_as_read_action">Segna come letto</string>
     <string name="send_alternate_action">Inoltra con altra applicazione</string>
     <string name="send_alternate_chooser_title">Scegli il mittente</string>
 
-    <string name="mark_all_as_read_dlg_title">Segna tutti i messaggi come letti</string>
-
     <string name="flag_action">Metti in evidenza</string>
     <string name="unflag_action">Togli stella</string>
     <string name="copy_action">Copia</string>
-    <string name="show_full_header_action">Mostra intestazione completa</string>
-    <string name="hide_full_header_action">Nascondi intestazione completa</string>
     <string name="select_text_action">Seleziona testo</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Opzioni account</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. -->
-    <string name="general_no_date">Nessuna data</string>
     <string name="general_no_sender">Nessun mittente</string>
     <string name="status_loading">Recupero in corso</string>
     <string name="status_loading_more">Caricamento dei messaggi in corso\u2026</string>
@@ -277,11 +261,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Apri</string>
     <string name="message_view_attachment_download_action">Salva</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archivia</string>
-    <string name="message_view_move_action">Sposta</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Allegato salvato su scheda SD come <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Impossibile salvare l\'allegato sulla scheda SD.</string>
     <string name="message_view_show_pictures_action">Mostra immagini</string>
@@ -305,12 +284,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Messaggio scartato</string>
     <string name="message_saved_toast">Messaggio salvato come bozza</string>
 
-    <string name="global_settings_flag_label">Mostra stelle</string>
-    <string name="global_settings_flag_summary">Le stelle indicano i messaggi evidenziati</string>
     <string name="global_settings_checkbox_label">Caselle di selezione multipla</string>
     <string name="global_settings_checkbox_summary">Mostra sempre caselle di selezione multipla</string>
-    <string name="global_settings_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_summary">Mostra il nome del mittente al posto dell\'indirizzo email</string>
@@ -333,12 +308,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Conferma azioni</string>
     <string name="global_settings_confirm_actions_summary">Mostra una finestra di dialogo ogni volta che si eseguono le azioni selezionate</string>
-    <string name="global_settings_confirm_action_archive">Archivia</string>
     <string name="global_settings_confirm_action_delete">Elimina (soltanto in visualizzazione messaggi)</string>
     <string name="global_settings_confirm_action_delete_starred">Elimina messaggi con la stella (solo messaggi visualizzati)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Segna tutti come già letti</string>
-    <string name="global_settings_confirm_action_send">Invia</string>
 
     <string name="global_settings_notification_hide_subject_title">Nascondi l\'oggetto della mail nelle notifiche</string>
     <string name="global_settings_notification_hide_subject_never">Mai</string>
@@ -361,10 +333,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Disattiva alle</string>
 
     <string name="account_setup_basics_title">Configura un nuovo account</string>
-    <string name="account_setup_basics_instructions">Inserisci l\'indirizzo email di questo account:</string>
     <string name="account_setup_basics_email_hint">Indirizzo email</string>
     <string name="account_setup_basics_password_hint">Password</string>
-    <string name="account_setup_basics_default_label">Account predefinito per l\'invio della posta</string>
     <string name="account_setup_basics_manual_setup_action">Configurazione manuale</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -376,7 +346,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Annullamento delle operazioni in corso\u2026</string>
 
     <string name="account_setup_names_title">Quasi fatto!</string>
-    <string name="account_setup_names_instructions">Il tuo account è stato impostato, e la posta è in viaggio!</string>
     <string name="account_setup_names_account_name_label">Assegna un nome all\'account (opzionale):</string>
     <string name="account_setup_names_user_name_label">Scrivi il tuo nome (visualizzato nei messaggi in uscita):</string>
 
@@ -411,9 +380,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Altra</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Scarica intestazioni</string>
-    <string name="account_setup_incoming_save_all_headers_label">Salva tutte le intestazioni dei messaggi localmente</string>
-
     <string name="local_storage_provider_external_label">Memoria esterna (SD card)</string>
     <string name="local_storage_provider_internal_label">Memoria interna standard</string>
     <string name="local_storage_provider_samsunggalaxy_label">Ulteriore memoria interna %1$s</string>
@@ -448,21 +414,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Server SMTP</string>
     <string name="account_setup_outgoing_port_label">Porta</string>
     <string name="account_setup_outgoing_security_label">Tipo di protezione</string>
-    <string name="account_setup_outgoing_security_none_label">Nessuna</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (se disponibile)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (sempre)</string>
     <string name="account_setup_outgoing_require_login_label">Richiedi accesso.</string>
     <string name="account_setup_outgoing_username_label">Nome utente</string>
     <string name="account_setup_outgoing_password_label">Password</string>
     <string name="account_setup_outgoing_authentication_label">Tipo di autenticazione</string>
-    <!-- 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">Nome utente e password</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Nome utente</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Password</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP prima di SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP prima di SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) prima di SMTP</string>
 
     <string name="account_setup_bad_uri">Impostazioni non valide: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -745,7 +700,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Identità iniziale</string>
     <string name="choose_identity_title">Scegli identità</string>
-    <string name="choose_account_title">Scegli account/identità</string>
     <string name="send_as">Invia come</string>
 
     <string name="no_removable_identity">Non puoi rimuovere l\'unica identità</string>
@@ -753,8 +707,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Data messaggio (più recenti)</string>
     <string name="sort_latest_first">Data messaggio (più vecchi)</string>
-    <string name="sort_sender_alpha">Mittente (A-Z)</string>
-    <string name="sort_sender_re_alpha">Mittente (Z-A)</string>
     <string name="sort_subject_alpha">Oggetto (A-Z)</string>
     <string name="sort_subject_re_alpha">Oggetto (Z-A)</string>
     <string name="sort_flagged_first">Messaggi con stella</string>
@@ -767,7 +719,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Ordina per…</string>
     <string name="sort_by_date">Data</string>
     <string name="sort_by_arrival">Arrivo</string>
-    <string name="sort_by_sender">Mittente</string>
     <string name="sort_by_subject">Oggetto</string>
     <string name="sort_by_flag">Stella</string>
     <string name="sort_by_unread">Letto/da leggere</string>
@@ -849,8 +800,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Quando \'Dati in background\' e \'Sincronizzazione automatica\' sono selezionati</string>
     <string name="background_ops_auto_sync_only">Quando \'Sincronizzazione automatica\' è selezionato</string>
 
-    <string name="no_message_seletected_toast">Nessun messaggio selezionato</string>
-
     <string name="date_format_label">Formato data</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -858,20 +807,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Operazioni sequenziali</string>
-    <string name="batch_delete_op">Elimina selezionati</string>
-    <string name="batch_mark_read_op">Segna selezionati come letti</string>
-    <string name="batch_mark_unread_op">Segna selezionati come non letti</string>
-    <string name="batch_flag_op">Aggiungi stella a selezionati</string>
-    <string name="batch_unflag_op">Rimuovi stella a selezionati</string>
-    <string name="batch_archive_op">Sposta selezionati in Archivio</string>
-    <string name="batch_spam_op">Sposta selezionati in Spam</string>
-    <string name="batch_move_op">Sposta selezionati</string>
-    <string name="batch_copy_op">Copia selezionati</string>
-    <string name="batch_flag_mode">Modalità stella</string>
-    <string name="batch_plain_mode">Modalità normale</string>
     <string name="batch_select_all">Seleziona tutti</string>
-    <string name="batch_deselect_all">Annulla tutte le selezioni</string>
 
     <string name="account_setup_push_limit_label">Max cartelle Push</string>
     <string name="account_setup_push_limit_10">10 cartelle</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c9b6c8f55..21ba3e504 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">סמן את כל ההודעות שב \'<xliff:g id="folder">%s</xliff:g>\' כנקראו?? (כולל את ההודעות בתיקיות שאינן מוצגות ב K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">החשבון \"<xliff:g id="account">%s</xliff:g>\" ימחק מ K-9 Mail .</string>
     <string name="account_recreate_dlg_instructions_fmt">על הנתונים עבור \"<xliff:g id="account">%s</xliff:g>\" ימחקו מ K-9 Mail, אך הגדרות החשבון יישמרו.</string>
     <string name="account_clear_dlg_instructions_fmt">כל ההודעות ב \"<xliff:g id="account">%s</xliff:g>\" ימחקו מ K-9 Mail, אך הגדרות החשבון יישמרו.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">חשבונות</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">מתקדם</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">ביטול</string>
     <string name="send_action">שלח</string>
     <string name="send_again_action">שלח שוב</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>
     <string name="spam_action">דואר זבל</string>
-    <string name="delete_all_action">נקה תיקייה</string>
     <string name="forward_action">קדימה</string>
     <string name="move_action">העבר</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">סיום</string>
     <string name="discard_action">השלך</string>
     <string name="save_draft_action">שמור כטיוטה</string>
-    <string name="retry_action">נסה שוב</string>
-    <string name="refresh_action">רענן</string>
     <string name="check_mail_action">בדוק דואר</string>
     <string name="send_messages_action">שלח הודעות</string>
-    <string name="list_folders_action">רשימת תיקיות</string>
     <string name="refresh_folders_action">רענן תיקיות</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">סמן כל ההודעות כנקראו</string>
     <string name="add_account_action">הוסף חשבון</string>
     <string name="compose_action">חבר</string>
     <string name="search_action">חפש</string>
     <string name="search_results">תוצאות חיפוש</string>
     <string name="preferences_action">הגדרות</string>
-    <string name="open_action">פתח</string>
     <string name="account_settings_action">הגדרות חשבון</string>
     <string name="folder_settings_action">הגדרות תיקייה</string>
     <string name="global_settings_action">הגדרות כלליות</string>
     <string name="remove_account_action">מחק חשבון</string>
     <string name="clear_pending_action">נקה פעולות ממתינות(סכנה!)</string>
 
-    <string name="accounts_action">חשבונות</string>
     <string name="mark_as_read_action">סמן כנקרא</string>
     <string name="send_alternate_action">שתף</string>
     <string name="send_alternate_chooser_title">בחר את השולח</string>
 
-    <string name="mark_all_as_read_dlg_title">סימון כל ההודעות כנקראו</string>
-
     <string name="flag_action">הוסף כוכב</string>
     <string name="unflag_action">מחק כוכב</string>
     <string name="copy_action">העתק</string>
-    <string name="show_full_header_action">הצג כותרת מלאה</string>
-    <string name="hide_full_header_action">הסתר כותרת מלאה</string>
     <string name="select_text_action">בחר טקסט</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">אפשרויות חשבון</string>
 
     <string name="general_no_subject">(ללא כותרת)</string>
-    <string name="general_no_date">ללא תאריך</string>
     <string name="general_no_sender">ללא שולח</string>
     <!-- NEW: <string name="status_loading">Polling</string>-->
     <string name="status_loading_more">טוען הודעות</string>
@@ -278,11 +262,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">עותק:</string>
     <string name="message_view_attachment_view_action">פתח</string>
     <string name="message_view_attachment_download_action">שמור</string>
-    <string name="message_view_prev_action">▼</string>
-    <string name="message_view_next_action">▲</string>
-    <string name="message_view_archive_action">ארכיון</string>
-    <string name="message_view_move_action">העבר</string>
-    <string name="message_view_spam_action">דואר זבל</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>
     <string name="message_view_show_pictures_action">הצג תמונות</string>
@@ -306,12 +285,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">ההודעה נמחקה</string>
     <string name="message_saved_toast">ההודעה נשמרה כטיוטה</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>
-    <string name="global_settings_touchable_summary">רשימת פריטים רבה יותר באמצעות תצוגה מקדימה של ההודעה</string>
     <string name="global_settings_preview_lines_label">קווי תצוגה מקדימה</string>
     <string name="global_settings_show_correspondent_names_label">הצג שמות תואמים</string>
     <string name="global_settings_show_correspondent_names_summary">הצג שמות תואמים במקום כתובות הדוא\"ל שלהם</string>
@@ -334,12 +309,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">אישור פעולות</string>
     <string name="global_settings_confirm_actions_summary">הצג דו שיח בכל פעם שאתה מבצע את פעולות הנבחרות</string>
-    <string name="global_settings_confirm_action_archive">ארכיון</string>
     <string name="global_settings_confirm_action_delete">מחק (צפה בהודעה בלבד)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">דואר זבל</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">סמן הכל כנקרא</string>
-    <string name="global_settings_confirm_action_send">שלח</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -362,10 +334,8 @@ http://k9mail.googlecode.com/
     <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_email_hint">כתובת דוא\"ל</string>
     <string name="account_setup_basics_password_hint">סיסמא</string>
-    <string name="account_setup_basics_default_label">הוראות הגדרה</string>
     <string name="account_setup_basics_manual_setup_action">הוראות הגדרה</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -377,7 +347,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">מבטל…</string>
 
     <string name="account_setup_names_title">כמעט מוכן!</string>
-    <string name="account_setup_names_instructions">החשבון שלך מוגדר, והדואר נמצא בדרך!</string>
     <string name="account_setup_names_account_name_label">תן שם לחשבון זה (לא חובה):</string>
     <string name="account_setup_names_user_name_label">הקלד את שמך (מוצג בהודעות יוצאות):</string>
 
@@ -412,9 +381,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">אחר</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">הורד כותרות</string>
-    <string name="account_setup_incoming_save_all_headers_label">שמור את כל כותרות ההודעות באופן מקומי</string>
-
     <string name="local_storage_provider_external_label">אחסון חיצוני (כרטיס SD)</string>
     <string name="local_storage_provider_internal_label">אחסון פנימי רגיל</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s אחסון פנימי נוסף</string>
@@ -449,21 +415,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">שרת SMTP</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">סוג אבטחה</string>
-    <string name="account_setup_outgoing_security_none_label">כלום</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (אם זמין)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (תמיד)</string>
     <string name="account_setup_outgoing_require_login_label">דרוש הרשמה.</string>
     <string name="account_setup_outgoing_username_label">שם משתמש</string>
     <string name="account_setup_outgoing_password_label">סיסמא</string>
     <string name="account_setup_outgoing_authentication_label">סו אימות</string>
-    <!-- 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">שם משתמש &amp; סיסמא</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">שם משתמש</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">סיסמא</string>
-    <!-- NEW: <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>-->
-    <!-- NEW: <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>-->
-    <!-- NEW: <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>-->
 
     <string name="account_setup_bad_uri">הגדרה לא חוקית: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -746,7 +701,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">הזהות הראשונית</string>
     <string name="choose_identity_title">בחר זהות</string>
-    <string name="choose_account_title">בחר חשבון/זהות</string>
     <string name="send_as">שלח כ</string>
 
     <string name="no_removable_identity">"לא ניתן להסיר את הזהות היחידה שלך"</string>
@@ -754,8 +708,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">הודעות קודמות ראשונות</string>
     <string name="sort_latest_first">הודעות אחרונות ראשונות</string>
-    <string name="sort_sender_alpha">סדר אלפביתי של השולח</string>
-    <string name="sort_sender_re_alpha">סדר אלפביתי הפןך של השולח</string>
     <string name="sort_subject_alpha">נושא אלפביתי</string>
     <string name="sort_subject_re_alpha">נושא אלפביתי הפוך</string>
     <string name="sort_flagged_first">הודעות שמסומנות בכוכב ראשונות</string>
@@ -768,7 +720,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">מיון לפי …</string>
     <string name="sort_by_date">תאריך</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">שולח</string>
     <string name="sort_by_subject">נושא</string>
     <string name="sort_by_flag">כוכב</string>
     <string name="sort_by_unread">נקרא/לא נקרא</string>
@@ -861,8 +812,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">"מתי ש\'נתונים ברקע\' ו\'סינכרון אוטומטי\' מסומנים "</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">לא נבחרו הודעות</string>
-
     <string name="date_format_label">פורמט תאריך</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -870,20 +819,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">פעולות קבוצה</string>
-    <string name="batch_delete_op">מחק נבחרים</string>
-    <string name="batch_mark_read_op">סמן נבחרים כנקרא</string>
-    <string name="batch_mark_unread_op">סמן נבחרים כלא נקרא</string>
-    <string name="batch_flag_op">הוסף כוכב לנבחרים</string>
-    <string name="batch_unflag_op">הסר כוכב מהנבחרים</string>
-    <string name="batch_archive_op">העבר נבחרים לארכיון</string>
-    <string name="batch_spam_op">העבר נבחרים לדואר זבל</string>
-    <string name="batch_move_op">העבר נבחרים</string>
-    <string name="batch_copy_op">העתק נבחרים</string>
-    <string name="batch_flag_mode">מצב \'כוכב\'</string>
-    <string name="batch_plain_mode">מצב רגיל</string>
     <string name="batch_select_all">בחר הכל</string>
-    <string name="batch_deselect_all">הקב את כל הבחירות</string>
 
     <string name="account_setup_push_limit_label">מקסימום תיקיות כדי לבדוק עם דחיפה</string>
     <string name="account_setup_push_limit_10">10 תיקיות</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bd713a445..4bc3ae5de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -54,7 +54,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">\&apos;<xliff:g id="folder">%s</xliff:g>\&apos;フォルダのすべてのメールを既読にしても良いですか？(一覧に表示されていないメッセージも既読にします)</string>
     <string name="account_delete_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" はK-9 Mailから削除されます。</string>
     <string name="account_recreate_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" の全データはK-9 Mailから削除されますが、アカウントの設定は残ります。</string>
     <string name="account_clear_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" の全メッセージはK-9 Mailから削除されますが、アカウントの設定は残ります。</string>
@@ -87,7 +86,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="accounts_title">アカウント一覧</string>
     <string name="folders_title">フォルダ一覧</string>
     <string name="advanced">拡張機能</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>
 
@@ -107,7 +105,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="status_syncing_off">同期停止</string>
 
     <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g>件選択しました</string>
-    <string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g>を選択しました</string>
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">次へ</string>
     <string name="previous_action">前へ</string> <!-- Used as part of a multi-step process -->
@@ -115,14 +112,11 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="cancel_action">キャンセル</string>
     <string name="send_action">送信</string>
     <string name="send_again_action">再編集</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>
     <string name="spam_action">迷惑メールとみなす</string>
-    <string name="delete_all_action">フォルダクリア</string>
     <string name="forward_action">転送</string>
     <string name="move_action">移動</string>
     <string name="single_message_options_action">メッセージ操作</string>
@@ -131,38 +125,28 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="done_action">完了</string>
     <string name="discard_action">破棄</string>
     <string name="save_draft_action">下書きへ保存</string>
-    <string name="retry_action">再実行</string>
-    <string name="refresh_action">再読込</string>
     <string name="check_mail_action">メール受信</string>
     <string name="send_messages_action">メール送信</string>
-    <string name="list_folders_action">フォルダ一覧</string>
     <string name="refresh_folders_action">フォルダ再読込</string>
     <string name="filter_folders_action">フォルダを探す</string>
-    <string name="mark_all_as_read_action">すべてのメールを既読にする</string>
     <string name="add_account_action">アカウント追加</string>
     <string name="compose_action">作成</string>
     <string name="search_action">検索</string>
     <string name="search_results">検索結果</string>
     <string name="preferences_action">設定</string>
-    <string name="open_action">開く</string>
     <string name="account_settings_action">アカウント設定</string>
     <string name="folder_settings_action">フォルダ設定</string>
     <string name="global_settings_action">グローバル設定</string>
     <string name="remove_account_action">アカウント削除</string>
     <string name="clear_pending_action">保留中のアクションをクリア (危険！)</string>
 
-    <string name="accounts_action">アカウント一覧</string>
     <string name="mark_as_read_action">既読にする</string>
     <string name="send_alternate_action">共有</string>
     <string name="send_alternate_chooser_title">アプリケーションを選択</string>
 
-    <string name="mark_all_as_read_dlg_title">すべてのメールを既読にする</string>
-
     <string name="flag_action">スターを付ける</string>
     <string name="unflag_action">スターをはずす</string>
     <string name="copy_action">コピー</string>
-    <string name="show_full_header_action">ヘッダを表示</string>
-    <string name="hide_full_header_action">ヘッダを隠す</string>
     <string name="select_text_action">テキストを選択</string>
 
     <string name="message_view_theme_action_dark">ダークテーマに切り替え</string>
@@ -185,7 +169,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="accounts_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>
     <string name="status_loading_more">メール取込中\u2026</string>
@@ -278,11 +261,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">開く</string>
     <string name="message_view_attachment_download_action">保存</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">アーカイブ</string>
-    <string name="message_view_move_action">移動</string>
-    <string name="message_view_spam_action">迷惑メール</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>
     <string name="message_view_show_pictures_action">画像表示</string>
@@ -306,12 +284,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="message_discarded_toast">メールを破棄しました</string>
     <string name="message_saved_toast">下書きに保存しました</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>
-    <string name="global_settings_touchable_summary">メッセージ一覧にプレビューを追加</string>
     <string name="global_settings_preview_lines_label">メッセージプレビューの行数</string>
     <string name="global_settings_show_correspondent_names_label">名前を表示</string>
     <string name="global_settings_show_correspondent_names_summary">E-mailアドレスではなく名前を表示する</string>
@@ -334,12 +308,9 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="global_settings_confirm_actions_title">確認</string>
     <string name="global_settings_confirm_actions_summary">選択した動作を実行するときに常にダイアログを表示する</string>
-    <string name="global_settings_confirm_action_archive">アーカイブ</string>
     <string name="global_settings_confirm_action_delete">削除(メッセージ表示画面のみ)</string>
     <string name="global_settings_confirm_action_delete_starred">スター付きメッセージの削除 (メッセージ表示画面のみ)</string>
     <string name="global_settings_confirm_action_spam">迷惑メール</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">すべて既読にする</string>
-    <string name="global_settings_confirm_action_send">送信</string>
 
     <string name="global_settings_notification_hide_subject_title">通知時にメールの題名を隠すか</string>
     <string name="global_settings_notification_hide_subject_never">常に表示する</string>
@@ -362,10 +333,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <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_email_hint">メールアドレス</string>
     <string name="account_setup_basics_password_hint">パスワード</string>
-    <string name="account_setup_basics_default_label">既定でこのアカウントからメールを送信する</string>
     <string name="account_setup_basics_manual_setup_action">手動設定</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -377,7 +346,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_setup_check_settings_canceling_msg">中断\u2026</string>
 
     <string name="account_setup_names_title">電子メールセットアップ</string>
-    <string name="account_setup_names_instructions">アカウントのセットアップとメール設定を行っています</string>
     <string name="account_setup_names_account_name_label">アカウントの名前を付けます (オプション):</string>
     <string name="account_setup_names_user_name_label">名前を入力します (送信メールの表示名):</string>
 
@@ -412,9 +380,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_setup_incoming_wifi_label">WiFi</string>
     <string name="account_setup_incoming_other_label">その他</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">ヘッダのダウンロード</string>
-    <string name="account_setup_incoming_save_all_headers_label">すべてのメールヘッダを端末に保存</string>
-
     <string name="local_storage_provider_external_label">外部ストレージ (SDカード)</string>
     <string name="local_storage_provider_internal_label">内部ストレージ</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s 追加の内部ストレージ</string>
@@ -449,21 +414,10 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_setup_outgoing_smtp_server_label">SMTP サーバ</string>
     <string name="account_setup_outgoing_port_label">ポート</string>
     <string name="account_setup_outgoing_security_label">保護された接続</string>
-    <string name="account_setup_outgoing_security_none_label">使用しない</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL を使用する</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">可能なら TLS を使用する</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS を使用する</string>
     <string name="account_setup_outgoing_require_login_label">このサーバは認証が必要</string>
     <string name="account_setup_outgoing_username_label">アカウント名</string>
     <string name="account_setup_outgoing_password_label">パスワード</string>
     <string name="account_setup_outgoing_authentication_label">セキュリティ設定</string>
-    <!-- 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">アカウント名 &amp; パスワード</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">アカウント名</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">パスワード</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV(Exchange) before SMTP</string>
 
     <string name="account_setup_bad_uri">無効な設定: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -746,7 +700,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="default_identity_description">差出人情報の初期設定</string>
     <string name="choose_identity_title">差出人情報選択</string>
-    <string name="choose_account_title">アカウント選択</string>
     <string name="send_as">他のアカウントで送信</string>
 
     <string name="no_removable_identity">最後の差出人情報は削除できません</string>
@@ -754,8 +707,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="sort_earliest_first">日付降順</string>
     <string name="sort_latest_first">日付昇順</string>
-    <string name="sort_sender_alpha">送信者アルファベット順</string>
-    <string name="sort_sender_re_alpha">送信者逆アルファベット順</string>
     <string name="sort_subject_alpha">件名アルファベット順</string>
     <string name="sort_subject_re_alpha">件名逆アルファベット順</string>
     <string name="sort_flagged_first">フラグメール順</string>
@@ -768,7 +719,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="sort_by">並べ替え…</string>
     <string name="sort_by_date">日付</string>
     <string name="sort_by_arrival">受信順</string>
-    <string name="sort_by_sender">送信者</string>
     <string name="sort_by_subject">件名</string>
     <string name="sort_by_flag">フラグ</string>
     <string name="sort_by_unread">既読/未読</string>
@@ -845,8 +795,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="background_ops_auto_sync">バックグランドデータと自動同期がチェックされた時</string>
     <string name="background_ops_auto_sync_only">自動同期がチェックされた時</string>
 
-    <string name="no_message_seletected_toast">メッセージが選択されていません</string>
-
     <string name="date_format_label">日付書式</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -854,20 +802,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">一括処理</string>
-    <string name="batch_delete_op">選択を削除</string>
-    <string name="batch_mark_read_op">選択を既読</string>
-    <string name="batch_mark_unread_op">選択を未読</string>
-    <string name="batch_flag_op">選択をスター付与</string>
-    <string name="batch_unflag_op">選択をスター除外</string>
-    <string name="batch_archive_op">選択をアーカイブ</string>
-    <string name="batch_spam_op">選択を迷惑メールとみなす</string>
-    <string name="batch_move_op">選択を移動</string>
-    <string name="batch_copy_op">選択をコピー</string>
-    <string name="batch_flag_mode">スターモード</string>
-    <string name="batch_plain_mode">簡素モード</string>
     <string name="batch_select_all">全選択</string>
-    <string name="batch_deselect_all">選択マークを外す</string>
 
     <string name="account_setup_push_limit_label">プッシュ受信の最大フォルダ数</string>
     <string name="account_setup_push_limit_10">10 フォルダ</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 99eb61ea1..859be9edd 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -53,7 +53,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">\'<xliff:g id="folder">%s</xliff:g>\' 폴더의 모든 메시지를 읽은 메시지로 표시하시겠습니까? (K-9에서 보여지지 않은 폴더의 메시지포함)</string>
     <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" 계정이 K-9에서 삭제됩니다.</string>
     <string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 데이타가 K-9에서 삭제됩니다. 하지만 계정 설정은 보존됩니다.</string>
     <string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 메일이 K-9에서 삭제될것입니다. 하지만 계정 설정은 보존됩니다.</string>
@@ -86,7 +85,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="accounts_title">계정</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">고급</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>
 
@@ -112,14 +110,11 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="cancel_action">취소</string>
     <string name="send_action">전송</string>
     <string name="send_again_action">재전송</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>
     <string name="spam_action">스팸</string>
-    <string name="delete_all_action">폴더 비우기</string>
     <string name="forward_action">전달</string>
     <string name="move_action">이동</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -128,38 +123,28 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="done_action">완료</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">버리기</string>
     <string name="save_draft_action">임시 보관함에 저장</string>
-    <string name="retry_action">재시도</string>
-    <string name="refresh_action">새로 읽기</string>
     <string name="check_mail_action">새로고침</string>
     <string name="send_messages_action">메시지 보내기</string>
-    <string name="list_folders_action">폴더 목록</string>
     <string name="refresh_folders_action">폴더 다시읽기</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">모든 편지를 읽음으로 표시</string>
     <string name="add_account_action">계정 추가</string>
     <string name="compose_action">작성</string>
     <string name="search_action">검색</string>
     <string name="search_results">검색 결과</string>
     <string name="preferences_action">설정</string>
-    <string name="open_action">열기</string>
     <string name="account_settings_action">계정 설정</string>
     <string name="folder_settings_action">폴더 설정</string>
     <string name="global_settings_action">환경 설정</string>
     <string name="remove_account_action">계정 삭제</string>
     <string name="clear_pending_action">예정된 작업 삭제(위험!)</string>
 
-    <string name="accounts_action">계정</string>
     <string name="mark_as_read_action">읽은 메일로 표시</string>
     <string name="send_alternate_action">공유</string>
     <string name="send_alternate_chooser_title">발신자 선택</string>
 
-    <string name="mark_all_as_read_dlg_title">모든 편지를 읽음으로 표시</string>
-
     <string name="flag_action">즐겨찾기 등록</string>
     <string name="unflag_action">즐겨찾기 해제</string>
     <string name="copy_action">복사</string>
-    <string name="show_full_header_action">헤더 보기</string>
-    <string name="hide_full_header_action">헤더 숨기기</string>
     <string name="select_text_action">텍스트 선택</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -182,7 +167,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="accounts_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. -->
-    <string name="general_no_date">날짜 없음</string>
     <string name="general_no_sender">보낸이 없음</string>
     <string name="status_loading">수신중</string>
     <string name="status_loading_more">이메일을 가져오는 중..\u2026</string>
@@ -275,11 +259,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="message_view_cc_label">참조:</string>
     <string name="message_view_attachment_view_action">열기</string>
     <string name="message_view_attachment_download_action">저장</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">보관</string>
-    <string name="message_view_move_action">이동</string>
-    <string name="message_view_spam_action">스팸</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>
     <string name="message_view_show_pictures_action">그림 보기</string>
@@ -303,12 +282,8 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="message_discarded_toast">삭제됨</string>
     <string name="message_saved_toast">임시보관함에 저장되었습니다</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>
-    <string name="global_settings_touchable_summary">메시지 미리보기 목록의 각 항목을 더 넓게</string>
     <string name="global_settings_preview_lines_label">미리보기 라인</string>
     <string name="global_settings_show_correspondent_names_label">발신자 이름을 보여줌</string>
     <string name="global_settings_show_correspondent_names_summary">이메일 주소를 보여주지않고 발신자 이름을 보여줌</string>
@@ -331,12 +306,9 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
 
     <string name="global_settings_confirm_actions_title">동작시 행동</string>
     <string name="global_settings_confirm_actions_summary">설정한 행동을 할 경우 확인창을 보여줍니다.</string>
-    <string name="global_settings_confirm_action_archive">보관</string>
     <string name="global_settings_confirm_action_delete">삭제 (message view only)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">스팸</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">모든 편지를 읽음으로 표시</string>
-    <string name="global_settings_confirm_action_send">보내기</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -359,10 +331,8 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <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_email_hint">이메일 주소</string>
     <string name="account_setup_basics_password_hint">비밀번호</string>
-    <string name="account_setup_basics_default_label">기본 이메일로 설정</string>
     <string name="account_setup_basics_manual_setup_action">수동 설정</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -374,7 +344,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="account_setup_check_settings_canceling_msg">취소중\u2026</string>
 
     <string name="account_setup_names_title">설정이 거의 완료되었습니다!</string>
-    <string name="account_setup_names_instructions">계정이 설정되었습니다. 순조롭게 진행중입니다!</string>
     <string name="account_setup_names_account_name_label">이 계정의 이름을 입력 (옵션):</string>
     <string name="account_setup_names_user_name_label">이름 입력 (보내는 메시지에 표시 될 이름):</string>
 
@@ -409,9 +378,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Other</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">헤더정보 다운로드</string>
-    <string name="account_setup_incoming_save_all_headers_label">모든 메시지의 헤더정보를 로컬에 저장</string>
-
     <string name="local_storage_provider_external_label">외부 저장장치(SD card)</string>
     <string name="local_storage_provider_internal_label">일반적인 내부 저장장치</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s 추가적인 내부 저장장치</string>
@@ -446,21 +412,10 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="account_setup_outgoing_smtp_server_label">SMTP 서버</string>
     <string name="account_setup_outgoing_port_label">포트번호</string>
     <string name="account_setup_outgoing_security_label">보안 유형</string>
-    <string name="account_setup_outgoing_security_none_label">없음</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (유효할 경우)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (모든 인증서 허용)</string>
     <string name="account_setup_outgoing_require_login_label">sign-in 필요.</string>
     <string name="account_setup_outgoing_username_label">이름</string>
     <string name="account_setup_outgoing_password_label">비밀번호</string>
     <string name="account_setup_outgoing_authentication_label">인증 유형</string>
-    <!-- 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">아이디 &amp; 비밀번호</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">아이디</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">비밀번호</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
 
     <string name="account_setup_bad_uri">잘못된 설정: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -743,7 +698,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
 
     <string name="default_identity_description">초기 발신자</string>
     <string name="choose_identity_title">발신자 선택</string>
-    <string name="choose_account_title">계정을 선택하시오</string>
     <string name="send_as">다른 계정으로 보내기</string>
 
     <string name="no_removable_identity">신원(Identity)를 제거할 수 없습니다.</string>
@@ -751,8 +705,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
 
     <string name="sort_earliest_first">오래된 메시지를 순서</string>
     <string name="sort_latest_first">최근 메시지 순서</string>
-    <string name="sort_sender_alpha">알파벳 순서</string>
-    <string name="sort_sender_re_alpha">알파벳 순서의 역순</string>
     <string name="sort_subject_alpha">제목의 알파벳 순서</string>
     <string name="sort_subject_re_alpha">제목의 알파벳 순서의 역순</string>
     <string name="sort_flagged_first">즐겨찾기(stared) 메시지를 첫번째로</string>
@@ -765,7 +717,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="sort_by">정렬</string>
     <string name="sort_by_date">날짜</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">보낸이</string>
     <string name="sort_by_subject">제목</string>
     <string name="sort_by_flag">즐겨찾기</string>
     <string name="sort_by_unread">읽음/읽지않음</string>
@@ -845,8 +796,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="background_ops_auto_sync">\'백그라운드 데이타\'와 \'Auto-sync\'가 선택된 경우</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">선택된 메시지가 없습니다.</string>
-
     <string name="date_format_label">날짜 형식</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -854,20 +803,7 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">선택항목 일괄처리</string>
-    <string name="batch_delete_op">삭제</string>
-    <string name="batch_mark_read_op">읽음으로 표시</string>
-    <string name="batch_mark_unread_op">읽지 않음으로 표시</string>
-    <string name="batch_flag_op">즐겨찾기 추기</string>
-    <string name="batch_unflag_op">즐겨찾기 해제</string>
-    <string name="batch_archive_op">보관(Archive)으로 이동</string>
-    <string name="batch_spam_op">스팸으로 이동</string>
-    <string name="batch_move_op">이동(Move)</string>
-    <string name="batch_copy_op">복사</string>
-    <string name="batch_flag_mode">즐겨찾기(Star) 모드</string>
-    <string name="batch_plain_mode">일반(Plain)모드</string>
     <string name="batch_select_all">모두 선택</string>
-    <string name="batch_deselect_all">선택 취소</string>
 
     <string name="account_setup_push_limit_label">Push 체크할 최대 폴더 수</string>
     <string name="account_setup_push_limit_10">10개 폴더</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2c63f7f59..bb4fe8e23 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Markeer alle berichten in \'<xliff:g id="folder">%s</xliff:g>\' als gelezen?  (inclusief berichten in de map die niet zichtbaar zijn in K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">De account \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Alle data voor \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail, maar account instellingen blijven behouden.</string>
     <string name="account_clear_dlg_instructions_fmt">Alle berichten in \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van  K-9 Mail, maar account instellingen blijven behouden.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Accounts</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Geavanceerd</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Annuleren</string>
     <string name="send_action">Verzenden</string>
     <string name="send_again_action">Opnieuw Verzenden</string>
-    <string name="select_action">Selecteren</string>
-    <string name="deselect_action">Annuleer selectie</string>
     <string name="reply_action">Antwoorden</string>
     <string name="reply_all_action">Iedereen antwoorden</string>
     <string name="delete_action">Verwijderen</string>
     <string name="archive_action">Archief</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Leeg map</string>
     <string name="forward_action">Doorsturen</string>
     <string name="move_action">Verplaatsen</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Klaar</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Vergeten</string>
     <string name="save_draft_action">Opslaan als concept</string>
-    <string name="retry_action">Opnieuw proberen</string>
-    <string name="refresh_action">Vernieuwen</string>
     <string name="check_mail_action">Controleer mail</string>
     <string name="send_messages_action">Verstuur bericht</string>
-    <string name="list_folders_action">Mappenlijst</string>
     <string name="refresh_folders_action">Vernieuw mappen</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">Markeer alle berichten als gelezen</string>
     <string name="add_account_action">Voeg account toe</string>
     <string name="compose_action">Nieuw bericht</string>
     <string name="search_action">Zoeken</string>
     <string name="search_results">Zoekresultaten</string>
     <string name="preferences_action">Instellingen</string>
-    <string name="open_action">Open</string>
     <string name="account_settings_action">Account instellingen</string>
     <string name="folder_settings_action">Mappen instellingen</string>
     <string name="global_settings_action">Algemene instellingen</string>
     <string name="remove_account_action">Verwijder account</string>
     <string name="clear_pending_action">Leeg maken in afwachting van acties (gevaar!)</string>
 
-    <string name="accounts_action">Accounts</string>
     <string name="mark_as_read_action">Markeer als gelezen</string>
     <string name="send_alternate_action">Doorsturen met een andere app</string>
     <string name="send_alternate_chooser_title">Kies afzender</string>
 
-    <string name="mark_all_as_read_dlg_title">Markeer alle berichten als gelezen</string>
-
     <string name="flag_action">Voeg ster toe</string>
     <string name="unflag_action">Verwijder ster</string>
     <string name="copy_action">Kopieer</string>
-    <string name="show_full_header_action">Toon volledige koptekst</string>
-    <string name="hide_full_header_action">Verberg volledige koptekst</string>
     <string name="select_text_action">Selecteer tekst</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Account 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. -->
-    <string name="general_no_date">Geen datum</string>
     <string name="general_no_sender">Geen afzender</string>
     <string name="status_loading">Polling</string>
     <string name="status_loading_more">Berichten laden\u2026</string>
@@ -276,11 +260,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Open</string>
     <string name="message_view_attachment_download_action">Bewaar</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archief</string>
-    <string name="message_view_move_action">Verplaats</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Bijlage opgeslagen op SD-kaart als <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Opslaan bijlage op SD-kaart mislukt.</string>
     <string name="message_view_show_pictures_action">Laat afbeeldingen zien</string>
@@ -304,12 +283,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Bericht verwijderd</string>
     <string name="message_saved_toast">Bericht opgeslagen als concept</string>
 
-    <string name="global_settings_flag_label">Bericht sterren</string>
-    <string name="global_settings_flag_summary">Sterren geven gemarkeerde berichten aan</string>
     <string name="global_settings_checkbox_label">Multi-selecteer selectieboxen</string>
     <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>
     <string name="global_settings_preview_lines_label">Preview regels</string>
     <string name="global_settings_show_correspondent_names_label">Toon naam bij bericht</string>
     <string name="global_settings_show_correspondent_names_summary">Geef bij voorkeur naam van afzender/geadresseerde weer i.p.v. e-mailadres</string>
@@ -332,12 +307,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Bevestig acties</string>
     <string name="global_settings_confirm_actions_summary">Toon een dialoogvenster altijd wanneer u de geselecteerde acties uitvoerd</string>
-    <string name="global_settings_confirm_action_archive">Archief</string>
     <string name="global_settings_confirm_action_delete">Verwijder (alleen berichten bekijken)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Markeer alles als gelezen</string>
-    <string name="global_settings_confirm_action_send">Verzonden</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -360,10 +332,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Stilteperiode eindigt</string>
 
     <string name="account_setup_basics_title">Een nieuwe account instellen</string>
-    <string name="account_setup_basics_instructions">Toets het e-mailadres in van deze account:</string>
     <string name="account_setup_basics_email_hint">E-mailadres</string>
     <string name="account_setup_basics_password_hint">Wachtwoord</string>
-    <string name="account_setup_basics_default_label">Verzend mail standaard vanaf deze account</string>
     <string name="account_setup_basics_manual_setup_action">Handmatige setup</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -375,7 +345,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Annuleren\u2026</string>
 
     <string name="account_setup_names_title">Bijna klaar!</string>
-    <string name="account_setup_names_instructions">Je account is ingesteld, en mail is onderweg!</string>
     <string name="account_setup_names_account_name_label">Geef deze account een naam (optioneel):</string>
     <string name="account_setup_names_user_name_label">Typ je naam (zichtbaar bij uitgaande berichten):</string>
 
@@ -410,9 +379,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Anders</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Downloaden van e-mailheaders</string>
-    <string name="account_setup_incoming_save_all_headers_label">Sla alle headers lokaal op</string>
-
     <string name="local_storage_provider_external_label">Externe opslag (SD kaart)</string>
     <string name="local_storage_provider_internal_label">Reguliere interne opslag</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s extra interne opslag</string>
@@ -447,21 +413,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">SMTP server</string>
     <string name="account_setup_outgoing_port_label">Poort</string>
     <string name="account_setup_outgoing_security_label">Beveiligings type</string>
-    <string name="account_setup_outgoing_security_none_label">Geen</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (indien beschikbaar)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (altijd)</string>
     <string name="account_setup_outgoing_require_login_label">Inloggen vereist.</string>
     <string name="account_setup_outgoing_username_label">Gebruikersnaam</string>
     <string name="account_setup_outgoing_password_label">Wachtwoord</string>
     <string name="account_setup_outgoing_authentication_label">Authenticatie type</string>
-    <!-- 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">Gebruikersnaam &amp; Wachtwoord</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Gebruikersnaam</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Wachtwoord</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP voor SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP voor SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) voor SMTP</string>
 
     <string name="account_setup_bad_uri">Ongeldige setup: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -744,7 +699,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Initiële identiteit</string>
     <string name="choose_identity_title">Kies identiteit</string>
-    <string name="choose_account_title">Kies account/identiteit</string>
     <string name="send_as">Verzenden als</string>
 
     <string name="no_removable_identity">Je kan je eigen identiteit niet verwijderen</string>
@@ -752,8 +706,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Oudste berichten eerst</string>
     <string name="sort_latest_first">Nieuwste berichten eerst</string>
-    <string name="sort_sender_alpha">Afzender alfabetische volgorde</string>
-    <string name="sort_sender_re_alpha">Afzender omgekeerd alfabetische volgorde</string>
     <string name="sort_subject_alpha">Onderwerp alfabetische volgorde</string>
     <string name="sort_subject_re_alpha">Onderwerp omgekeerd alfabetische volgorde</string>
     <string name="sort_flagged_first">Berichten met ster eerst</string>
@@ -766,7 +718,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Sorteer volgens…</string>
     <string name="sort_by_date">Datum</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">Afzender</string>
     <string name="sort_by_subject">Onderwerp</string>
     <string name="sort_by_flag">Ster</string>
     <string name="sort_by_unread">Gelezen/ongelezen</string>
@@ -845,8 +796,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Wanneer \'Achtergrond data\' &amp; \'Auto-sync\' zijn aangevinkt</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Geen bericht geselecteerd</string>
-
     <string name="date_format_label">Datum formaat</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -854,20 +803,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Batch uitvoeren</string>
-    <string name="batch_delete_op">Verwijder geselecteerde</string>
-    <string name="batch_mark_read_op">Markeer geselecteerde als gelezen</string>
-    <string name="batch_mark_unread_op">Markeer geselecteerde als ongelezen</string>
-    <string name="batch_flag_op">Voeg ster toe aan geselecteerde</string>
-    <string name="batch_unflag_op">Verwijder ster van geselecteerde</string>
-    <string name="batch_archive_op">Verplaats geselecteerde naar archief</string>
-    <string name="batch_spam_op">Verplaats geselecteerde naar Spam</string>
-    <string name="batch_move_op">Verplaats geselecteerde</string>
-    <string name="batch_copy_op">Kopieer geselecteerde</string>
-    <string name="batch_flag_mode">Ster modus</string>
-    <string name="batch_plain_mode">Standaard modus</string>
     <string name="batch_select_all">Selecteer alle</string>
-    <string name="batch_deselect_all">Wis alle selecties</string>
 
     <string name="account_setup_push_limit_label">Max mappen om te controleren met push</string>
     <string name="account_setup_push_limit_10">10 mappen</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 743e7f6fc..fe3bdcac9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -67,7 +67,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Oznaczyć wszystkie wiadomości w  \'<xliff:g id="folder">%s</xliff:g>\' jako przeczytane (włączając wiadomości znajdujące się w folderze, które nie są wyświetlone w programie K-9)?</string>
     <string name="account_delete_dlg_instructions_fmt">Konto \"<xliff:g id="account">%s</xliff:g>\" zostanie usunięte z K-9.</string>
     <string name="account_recreate_dlg_instructions_fmt">Ustawienia konta \"<xliff:g id="account">%s</xliff:g>\" pozostaną bez zmian, niemniej wszystkie dane zostaną usunięte z bazy programu.</string>
     <string name="account_clear_dlg_instructions_fmt">Ustawienia konta \"<xliff:g id="account">%s</xliff:g>\" pozostaną bez zmian, niemniej wszystkie wiadomości zostaną usunięte z bazy programu.</string>
@@ -100,7 +99,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Konta</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Zaawansowane</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>
 
@@ -126,14 +124,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Anuluj</string>
     <string name="send_action">Wyślij</string>
     <string name="send_again_action">Prześlij ponownie</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>
     <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>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -142,38 +137,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Gotowe</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Usuń</string>
     <string name="save_draft_action">Zapisz jako szkic</string>
-    <string name="retry_action">Ponów</string>
-    <string name="refresh_action">Odśwież</string>
     <string name="check_mail_action">Sprawdź pocztę</string>
     <string name="send_messages_action">Wyślij wiadomości</string>
-    <string name="list_folders_action">Lista folderów</string>
     <string name="refresh_folders_action">Odśwież listę</string>
     <string name="filter_folders_action">Wyszukaj folder</string>
-    <string name="mark_all_as_read_action">Wszystkie jako przeczytane</string>
     <string name="add_account_action">Dodaj konto</string>
     <string name="compose_action">Napisz</string>
     <string name="search_action">Szukaj</string>
     <string name="search_results">Wyniki</string>
     <string name="preferences_action">Ustawienia</string>
-    <string name="open_action">Otwórz</string>
     <string name="account_settings_action">Ustawienia konta</string>
     <string name="folder_settings_action">Ustawienia folderu</string>
     <string name="global_settings_action">Ustawienia globalne</string>
     <string name="remove_account_action">Usuń konto</string>
     <string name="clear_pending_action">Anuluj oczekujące zadania (niebezpieczne!)</string>
 
-    <string name="accounts_action">Konta</string>
     <string name="mark_as_read_action">Oznacz jako przeczytane</string>
     <string name="send_alternate_action">Prześlij dalej (alternatywne)</string>
     <string name="send_alternate_chooser_title">Wybierz nadawcę</string>
 
-    <string name="mark_all_as_read_dlg_title">Wszystkie jako przeczytane</string>
-
     <string name="flag_action">Dodaj gwiazdkę</string>
     <string name="unflag_action">Usuń gwiazdkę</string>
     <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>
     <string name="select_text_action">Zaznacz tekst</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -196,7 +181,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Ustawienia konta</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. -->
-    <string name="general_no_date">Brak daty</string>
     <string name="general_no_sender">Brak nadawcy</string>
     <string name="status_loading">Sprawdzanie <xliff:g id="progress">%s</xliff:g></string>
     <string name="status_loading_more">Wczytuję wiadomości…</string>
@@ -284,11 +268,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">DW:</string>
     <string name="message_view_attachment_view_action">Otwórz</string>
     <string name="message_view_attachment_download_action">Zapisz</string>
-    <string name="message_view_prev_action">▼</string>
-    <string name="message_view_next_action">▲</string>
-    <string name="message_view_archive_action">Archiwizuj</string>
-    <string name="message_view_move_action">Przenieś</string>
-    <string name="message_view_spam_action">Spam</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>
     <string name="message_view_show_pictures_action">Wyświetl grafikę</string>
@@ -312,12 +291,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Wiadomość usunięta</string>
     <string name="message_saved_toast">Wiadomość zapisana jako szkic</string>
 
-    <string name="global_settings_flag_label">Oznaczaj gwiazdkami</string>
-    <string name="global_settings_flag_summary">Gwiazka wskazuje oznakowane wiadomości</string>
     <string name="global_settings_checkbox_label">Zaznaczanie wielu</string>
     <string name="global_settings_checkbox_summary">Opcja zaznaczania wielu wiadomości dostępna zawsze w trybie wielokrotnego wyboru</string>
-    <string name="global_settings_touchable_label">Widok palco-przyjazny</string>
-    <string name="global_settings_touchable_summary">Lista z podglądem treści wiadomości</string>
     <string name="global_settings_preview_lines_label">Podglądaj linie</string>
     <string name="global_settings_show_correspondent_names_label">Pokazuj nazwiska korespondentów</string>
     <string name="global_settings_show_correspondent_names_summary">Pokazuj nazwiska korespondentów zamiast ich adresów email</string>
@@ -340,12 +315,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Potwierdź akcje</string>
     <string name="global_settings_confirm_actions_summary">Pokaż potwierdzające okno dialogowe, gdy wykonujesz wybrane akcje</string>
-    <string name="global_settings_confirm_action_archive">Archiwizuj</string>
     <string name="global_settings_confirm_action_delete">Usuń (tylko widok wiadomości)</string>
     <string name="global_settings_confirm_action_delete_starred">Usuń oznacz. gwiazkdą (tylko widok wiadomości)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
-    <string name="global_settings_confirm_action_send">Wyślij</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -368,10 +340,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Koniec okresu ciszy</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_email_hint">Adres email</string>
     <string name="account_setup_basics_password_hint">Hasło</string>
-    <string name="account_setup_basics_default_label">Domyślnie wysyłaj z tego konta</string>
     <string name="account_setup_basics_manual_setup_action">Ustaw ręcznie</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -383,7 +353,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Przerywam…</string>
 
     <string name="account_setup_names_title">Prawie gotowe!</string>
-    <string name="account_setup_names_instructions">Ustawienia są już gotowe i maile są w drodze!</string>
     <string name="account_setup_names_account_name_label">Wpisz nazwę (opcjonalną) tego konta:</string>
     <string name="account_setup_names_user_name_label">Twoje imię i nazwisko (pojawi się w wysyłanych wiadomościach):</string>
 
@@ -418,9 +387,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Inne</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Pobieranie nagłówków</string>
-    <string name="account_setup_incoming_save_all_headers_label">Zapisuj nagłówki wiadomości lokalnie</string>
-
     <string name="local_storage_provider_external_label">Pamięć zewnętrzna (karta SD)</string>
     <string name="local_storage_provider_internal_label">Zwykła pamięc wewnętrzna</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s dodatkowa pamięć wewnętrzna</string>
@@ -455,21 +421,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Nazwa serwera SMTP</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Typ zabezpieczeń</string>
-    <string name="account_setup_outgoing_security_none_label">Brak</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (jeśli dostępne)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (zawsze)</string>
     <string name="account_setup_outgoing_require_login_label">Serwer wymaga uwierzytelnienia</string>
     <string name="account_setup_outgoing_username_label">Identyfikator</string>
     <string name="account_setup_outgoing_password_label">Hasło</string>
     <string name="account_setup_outgoing_authentication_label">Rodzaj autentyfikacji</string>
-    <!-- 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>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP przed SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP przed SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) przed SMTP</string>
 
     <string name="account_setup_bad_uri">Nieprawidłowe ustawienia: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -752,7 +707,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Tożsamość domyślna</string>
     <string name="choose_identity_title">Wybierz tożsamość</string>
-    <string name="choose_account_title">Wybierz konto/tożsamość</string>
     <string name="send_as">Wyślij jako</string>
 
     <string name="no_removable_identity">Nie możesz usunąć jedynej tożsamości</string>
@@ -760,8 +714,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Najstarsze wiadomości na początku</string>
     <string name="sort_latest_first">Najnowsze wiadomości na początku</string>
-    <string name="sort_sender_alpha">Alfabetycznie, po nadawcy (A-&gt;Z)</string>
-    <string name="sort_sender_re_alpha">Alfabetycznie, po nadawcy (Z-&gt;A)</string>
     <string name="sort_subject_alpha">Alfabetycznie, po temacie (A-&gt;Z)</string>
     <string name="sort_subject_re_alpha">Alfabetycznie, po temacie (Z-&gt;A)</string>
     <string name="sort_flagged_first">Wiadomości oznaczone gwiazką jako pierwsze</string>
@@ -774,7 +726,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Sortuj wg…</string>
     <string name="sort_by_date">Daty</string>
     <string name="sort_by_arrival">Daty otrzymania</string>
-    <string name="sort_by_sender">Nadawcy</string>
     <string name="sort_by_subject">Tematu</string>
     <string name="sort_by_flag">Gwiazdek</string>
     <string name="sort_by_unread">Przeczytane/nieprzeczytane</string>
@@ -878,8 +829,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Gdy systemowe opcje \'Dane w tle\' oraz \'Autosynchronizacja\' są włączone</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Nie wybrano wiadomości</string>
-
     <string name="date_format_label">Format daty</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -887,20 +836,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</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>
-    <string name="batch_archive_op">Przenieś wybrane do archiwum</string>
-    <string name="batch_spam_op">Przenieś wybrane do Spamu</string>
-    <string name="batch_move_op">Przenieś</string>
-    <string name="batch_copy_op">Skopiuj</string>
-    <string name="batch_flag_mode">Tryb gwiadzki</string>
-    <string name="batch_plain_mode">Tryb zwykły</string>
     <string name="batch_select_all">Zaznacz wszystko</string>
-    <string name="batch_deselect_all">Usuń zaznaczenie</string>
 
     <string name="account_setup_push_limit_label">Sprawdzanie przez Push</string>
     <string name="account_setup_push_limit_10">Do 10 folderów</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index eb32b02d8..f7464136f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Marcar todas as mensagens em \'<xliff:g id="folder">%s</xliff:g>\' como lidas?  (incluindo mensagens em pastas não mostradas pelo K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será removida do K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Todos os dados relativos à \"<xliff:g id="account">%s</xliff:g>\" serão removidos do K-9 Mail, mas as configurações da conta serão mantidas.</string>
     <string name="account_clear_dlg_instructions_fmt">Todas as mensagens de \"<xliff:g id="account">%s</xliff:g>\" serão removidas do K-9 Mail, mas as configurações da conta serão mantidas.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Contas</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Avançado</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Cancelar</string>
     <string name="send_action">Enviar</string>
     <string name="send_again_action">Reenviar</string>
-    <string name="select_action">Selecionar</string>
-    <string name="deselect_action">Desselecionar</string>
     <string name="reply_action">Responder</string>
     <string name="reply_all_action">Responder a todos</string>
     <string name="delete_action">Excluir</string>
     <string name="archive_action">Arquivar</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Limpar pastas</string>
     <string name="forward_action">Encaminhar</string>
     <string name="move_action">Mover</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Pronto</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Descartar</string>
     <string name="save_draft_action">Salvar como rascunho</string>
-    <string name="retry_action">Tentar novamente</string>
-    <string name="refresh_action">Atualizar</string>
     <string name="check_mail_action">Verificar e-mail</string>
     <string name="send_messages_action">Enviar mensagens</string>
-    <string name="list_folders_action">Lista de pastas</string>
     <string name="refresh_folders_action">Atualizar pastas</string>
     <string name="filter_folders_action">Encontrar pasta</string>
-    <string name="mark_all_as_read_action">Marcar todas as como lidas</string>
     <string name="add_account_action">Incluir conta</string>
     <string name="compose_action">Escrever</string>
     <string name="search_action">Pesquisar</string>
     <string name="search_results">Resultado da pesquisa</string>
     <string name="preferences_action">Configurações</string>
-    <string name="open_action">Abrir</string>
     <string name="account_settings_action">Configurações de conta</string>
     <string name="folder_settings_action">Configurações de pasta</string>
     <string name="global_settings_action">Configurações gerais</string>
     <string name="remove_account_action">Remover conta</string>
     <string name="clear_pending_action">Limpar ações pendentes (perigoso!)</string>
 
-    <string name="accounts_action">Contas</string>
     <string name="mark_as_read_action">Marcar como lido</string>
     <string name="send_alternate_action">Compartilhar</string>
     <string name="send_alternate_chooser_title">Escolher remetente</string>
 
-    <string name="mark_all_as_read_dlg_title">Marcar todas as mensagens como lidas</string>
-
     <string name="flag_action">Incluir favorito</string>
     <string name="unflag_action">Remover favorito</string>
     <string name="copy_action">Copiar</string>
-    <string name="show_full_header_action">Mostar cabeçalho inteiro</string>
-    <string name="hide_full_header_action">Esconder cabeçalho inteiro</string>
     <string name="select_text_action">Selecionar texto</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Opções de conta</string>
 
     <string name="general_no_subject">(Sem assunto)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">Sem data</string>
     <string name="general_no_sender">Sem remetente</string>
     <string name="status_loading">Verificando</string>
     <string name="status_loading_more">Carregando mensagens\u2026</string>
@@ -273,11 +257,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Abrir</string>
     <string name="message_view_attachment_download_action">Salvar</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arquivar</string>
-    <string name="message_view_move_action">Mover</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Anexo salvo no cartão de memória como <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Impossível salvar anexo no cartão de memória.</string>
     <string name="message_view_show_pictures_action">Mostrar imagens</string>
@@ -301,12 +280,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Mensagem descartada</string>
     <string name="message_saved_toast">Mensagem salva como rascunho</string>
 
-    <string name="global_settings_flag_label">Mostrar favoritos</string>
-    <string name="global_settings_flag_summary">Estrelas indicam mensagens favoritas</string>
     <string name="global_settings_checkbox_label">Caixas de multi-seleção</string>
     <string name="global_settings_checkbox_summary">Sempre mostrar caixas de multi-seleção</string>
-    <string name="global_settings_touchable_label">Visualizar mensagens</string>
-    <string name="global_settings_touchable_summary">Itens mais espaçosos da lista com vizualização</string>
     <string name="global_settings_preview_lines_label">Linhas de visualização</string>
     <string name="global_settings_show_correspondent_names_label">Mostrar nomes correspondentes</string>
     <string name="global_settings_show_correspondent_names_summary">Mostrar nomes correspondentes ao invés de seus e-mails.</string>
@@ -329,12 +304,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Confirmar ações</string>
     <string name="global_settings_confirm_actions_summary">Mostrar diálogo sempre quando for disparada uma ação</string>
-    <string name="global_settings_confirm_action_archive">Arquivo</string>
     <string name="global_settings_confirm_action_delete">Excluir (apenas visualização)</string>
     <string name="global_settings_confirm_action_delete_starred">Excluir marcados com estrela (visualização apenas)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Marcar todas como lidas</string>
-    <string name="global_settings_confirm_action_send">Enviar</string>
 
     <string name="global_settings_notification_hide_subject_title">Ocultar assunto nas notificações</string>
     <string name="global_settings_notification_hide_subject_never">Nunca</string>
@@ -357,10 +329,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Fim do período de silêncio</string>
 
     <string name="account_setup_basics_title">Configurar uma nova conta</string>
-    <string name="account_setup_basics_instructions">Informe o endereço de e-mail da conta:</string>
     <string name="account_setup_basics_email_hint">Endereço de e-mail</string>
     <string name="account_setup_basics_password_hint">Senha</string>
-    <string name="account_setup_basics_default_label">Usar esta conta como padrão para envio de e-mail</string>
     <string name="account_setup_basics_manual_setup_action">Configuração manual</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -372,7 +342,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>
 
     <string name="account_setup_names_title">Quase terminado!</string>
-    <string name="account_setup_names_instructions">Sua conta está configurada, e seus e-mails estão sendo baixados!</string>
     <string name="account_setup_names_account_name_label">Dê um nome a esta conta (Opcional):</string>
     <string name="account_setup_names_user_name_label">Seu nome (como deseja que seja mostrado nas mensagens enviadas):</string>
 
@@ -407,9 +376,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Outras</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Baixar cabeçalhos</string>
-    <string name="account_setup_incoming_save_all_headers_label">Salvar todos os cabeçalhos das mensagens localmente</string>
-
     <string name="local_storage_provider_external_label">Armazenamento externo (Cartão de memória)</string>
     <string name="local_storage_provider_internal_label">Armazenamento em memória interna</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s armazenamentos internos adicionais</string>
@@ -444,21 +410,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Servidor SMTP</string>
     <string name="account_setup_outgoing_port_label">Porta</string>
     <string name="account_setup_outgoing_security_label">Tipo de segurança</string>
-    <string name="account_setup_outgoing_security_none_label">Nenhum</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (se disponível)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (sempre)</string>
     <string name="account_setup_outgoing_require_login_label">Requer login.</string>
     <string name="account_setup_outgoing_username_label">Usuário</string>
     <string name="account_setup_outgoing_password_label">Senha</string>
     <string name="account_setup_outgoing_authentication_label">Tipo de autenticação</string>
-    <!-- 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">Usuário &amp; senha</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Usuário</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Senha</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP antes de SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP antes de SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) antes de SMTP</string>
 
     <string name="account_setup_bad_uri">Configuração inválida: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -741,7 +696,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Identidade inicial</string>
     <string name="choose_identity_title">Escolher identidade</string>
-    <string name="choose_account_title">Escolher conta/identidade</string>
     <string name="send_as">Enviar como</string>
 
     <string name="no_removable_identity">Você não pode remover sua única identidade</string>
@@ -749,8 +703,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Mensagens antigas primeiro</string>
     <string name="sort_latest_first">Mensagens recentes primeiro</string>
-    <string name="sort_sender_alpha">Remetentes em ordem alfabética</string>
-    <string name="sort_sender_re_alpha">Remetentes em ordem alfabética reversa</string>
     <string name="sort_subject_alpha">Assunto em ordem alfabética</string>
     <string name="sort_subject_re_alpha">Assunto em ordem alfabética reversa</string>
     <string name="sort_flagged_first">Mensagens favoritas primeiro</string>
@@ -763,7 +715,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Ordenar por…</string>
     <string name="sort_by_date">Data</string>
     <string name="sort_by_arrival">Recebimento</string>
-    <string name="sort_by_sender">Remetente</string>
     <string name="sort_by_subject">Assunto</string>
     <string name="sort_by_flag">Favorito</string>
     <string name="sort_by_unread">Lido/não lido</string>
@@ -844,8 +795,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Quando \'Dados de segundo plano\' e \'Auto-sinc\' estiverem checados</string>
     <string name="background_ops_auto_sync_only">Quando a \'Auto-sinc\' estiver ligada</string>
 
-    <string name="no_message_seletected_toast">Nenhuma mensagem selecionada</string>
-
     <string name="date_format_label">Formato de data</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -853,20 +802,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Ops em lote</string>
-    <string name="batch_delete_op">Excluir selecionados</string>
-    <string name="batch_mark_read_op">Marcar selecionados como lidos</string>
-    <string name="batch_mark_unread_op">Marcar selecionados como não lidos</string>
-    <string name="batch_flag_op">Incluir estrela para selecionados</string>
-    <string name="batch_unflag_op">Remover estrela dos selecionados</string>
-    <string name="batch_archive_op">Mover selecionados para arquivo</string>
-    <string name="batch_spam_op">Mover selecionados para Spam</string>
-    <string name="batch_move_op">Mover selecionados</string>
-    <string name="batch_copy_op">Copiar selecionados</string>
-    <string name="batch_flag_mode">Modo estrela</string>
-    <string name="batch_plain_mode">Modo simples</string>
     <string name="batch_select_all">Selecione todos</string>
-    <string name="batch_deselect_all">Limpar seleção</string>
 
     <string name="account_setup_push_limit_label">Máximo de pastas para checar com push</string>
     <string name="account_setup_push_limit_10">10 pastas</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fb9fce0c7..aa2e99988 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Отметить все сообщения в \'<xliff:g id="folder">%s</xliff:g>\' как прочитанные?  (включая сообщения в папке, которые не отображаются)</string>
     <string name="account_delete_dlg_instructions_fmt">Учётная запись \"<xliff:g id="account">%s</xliff:g>\" будет удалена.</string>
     <string name="account_recreate_dlg_instructions_fmt">Все данные учётной записи \"<xliff:g id="account">%s</xliff:g>\" будут уничтожены, но настройки сохранятся.</string>
     <string name="account_clear_dlg_instructions_fmt">Все сообщения учётной записи \"<xliff:g id="account">%s</xliff:g>\" будут уничтожены, но настройки сохранятся.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Адреса</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Дополнительные параметры</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Отменить</string>
     <string name="send_action">Отослать</string>
     <string name="send_again_action">Послать снова</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>
     <string name="spam_action">Спам</string>
-    <string name="delete_all_action">Очистить папку</string>
     <string name="forward_action">Переслать</string>
     <string name="move_action">Переместить</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Завершено</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Отбросить</string>
     <string name="save_draft_action">Сохранить как черновик</string>
-    <string name="retry_action">Повторить</string>
-    <string name="refresh_action">Обновить</string>
     <string name="check_mail_action">Проверить почту</string>
     <string name="send_messages_action">Отправить сообщения</string>
-    <string name="list_folders_action">Список папок</string>
     <string name="refresh_folders_action">Обновить список папок</string>
     <string name="filter_folders_action">Найти дирректорию</string>
-    <string name="mark_all_as_read_action">Отметить все сообщения как прочитанные</string>
     <string name="add_account_action">Добавить адрес</string>
     <string name="compose_action">Написать новое письмо</string>
     <string name="search_action">Поиск</string>
     <string name="search_results">Искать в результатах</string>
     <string name="preferences_action">Настройки</string>
-    <string name="open_action">Открыть</string>
     <string name="account_settings_action">Почтовые настройки</string>
     <string name="folder_settings_action">Настройки папки</string>
     <string name="global_settings_action">Глобальные настройки</string>
     <string name="remove_account_action">Удалить адрес</string>
     <string name="clear_pending_action">Остановить незаконченные действия (опасно!)</string>
 
-    <string name="accounts_action">Учётные записи</string>
     <string name="mark_as_read_action">Отметить как прочитанное</string>
     <string name="send_alternate_action">Переслать (альтернат.)</string>
     <string name="send_alternate_chooser_title">Выберать отправителя</string>
 
-    <string name="mark_all_as_read_dlg_title">Отметить все сообщения как прочитанные</string>
-
     <string name="flag_action">Добавить звезду</string>
     <string name="unflag_action">Удалить звезду</string>
     <string name="copy_action">Копировать</string>
-    <string name="show_full_header_action">Показать полный заголовок</string>
-    <string name="hide_full_header_action">Скрыть полный заголовок</string>
     <string name="select_text_action">Выбрать текст</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_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. -->
-    <string name="general_no_date">Нет даты</string>
     <string name="general_no_sender">Отправитель отсуствует</string>
     <string name="status_loading">Загрузка</string>
     <string name="status_loading_more">Загрузка сообщений\u2026</string>
@@ -271,11 +255,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Копия:</string>
     <string name="message_view_attachment_view_action">Открыть</string>
     <string name="message_view_attachment_download_action">Сохранить</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Архивировать</string>
-    <string name="message_view_move_action">Перенести</string>
-    <string name="message_view_spam_action">Спам</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>
     <string name="message_view_show_pictures_action">Показать картинки</string>
@@ -299,12 +278,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Сообщение отброшено</string>
     <string name="message_saved_toast">Сообщение сохранено в черновиках</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>
-    <string name="global_settings_touchable_summary">Список сообщений с предпросмотром</string>
     <string name="global_settings_preview_lines_label">Строки предпросмотра</string>
     <string name="global_settings_show_correspondent_names_label">Показывать имя отправителя</string>
     <string name="global_settings_show_correspondent_names_summary">Показывать имя отправителя вместо e-mail, если это возмомжно</string>
@@ -327,12 +302,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Подтверждение действий</string>
     <string name="global_settings_confirm_actions_summary">Показывать диалог при совершении действий</string>
-    <string name="global_settings_confirm_action_archive">Архивировать</string>
     <string name="global_settings_confirm_action_delete">Удалить (только представление сообщения)</string>
     <string name="global_settings_confirm_action_delete_starred">Удалить отмеченные (message view only)</string>
     <string name="global_settings_confirm_action_spam">Спам</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Пометить как прочитанное</string>
-    <string name="global_settings_confirm_action_send">Послать</string>
 
     <string name="global_settings_notification_hide_subject_title">Скрыть тему в оповещениях</string>
     <string name="global_settings_notification_hide_subject_never">Никогда</string>
@@ -355,10 +327,8 @@ http://k9mail.googlecode.com/
     <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_email_hint">Адрес электронной почты</string>
     <string name="account_setup_basics_password_hint">Пароль</string>
-    <string name="account_setup_basics_default_label">Отправлять почту с этого адреса по умолчанию</string>
     <string name="account_setup_basics_manual_setup_action">Ручная настройка</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -370,7 +340,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Отмена\u2026</string>
 
     <string name="account_setup_names_title">Почти готово!</string>
-    <string name="account_setup_names_instructions">Ваш ящик создан и почта на пути!</string>
     <string name="account_setup_names_account_name_label">Дать этому ящику имя (необязательно):</string>
     <string name="account_setup_names_user_name_label">Ваше имя (отображается в исходящих сообщениях):</string>
 
@@ -405,9 +374,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Другие</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Загрузить заголовки</string>
-    <string name="account_setup_incoming_save_all_headers_label">Сохранить локально все заголовки</string>
-
     <string name="local_storage_provider_external_label">Внешнее хранилище (SD-карта)</string>
     <string name="local_storage_provider_internal_label">Стандартное внутреннее хранилище</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s дополнительное внутреннее хранилище</string>
@@ -442,21 +408,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Сервер SMTP</string>
     <string name="account_setup_outgoing_port_label">Порт</string>
     <string name="account_setup_outgoing_security_label">Тип защиты</string>
-    <string name="account_setup_outgoing_security_none_label">Никакой</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (если доступно)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (всегда)</string>
     <string name="account_setup_outgoing_require_login_label">Требовать входа в систему.</string>
     <string name="account_setup_outgoing_username_label">Имя пользователя</string>
     <string name="account_setup_outgoing_password_label">Пароль</string>
     <string name="account_setup_outgoing_authentication_label">Тип защиты</string>
-    <!-- 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">Имя пользователя и пароль</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Имя пользователя</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Пароль</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP прежде SMTP</string>
-    <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>
 
@@ -739,7 +694,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Первоначальная личность</string>
     <string name="choose_identity_title">Выбрать личность</string>
-    <string name="choose_account_title">Выбрать учётную запись/личность</string>
     <string name="send_as">Послать как</string>
 
     <string name="no_removable_identity">Нельзя удалить единственную личность.</string>
@@ -747,8 +701,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Сначала старые сообщения</string>
     <string name="sort_latest_first">Сначала новые сообщения</string>
-    <string name="sort_sender_alpha">Отправитель по алфавиту</string>
-    <string name="sort_sender_re_alpha">Отправитель по алфавиту в обратном порядке</string>
     <string name="sort_subject_alpha">Тема по алфавиту</string>
     <string name="sort_subject_re_alpha">Тема по алфавиту в обратном порядке</string>
     <string name="sort_flagged_first">Сначала сообщения со звёздами</string>
@@ -761,7 +713,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Сортировка по…</string>
     <string name="sort_by_date">Дате</string>
     <string name="sort_by_arrival">Получению</string>
-    <string name="sort_by_sender">Отправителю</string>
     <string name="sort_by_subject">Теме</string>
     <string name="sort_by_flag">Звёздам</string>
     <string name="sort_by_unread">Прочитанном/не прочитанном</string>
@@ -841,8 +792,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Когда \'Фоновые данные\' и \'Автосинхронизация\' включены</string>
     <string name="background_ops_auto_sync_only">Когда выбрана \'Автосинхронизация\'</string>
 
-    <string name="no_message_seletected_toast">Никаких сообщений не выбранно</string>
-
     <string name="date_format_label">Формат даты</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -850,20 +799,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Групповые операции</string>
-    <string name="batch_delete_op">Удалить выбранное</string>
-    <string name="batch_mark_read_op">Пометить выбранное как прочитанное</string>
-    <string name="batch_mark_unread_op">Пометить выбранное как не прочитанное</string>
-    <string name="batch_flag_op">Пометить выбранное звёздами</string>
-    <string name="batch_unflag_op">Удалить звёзды с выбранных</string>
-    <string name="batch_archive_op">Переместить выбранные в Архив</string>
-    <string name="batch_spam_op">Переместить выбранные в Спам</string>
-    <string name="batch_move_op">Переместить выбранное</string>
-    <string name="batch_copy_op">Скопировать выбранное</string>
-    <string name="batch_flag_mode">Режим звёзд</string>
-    <string name="batch_plain_mode">Простой режим</string>
     <string name="batch_select_all">Выбрать все</string>
-    <string name="batch_deselect_all">Очистить все выборы</string>
 
     <string name="account_setup_push_limit_label">Максимальное число папок для проверки с \"Push\"</string>
     <string name="account_setup_push_limit_10">10 папок</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2713c16b5..c05ba8741 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Markera alla brev i \'<xliff:g id="folder">%s</xliff:g>\' som lästa?  (inklusive post i mappen som inte visas i K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">Kontot \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas från K-9 E-post.</string>
     <string name="account_recreate_dlg_instructions_fmt">Alla meddelanden, bifogade filer, mappar och inställningar mapp för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
     <string name="account_clear_dlg_instructions_fmt">All e-post i \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Konton</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Avancerat</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Avbryt</string>
     <string name="send_action">Skicka</string>
     <string name="send_again_action">Skicka igen</string>
-    <string name="select_action">Markera</string>
-    <string name="deselect_action">Avmarkera</string>
     <string name="reply_action">Svara</string>
     <string name="reply_all_action">Svara alla</string>
     <string name="delete_action">Radera</string>
     <string name="archive_action">Arkivera</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Radera alla</string>
     <string name="forward_action">Vidarebefordra</string>
     <string name="move_action">Flytta</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Färdig</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Radera</string>
     <string name="save_draft_action">Spara som utkast</string>
-    <string name="retry_action">Försök igen</string>
-    <string name="refresh_action">Läs om</string>
     <string name="check_mail_action">Kontrollera e-post</string>
     <string name="send_messages_action">Skicka e-post</string>
-    <string name="list_folders_action">Mapplista</string>
     <string name="refresh_folders_action">Läs om mappar</string>
     <!-- NEW: <string name="filter_folders_action">Find folder</string>-->
-    <string name="mark_all_as_read_action">Markera alla meddelanden som lästa</string>
     <string name="add_account_action">Lägg till konto</string>
     <string name="compose_action">Skriv</string>
     <string name="search_action">Sök</string>
     <string name="search_results">Sökresultat</string>
     <string name="preferences_action">Inställningar</string>
-    <string name="open_action">Öppna</string>
     <string name="account_settings_action">Kontoinställningar</string>
     <string name="folder_settings_action">Mappinställningar</string>
     <string name="global_settings_action">Globala inställningar</string>
     <string name="remove_account_action">Ta bort konto</string>
     <string name="clear_pending_action">Rensa avvaktande handlingar (farligt!)</string>
 
-    <string name="accounts_action">Konton</string>
     <string name="mark_as_read_action">Markera som läst</string>
     <string name="send_alternate_action">Vidarebefordra med annat program</string>
     <string name="send_alternate_chooser_title">Välj avsändare</string>
 
-    <string name="mark_all_as_read_dlg_title">Markera alla brev som lästa</string>
-
     <string name="flag_action">Lägg till stjärna</string>
     <string name="unflag_action">Ta bort stjärna</string>
     <string name="copy_action">Kopiera</string>
-    <string name="show_full_header_action">Visa fulla huvudet</string>
-    <string name="hide_full_header_action">Dölj fulla huvudet</string>
     <string name="select_text_action">Markera text</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Kontoinstä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. -->
-    <string name="general_no_date">Inget datum</string>
     <string name="general_no_sender">Ingen avsändare</string>
     <string name="status_loading">Kontrollerar</string>
     <string name="status_loading_more">Hämtar brev\u2026</string>
@@ -277,11 +261,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Öppna</string>
     <string name="message_view_attachment_download_action">Spara</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arkiv</string>
-    <string name="message_view_move_action">Flytta</string>
-    <string name="message_view_spam_action">Skräp</string>
     <string name="message_view_status_attachment_saved">Bilagan har sparats till SD-kortet som <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Kan inte spara bilaga till SD-kortet.</string>
     <string name="message_view_show_pictures_action">Visa bilder</string>
@@ -305,12 +284,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Brevet kasserat</string>
     <string name="message_saved_toast">Brevet sparat som utkast</string>
 
-    <string name="global_settings_flag_label">Stjärnor</string>
-    <string name="global_settings_flag_summary">Stjärnor indikerar flaggade brev</string>
     <string name="global_settings_checkbox_label">Checkboxar för flerval</string>
     <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>
     <string name="global_settings_preview_lines_label">Förhandsgranska rader</string>
     <string name="global_settings_show_correspondent_names_label">Visa korrespondensnamn</string>
     <string name="global_settings_show_correspondent_names_summary">Visa namn på korrespondens hellre än e-post-adresser</string>
@@ -333,12 +308,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Bekräfta åtgärder</string>
     <string name="global_settings_confirm_actions_summary">Visa en dialogruta när du genomför utvalda åtgärder</string>
-    <string name="global_settings_confirm_action_archive">Arkivera</string>
     <string name="global_settings_confirm_action_delete">Radera (endast meddelandevyn)</string>
     <!-- NEW: <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>-->
     <string name="global_settings_confirm_action_spam">Skräp</string>
-    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
-    <string name="global_settings_confirm_action_send">Skicka</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -361,10 +333,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Tyst tid slutar</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_email_hint">e-postadress</string>
     <string name="account_setup_basics_password_hint">Lösenord</string>
-    <string name="account_setup_basics_default_label">Skicka e-post från detta konto som standard</string>
     <string name="account_setup_basics_manual_setup_action">Konfigurera manuellt</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -376,7 +346,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Avbryter\u2026</string>
 
     <string name="account_setup_names_title">Nästan färdig!</string>
-    <string name="account_setup_names_instructions">Ditt konto är nu konfigurerat och e-posten är på väg!</string>
     <string name="account_setup_names_account_name_label">Ge detta konto ett namn (frivilligt):</string>
     <string name="account_setup_names_user_name_label">Ange ditt namn (visas på utgående e-post):</string>
 
@@ -411,9 +380,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Annat</string>
 
-    <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>
-
     <string name="local_storage_provider_external_label">Extern lagring (SD-kort)</string>
     <string name="local_storage_provider_internal_label">Vanlig intern lagring</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s ytterligare intern lagring</string>
@@ -448,21 +414,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">SMTP-server</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Säkerhetstyp</string>
-    <string name="account_setup_outgoing_security_none_label">Ingen</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (om tillgängligt)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (alltid)</string>
     <string name="account_setup_outgoing_require_login_label">Kräv inloggning.</string>
     <string name="account_setup_outgoing_username_label">Användarnamn</string>
     <string name="account_setup_outgoing_password_label">Lösenord</string>
     <string name="account_setup_outgoing_authentication_label">Autentiseringstyp</string>
-    <!-- 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">Användarnamn &amp; lösenord</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Användarnamn</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Lösenord</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP före SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP före SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) före SMTP</string>
 
     <string name="account_setup_bad_uri">Ogiltig konfiguration: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -745,7 +700,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Ursprunglig identitet</string>
     <string name="choose_identity_title">Välj identitet</string>
-    <string name="choose_account_title">Välj konto/identitet</string>
     <string name="send_as">Skicka som</string>
 
     <string name="no_removable_identity">Du kan inte radera din enda identitet</string>
@@ -753,8 +707,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Äldsta brev först</string>
     <string name="sort_latest_first">Nyaste brev först</string>
-    <string name="sort_sender_alpha">Sortera efter avsändare</string>
-    <string name="sort_sender_re_alpha">Sortera efter avsändare omvänt</string>
     <string name="sort_subject_alpha">Sortera efter ämne</string>
     <string name="sort_subject_re_alpha">Sortera efter ämne omvänt</string>
     <string name="sort_flagged_first">Stjärnmärkta brev först</string>
@@ -767,7 +719,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Sortera efter…</string>
     <string name="sort_by_date">Datum</string>
     <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
-    <string name="sort_by_sender">Avsändare</string>
     <string name="sort_by_subject">Ämne</string>
     <string name="sort_by_flag">Stjärnor</string>
     <string name="sort_by_unread">Lästa/olästa</string>
@@ -848,8 +799,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">När \'Bakgrundsdata\' &amp; \'Auto-sync\' är aktiverade</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Inget brev valt</string>
-
     <string name="date_format_label">Datumformat</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -857,20 +806,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd MMM yyyy</string>
 
-    <string name="batch_ops">Batch-operationer</string>
-    <string name="batch_delete_op">Radera markerade</string>
-    <string name="batch_mark_read_op">Märk markerade som lästa</string>
-    <string name="batch_mark_unread_op">Märk markerade som olästa</string>
-    <string name="batch_flag_op">Lägg till stjärna till markerade</string>
-    <string name="batch_unflag_op">Ta bort stjärna från markerade</string>
-    <string name="batch_archive_op">Flytta markerade till arkivet</string>
-    <string name="batch_spam_op">Flytta markerade till Skräppost</string>
-    <string name="batch_move_op">Flytta markerade</string>
-    <string name="batch_copy_op">Kopierade markerade</string>
-    <string name="batch_flag_mode">Stjärnläge</string>
-    <string name="batch_plain_mode">Vanligt läge</string>
     <string name="batch_select_all">Markera alla</string>
-    <string name="batch_deselect_all">Avmarkera alla</string>
 
     <string name="account_setup_push_limit_label">Max antal mappar att kontrollera med push</string>
     <string name="account_setup_push_limit_10">10 mappar</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5e004de27..7194016f2 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">içindeki bütün mesajları \'<xliff:g id="folder">%s</xliff:g>\' okundu olarak işaretle?  (Klasöre eklenen mesajlar K-9 de gösterilemez.)</string>
     <string name="account_delete_dlg_instructions_fmt">Hesap \"<xliff:g id="account">%s</xliff:g>\" K-9 Mail\'den kaldırılacak.</string>
     <string name="account_recreate_dlg_instructions_fmt">Bütün bilgi \"<xliff:g id="account">%s</xliff:g>\" için K-9 Mail\'den kaldırılacak, fakat hesap ayarları korunacak.</string>
     <string name="account_clear_dlg_instructions_fmt">Bütün mesajlar \"<xliff:g id="account">%s</xliff:g>\" içinden ve K-9 Mail\'den kaldırılacak, fakat hesap ayarları korunacak.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="accounts_title">Hesaplar</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Gelişmiş</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="cancel_action">İptal</string>
     <string name="send_action">Gönder</string>
     <string name="send_again_action">Tekrar Gönder</string>
-    <string name="select_action">Seç</string>
-    <string name="deselect_action">Kaldır</string>
     <string name="reply_action">Cevap</string>
     <string name="reply_all_action">Hepsini Cevapla</string>
     <string name="delete_action">Sil</string>
     <string name="archive_action">Arşiv</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Klasörü temizle</string>
     <string name="forward_action">İlet</string>
     <string name="move_action">Taşı</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="done_action">Tamam</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Çıkart</string>
     <string name="save_draft_action">Taslak olarak Kaydet</string>
-    <string name="retry_action">Yeniden dene</string>
-    <string name="refresh_action">Yinele</string>
     <string name="check_mail_action">E-postayı Kontrol et</string>
     <string name="send_messages_action">Mesajları Gönder</string>
-    <string name="list_folders_action">Klasör Listesi</string>
     <string name="refresh_folders_action">Klasörleri Yinele</string>
     <string name="filter_folders_action">Klasör ara</string>
-    <string name="mark_all_as_read_action">Hepsini Okundu olarak işaretle</string>
     <string name="add_account_action">Hesap Ekle</string>
     <string name="compose_action">Oluştur</string>
     <string name="search_action">Arama</string>
     <string name="search_results">Arama Sonuçları</string>
     <string name="preferences_action">Ayarlar</string>
-    <string name="open_action">Açık</string>
     <string name="account_settings_action">Hesap Ayarları</string>
     <string name="folder_settings_action">Klasör Ayarları</string>
     <string name="global_settings_action">Genel Ayarlar</string>
     <string name="remove_account_action">Hesabı Kaldır</string>
     <string name="clear_pending_action">Bekleyen faaliyetleri Temizle (Tehlike!)</string>
 
-    <string name="accounts_action">Hesaplar</string>
     <string name="mark_as_read_action">Okundu olarak işaretle</string>
     <string name="send_alternate_action">Paylaş</string>
     <string name="send_alternate_chooser_title">Gönderici Seç</string>
 
-    <string name="mark_all_as_read_dlg_title">Hepsini okundu olarak işaretle</string>
-
     <string name="flag_action">Yıldız Ekle</string>
     <string name="unflag_action">Yıldızı Kaldır</string>
     <string name="copy_action">Kopyala</string>
-    <string name="show_full_header_action">Tam Başlığı Göster</string>
-    <string name="hide_full_header_action">Tam Başlığı Sakla</string>
     <string name="select_text_action">Metin Seç</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="accounts_context_menu_title">Hesap Seçenekleri</string>
 
     <string name="general_no_subject">(Konu yok)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">Tarih yok</string>
     <string name="general_no_sender">Gönderen yok</string>
     <string name="status_loading">Seçim</string>
     <string name="status_loading_more">Yüklenen mesajlar\u2026</string>
@@ -277,11 +261,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Açık</string>
     <string name="message_view_attachment_download_action">Kaydet</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Arşiv</string>
-    <string name="message_view_move_action">Taşı</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">SD Karta Ek kaydedildi  <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">SD Karta Ek kaydedilemedi.</string>
     <string name="message_view_show_pictures_action">Resimleri Göster</string>
@@ -305,12 +284,8 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="message_discarded_toast">Mesaj silindi</string>
     <string name="message_saved_toast">Mesaj taslak olarak kaydedildi.</string>
 
-    <string name="global_settings_flag_label">Yıldızları Göster</string>
-    <string name="global_settings_flag_summary">Yıldızlar bayraklı mesajları gösterir.</string>
     <string name="global_settings_checkbox_label">Çoklu-seçim işaret kutuları</string>
     <string name="global_settings_checkbox_summary">Çoklu-seçim işaret kutularını Daima göster.</string>
-    <string name="global_settings_touchable_label">Mesaj önizleme</string>
-    <string name="global_settings_touchable_summary">Mesaj önizleme ile liste görünümü.</string>
     <string name="global_settings_preview_lines_label">Önizleme hatları</string>
     <string name="global_settings_show_correspondent_names_label">İlgili isimleri göster.</string>
     <string name="global_settings_show_correspondent_names_summary">İlgili e-posta adresleri yerine isimlerini göster.</string>
@@ -333,12 +308,9 @@ http://k9mail.googlecode.com/ adresine gönderin.
 
     <string name="global_settings_confirm_actions_title">Eylemleri Onaylayın</string>
     <string name="global_settings_confirm_actions_summary">Seçilmiş eylemleri yaptığınız zaman bir diyalog göster</string>
-    <string name="global_settings_confirm_action_archive">Arşiv</string>
     <string name="global_settings_confirm_action_delete">Sil (sadece mesaj görünümü)</string>
     <string name="global_settings_confirm_action_delete_starred">Yıldızlıları Sil (sadece mesaj görünümü)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Hepsini okundu olarak işaretle</string>
-    <string name="global_settings_confirm_action_send">Gönder</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -361,10 +333,8 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="quiet_time_ends">Sessiz Zaman bitiş</string>
 
     <string name="account_setup_basics_title">Bir yeni hesap kurun</string>
-    <string name="account_setup_basics_instructions">Bu hesabın e-posta adresine giriş:</string>
     <string name="account_setup_basics_email_hint">E-posta adresi</string>
     <string name="account_setup_basics_password_hint">Şifre</string>
-    <string name="account_setup_basics_default_label">Postaları varsayılan olarak bu hesaptan gönder</string>
     <string name="account_setup_basics_manual_setup_action">El ile ayar</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -376,7 +346,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="account_setup_check_settings_canceling_msg">İptal ediliyor\u2026</string>
 
     <string name="account_setup_names_title">Hemen hemen tamam!</string>
-    <string name="account_setup_names_instructions">Hesabınız kurulu ve postalarınız yolda!</string>
     <string name="account_setup_names_account_name_label">Bu hesaba bir isim verin (isteğe bağlı):</string>
     <string name="account_setup_names_user_name_label">İsminizi yazın (Giden mesajlarda görüntülenir):</string>
 
@@ -411,9 +380,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Diğer</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Başlıkları indir</string>
-    <string name="account_setup_incoming_save_all_headers_label">Bütün mesaj başlıklarını yerel kaydet</string>
-
     <string name="local_storage_provider_external_label">Harici depolama (SD card)</string>
     <string name="local_storage_provider_internal_label">Düzenli dahili depolama</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s ek iç depolama</string>
@@ -448,21 +414,10 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="account_setup_outgoing_smtp_server_label">SMTP sunucu</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Güvenlik Tipi</string>
-    <string name="account_setup_outgoing_security_none_label">Hiçbiri</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (Varsa)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (Daima)</string>
     <string name="account_setup_outgoing_require_login_label">Oturum açmayı gerektirir.</string>
     <string name="account_setup_outgoing_username_label">Kullanıcı Adı</string>
     <string name="account_setup_outgoing_password_label">Şifre</string>
     <string name="account_setup_outgoing_authentication_label">Kimlik Doğrulama Tipi</string>
-    <!-- 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">Kullanıcı Adı &amp; şifre</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Kullanıcı Adı</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Şifre</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
 
     <string name="account_setup_bad_uri">Geçersiz kurulum: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -745,7 +700,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
 
     <string name="default_identity_description">İlk kimlik</string>
     <string name="choose_identity_title">Kimlik seç</string>
-    <string name="choose_account_title">Hesap/Kimlik seç</string>
     <string name="send_as">Olarak gönderin</string>
 
     <string name="no_removable_identity">Son kimliğinizi kaldıramazsınız</string>
@@ -753,8 +707,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
 
     <string name="sort_earliest_first">En erken mesajlar ilk</string>
     <string name="sort_latest_first">En son mesajlar ilk</string>
-    <string name="sort_sender_alpha">Göndereni alfabetik sırala</string>
-    <string name="sort_sender_re_alpha">Göndereni ters alfabetik sırala</string>
     <string name="sort_subject_alpha">Konuyu alfabetik sırala</string>
     <string name="sort_subject_re_alpha">Konuyu ters alfabetik sırala</string>
     <string name="sort_flagged_first">Yıldızlı mesajlar ilk</string>
@@ -767,7 +719,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="sort_by">Şuna göre sırala…</string>
     <string name="sort_by_date">Tarih</string>
     <string name="sort_by_arrival">Ulaşma</string>
-    <string name="sort_by_sender">Gönderici</string>
     <string name="sort_by_subject">Konu</string>
     <string name="sort_by_flag">Yıldız</string>
     <string name="sort_by_unread">Okundu/Okunmadı</string>
@@ -849,28 +800,13 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="background_ops_auto_sync">\'Arkaplan verisi\' &amp; \'Oto. Senk.\' işaretli olduğu zaman</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Mesaj Seçilmedi</string>
-
     <string name="date_format_label">Tarih Biçimi</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
       See Android SDK documentation for the class SimpleDateFormat.
     -->
 
-    <string name="batch_ops">Yığın Seçenekleri</string>
-    <string name="batch_delete_op">Seçileni Sil</string>
-    <string name="batch_mark_read_op">Seçilmiş olanı okundu işaretle</string>
-    <string name="batch_mark_unread_op">Seçilmiş olanı okunmadı işaretle</string>
-    <string name="batch_flag_op">Seçilmiş olana Yıldız ekle</string>
-    <string name="batch_unflag_op">Seçilmi olandan Yıldızı kaldır</string>
-    <string name="batch_archive_op">Seçilmişi Arşive Taşı</string>
-    <string name="batch_spam_op">Seçilmişi Spam\'a Taşı</string>
-    <string name="batch_move_op">Seçileni Taşı</string>
-    <string name="batch_copy_op">Seçileni Kopyala</string>
-    <string name="batch_flag_mode">Yıldız modu</string>
-    <string name="batch_plain_mode">Düz mod</string>
     <string name="batch_select_all">Hepsini Seç</string>
-    <string name="batch_deselect_all">Bütün seçimleri temizle</string>
 
     <string name="account_setup_push_limit_label">Push ile en fazla kontrol edilecek klasör sayısı</string>
     <string name="account_setup_push_limit_10">10 klasör</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 99558d09e..daf138c41 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -54,7 +54,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Відмітити усі повідомлення у \'<xliff:g id="folder">%s</xliff:g>\' як прочитані?  (включаючи повідомлення в папці, які не відображються в K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">Обліковий запис \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">Усі дані \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail, але налаштування облікового запису будуть збережені.</string>
     <string name="account_clear_dlg_instructions_fmt">Усі повідомлення у \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail, але налаштування облікового запису будуть збережені.</string>
@@ -87,7 +86,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Облікові записи</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">Додатково</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>
 
@@ -113,14 +111,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Відмінити</string>
     <string name="send_action">Надіслати</string>
     <string name="send_again_action">Надіслати знову</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>
     <string name="spam_action">Спам</string>
-    <string name="delete_all_action">Очистити папку</string>
     <string name="forward_action">Переслати</string>
     <string name="move_action">Перемістити</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -129,38 +124,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Готово</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Відкинути зміни</string>
     <string name="save_draft_action">Зберегти як чернетку</string>
-    <string name="retry_action">Повторити</string>
-    <string name="refresh_action">Оновити</string>
     <string name="check_mail_action">Перевірити пошту</string>
     <string name="send_messages_action">Надіслати повідомлення</string>
-    <string name="list_folders_action">Список папок</string>
     <string name="refresh_folders_action">Оновити папки</string>
     <string name="filter_folders_action">Знайти папку</string>
-    <string name="mark_all_as_read_action">Відмітити усі повідомлення як прочитані</string>
     <string name="add_account_action">Додати обліковий запис</string>
     <string name="compose_action">Написати новий лист</string>
     <string name="search_action">Пошук</string>
     <string name="search_results">Результати пошуку</string>
     <string name="preferences_action">Налаштування</string>
-    <string name="open_action">Відкрити</string>
     <string name="account_settings_action">Налаштування пошти</string>
     <string name="folder_settings_action">Налаштування папки</string>
     <string name="global_settings_action">Глобальні налаштування</string>
     <string name="remove_account_action">Видалити обліковий запис</string>
     <string name="clear_pending_action">Зупинити незавершені дії (небезпечно!)</string>
 
-    <string name="accounts_action">Облікові записи</string>
     <string name="mark_as_read_action">Відмітити як прочитаний</string>
     <string name="send_alternate_action">Переслати</string>
     <string name="send_alternate_chooser_title">Вибрати відправника</string>
 
-    <string name="mark_all_as_read_dlg_title">Відмітити усі повідомлення як прочитані</string>
-
     <string name="flag_action">Додати зірочку</string>
     <string name="unflag_action">Видалити зірочку</string>
     <string name="copy_action">Копіювати</string>
-    <string name="show_full_header_action">Показати повний заголовок</string>
-    <string name="hide_full_header_action">Приховати повний заголовок</string>
     <string name="select_text_action">Вибрати текст</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -183,7 +168,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_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. -->
-    <string name="general_no_date">Немає дати</string>
     <string name="general_no_sender">Немає відправника</string>
     <string name="status_loading">Завантаження</string>
     <string name="status_loading_more">Завантажуються повідомлення\u2026</string>
@@ -277,11 +261,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Копія:</string>
     <string name="message_view_attachment_view_action">Відкрити</string>
     <string name="message_view_attachment_download_action">Зберегти</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Архівувати</string>
-    <string name="message_view_move_action">Перемістити</string>
-    <string name="message_view_spam_action">Спам</string>
     <string name="message_view_status_attachment_saved">Вкладення збережено на карту пам’яті як <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Не вдалося зберегти вкладення на карту пам’яті.</string>
     <string name="message_view_show_pictures_action">Показати зобарження</string>
@@ -305,12 +284,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Повідомлення скасовано</string>
     <string name="message_saved_toast">Повідомлення збережено як чернетка</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>
-    <string name="global_settings_touchable_summary">Список повідомлень з попереднім переглядом</string>
     <string name="global_settings_preview_lines_label">Рядки попереднього перегляду</string>
     <string name="global_settings_show_correspondent_names_label">Показувати ім’я відправника</string>
     <string name="global_settings_show_correspondent_names_summary">Показувати ім’я відправника замість електронної адреси</string>
@@ -333,12 +308,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Підтвердження дій</string>
     <string name="global_settings_confirm_actions_summary">Показати діалогове вікно щоразу, коли ви виконуєте вибрані дії</string>
-    <string name="global_settings_confirm_action_archive">Архівувати</string>
     <string name="global_settings_confirm_action_delete">Вилучити (лише перегляд повідомлення)</string>
     <string name="global_settings_confirm_action_delete_starred">Вилучити позначені зірочкою (лише перегляд повідомлень)</string>
     <string name="global_settings_confirm_action_spam">Спам</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Відмітити усі як прочитані</string>
-    <string name="global_settings_confirm_action_send">Надіслати</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -361,10 +333,8 @@ http://k9mail.googlecode.com/
     <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_email_hint">Адреса електронної пошти</string>
     <string name="account_setup_basics_password_hint">Пароль</string>
-    <string name="account_setup_basics_default_label">Надсилати пошту з цієї адреси за замовчуванням.</string>
     <string name="account_setup_basics_manual_setup_action">Ручне налаштування</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -376,7 +346,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Скасування\u2026</string>
 
     <string name="account_setup_names_title">Вже готово!</string>
-    <string name="account_setup_names_instructions">Ваш обліковий запис створено, завантажується пошта.</string>
     <string name="account_setup_names_account_name_label">Дайте ім’я цьому обліковому запису (необов’язково):</string>
     <string name="account_setup_names_user_name_label">Введіть ваше ім’я (відображається у вихідних повідомленнях):</string>
 
@@ -411,9 +380,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">WI-FI</string>
     <string name="account_setup_incoming_other_label">Інше</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Завантажувати заголовки</string>
-    <string name="account_setup_incoming_save_all_headers_label">Зберігати всі заголовки повідомлень локально</string>
-
     <string name="local_storage_provider_external_label">Зовнішня пам’ять (SD карта)</string>
     <string name="local_storage_provider_internal_label">Стандартне внутрішня пам’ять</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s додаткова внутрішня пам’ять</string>
@@ -448,21 +414,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">Сервер SMTP</string>
     <string name="account_setup_outgoing_port_label">Порт</string>
     <string name="account_setup_outgoing_security_label">Тип системи захисту</string>
-    <string name="account_setup_outgoing_security_none_label">Немає</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (якщо доступно)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (завжди)</string>
     <string name="account_setup_outgoing_require_login_label">Завжди вимагати входу в систему.</string>
     <string name="account_setup_outgoing_username_label">Ім’я користувача</string>
     <string name="account_setup_outgoing_password_label">Пароль</string>
     <string name="account_setup_outgoing_authentication_label">Метод автентифікації</string>
-    <!-- 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">Ім’я користувача та пароль</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Ім’я користувача</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Пароль</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP перед SMTP</string>
-    <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>
 
@@ -745,7 +700,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Первісна особа</string>
     <string name="choose_identity_title">Вибрати особу</string>
-    <string name="choose_account_title">Вибрати обліковий запис/особу</string>
     <string name="send_as">Надіслати як</string>
 
     <string name="no_removable_identity">Не можна видалити єдину особу</string>
@@ -753,8 +707,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Спершу старі повідомлення</string>
     <string name="sort_latest_first">Спершу нові повідомлення</string>
-    <string name="sort_sender_alpha">Відправники за алфавітом</string>
-    <string name="sort_sender_re_alpha">Відправники за алфавітом у зворотньому порядку</string>
     <string name="sort_subject_alpha">Тема за алфавітом</string>
     <string name="sort_subject_re_alpha">Тема за алфавітом у зворотньому порядку</string>
     <string name="sort_flagged_first">Спершу повідомлення із зірочками</string>
@@ -767,7 +719,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Упорядкувати за…</string>
     <string name="sort_by_date">датою</string>
     <string name="sort_by_arrival">Надходженням</string>
-    <string name="sort_by_sender">Відправником</string>
     <string name="sort_by_subject">Темою</string>
     <string name="sort_by_flag">Зірочкою</string>
     <string name="sort_by_unread">Прочитані/непрочитані</string>
@@ -847,8 +798,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">Коли \'Фонові дані\' та \'Автосинхронізація\' включено</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">Жодних повідомлень не вибрано</string>
-
     <string name="date_format_label">Формат дати</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -856,20 +805,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Групові операції</string>
-    <string name="batch_delete_op">Вилучити вибране</string>
-    <string name="batch_mark_read_op">Відмітити вибране як прочитане</string>
-    <string name="batch_mark_unread_op">Відмітити вибране як непрочитане</string>
-    <string name="batch_flag_op">Відмітити вибране зірочками</string>
-    <string name="batch_unflag_op">Видалити зірочки з вибраного</string>
-    <string name="batch_archive_op">Перемістити вибране до архіву</string>
-    <string name="batch_spam_op">Перемістити вибране до спаму</string>
-    <string name="batch_move_op">Перемістити вибране</string>
-    <string name="batch_copy_op">Копіювати вибране</string>
-    <string name="batch_flag_mode">Режим зірочок</string>
-    <string name="batch_plain_mode">Простий режим</string>
     <string name="batch_select_all">Вибрати усе</string>
-    <string name="batch_deselect_all">Зняти усі виділення</string>
 
     <string name="account_setup_push_limit_label">Найбільша кількість папок для перевірки з push</string>
     <string name="account_setup_push_limit_10">10 папок</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7d53acf47..214c35f18 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -53,7 +53,6 @@
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">标记“<xliff:g id="folder">%s</xliff:g>”中全部的邮件（包括K-9中没有显示的文件夹中的邮件）为已读么？</string>
     <string name="account_delete_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”将从K-9 Mail中删除。</string>
     <string name="account_recreate_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”的全部数据将从K-9 Mail中删除，但是账户设置将保留。</string>
     <string name="account_clear_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”中的全部邮件将从K-9 Mail中删除，但是账户设置将保留。</string>
@@ -86,7 +85,6 @@
     <string name="accounts_title">账户</string>
     <!-- NEW: <string name="folders_title">Folders</string>-->
     <string name="advanced">高级</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>
 
@@ -112,14 +110,11 @@
     <string name="cancel_action">取消</string>
     <string name="send_action">发送</string>
     <string name="send_again_action">重新发送</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>
     <string name="spam_action">标记为垃圾</string>
-    <string name="delete_all_action">清空文件夹</string>
     <string name="forward_action">转发</string>
     <string name="move_action">移动</string>
     <!-- NEW: <string name="single_message_options_action">Message Options</string>-->
@@ -128,38 +123,28 @@
     <string name="done_action">完成</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">忽略</string>
     <string name="save_draft_action">保存为草稿</string>
-    <string name="retry_action">重试</string>
-    <string name="refresh_action">刷新</string>
     <string name="check_mail_action">检查新邮件</string>
     <string name="send_messages_action">发送</string>
-    <string name="list_folders_action">全部文件夹</string>
     <string name="refresh_folders_action">刷新文件夹</string>
     <string name="filter_folders_action">搜索文件夹</string>
-    <string name="mark_all_as_read_action">标记全部邮件为已读</string>
     <string name="add_account_action">添加账户</string>
     <string name="compose_action">新邮件</string>
     <string name="search_action">搜索</string>
     <string name="search_results">搜索结果</string>
     <string name="preferences_action">设置</string>
-    <string name="open_action">打开</string>
     <string name="account_settings_action">账户设置</string>
     <string name="folder_settings_action">文件夹设置</string>
     <string name="global_settings_action">全局设置</string>
     <string name="remove_account_action">删除账户</string>
     <string name="clear_pending_action">取消挂起的操作（慎用）</string>
 
-    <string name="accounts_action">账户</string>
     <string name="mark_as_read_action">标记为已读</string>
     <string name="send_alternate_action">共享</string>
     <string name="send_alternate_chooser_title">选择发件人</string>
 
-    <string name="mark_all_as_read_dlg_title">标记全部邮件为已读</string>
-
     <string name="flag_action">添加星标</string>
     <string name="unflag_action">移除星标</string>
     <string name="copy_action">拷贝</string>
-    <string name="show_full_header_action">显示详细信息</string>
-    <string name="hide_full_header_action">隐藏详细信息</string>
     <string name="select_text_action">选择文本</string>
 
     <!-- NEW: <string name="message_view_theme_action_dark">Switch to dark theme</string>-->
@@ -182,7 +167,6 @@
     <string name="accounts_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. -->
-    <string name="general_no_date">无日期</string>
     <string name="general_no_sender">无发件人</string>
     <string name="status_loading">正在接收</string>
     <string name="status_loading_more">正在加载邮件\u2026</string>
@@ -270,11 +254,6 @@
     <string name="message_view_cc_label">抄送：</string>
     <string name="message_view_attachment_view_action">打开</string>
     <string name="message_view_attachment_download_action">保存</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">归档</string>
-    <string name="message_view_move_action">移动</string>
-    <string name="message_view_spam_action">标记为垃圾</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>
     <string name="message_view_show_pictures_action">显示图片</string>
@@ -298,12 +277,8 @@
     <string name="message_discarded_toast">邮件已忽略</string>
     <string name="message_saved_toast">邮件已保存为草稿</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>
-    <string name="global_settings_touchable_summary">在列表中显示邮件预览</string>
     <string name="global_settings_preview_lines_label">预览行数</string>
     <string name="global_settings_show_correspondent_names_label">显示收件人姓名</string>
     <string name="global_settings_show_correspondent_names_summary">如果可能则使用收件人姓名代替收件地址</string>
@@ -326,12 +301,9 @@
 
     <string name="global_settings_confirm_actions_title">确认操作</string>
     <string name="global_settings_confirm_actions_summary">进行选择操作时总是显示一个对话框进行确认</string>
-    <string name="global_settings_confirm_action_archive">归档</string>
     <string name="global_settings_confirm_action_delete">删除（仅在邮件视图里）</string>
     <string name="global_settings_confirm_action_delete_starred">删除加星（仅在邮件视图里）</string>
     <string name="global_settings_confirm_action_spam">标记为垃圾</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">全部标记为已读</string>
-    <string name="global_settings_confirm_action_send">发送</string>
 
     <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
     <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
@@ -354,10 +326,8 @@
     <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_email_hint">电子邮件地址</string>
     <string name="account_setup_basics_password_hint">密码</string>
-    <string name="account_setup_basics_default_label">默认使用这个账户发送邮件</string>
     <string name="account_setup_basics_manual_setup_action">手工设置</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -369,7 +339,6 @@
     <string name="account_setup_check_settings_canceling_msg">正在取消\u2026</string>
 
     <string name="account_setup_names_title">快要完成了！</string>
-    <string name="account_setup_names_instructions">你的账户已经设置，并且正在接受邮件！</string>
     <string name="account_setup_names_account_name_label">为这个账户选择一个名称（可选项）：</string>
     <string name="account_setup_names_user_name_label">输入你的名字（将显示在发出的邮件中）：</string>
 
@@ -404,9 +373,6 @@
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">其他</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">下载邮件信息</string>
-    <string name="account_setup_incoming_save_all_headers_label">在本地保存全部邮件的信息</string>
-
     <string name="local_storage_provider_external_label">外部存储（SD卡）</string>
     <string name="local_storage_provider_internal_label">正常内部存储</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s 额外的内部存储</string>
@@ -441,21 +407,10 @@
     <string name="account_setup_outgoing_smtp_server_label">SMTP服务器</string>
     <string name="account_setup_outgoing_port_label">端口号</string>
     <string name="account_setup_outgoing_security_label">加密方法</string>
-    <string name="account_setup_outgoing_security_none_label">无</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS（如果可能的话）</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS（总是）</string>
     <string name="account_setup_outgoing_require_login_label">要求登录。</string>
     <string name="account_setup_outgoing_username_label">用户名</string>
     <string name="account_setup_outgoing_password_label">密码</string>
     <string name="account_setup_outgoing_authentication_label">身份验证方法</string>
-    <!-- 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">用户名与密码</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">用户名</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">密码</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">在SMTP前POP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">在SMTP前IMAP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">在SMTP前WebDAV (Exchange)</string>
 
     <string name="account_setup_bad_uri">无效的设置：<xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -738,7 +693,6 @@
 
     <string name="default_identity_description">初始身份标识</string>
     <string name="choose_identity_title">选择身份标识</string>
-    <string name="choose_account_title">选择账户/身份标识</string>
     <string name="send_as">发送为</string>
 
     <string name="no_removable_identity">您必须保留一个身份标识</string>
@@ -746,8 +700,6 @@
 
     <string name="sort_earliest_first">优先显示最早的邮件</string>
     <string name="sort_latest_first">优先显示最近的邮件</string>
-    <string name="sort_sender_alpha">按收件人升序</string>
-    <string name="sort_sender_re_alpha">按收件人降序</string>
     <string name="sort_subject_alpha">按主题升序</string>
     <string name="sort_subject_re_alpha">按主题降序</string>
     <string name="sort_flagged_first">优先显示带有星标的邮件</string>
@@ -760,7 +712,6 @@
     <string name="sort_by">排序方式</string>
     <string name="sort_by_date">日期</string>
     <string name="sort_by_arrival">到达时间</string>
-    <string name="sort_by_sender">发件人</string>
     <string name="sort_by_subject">主题</string>
     <string name="sort_by_flag">星标</string>
     <string name="sort_by_unread">已读/未读</string>
@@ -837,8 +788,6 @@
     <string name="background_ops_auto_sync">当“后台数据”&amp;“自动同步”被选中</string>
     <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
-    <string name="no_message_seletected_toast">没有选择任何邮件</string>
-
     <string name="date_format_label">日期格式</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -846,20 +795,7 @@
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">批量操作</string>
-    <string name="batch_delete_op">删除选中的邮件</string>
-    <string name="batch_mark_read_op">将选中的邮件标记为已读</string>
-    <string name="batch_mark_unread_op">将选中的邮件标记为未读</string>
-    <string name="batch_flag_op">为选中的邮件添加星标</string>
-    <string name="batch_unflag_op">为选中的邮件移除星标</string>
-    <string name="batch_archive_op">移动选中的邮件到归档文件夹</string>
-    <string name="batch_spam_op">移动选中的邮件到垃圾邮件文件夹</string>
-    <string name="batch_move_op">移动选中的邮件</string>
-    <string name="batch_copy_op">拷贝选中的邮件</string>
-    <string name="batch_flag_mode">星标模式</string>
-    <string name="batch_plain_mode">水平模式</string>
     <string name="batch_select_all">选择全部</string>
-    <string name="batch_deselect_all">清除全部选择</string>
 
     <string name="account_setup_push_limit_label">推送时最多检查文件夹数量</string>
     <string name="account_setup_push_limit_10">十个文件夹</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 333251090..1a2d2fcdb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -52,7 +52,6 @@
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">標記「<xliff:g id="folder">%s</xliff:g>」中全部的郵件（包括K-9中沒有顯示的文件匣中的郵件）為已讀？</string>
     <string name="account_delete_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」將從K-9 Mail中刪除。</string>
     <string name="account_recreate_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」的所有相關資料將從K-9 Mail中刪除，僅保留帳戶設定。</string>
     <string name="account_clear_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」的所有郵件將從K-9 Mail中刪除，僅保留帳戶設定。</string>
@@ -85,7 +84,6 @@
     <string name="accounts_title">帳戶</string>
     <string name="folders_title">信件匣</string>
     <string name="advanced">進階</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>
 
@@ -105,7 +103,6 @@
     <string name="status_syncing_off">同步已停用</string>
 
     <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> 已選擇</string>
-    <string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g>  已選擇</string>
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">下一步</string>
     <string name="previous_action">上一步</string>
@@ -113,14 +110,11 @@
     <string name="cancel_action">取消</string>
     <string name="send_action">寄送</string>
     <string name="send_again_action">再次寄送</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>
     <string name="spam_action">標記為垃圾</string>
-    <string name="delete_all_action">清空信件匣</string>
     <string name="forward_action">轉寄</string>
     <string name="move_action">移動</string>
     <string name="single_message_options_action">訊息選項</string>
@@ -129,38 +123,28 @@
     <string name="done_action">完成</string>
     <string name="discard_action">忽略</string>
     <string name="save_draft_action">儲存為草稿</string>
-    <string name="retry_action">重試</string>
-    <string name="refresh_action">重新整理</string>
     <string name="check_mail_action">檢查新郵件</string>
     <string name="send_messages_action">寄送</string>
-    <string name="list_folders_action">全部信件匣</string>
     <string name="refresh_folders_action">重整信件匣</string>
     <string name="filter_folders_action">Find folder</string>
-    <string name="mark_all_as_read_action">標記全部郵件為已讀</string>
     <string name="add_account_action">新增帳戶</string>
     <string name="compose_action">新郵件</string>
     <string name="search_action">搜尋</string>
     <string name="search_results">搜尋結果</string>
     <string name="preferences_action">設定</string>
-    <string name="open_action">打開</string>
     <string name="account_settings_action">帳戶設定</string>
     <string name="folder_settings_action">信件匣設定</string>
     <string name="global_settings_action">全域設定</string>
     <string name="remove_account_action">刪除帳戶</string>
     <string name="clear_pending_action">取消等待中操作項目（慎用）</string>
 
-    <string name="accounts_action">帳戶</string>
     <string name="mark_as_read_action">標記為已讀</string>
     <string name="send_alternate_action">分享</string>
     <string name="send_alternate_chooser_title">選擇寄件人</string>
 
-    <string name="mark_all_as_read_dlg_title">標記全部郵件為已讀</string>
-
     <string name="flag_action">加上星號</string>
     <string name="unflag_action">移除星號</string>
     <string name="copy_action">複製</string>
-    <string name="show_full_header_action">顯示詳細訊息</string>
-    <string name="hide_full_header_action">隱藏詳細訊息</string>
     <string name="select_text_action">選擇本文</string>
 
     <string name="message_view_theme_action_dark">切換為黑色主題</string>
@@ -183,7 +167,6 @@
     <string name="accounts_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>
     <string name="status_loading_more">正在載入郵件…</string>
@@ -271,11 +254,6 @@
     <string name="message_view_cc_label">副本：</string>
     <string name="message_view_attachment_view_action">開啟</string>
     <string name="message_view_attachment_download_action">儲存</string>
-    <string name="message_view_prev_action">▼</string>
-    <string name="message_view_next_action">▲</string>
-    <string name="message_view_archive_action">歸檔</string>
-    <string name="message_view_move_action">移動</string>
-    <string name="message_view_spam_action">標記為垃圾</string>
     <string name="message_view_status_attachment_saved">附件已經儲存到記憶卡：<xliff:g id="filename">%s</xliff:g>。</string>
     <string name="message_view_status_attachment_not_saved">無法將附件儲存到記憶卡。</string>
     <string name="message_view_show_pictures_action">顯示圖片</string>
@@ -299,12 +277,8 @@
     <string name="message_discarded_toast">郵件已忽略</string>
     <string name="message_saved_toast">郵件已儲存為草稿</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>
-    <string name="global_settings_touchable_summary">在列表中顯示郵件預覽</string>
     <string name="global_settings_preview_lines_label">預覽行數</string>
     <string name="global_settings_show_correspondent_names_label">顯示收件人姓名</string>
     <string name="global_settings_show_correspondent_names_summary">用收件人姓名取代顯示電子郵件地址</string>
@@ -327,12 +301,9 @@
 
     <string name="global_settings_confirm_actions_title">確認操作</string>
     <string name="global_settings_confirm_actions_summary">進行選擇操作時總是顯示一個對話框進行確認</string>
-    <string name="global_settings_confirm_action_archive">歸檔</string>
     <string name="global_settings_confirm_action_delete">刪除（僅檢視郵件時）</string>
     <string name="global_settings_confirm_action_delete_starred">移除星號 (僅檢視郵件時)</string>
     <string name="global_settings_confirm_action_spam">標記為垃圾</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">全部標示為已讀取</string>
-    <string name="global_settings_confirm_action_send">寄送</string>
 
     <string name="global_settings_notification_hide_subject_title">進行通知時隱藏主題</string>
     <string name="global_settings_notification_hide_subject_never">絕不</string>
@@ -355,10 +326,8 @@
     <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_email_hint">電子郵件地址</string>
     <string name="account_setup_basics_password_hint">密碼</string>
-    <string name="account_setup_basics_default_label">預設使用這個帳戶寄送郵件</string>
     <string name="account_setup_basics_manual_setup_action">手動設定</string>
 
     <string name="account_setup_check_settings_title" />
@@ -370,7 +339,6 @@
     <string name="account_setup_check_settings_canceling_msg">正在取消…</string>
 
     <string name="account_setup_names_title">快要完成了！</string>
-    <string name="account_setup_names_instructions">你的帳戶已經設定完成，並且正在接收郵件！</string>
     <string name="account_setup_names_account_name_label">為這個帳戶選擇一個名稱（非必填）：</string>
     <string name="account_setup_names_user_name_label">輸入你的名字（將顯示在發出的郵件中）：</string>
 
@@ -405,9 +373,6 @@
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">其他</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">下載郵件訊息</string>
-    <string name="account_setup_incoming_save_all_headers_label">在本地儲存全部郵件的訊息</string>
-
     <string name="local_storage_provider_external_label">外部儲存 (記憶卡)</string>
     <string name="local_storage_provider_internal_label">手機內部儲存</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s 額外內部儲存</string>
@@ -442,20 +407,10 @@
     <string name="account_setup_outgoing_smtp_server_label">SMTP伺服器</string>
     <string name="account_setup_outgoing_port_label">埠號</string>
     <string name="account_setup_outgoing_security_label">加密類型</string>
-    <string name="account_setup_outgoing_security_none_label">無</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS（如果可用）</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS（預設）</string>
     <string name="account_setup_outgoing_require_login_label">要求登錄。</string>
     <string name="account_setup_outgoing_username_label">用戶名</string>
     <string name="account_setup_outgoing_password_label">密碼</string>
     <string name="account_setup_outgoing_authentication_label">身份驗證方法</string>
-    <string name="account_setup_outgoing_authentication_basic_label">使用者名稱與密碼</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">使用者名稱</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">密碼</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">在SMTP前POP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">在SMTP前IMAP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">在SMTP前WebDAV (Exchange)</string>
 
     <string name="account_setup_bad_uri">無效的設定：<xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -738,7 +693,6 @@
 
     <string name="default_identity_description">初始身份識別</string>
     <string name="choose_identity_title">選擇身份識別</string>
-    <string name="choose_account_title">選擇帳戶/身份識別</string>
     <string name="send_as">以身份寄送</string>
 
     <string name="no_removable_identity">您必須保留一個身份識別</string>
@@ -746,8 +700,6 @@
 
     <string name="sort_earliest_first">優先顯示最早的郵件</string>
     <string name="sort_latest_first">優先顯示最近的郵件</string>
-    <string name="sort_sender_alpha">按寄件人升冪</string>
-    <string name="sort_sender_re_alpha">按寄件人降冪</string>
     <string name="sort_subject_alpha">按主題升冪</string>
     <string name="sort_subject_re_alpha">按主題降冪</string>
     <string name="sort_flagged_first">優先顯示帶有星號的郵件</string>
@@ -760,7 +712,6 @@
     <string name="sort_by">排序方式</string>
     <string name="sort_by_date">日期</string>
     <string name="sort_by_arrival">收到日</string>
-    <string name="sort_by_sender">寄件人</string>
     <string name="sort_by_subject">主題</string>
     <string name="sort_by_flag">星號</string>
     <string name="sort_by_unread">已讀/未讀</string>
@@ -855,8 +806,6 @@
     <string name="background_ops_auto_sync">當「背景資料」&amp;「自動同步」被勾選</string>
     <string name="background_ops_auto_sync_only">"當「自動同步」被勾選"</string>
 
-    <string name="no_message_seletected_toast">沒有選擇任何郵件</string>
-
     <string name="date_format_label">日期格式</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -864,20 +813,7 @@
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">批次操作</string>
-    <string name="batch_delete_op">刪除勾選的郵件</string>
-    <string name="batch_mark_read_op">將勾選的郵件標記為已讀</string>
-    <string name="batch_mark_unread_op">將勾選的郵件標記為未讀</string>
-    <string name="batch_flag_op">為勾選的郵件加上星號</string>
-    <string name="batch_unflag_op">為勾選的郵件移除星號</string>
-    <string name="batch_archive_op">移動勾選的郵件到歸檔信件匣</string>
-    <string name="batch_spam_op">移動勾選的郵件到垃圾郵件信件匣</string>
-    <string name="batch_move_op">移動勾選的郵件</string>
-    <string name="batch_copy_op">複製勾選的郵件</string>
-    <string name="batch_flag_mode">星號模式</string>
-    <string name="batch_plain_mode">水平模式</string>
     <string name="batch_select_all">選擇全部</string>
-    <string name="batch_deselect_all">清除勾選項目</string>
 
     <string name="account_setup_push_limit_label">推送時檢查信件匣上限數量</string>
     <string name="account_setup_push_limit_10">十個信件匣</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 63f86bebc..151d893e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,7 +56,6 @@ http://k9mail.googlecode.com/
 
 
     <!-- General strings that include the app name -->
-    <string name="mark_all_as_read_dlg_instructions_fmt">Mark all messages in \'<xliff:g id="folder">%s</xliff:g>\' as read?  (including messages in the folder that are not displayed in K-9)</string>
     <string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail.</string>
     <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>
     <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>
@@ -89,7 +88,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_title">Accounts</string>
     <string name="folders_title">Folders</string>
     <string name="advanced">Advanced</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>
 
@@ -109,7 +107,6 @@ http://k9mail.googlecode.com/
     <string name="status_syncing_off">Syncing disabled</string>
 
     <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> selected</string>
-    <string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g> selected</string>
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Next</string> <!-- Used as part of a multi-step process -->
     <string name="previous_action">Previous</string> <!-- Used as part of a multi-step process -->
@@ -117,14 +114,11 @@ http://k9mail.googlecode.com/
     <string name="cancel_action">Cancel</string>
     <string name="send_action">Send</string>
     <string name="send_again_action">Send Again</string>
-    <string name="select_action">Select</string>
-    <string name="deselect_action">Deselect</string>
     <string name="reply_action">Reply</string>
     <string name="reply_all_action">Reply all</string>
     <string name="delete_action">Delete</string>
     <string name="archive_action">Archive</string>
     <string name="spam_action">Spam</string>
-    <string name="delete_all_action">Clear folder</string>
     <string name="forward_action">Forward</string>
     <string name="move_action">Move</string>
     <string name="single_message_options_action">Message Options</string>
@@ -133,38 +127,28 @@ http://k9mail.googlecode.com/
     <string name="done_action">Done</string> <!--  Used to complete a multi-step process -->
     <string name="discard_action">Discard</string>
     <string name="save_draft_action">Save as draft</string>
-    <string name="retry_action">Retry</string>
-    <string name="refresh_action">Refresh</string>
     <string name="check_mail_action">Check mail</string>
     <string name="send_messages_action">Send messages</string>
-    <string name="list_folders_action">Folder list</string>
     <string name="refresh_folders_action">Refresh folders</string>
     <string name="filter_folders_action">Find folder</string>
-    <string name="mark_all_as_read_action">Mark all messages as read</string>
     <string name="add_account_action">Add account</string>
     <string name="compose_action">Compose</string>
     <string name="search_action">Search</string>
     <string name="search_results">Search results</string>
     <string name="preferences_action">Settings</string>
-    <string name="open_action">Open</string>
     <string name="account_settings_action">Account settings</string>
     <string name="folder_settings_action">Folder settings</string>
     <string name="global_settings_action">Global settings</string>
     <string name="remove_account_action">Remove account</string>
     <string name="clear_pending_action">Clear pending actions (danger!)</string>
 
-    <string name="accounts_action">Accounts</string>
     <string name="mark_as_read_action">Mark as read</string>
     <string name="send_alternate_action">Share</string>
     <string name="send_alternate_chooser_title">Choose sender</string>
 
-    <string name="mark_all_as_read_dlg_title">Mark all messages as read</string>
-
     <string name="flag_action">Add star</string>
     <string name="unflag_action">Remove star</string>
     <string name="copy_action">Copy</string>
-    <string name="show_full_header_action">Show full header</string>
-    <string name="hide_full_header_action">Hide full header</string>
     <string name="select_text_action">Select text</string>
 
     <string name="message_view_theme_action_dark">Switch to dark theme</string>
@@ -187,7 +171,6 @@ http://k9mail.googlecode.com/
     <string name="accounts_context_menu_title">Account options</string>
 
     <string name="general_no_subject">(No subject)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <string name="general_no_date">No date</string>
     <string name="general_no_sender">No sender</string>
     <string name="status_loading">Polling</string>
     <string name="status_loading_more">Loading messages\u2026</string>
@@ -281,11 +264,6 @@ http://k9mail.googlecode.com/
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Open</string>
     <string name="message_view_attachment_download_action">Save</string>
-    <string name="message_view_prev_action">\u25BC</string>
-    <string name="message_view_next_action">\u25B2</string>
-    <string name="message_view_archive_action">Archive</string>
-    <string name="message_view_move_action">Move</string>
-    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_status_attachment_saved">Attachment saved to SD card as <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Unable to save attachment to SD card.</string>
     <string name="message_view_show_pictures_action">Show pictures</string>
@@ -309,12 +287,8 @@ http://k9mail.googlecode.com/
     <string name="message_discarded_toast">Message discarded</string>
     <string name="message_saved_toast">Message saved as draft</string>
 
-    <string name="global_settings_flag_label">Show stars</string>
-    <string name="global_settings_flag_summary">Stars indicate flagged messages</string>
     <string name="global_settings_checkbox_label">Multi-select checkboxes</string>
     <string name="global_settings_checkbox_summary">Always show multi-select checkboxes</string>
-    <string name="global_settings_touchable_label">Message previews</string>
-    <string name="global_settings_touchable_summary">Roomier list items with message previews</string>
     <string name="global_settings_preview_lines_label">Preview lines</string>
     <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>
     <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>
@@ -337,12 +311,9 @@ http://k9mail.googlecode.com/
 
     <string name="global_settings_confirm_actions_title">Confirm actions</string>
     <string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>
-    <string name="global_settings_confirm_action_archive">Archive</string>
     <string name="global_settings_confirm_action_delete">Delete (message view only)</string>
     <string name="global_settings_confirm_action_delete_starred">Delete Starred (message view only)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
-    <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>
-    <string name="global_settings_confirm_action_send">Send</string>
 
     <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>
     <string name="global_settings_notification_hide_subject_never">Never</string>
@@ -365,10 +336,8 @@ http://k9mail.googlecode.com/
     <string name="quiet_time_ends">Quiet Time ends</string>
 
     <string name="account_setup_basics_title">Set up a new account</string>
-    <string name="account_setup_basics_instructions">Enter this account\'s email address:</string>
     <string name="account_setup_basics_email_hint">Email address</string>
     <string name="account_setup_basics_password_hint">Password</string>
-    <string name="account_setup_basics_default_label">Send mail from this account by default</string>
     <string name="account_setup_basics_manual_setup_action">Manual setup</string>
 
     <string name="account_setup_check_settings_title"></string>
@@ -380,7 +349,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_check_settings_canceling_msg">Canceling\u2026</string>
 
     <string name="account_setup_names_title">You\'re almost done!</string>
-    <string name="account_setup_names_instructions">Your account is set up, and mail is on its way!</string>
     <string name="account_setup_names_account_name_label">Give this account a name (optional):</string>
     <string name="account_setup_names_user_name_label">Type your name (displays on outgoing messages):</string>
 
@@ -415,9 +383,6 @@ http://k9mail.googlecode.com/
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Other</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Download headers</string>
-    <string name="account_setup_incoming_save_all_headers_label">Save all message headers locally</string>
-
     <string name="local_storage_provider_external_label">External storage (SD card)</string>
     <string name="local_storage_provider_internal_label">Regular internal storage</string>
     <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>
@@ -452,21 +417,10 @@ http://k9mail.googlecode.com/
     <string name="account_setup_outgoing_smtp_server_label">SMTP server</string>
     <string name="account_setup_outgoing_port_label">Port</string>
     <string name="account_setup_outgoing_security_label">Security</string>
-    <string name="account_setup_outgoing_security_none_label">None</string>
-    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
-    <string name="account_setup_outgoing_security_tls_optional_label">TLS (if available)</string>
-    <string name="account_setup_outgoing_security_tls_label">TLS (always)</string>
     <string name="account_setup_outgoing_require_login_label">Require sign-in.</string>
     <string name="account_setup_outgoing_username_label">Username</string>
     <string name="account_setup_outgoing_password_label">Password</string>
     <string name="account_setup_outgoing_authentication_label">Authentication</string>
-    <!-- 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">Username &amp; password</string>
-    <string name="account_setup_outgoing_authentication_basic_username_label">Username</string>
-    <string name="account_setup_outgoing_authentication_basic_password_label">Password</string>
-    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
-    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
 
     <string name="account_setup_bad_uri">Invalid setup: <xliff:g id="err_mess">%s</xliff:g></string>
 
@@ -749,7 +703,6 @@ http://k9mail.googlecode.com/
 
     <string name="default_identity_description">Initial identity</string>
     <string name="choose_identity_title">Choose identity</string>
-    <string name="choose_account_title">Choose account/identity</string>
     <string name="send_as">Send as</string>
 
     <string name="no_removable_identity">You can\'t remove your only identity</string>
@@ -757,8 +710,6 @@ http://k9mail.googlecode.com/
 
     <string name="sort_earliest_first">Earliest messages first</string>
     <string name="sort_latest_first">Latest messages first</string>
-    <string name="sort_sender_alpha">Sender alphabetical</string>
-    <string name="sort_sender_re_alpha">Sender reverse alphabetical</string>
     <string name="sort_subject_alpha">Subject alphabetical</string>
     <string name="sort_subject_re_alpha">Subject reverse alphabetical</string>
     <string name="sort_flagged_first">Starred messages first</string>
@@ -771,7 +722,6 @@ http://k9mail.googlecode.com/
     <string name="sort_by">Sort by…</string>
     <string name="sort_by_date">Date</string>
     <string name="sort_by_arrival">Arrival</string>
-    <string name="sort_by_sender">Sender</string>
     <string name="sort_by_subject">Subject</string>
     <string name="sort_by_flag">Star</string>
     <string name="sort_by_unread">Read/unread</string>
@@ -853,8 +803,6 @@ http://k9mail.googlecode.com/
     <string name="background_ops_auto_sync">When \'Background data\' &amp; \'Auto-sync\' are checked</string>
     <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>
 
-    <string name="no_message_seletected_toast">No message selected</string>
-
     <string name="date_format_label">Date format</string>
     <!--
       The values of the date_format_* strings MUST be valid date format strings.
@@ -862,20 +810,7 @@ http://k9mail.googlecode.com/
     -->
     <string name="date_format_common">dd-MMM-yyyy</string>
 
-    <string name="batch_ops">Batch Ops</string>
-    <string name="batch_delete_op">Delete selected</string>
-    <string name="batch_mark_read_op">Mark selected read</string>
-    <string name="batch_mark_unread_op">Mark selected unread</string>
-    <string name="batch_flag_op">Add star to selected</string>
-    <string name="batch_unflag_op">Remove star from selected</string>
-    <string name="batch_archive_op">Move selected to Archive</string>
-    <string name="batch_spam_op">Move selected to Spam</string>
-    <string name="batch_move_op">Move selected</string>
-    <string name="batch_copy_op">Copy selected</string>
-    <string name="batch_flag_mode">Star mode</string>
-    <string name="batch_plain_mode">Plain mode</string>
     <string name="batch_select_all">Select all</string>
-    <string name="batch_deselect_all">Clear all selections</string>
 
     <string name="account_setup_push_limit_label">Max folders to check with push</string>
     <string name="account_setup_push_limit_10">10 folders</string>