From 1494a73a83872fd7863039bd1f21dd6e742e68e8 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 4 Mar 2021 16:11:16 +0100
Subject: [PATCH] Update translations

---
 .../legacy/src/main/res/values-ar/strings.xml |   2 +-
 .../legacy/src/main/res/values-be/strings.xml |  23 +++-
 .../legacy/src/main/res/values-bg/strings.xml |   2 +-
 .../legacy/src/main/res/values-br/strings.xml |   2 +-
 .../legacy/src/main/res/values-ca/strings.xml |   4 +-
 .../legacy/src/main/res/values-cs/strings.xml |   2 +-
 .../legacy/src/main/res/values-cy/strings.xml |   2 +-
 .../legacy/src/main/res/values-da/strings.xml |   2 +-
 .../legacy/src/main/res/values-de/strings.xml |   3 +-
 .../legacy/src/main/res/values-el/strings.xml | 114 +++++++++++++++---
 .../legacy/src/main/res/values-eo/strings.xml |   3 +-
 .../legacy/src/main/res/values-es/strings.xml |   2 +-
 .../legacy/src/main/res/values-et/strings.xml |   2 +-
 .../legacy/src/main/res/values-eu/strings.xml |   2 +-
 .../legacy/src/main/res/values-fa/strings.xml |   2 +-
 .../legacy/src/main/res/values-fi/strings.xml |  10 +-
 .../legacy/src/main/res/values-fr/strings.xml |   3 +-
 .../legacy/src/main/res/values-gd/strings.xml |   2 +-
 .../src/main/res/values-gl-rES/strings.xml    |   2 +-
 .../legacy/src/main/res/values-gl/strings.xml |   2 +-
 .../legacy/src/main/res/values-hr/strings.xml |   2 +-
 .../legacy/src/main/res/values-hu/strings.xml |   2 +-
 .../legacy/src/main/res/values-in/strings.xml |   2 +-
 .../legacy/src/main/res/values-is/strings.xml |   2 +-
 .../legacy/src/main/res/values-it/strings.xml |   9 +-
 .../legacy/src/main/res/values-iw/strings.xml |   2 +-
 .../legacy/src/main/res/values-ja/strings.xml |  13 +-
 .../legacy/src/main/res/values-ko/strings.xml |   2 +-
 .../legacy/src/main/res/values-lt/strings.xml |   2 +-
 .../legacy/src/main/res/values-lv/strings.xml |   2 +-
 .../legacy/src/main/res/values-ml/strings.xml |   1 -
 .../legacy/src/main/res/values-nb/strings.xml |   2 +-
 .../legacy/src/main/res/values-nl/strings.xml |   3 +-
 .../legacy/src/main/res/values-pl/strings.xml |   2 +-
 .../src/main/res/values-pt-rBR/strings.xml    |   3 +-
 .../src/main/res/values-pt-rPT/strings.xml    |   4 +-
 .../legacy/src/main/res/values-ro/strings.xml |   2 +-
 .../legacy/src/main/res/values-ru/strings.xml |   3 +-
 .../legacy/src/main/res/values-sk/strings.xml |   2 +-
 .../legacy/src/main/res/values-sl/strings.xml |   3 +-
 .../legacy/src/main/res/values-sq/strings.xml |   3 +-
 .../legacy/src/main/res/values-sr/strings.xml |   2 +-
 .../legacy/src/main/res/values-sv/strings.xml |   3 +-
 .../legacy/src/main/res/values-tr/strings.xml |  12 +-
 .../legacy/src/main/res/values-uk/strings.xml |   2 +-
 .../src/main/res/values-zh-rCN/strings.xml    |   3 +-
 .../src/main/res/values-zh-rTW/strings.xml    |   2 +-
 47 files changed, 202 insertions(+), 74 deletions(-)

diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml
index 9c2b9809a..3c84ea081 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -116,7 +116,6 @@
   <string name="unflag_action">احذف النجمة</string>
   <string name="copy_action">انسخ</string>
   <string name="show_headers_action">أظهر الرؤوس</string>
-  <string name="hide_headers_action">اخفِ الرؤوس</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="zero">ﻻ عناوين نُسخت إلى الحافظة</item>
     <item quantity="one">عنوان واحد نُسخ إلى الحافظة</item>
@@ -516,6 +515,7 @@
   <string name="manage_identities_title">إدارة الهويات</string>
   <string name="manage_identities_context_menu_title">إدارة الهوية</string>
   <string name="edit_identity_title">تعديل الهوية</string>
+  <string name="edit_identity_save">احفظ</string>
   <string name="new_identity_action">هوية جديدة</string>
   <string name="manage_identities_edit_action">حرر</string>
   <string name="manage_identities_move_up_action">إلى الأعلى</string>
diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml
index a978d4f65..083938281 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -9,9 +9,18 @@
   <!--Used in the about dialog-->
   <string name="app_authors">The K-9 Dog Walkers</string>
   <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
+  <string name="source_code">Зыходны код</string>
   <string name="app_license">Ліцэнзія Apache, версія 2.0</string>
+  <string name="about_project_title">Праект з адкрытым зыходным кодам</string>
+  <string name="about_website_title">Сайт</string>
+  <string name="user_forum_title">Форум</string>
+  <string name="about_fediverse_title">Fediverse</string>
+  <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">Бібліятэкі</string>
   <string name="license">Ліцэнзія</string>
+  <string name="changelog_title">Спіс змен</string>
+  <string name="changelog_loading_error">Не атрымалася загрузіць спіс змен.</string>
+  <string name="changelog_version_title">Версія %s</string>
   <!--Welcome message-->
   <string name="welcome_message_title">Вітаем у K-9</string>
   <string name="accounts_welcome"><![CDATA[<p>
@@ -115,7 +124,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="unflag_action">Выдаліць адзнаку</string>
   <string name="copy_action">Капіяваць</string>
   <string name="show_headers_action">Паказаць загалоўкі</string>
-  <string name="hide_headers_action">Схаваць загалоўкі</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Адрас скапіяваны ў буфер абмену</item>
     <item quantity="few">Адрасы скапіяваныя ў буфер абмену</item>
@@ -319,7 +327,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
   <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
   <string name="account_setup_incoming_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" непрыдатны для \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
-  <string name="account_setup_incoming_delete_policy_label">Чаму я выдаліў ліст</string>
+  <string name="account_setup_incoming_delete_policy_label">Дзеянне з лістамі на серверы</string>
   <string name="account_setup_incoming_delete_policy_never_label">Пакінуць на серверы</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Выдаліць з сервера</string>
   <string name="account_setup_incoming_delete_policy_markread_label">Пазначыць на серверы як прачытанае</string>
@@ -329,7 +337,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="account_setup_incoming_other_label">Іншыя</string>
   <string name="local_storage_provider_external_label">Вонкавае сховішча (картка памяці)</string>
   <string name="local_storage_provider_internal_label">Унутранае сховішча</string>
-  <string name="account_setup_expunge_policy_label">Сціраць выдаленыя лісты з сервера</string>
+  <string name="account_setup_expunge_policy_label">Сціранне выдаленых лістоў з сервера</string>
   <string name="account_setup_expunge_policy_immediately">Неадкладна</string>
   <string name="account_setup_expunge_policy_on_poll">Падчас праверкі</string>
   <string name="account_setup_expunge_policy_manual">Уласнаручна</string>
@@ -476,7 +484,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="account_settings_led_color_label">Колер індыкатара</string>
   <string name="account_settings_led_color_summary">Колер індыкатара для апавяшчэнняў для гэтага акаўнта</string>
   <string name="account_settings_mail_display_count_label">Памер лакальнага каталога</string>
-  <string name="account_settings_autodownload_message_size_label">Атрымліваць фрагмент</string>
+  <string name="account_settings_autodownload_message_size_label">Памер атрымання</string>
   <string name="account_settings_autodownload_message_size_1">1 Кб</string>
   <string name="account_settings_autodownload_message_size_2">2 Кб</string>
   <string name="account_settings_autodownload_message_size_4">4 Кб</string>
@@ -492,7 +500,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="account_settings_autodownload_message_size_5120">5 Мб</string>
   <string name="account_settings_autodownload_message_size_10240">10 Мб</string>
   <string name="account_settings_autodownload_message_size_any">цалкам</string>
-  <string name="account_settings_message_age_label">Колькасць сінхранізацыі лістоў</string>
+  <string name="account_settings_message_age_label">Перыяд сінхранізацыі лістоў</string>
   <string name="account_settings_message_age_any">увесь час</string>
   <string name="account_settings_message_age_0">сёння</string>
   <string name="account_settings_message_age_1">2 апошнія дні</string>
@@ -581,6 +589,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="manage_identities_title">Кіраванне ролямі</string>
   <string name="manage_identities_context_menu_title">Кіраванне роляй</string>
   <string name="edit_identity_title">Рэдагаванне ролі</string>
+  <string name="edit_identity_save">Захаваць</string>
   <string name="new_identity_action">Новая роля</string>
   <string name="account_settings_always_bcc_label">Схаваная копія ўсіх паведамленняў</string>
   <string name="manage_identities_edit_action">Рэдагаваць</string>
@@ -681,6 +690,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="volume_navigation_title">Навігацыя клавішамі гучнасці</string>
   <string name="volume_navigation_message">У лісце</string>
   <string name="volume_navigation_list">У спісе</string>
+  <string name="show_unified_inbox_title">Агульная скрыня ўваходных лістоў для ўсіх акаўнтаў</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier"> - не прачытана</string>
   <string name="search_all_messages_title">Усе лісты</string>
@@ -767,7 +777,7 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="dialog_attachment_progress_title">Спампоўванне ўкладзеных файлаў</string>
   <string name="messagelist_sent_to_me_sigil">»</string>
   <string name="messagelist_sent_cc_me_sigil">›</string>
-  <string name="settings_list_backup_category">Рэзервовая копія</string>
+  <string name="settings_list_backup_category">Рэзервовае капіяванне</string>
   <string name="settings_list_miscellaneous_category">Рознае</string>
   <string name="settings_export_title">Экспартаваць налады</string>
   <string name="settings_export_button">Экспарт</string>
@@ -1048,4 +1058,5 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Дазволіць доступ да кантактаў</string>
   <string name="permission_contacts_rationale_message">Для вываду прапаноў імёнаў і фота праграме неабходна мець доступ да кантактаў.</string>
+  <string name="generic_loading_error">Падчас загрузкі даных адбылася памылка</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml
index 69b31c71c..dc624f90c 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -114,7 +114,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="unflag_action">Премахни звезда</string>
   <string name="copy_action">Копирай</string>
   <string name="show_headers_action">Покажи заглавията</string>
-  <string name="hide_headers_action">Скрий заглавията</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Адресът е копиран</item>
     <item quantity="other">Адресите са копирани</item>
@@ -554,6 +553,7 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="manage_identities_title">Управление на самоличности</string>
   <string name="manage_identities_context_menu_title">Управление на самоличност</string>
   <string name="edit_identity_title">Редактиране на индентичноста</string>
+  <string name="edit_identity_save">Запиши</string>
   <string name="new_identity_action">Нова идентичност</string>
   <string name="account_settings_always_bcc_label">Всс всички съобщения до</string>
   <string name="manage_identities_edit_action">Редактирай</string>
diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml
index 4bd99fcdd..02969d078 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -114,7 +114,6 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
   <string name="unflag_action">Dilemel ar steredenn</string>
   <string name="copy_action">Eilañ</string>
   <string name="show_headers_action">Diskouez an talbennoù</string>
-  <string name="hide_headers_action">Kuzhat an talbennoù</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Chomlec’h eilet er golver</item>
     <item quantity="two">Chomlec’hioù eilet er golver</item>
@@ -561,6 +560,7 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
   <string name="manage_identities_title">Merañ ar pivelezhioù</string>
   <string name="manage_identities_context_menu_title">Merañ ar bivelezh</string>
   <string name="edit_identity_title">Embann ar bivelezh</string>
+  <string name="edit_identity_save">Enrollañ</string>
   <string name="new_identity_action">Pivelezh nevez</string>
   <string name="account_settings_always_bcc_label">Bcc an holl gemennadennoù da</string>
   <string name="manage_identities_edit_action">Embann</string>
diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml
index 88634af85..a6e21ed94 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -125,7 +125,6 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="unflag_action">Elimina l\'estel</string>
   <string name="copy_action">Copia</string>
   <string name="show_headers_action">Mostra les capçaleres</string>
-  <string name="hide_headers_action">Amaga les capçaleres</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adreça copiada al porta-retalls</item>
     <item quantity="other">Adreces copiades al porta-retalls</item>
@@ -587,6 +586,7 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="manage_identities_title">Gestiona identitats</string>
   <string name="manage_identities_context_menu_title">Gestiona la identitat</string>
   <string name="edit_identity_title">Edita la identitat</string>
+  <string name="edit_identity_save">Desa</string>
   <string name="new_identity_action">Nova identitat</string>
   <string name="account_settings_always_bcc_label">A/c tots els missatges a</string>
   <string name="manage_identities_edit_action">Edita</string>
@@ -687,6 +687,7 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="volume_navigation_title">Navegació amb botons de volum</string>
   <string name="volume_navigation_message">Vista del missatge</string>
   <string name="volume_navigation_list">A la vista de llistes</string>
+  <string name="show_unified_inbox_title">Mostra la safata d\'entrada unificada</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier">- No llegit</string>
   <string name="search_all_messages_title">Tots els missatges</string>
@@ -1043,4 +1044,5 @@ Podeu guardar aquest missatge i usar-lo com a còpia de seguretat per a la vostr
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Permet l\'accés als contactes</string>
   <string name="permission_contacts_rationale_message">Per poder proporcionar suggeriments de contactes i mostrar-ne els noms i fotografies, l\'aplicació necessita accés als vostres contactes.</string>
+  <string name="generic_loading_error">S\'ha produït un error en carregar les dades</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index 0e54306b2..e8b8315aa 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -115,7 +115,6 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="unflag_action">Odebrat \u2606</string>
   <string name="copy_action">Kopírovat</string>
   <string name="show_headers_action">Zobraz hlavičku</string>
-  <string name="hide_headers_action">Skryj hlavičku</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresa zkopírována do schránky</item>
     <item quantity="few">Adresy zkopírovány do schránky</item>
@@ -567,6 +566,7 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="manage_identities_title">Správa identit</string>
   <string name="manage_identities_context_menu_title">Spravovat identitu</string>
   <string name="edit_identity_title">Upravit identitu</string>
+  <string name="edit_identity_save">Uložit</string>
   <string name="new_identity_action">Nová identita</string>
   <string name="account_settings_always_bcc_label">Kopii všech zpráv na adresu</string>
   <string name="manage_identities_edit_action">Upravit</string>
diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml
index 43e27115b..6074be8de 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -121,7 +121,6 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti
   <string name="unflag_action">Tynnu seren</string>
   <string name="copy_action">Copïo</string>
   <string name="show_headers_action">Dangos penynnau</string>
-  <string name="hide_headers_action">Cuddio penynnau</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Copïwyd y cyfeiriad i\'r clipfwrdd</item>
     <item quantity="two">Copïwyd y cyfeiriadau i\'r clipfwrdd</item>
@@ -587,6 +586,7 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti
   <string name="manage_identities_title">Rheoli hunaniaethau</string>
   <string name="manage_identities_context_menu_title">Rheoli hunaniaeth</string>
   <string name="edit_identity_title">Golygu hunaniaeth</string>
+  <string name="edit_identity_save">Cadw</string>
   <string name="new_identity_action">Hunaniaeth newydd</string>
   <string name="account_settings_always_bcc_label">Bcc pob neges at</string>
   <string name="manage_identities_edit_action">Golygu</string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index b7f8ae8f7..23ce87eef 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -116,7 +116,6 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="unflag_action">Fjern stjernemarkering</string>
   <string name="copy_action">Kopier</string>
   <string name="show_headers_action">Vis headers</string>
-  <string name="hide_headers_action">Skjul headers</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresse kopieret til udklipsholder</item>
     <item quantity="other">Adresser kopieret til udklipsholder</item>
@@ -560,6 +559,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="manage_identities_title">Håndter identiteter</string>
   <string name="manage_identities_context_menu_title">Håndter identitet</string>
   <string name="edit_identity_title">Rediger identitet</string>
+  <string name="edit_identity_save">Gem</string>
   <string name="new_identity_action">Ny identitet</string>
   <string name="account_settings_always_bcc_label">Send altid Bcc til</string>
   <string name="manage_identities_edit_action">Rediger</string>
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index 3d59bdd1b..72131b212 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -126,7 +126,6 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
   <string name="unflag_action">Wichtig-Markierung entfernen</string>
   <string name="copy_action">Kopieren</string>
   <string name="show_headers_action">Kopfzeilen anzeigen</string>
-  <string name="hide_headers_action">Kopfzeilen verbergen</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresse in Zwischenablage kopiert</item>
     <item quantity="other">Adressen in Zwischenablage kopiert</item>
@@ -588,6 +587,7 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
   <string name="manage_identities_title">Identitäten verwalten</string>
   <string name="manage_identities_context_menu_title">Identität bearbeiten</string>
   <string name="edit_identity_title">Identität bearbeiten</string>
+  <string name="edit_identity_save">Speichern</string>
   <string name="new_identity_action">Neue Identität erstellen</string>
   <string name="account_settings_always_bcc_label">Alle Nachrichten als BCC an</string>
   <string name="manage_identities_edit_action">Bearbeiten</string>
@@ -1046,4 +1046,5 @@ Sie können diese Nachricht aufheben und sie als Backup für Ihren geheimen Schl
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Zugriff auf Kontakte erlauben</string>
   <string name="permission_contacts_rationale_message">Damit die App Kontakte vorschlagen sowie Namen und Fotos der Kontakte anzeigen kann, benötigt sie Zugriff auf Ihre Kontakte.</string>
+  <string name="generic_loading_error">Beim Laden der Daten ist ein Fehler aufgetreten</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml
index e0b499c37..e3153e936 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -7,10 +7,20 @@
   <string name="shortcuts_title">Λογαριασμοί K-9</string>
   <string name="unread_widget_label">Μη αναγνωσμένα K-9</string>
   <!--Used in the about dialog-->
+  <string name="app_authors">The K-9 Dog Walkers</string>
   <string name="app_copyright_fmt">Πνευματικά δικαιώματα 2008-<xliff:g>%s</xliff:g> από The K-9 Dog Walkers. Τμηματικά πνευματικά δικαιώματα 2006-<xliff:g>%s</xliff:g> από το Android Open Source Project.</string>
+  <string name="source_code">Πηγαίος κώδικας</string>
   <string name="app_license">Άδεια χρήσης Apache, έκδοση 2.0.</string>
+  <string name="about_project_title">Έργο Ανοιχτού Κώδικα</string>
+  <string name="about_website_title">Ιστότοπος</string>
+  <string name="user_forum_title">Χώρος συζητήσεων χρηστών</string>
+  <string name="about_fediverse_title">Fediverse</string>
+  <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">Βιβλιοθήκες</string>
   <string name="license">Άδεια</string>
+  <string name="changelog_title">Κατάλογος αλλαγών</string>
+  <string name="changelog_loading_error">Δεν ήταν δυνατή η φόρτωση του καταλόγου αλλαγών</string>
+  <string name="changelog_version_title">Έκδοση %s</string>
   <!--Welcome message-->
   <string name="welcome_message_title">Καλώς ήλθατε στο K-9 Mail</string>
   <string name="accounts_welcome"><![CDATA[
@@ -86,9 +96,10 @@
   <string name="reply_all_action">Απάντηση σε όλους</string>
   <string name="delete_action">Διαγραφή</string>
   <string name="archive_action">Αρχειοθέτηση</string>
-  <string name="spam_action">Σκουπιδοταχυδρομείο</string>
+  <string name="spam_action">Ανεπιθύμητα</string>
   <string name="forward_action">Προώθηση</string>
   <string name="forward_as_attachment_action">Προώθηση σαν συνημέννο</string>
+  <string name="edit_as_new_message_action">Επεξεργασία ως νέο μήνυμα</string>
   <string name="move_action">Μετακίνηση</string>
   <string name="move_to_drafts_action">Μετακίνηση στα πρόχειρα</string>
   <string name="single_message_options_action">Επιλογές μηνύματος…</string>
@@ -115,7 +126,6 @@
   <string name="unflag_action">Αφαίρεση αστεριού</string>
   <string name="copy_action">Αντιγραφή</string>
   <string name="show_headers_action">Προβολή επικεφαλίδων</string>
-  <string name="hide_headers_action">Απόκρυψη επικεφαλίδων</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Η διεύθυνση αντιγράφηκε στο πρόχειρο</item>
     <item quantity="other">Οι διευθύνσεις αντιγράφηκαν στο πρόχειρο </item>
@@ -160,7 +170,7 @@
   <string name="notification_action_delete_all">Διαγραφή όλων</string>
   <string name="notification_action_archive">Αρχειοθήκη</string>
   <string name="notification_action_archive_all">Αρχειοθέτηση όλων</string>
-  <string name="notification_action_spam">Σκουπίδια</string>
+  <string name="notification_action_spam">Ανεπιθύμητα</string>
   <string name="notification_certificate_error_title">Σφάλμα πιστοποιητικού για <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_certificate_error_text">Ελέγξτε τις ρυθμίσεις του εξυπηρετητή</string>
   <string name="notification_authentication_error_title">Αποτυχία πιστοποίησης</string>
@@ -171,7 +181,9 @@
   <string name="notification_bg_send_title">Αποστολή μηνύματος</string>
   <string name="notification_bg_title_separator">:</string>
   <string name="notification_channel_messages_title">Μηνύματα</string>
+  <string name="notification_channel_messages_description">Ειδοποιήσεις που αφορούν μηνύματα</string>
   <string name="notification_channel_miscellaneous_title">Διάφορα</string>
+  <string name="notification_channel_miscellaneous_description">Διάφορες ειδοποιήσεις όπως σφάλματα κ.τ.λ.</string>
   <string name="special_mailbox_name_inbox">Εισερχόμενα</string>
   <string name="special_mailbox_name_outbox">Εξερχόμενα</string>
   <string name="special_mailbox_name_drafts">Πρόχειρα</string>
@@ -228,12 +240,12 @@
   <string name="global_settings_flag_label">Προβολή αστεριών</string>
   <string name="global_settings_flag_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>
+  <string name="global_settings_show_correspondent_names_label">Εμφάνιση ονομάτων επιστολογράφων</string>
+  <string name="global_settings_show_correspondent_names_summary">Εμφάνιση των ονομάτων των επιστολογράφων αντί των διευθύνσεων ηλεκτρονικού ταχυδρομείου</string>
   <string name="global_settings_sender_above_subject_label">Αποστολέας πάνω από το θέμα</string>
-  <string name="global_settings_sender_above_subject_summary">Προβολή επιστολογράφων πάνω από τη γραμμή του θέματος και όχι από κάτω</string>
-  <string name="global_settings_show_contact_name_label">Προβολή ονομάτων επαφών</string>
-  <string name="global_settings_show_contact_name_summary">Όνομα επιστολογράφων από Επαφές όταν είναι διαθέσιμο</string>
+  <string name="global_settings_sender_above_subject_summary">Εμφάνιση των ονομάτων των επιστολογράφων πάνω από τη γραμμή του θέματος, όχι από κάτω</string>
+  <string name="global_settings_show_contact_name_label">Εμφάνιση ονομάτων επαφών</string>
+  <string name="global_settings_show_contact_name_summary">Χρήση ονομάτων επιστολογράφων από Επαφές όταν είναι διαθέσιμο</string>
   <string name="global_settings_registered_name_color_label">Χρωματισμός Επαφών</string>
   <string name="global_settings_registered_name_color_changed">Να χρωματίζονται τα ονόματα στη λίστα επαφών</string>
   <string name="global_settings_messageview_fixedwidth_label">Γραμματοσειρά σταθερού πλάτους</string>
@@ -248,7 +260,7 @@
   <string name="global_settings_confirm_actions_summary">Προβολή διαλόγου όποτε εκτελούνται επιλεγμένες ενέργειες</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_spam">Ανεπιθύμητα</string>
   <string name="global_settings_confirm_menu_discard">Απόρριψη μηνύματος</string>
   <string name="global_settings_confirm_menu_mark_all_read">Μαρκάρισμα όλων των μηνυμάτων ως αναγνωσμένων</string>
   <string name="global_settings_confirm_action_delete_notif">Διαγραφή (από ειδοποίηση)</string>
@@ -333,7 +345,7 @@
   <string name="sent_folder_label">Φάκελος Απεσταλμένα</string>
   <string name="trash_folder_label">Φάκελος Διαγραμμένα</string>
   <string name="archive_folder_label">Φάκελος Αρχειοθέτηση</string>
-  <string name="spam_folder_label">Φάκελος Σκουπίδια</string>
+  <string name="spam_folder_label">Φάκελος Ανεπιθύμητα</string>
   <string name="account_setup_incoming_subscribed_folders_only_label">Προβολή μόνον φακέλων υπό παρακολούθηση</string>
   <string name="account_setup_auto_expand_folder">Αυτόματη επέκταση φακέλου</string>
   <string name="account_setup_incoming_webdav_path_prefix_label">Μονοπάτι OWA</string>
@@ -444,19 +456,25 @@
   <string name="account_settings_message_read_receipt_label">Απόδειξη ανάγνωσης</string>
   <string name="account_settings_message_read_receipt_summary">Πάντοτε να απαιτείται απόδειξη ανάγνωσης</string>
   <string name="account_settings_quote_style_label">Μορφή παράθεσης για απάντηση</string>
-  <string name="account_settings_quote_style_prefix">Πρόθεση (όπως στο Gmail, Pine)</string>
+  <string name="account_settings_quote_style_prefix">Πρόθημα (όπως στο Gmail)</string>
   <string name="account_settings_quote_style_header">Επικεφαλίδα (όπως στο Outlook, Yahoo!, Hotmail)</string>
+  <string name="account_settings_upload_sent_messages_label">Αναφόρτωση (ανέβασμα) απεσταλμένων μηνυμάτων</string>
+  <string name="account_settings_upload_sent_messages_summary">Αναφόρτωση (ανέβασμα) μηνυμάτων στον φάκελο «Απεσταλμένα» μετά την αποστολή</string>
   <string name="account_settings_general_title">Γενικές ρυθμίσεις</string>
   <string name="account_settings_reading_mail">Ανάγνωση ταχυδρομείου</string>
   <string name="account_settings_sync">Συγχρονισμός ταχυδρομείου</string>
   <string name="account_settings_folders">Φάκελοι</string>
   <string name="account_settings_quote_prefix_label">Πρόθεμα κειμένου παράθεσης</string>
-  <string name="account_settings_crypto">Κρυπτογράφηση από άκρο σε άκρο</string>
+  <string name="account_settings_crypto">Διατερματική κρυπτογράφηση</string>
   <string name="account_settings_crypto_app">Ενεργοποίηση υποστήριξης OpenPGP</string>
   <string name="account_settings_crypto_app_select_title">Επιλογή εφαρμογής OpenPGP</string>
-  <string name="account_settings_crypto_key">Ρύθμιση κλειδιού απ\' άκρο-σε-άκρο</string>
+  <string name="account_settings_crypto_key">Ρύθμιση διατερματικού κλειδιού</string>
   <string name="account_settings_crypto_summary_off">Δεν έχει ρυθμιστεί εφαρμογή OpenPGP</string>
   <string name="account_settings_crypto_summary_on">Συνδεδεμένος σε %s</string>
+  <string name="account_settings_crypto_summary_config">Διαμόρφωση...</string>
+  <string name="account_settings_crypto_encrypt_all_drafts">Αποθήκευση όλων των πρόχειρων ως κρυπτογραφημένα</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_on">Όλα τα πρόχειρα θα αποθηκεύονται κρυπτογραφημένα</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_off">Κρυπτογράφηση πρόχειρων μόνο εάν είναι ενεργοποιημένη η λειτουργία κρυπτογράφησης</string>
   <string name="account_settings_mail_check_frequency_label">Συχνότητα ενημέρωσης φακέλων</string>
   <string name="account_settings_color_label">Χρώμα λογαριασμού</string>
   <string name="account_settings_color_summary">Επιλογή χρώματος για χρήση στους φακέλους και τη λίστα των λογαριασμών</string>
@@ -517,10 +535,12 @@
   <string name="account_settings_folder_target_mode_not_second_class">Όλοι εκτός από του 2ου επιπέδου</string>
   <string name="account_settings_sync_remote_deletetions_label">Συγχρονισμός διαγραφών στον εξυπηρέτη</string>
   <string name="account_settings_sync_remote_deletetions_summary">Διαγράφονται τα μηνύματα που διαγράφονται στον εξυπηρέτη.</string>
+  <string name="account_settings_openpgp_missing">Λείπει η εφαρμογή OpenPGP - απεγκαταστήθηκε;</string>
   <string name="folder_settings_title">Ρυθμίσεις φακέλων</string>
   <string name="folder_settings_in_top_group_label">Προβολή στην ομάδα κορυφής</string>
   <string name="folder_settings_in_top_group_summary">Προβολή κοντά στην κορυφή της λίστας των φακέλων</string>
   <string name="folder_settings_folder_display_mode_label">Επίπεδο προβολής φακέλου</string>
+  <string name="folder_settings_folder_display_mode_normal">Χωρίς Επίπεδο</string>
   <string name="folder_settings_folder_display_mode_first_class">Πρώτο επίπεδο</string>
   <string name="folder_settings_folder_display_mode_second_class">Δεύτερο επίπεδο</string>
   <string name="folder_settings_folder_sync_mode_normal">Κανένας</string>
@@ -528,10 +548,12 @@
   <string name="folder_settings_folder_sync_mode_second_class">Δεύτερο επίπεδο</string>
   <string name="folder_settings_folder_sync_mode_inherited">Όπως το επίπεδο προβολής</string>
   <string name="folder_settings_folder_push_mode_label">Επίπεδο σπρωξίματος φακέλου</string>
+  <string name="folder_settings_folder_push_mode_normal">Χωρίς Επίπεδο</string>
   <string name="folder_settings_folder_push_mode_first_class">Πρώτο επίπεδο</string>
   <string name="folder_settings_folder_push_mode_second_class">Δεύτερο επίπεδο</string>
   <string name="folder_settings_folder_push_mode_inherited">Όπως το επίπεδο συγχρονισμού</string>
   <string name="folder_settings_folder_notify_mode_label">Επίπεδο ειδοποίησης φακέλου</string>
+  <string name="folder_settings_folder_notify_mode_normal">Χωρίς Επίπεδο</string>
   <string name="folder_settings_folder_notify_mode_first_class">Πρώτο επίπεδο</string>
   <string name="folder_settings_folder_notify_mode_second_class">Δεύτερο επίπεδο</string>
   <string name="folder_settings_folder_notify_mode_inherited">Όπως το επίπεδο σπρωξίματος </string>
@@ -564,6 +586,7 @@
   <string name="manage_identities_title">Ρύθμιση ταυτοτήτων</string>
   <string name="manage_identities_context_menu_title">Ρύθμιση ταυτότητας</string>
   <string name="edit_identity_title">Διόρθωση ταυτότητας</string>
+  <string name="edit_identity_save">Αποθήκευση</string>
   <string name="new_identity_action">Νέα ταυτότητα</string>
   <string name="account_settings_always_bcc_label">Ιδιωτική κοινοποίηση όλων των μηνυμάτων προς</string>
   <string name="manage_identities_edit_action">Διόρθωση</string>
@@ -612,6 +635,8 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Άγνωστο πιστοποιητικό</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Αποδοχή κλειδιού</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Απόρριψη κλειδιού</string>
+  <string name="message_view_help_key">Del (or D) - Διαγραφή\nR - Απάντηση\nA - Απάντηση Όλων\nC - Σύνθεση\nF - Προώθηση\nM - Μετακίνηση\nV - Αρχειοθέτηση\nY - Αντιγραφή\nZ - Σημείωση ως (μη) αναγνωσμένο\nG - Αστέρι\nO - Ταξινόμηση κατά τύπο\nI - Ταξινόμηση κατά σειρά\nQ - Επιστροφή στους Φακέλους\nS - Επιλογή/αποεπιλογή\nJ or P - Προηγούμενο Μήνυμα\nK or N - Επόμενο Μήνυμα</string>
+  <string name="message_list_help_key">Del (or D) - Διαγραφή\nC - Σύνθεση\nM - Μετακίνηση\nV - Αρχειοθέτηση\nY - Αντιγραφή\nZ - Σημείωση ως (μη) αναγνωσμένο\nG - Αστέρι\nO - Ταξινόμηση κατά τύπο\nI - Ταξινόμηση κατά σειρά\nQ - Επιστροφή στους Φακέλους\nS - Επιλογή/αποεπιλογή</string>
   <string name="folder_list_filter_hint">Το όνομα του φακέλου περιέχει</string>
   <string name="folder_list_display_mode_label">Φάκελοι</string>
   <string name="folder_list_display_mode_all">Προβολή όλων</string>
@@ -624,6 +649,7 @@
   <string name="setting_theme_global">Χρήση θέματος εφαρμογής</string>
   <string name="setting_theme_dark">Σκοτεινό</string>
   <string name="setting_theme_light">Ανοιχτόχρωμο</string>
+  <string name="setting_theme_follow_system">Χρήση προεπιλεγμένου</string>
   <string name="display_preferences">Προβολή</string>
   <string name="global_preferences">Γενικές</string>
   <string name="debug_preferences">Αποσφαλμάτωση</string>
@@ -661,6 +687,7 @@
   <string name="volume_navigation_title">Πλοήγηση με πλήκτρο έντασης</string>
   <string name="volume_navigation_message">Προβολή μηνύματος</string>
   <string name="volume_navigation_list">Διάφορες προβολές λίστας</string>
+  <string name="show_unified_inbox_title">Εμφάνιση Ενιαία Εισερχόμενα</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier"> - Μη αναγνωσμένα</string>
   <string name="search_all_messages_title">Όλα τα μηνύματα</string>
@@ -733,7 +760,7 @@
   <string name="dialog_confirm_empty_trash_message">Θέλετε να αδειάσετε το φάκελο απορριμμάτων;</string>
   <string name="dialog_confirm_mark_all_as_read_confirm_button">Ναι</string>
   <string name="dialog_confirm_mark_all_as_read_cancel_button">Όχι</string>
-  <string name="dialog_confirm_spam_title">Επιβεβαίωση μετακίνησης στο φάκελο σκουπιδιών</string>
+  <string name="dialog_confirm_spam_title">Επιβεβαίωση μετακίνησης στον φάκελο ανεπιθύμητης αλληλογραφίας</string>
   <plurals name="dialog_confirm_spam_message">
     <item quantity="one">Θέλετε πράγματι να μετακινήσετε αυτό το μήνυμα στο φάκελο σκουπιδιών;</item>
     <item quantity="other">Θέλετε πραγματικά να μετακινήσετε <xliff:g id="message_count">%1$d</xliff:g> μηνύματα στο φάκελο ανεπιθύμητης αλληλογραφίας;</item>
@@ -755,7 +782,9 @@
   <string name="settings_import_pick_document_button">Επιλογή αρχείου</string>
   <string name="settings_import_button">Εισαγωγή</string>
   <string name="settings_import_success_generic">Οι ρυθμίσεις έχουν εισαχθεί με επιτυχία</string>
+  <string name="settings_import_password_required">Παρακαλώ εισάγετε συνθηματικά</string>
   <string name="settings_import_failure">Αποτυχία εισαγωγής ρυθμίσεων</string>
+  <string name="settings_import_read_failure">Αποτυχία ανάγνωσης αρχείου ρυθμίσεων</string>
   <string name="settings_import_partial_failure">Αποτυχία εισαγωγής ορισμένων ρυθμίσεων</string>
   <string name="settings_import_status_success">Η εισαγωγή ολοκληρώθηκε με επιτυχία</string>
   <string name="settings_import_status_password_required">Απαιτείται κωδικός πρόσβασης</string>
@@ -774,8 +803,12 @@
   <string name="server_name_format">Όνομα διακομιστή: <xliff:g id="hostname">%s</xliff:g></string>
   <string name="unread_widget_select_account">Προβολή πλήθους μη αναγνωσμένων για…</string>
   <string name="unread_widget_account_title">Λογαριασμός</string>
+  <string name="unread_widget_account_summary">Ο λογαριασμός για τον οποίο θα πρέπει να εμφανίζεται ο αριθμός μη αναγνωσμένων</string>
   <string name="unread_widget_unified_inbox_account_summary">Ενιαία Εισερχόμενα</string>
+  <string name="unread_widget_folder_enabled_title">Αριθμός φακέλων</string>
+  <string name="unread_widget_folder_enabled_summary">Εμφάνιση του αριθμού μη αναγνωσμένων μηνυμάτων ενός μόνο φακέλου</string>
   <string name="unread_widget_folder_title">Φάκελος</string>
+  <string name="unread_widget_folder_summary">Ο φάκελος για τον οποίον να εμφανίζεται ο αριθμός μη αναγνωσμένων μηνυμάτων</string>
   <string name="unread_widget_action_done">Ολοκληρώθηκε</string>
   <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> - <xliff:g id="folder_name">%2$s</xliff:g></string>
   <string name="unread_widget_account_not_selected">Δεν έχει επιλεγεί λογαριασμός</string>
@@ -785,6 +818,7 @@
   <string name="webview_contextmenu_link_share_action">Κοινοποίηση συνδέσμου</string>
   <string name="webview_contextmenu_link_copy_action">Αντιγραφή συνδέσμου στο clipboard</string>
   <string name="webview_contextmenu_link_clipboard_label">Σύνδεσμος</string>
+  <string name="webview_contextmenu_link_text_copy_action">Αντιγραφή συνδέσμου στο πρόχειρο</string>
   <string name="webview_contextmenu_image_title">Εικόνα</string>
   <string name="webview_contextmenu_image_view_action">Προβολή εικόνας</string>
   <string name="webview_contextmenu_image_save_action">Αποθήκευση εικόνας</string>
@@ -867,7 +901,7 @@
   <string name="compose_error_no_key_configured">Δεν έχει ρυθμιστεί κλειδί για αυτόν το λογαριασμό! Ελέγξτε τις ρυθμίσεις σας.</string>
   <string name="error_crypto_provider_incompatible">Η υπηρεσία παροχής κρυπτογράφησης χρησιμοποιεί μη συμβατή έκδοση. Ελέγξτε τις ρυθμίσεις σας!</string>
   <string name="error_crypto_provider_connect">Δεν είναι δυνατή η σύνδεση με τον πάροχο κρυπτογράφησης, ελέγξτε τις ρυθμίσεις σας ή πιέστε το εικονίδιο κρυπτογράφηση για επανάληψη!</string>
-  <string name="error_crypto_provider_ui_required">Απέτυχε η προετοιμασία της κρυπτογράφησης από άκρο σε άκρο, ελέγξτε τις ρυθμίσεις σας</string>
+  <string name="error_crypto_provider_ui_required">Απέτυχε η προετοιμασία της διατερματικής κρυπτογράφησης, ελέγξτε τις ρυθμίσεις σας</string>
   <string name="error_crypto_inline_attach">Η λειτουργία σε PGP/INLINE δεν υποστιρίχει συνημμένα αρχεία!</string>
   <string name="enable_inline_pgp">Ενεργοποίηση PGP/INLINE</string>
   <string name="disable_inline_pgp">Απενεργοποίηση PGP/INLINE</string>
@@ -891,12 +925,33 @@
   <string name="openpgp_dialog_sign_only_minus_attach">Οι υπογραφές μπορεί να εμφανίζονται ως συνημμένα «signature.asc» σε μερικά προγράμματα.</string>
   <string name="openpgp_dialog_sign_only_neutral_encsigned">Τα κρυπτογραφημένα μηνύματα περιλαμβάνουν πάντα μια υπογραφή.</string>
   <string name="crypto_msg_title_plaintext">Aπλό κείμενο</string>
-  <string name="crypto_msg_unencrypted_sign_error">Η υπογραφή κρυπτογράφησης από άκρο σε άκρο περιείχε σφάλμα</string>
+  <string name="crypto_msg_unencrypted_sign_error">η υπογραφή διατερματικής κρυπτογράφησης περιείχε σφάλμα</string>
+  <string name="crypto_msg_incomplete_signed">απαιτείται η πλήρης λήψη του μηνύματος για επεξεργασία υπογραφής </string>
+  <string name="crypto_msg_unsupported_signed">περιέχει μη υποστηριζομενη διατερματική υπογραφή</string>
   <string name="crypto_msg_unsupported_encrypted">Το μήνυμα είναι κρυπτογραφημένο σε μη υποστηριζόμενη μορφοποίηση</string>
   <string name="crypto_msg_cancelled">Το μήνυμα είναι κρυπτογραφημένο, αλλά η αποκρυπτογράφηση ακυρώθηκε.</string>
+  <string name="crypto_msg_title_unencrypted_signed_e2e">Διατερματικά υπογεγραμμένο απλό κείμενο</string>
+  <string name="crypto_msg_unencrypted_sign_verified">από επικυρωμένο υπογράφοντα</string>
+  <string name="crypto_msg_unencrypted_sign_mismatch">όμως το διατερματικό κλειδί δεν ταίριαξε με τον αποστολέα</string>
+  <string name="crypto_msg_unencrypted_sign_expired">όμως το διατερματικό κλειδί έχει λήξει</string>
+  <string name="crypto_msg_unencrypted_sign_revoked">όμως το διατερματικό κλειδί έχει ανακληθεί</string>
+  <string name="crypto_msg_unencrypted_sign_insecure">όμως το διατερματικό κλειδί δε θεωρείται ασφαλές</string>
+  <string name="crypto_msg_unencrypted_sign_unknown">από άγνωστο διατερματικό κλειδί</string>
   <string name="crypto_msg_title_encrypted_unknown">Κρυπτογραφημένο </string>
+  <string name="crypto_msg_encrypted_error">όμως υπήρξε ένα σφάλμα αποκρυπτογράφησης </string>
+  <string name="crypto_msg_encrypted_incomplete">απαιτείται πλήρης λήψη του μηνύματος για αποκρυπτογράφηση</string>
   <string name="crypto_msg_title_encrypted_unsigned">Κρυπτογραφημένο</string>
+  <string name="crypto_msg_encrypted_unsigned">όμως όχι διατερματικά</string>
+  <string name="crypto_msg_title_encrypted_signed_e2e">Διατερματικά κρυπτογραφημένο </string>
+  <string name="crypto_msg_encrypted_sign_verified">από επικυρωμένο αποστολέα</string>
   <string name="crypto_msg_title_encrypted_signed">Κρυπτογραφημένο</string>
+  <string name="crypto_msg_encrypted_sign_unknown">από άγνωστο από άκρο σε άκρο κλειδί</string>
+  <string name="crypto_msg_encrypted_sign_mismatch">όμως το διατερματικό κλειδί δεν ταίριαξε με τον αποστολέα</string>
+  <string name="crypto_msg_encrypted_sign_expired">όμως το διατερματικό κλειδί έχει λήξει</string>
+  <string name="crypto_msg_encrypted_sign_revoked">όμως το διατερματικό κλειδί έχει ανακληθεί</string>
+  <string name="crypto_msg_encrypted_sign_insecure">όμως το διατερματικό κλειδί δε θεωρείται ασφαλές</string>
+  <string name="crypto_msg_encrypted_sign_error">όμως τα διατερματικά δεδομένα έχουν σφάλματα</string>
+  <string name="crypto_msg_encrypted_insecure">όμως η κρυπτογράφηση δε θεωρείται ασφαλής</string>
   <string name="crypto_info_ok">Εντάξει</string>
   <string name="crypto_info_search_key">Αναζήτηση Κλειδιού</string>
   <string name="crypto_info_view_signer">Προβολή Υπογράφοντα</string>
@@ -943,9 +998,35 @@
   <string name="openpgp_enabled_error_back">Πίσω</string>
   <string name="openpgp_enabled_error_disable">Απενεργοποίηση Κρυπτογράφησης</string>
   <string name="openpgp_encryption">Κρυπτογράφηση OpenPGP</string>
+  <string name="dialog_autocrypt_mutual_description_1">Τα μηνύματα θα είναι, κανονικά, κρυπτογραφημένα από επιλογή ή όταν δίνονται ως απάντηση σε κρυπτογραφημένο μήνυμα.</string>
+  <string name="dialog_autocrypt_mutual_learn_more">Μπορείτε να πατήσετε <a href="https://k9mail.github.io/2018/02/26/OpenPGP-Considerations-Part-III-Autocrypt.html">εδώ</a> για να μάθετε περισσότερα.</string>
   <string name="general_settings_title">Γενικές ρυθμίσεις</string>
+  <string name="dialog_openkeychain_info_title">Δεν υπάρχει εγκατεστημένη εφαρμογή OpenPGP</string>
+  <string name="dialog_openkeychain_info_install">Εγκατάσταση</string>
+  <string name="dialog_openkeychain_info_text">Το K-9 Mail χρειάζεται το OpenKeychain για διατερματική κρυπτογράφηση.</string>
   <string name="encrypted_subject">Κρυπτογραφημένο μήνυμα</string>
+  <string name="account_settings_crypto_encrypt_subject">Κρυπτογράφηση θεμάτων των μηνυμάτων </string>
+  <string name="account_settings_crypto_encrypt_subject_subtitle">Ενδέχεται να μην υποστηρίζεται από ορισμένους παραλήπτες</string>
+  <string name="toast_account_not_found">Εσωτερικό σφάλμα: Μη έγκυρος λογαριασμός!</string>
+  <string name="toast_openpgp_provider_error">Σφάλμα σύνδεσης στο %s!</string>
+  <string name="ac_transfer_setting_title">Αποστολή Μηνύματος Ρύθμισης Autocrypt</string>
+  <string name="ac_transfer_setting_summary">Μοιραστείτε, με ασφάλεια, διατερματικές ρυθμίσεις με άλλες συσκευές</string>
+  <string name="ac_transfer_title">Μήνυμα Ρύθμισης Autocrypt</string>
+  <string name="ac_transfer_intro">Ένα Μήνυμα Ρύθμισης Autocrypt μοιράζεται, με ασφάλεια, τη διατερματική σας ρύθμιση με άλλες συσκευές.</string>
+  <string name="ac_transfer_button_send">Αποστολή Μηνύματος Ρύθμισης</string>
+  <string name="ac_transfer_will_be_sent">Το μήνυμα θα σταλεί στη διεύθυνσή σας:</string>
+  <string name="ac_transfer_generating">Δημιουργία μηνύματος ρύθμισης...</string>
   <string name="ac_transfer_sending_to">Αποστολή μηνύματος σε:</string>
+  <string name="ac_transfer_finish">Για να τελειώσετε, ανοίξτε το μήνυμα στην άλλη συσκευή σας και καταχωρίστε τον κωδικό ρύθμισης.</string>
+  <string name="ac_transfer_show_code">Εμφάνιση Κωδικού Ρύθμισης</string>
+  <string name="ac_transfer_msg_subject">Μήνυμα Ρύθμισης Autocrypt</string>
+  <string name="ac_transfer_msg_body">Αυτό το μήνυμα περιέχει όσες πληροφορίες χρειάζεστε για την ασφαλή μεταφορά των ρυθμίσεων Autocrypt μαζί με το μυστικό σας κλειδί από την αρχική συσκευή. 
+
+Για να ρυθμίσετε τη νέα σας συσκευή για Autocrypt, παρακαλώ ακολουθήστε τις οδηγίες που θα πρέπει να παρουσιάζονται από τη νέα σας συσκευή. 
+
+Μπορείτε να κρατήσετε αυτό το μήνυμα και να το χρησιμοποιήσετε ως εφεδρικό για το μυστικό σας κλειδί. Εάν αυτό επιθυμείτε, θα πρέπει να σημειώσετε τον κωδικό και να τον αποθηκεύσετε σε ασφαλές σημείο.
+</string>
+  <string name="ac_transfer_error_send">Προέκυψε ένα σφάλμα κατά την αποστολή του μηνύματος. Παρακαλώ ελέγξτε τη συνδεσιμότητα του δικτύου σας και τη διαμόρφωση του εξερχόμενου διακομιστή.</string>
   <string name="switch_on">Ενεργό</string>
   <string name="switch_off">Ανενεργό</string>
   <string name="navigation_drawer_open">Άνοιγμα</string>
@@ -953,4 +1034,5 @@
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Να επιτρέπεται η πρόσβαση στις επαφές</string>
   <string name="permission_contacts_rationale_message">Για να είναι δυνατή η παροχή προτάσεων επαφών και η εμφάνιση των ονομάτων και φωτογραφιών των επαφών, η εφαρμογή χρειάζεται πρόσβαση στις επαφές σας.</string>
+  <string name="generic_loading_error">Προέκυψε σφάλμα κατά τη φόρτωση των δεδομένων</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index 356ab3da9..0237312ea 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -124,7 +124,6 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="unflag_action">Malsteletigi</string>
   <string name="copy_action">Kopii</string>
   <string name="show_headers_action">Montri mesaĝokapojn</string>
-  <string name="hide_headers_action">Kaŝi mesaĝokapojn</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adreso kopiita al tondujo</item>
     <item quantity="other">Adresoj kopiitaj al tondujo</item>
@@ -585,6 +584,7 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="manage_identities_title">Administri identigilojn</string>
   <string name="manage_identities_context_menu_title">Administri identigilon</string>
   <string name="edit_identity_title">Redakti identigilon</string>
+  <string name="edit_identity_save">Konservi</string>
   <string name="new_identity_action">Nova identigilo</string>
   <string name="account_settings_always_bcc_label">Kaŝkopii ĉiujn mesaĝojn al</string>
   <string name="manage_identities_edit_action">Redakti</string>
@@ -1042,4 +1042,5 @@ Vi povas konservi tiun ĉi mesaĝon kaj uzi ĝin kiel sekurkopion de via privata
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Permesu aliron al kontaktoj</string>
   <string name="permission_contacts_rationale_message">Por ebligi al K-9 sugesti kontaktojn kaj vidigi iliajn nomojn kaj fotojn, la aplikaĵo postulas aliron al viaj kontaktoj.</string>
+  <string name="generic_loading_error">Eraro okazis dum enlegi datumojn</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml
index 59a09237a..a8c280a38 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -116,7 +116,6 @@ Por favor informe de fallos, aporte nueva funcionalidad o envíe sus preguntas a
   <string name="unflag_action">Borrar estrella</string>
   <string name="copy_action">Copiar</string>
   <string name="show_headers_action">Mostrar cabeceras</string>
-  <string name="hide_headers_action">Ocultar cabeceras</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Se ha copiado la dirección al portapapeles</item>
     <item quantity="other">Se han copiado las direcciones al portapeles</item>
@@ -577,6 +576,7 @@ Por favor informe de fallos, aporte nueva funcionalidad o envíe sus preguntas a
   <string name="manage_identities_title">Gestionar identidades</string>
   <string name="manage_identities_context_menu_title">Gestionar identidad</string>
   <string name="edit_identity_title">Editar identidad</string>
+  <string name="edit_identity_save">Guardar</string>
   <string name="new_identity_action">Nueva identidad</string>
   <string name="account_settings_always_bcc_label">Cco en todos los mensajes para</string>
   <string name="manage_identities_edit_action">Editar</string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index 73719d9fc..833397802 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -86,7 +86,6 @@
   <string name="unflag_action">Eemalda tärn</string>
   <string name="copy_action">Kopeeri</string>
   <string name="show_headers_action">Näita päiseid</string>
-  <string name="hide_headers_action">Peida päised</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Aadress kopeeritud lõikelauale</item>
     <item quantity="other">Aadressid kopeeritud lõikelauale</item>
@@ -534,6 +533,7 @@
   <string name="manage_identities_title">Halda indentiteete</string>
   <string name="manage_identities_context_menu_title">Halda identiteeti</string>
   <string name="edit_identity_title">Muuda identiteeti</string>
+  <string name="edit_identity_save">Salvesta</string>
   <string name="new_identity_action">Uus identiteet</string>
   <string name="account_settings_always_bcc_label">Kõikide sõnumite Bcc saata</string>
   <string name="manage_identities_edit_action">Muuda</string>
diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml
index dfac00eb5..7e9171a1b 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -114,7 +114,6 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="unflag_action">Kendu izarra</string>
   <string name="copy_action">Kopiatu</string>
   <string name="show_headers_action">Erakutsi goiburuak</string>
-  <string name="hide_headers_action">Ezkutatu goiburuak</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Helbidea arbelera kopiatuta</item>
     <item quantity="other">Helbideak arbelera kopiatuta</item>
@@ -556,6 +555,7 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="manage_identities_title">Kudeatu identitateak</string>
   <string name="manage_identities_context_menu_title">Kudeatu identitatea</string>
   <string name="edit_identity_title">Editatu identitatea</string>
+  <string name="edit_identity_save">Gorde</string>
   <string name="new_identity_action">Identitate berria</string>
   <string name="account_settings_always_bcc_label">Mezu guztietarako Bcc</string>
   <string name="manage_identities_edit_action">Editatu</string>
diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml
index 3b04356cf..097b233a3 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -115,7 +115,6 @@
   <string name="unflag_action">حذف ستاره</string>
   <string name="copy_action">کپی به</string>
   <string name="show_headers_action">نمایش سرایندها</string>
-  <string name="hide_headers_action">پنهان‌کردن سرایندها</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">نشانی‌ها در بریده‌دان کپی شد</item>
     <item quantity="other">نشانی‌ها در بریده‌دان کپی شد</item>
@@ -577,6 +576,7 @@
   <string name="manage_identities_title">مدیریت هویت‌ها</string>
   <string name="manage_identities_context_menu_title">مدیریت هویت</string>
   <string name="edit_identity_title">ویرایش هویت</string>
+  <string name="edit_identity_save">ذخیره</string>
   <string name="new_identity_action">هویت جدید</string>
   <string name="account_settings_always_bcc_label">همهٔ پیام‌ها «مخفیانه به» کجا ارسال شوند؟</string>
   <string name="manage_identities_edit_action">ویرایش</string>
diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml
index bf92a35b8..ceb0fa22a 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -124,7 +124,6 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="unflag_action">Poista tähti</string>
   <string name="copy_action">Kopioi</string>
   <string name="show_headers_action">Näytä otsikot</string>
-  <string name="hide_headers_action">Piilota otsikot</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Osoite kopioitu leikepöydälle</item>
     <item quantity="other">Osoitteet kopioitu leikepöydälle</item>
@@ -585,6 +584,7 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="manage_identities_title">Identiteettien hallinta</string>
   <string name="manage_identities_context_menu_title">Identiteetin hallinta</string>
   <string name="edit_identity_title">Muokkaa identiteettiä</string>
+  <string name="edit_identity_save">Tallenna</string>
   <string name="new_identity_action">Uusi identiteetti</string>
   <string name="account_settings_always_bcc_label">Piilokopio kaikista viesteistä osoitteeseen</string>
   <string name="manage_identities_edit_action">Muokkaa</string>
@@ -685,14 +685,15 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="volume_navigation_title">Navigointi äänenvoimakkuusnäppäimillä</string>
   <string name="volume_navigation_message">Viestinäkymä</string>
   <string name="volume_navigation_list">Erilaisia listanäkymiä</string>
+  <string name="show_unified_inbox_title">Näytä \"Yhdistetty saapuneet\"</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier"> - Lukemattomat</string>
   <string name="search_all_messages_title">Kaikki viestit</string>
   <string name="search_all_messages_detail">Kaikki viestit kansioissa, joihin voidaan tehdä hakuja</string>
-  <string name="integrated_inbox_title">Yhdistetty Saapuneet-kansio</string>
-  <string name="integrated_inbox_detail">Kaikki viestit yhdistetyssä Saapuneet-kansiossa</string>
+  <string name="integrated_inbox_title">Yhdistetty saapuneet</string>
+  <string name="integrated_inbox_detail">Kaikki viestit Yhdistetty saapuneet -kansiossa</string>
   <string name="folder_settings_include_in_integrated_inbox_label">Yhdistä</string>
-  <string name="folder_settings_include_in_integrated_inbox_summary">Kaikki viestit näytetään yhdistetyssä Saapuneet-kansiossa</string>
+  <string name="folder_settings_include_in_integrated_inbox_summary">Kaikki viestit näytetään Yhdistetty saapuneet -kansiossa</string>
   <string name="account_settings_searchable_label">Etsi kansioista</string>
   <string name="account_settings_searchable_all">Kaikki</string>
   <string name="account_settings_searchable_displayable">Näytettävissä olevat</string>
@@ -1041,4 +1042,5 @@ Voit säilyttää tämän viestin ja käyttää sitä varmuuskopioina salausavai
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Salli pääsy yhteystietoihin</string>
   <string name="permission_contacts_rationale_message">Tämä sovellus vaatii käyttöoikeuden yhteystietoihisi, jotta sovellus voi tehdä ehdotuksia yhteystietoihin liittyen ja näyttää yhteystietojen nimiä sekä kuvia.</string>
+  <string name="generic_loading_error">Tietoja ladatessa tapahtui virhe</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index f564239a3..00a655fe1 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -126,7 +126,6 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions
   <string name="unflag_action">Supprimer l’étoile</string>
   <string name="copy_action">Copier</string>
   <string name="show_headers_action">Afficher les en-têtes</string>
-  <string name="hide_headers_action">Cacher les en-têtes</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresse copiée dans le presse-papiers</item>
     <item quantity="other">Adresses copiées dans le presse-papiers</item>
@@ -588,6 +587,7 @@ jusqu’à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="manage_identities_title">Gérer les identités</string>
   <string name="manage_identities_context_menu_title">Gérer l’identité</string>
   <string name="edit_identity_title">Modifier l’identité</string>
+  <string name="edit_identity_save">Enregistrer</string>
   <string name="new_identity_action">Nouvelle identité</string>
   <string name="account_settings_always_bcc_label">Envoyer une copie Cci de tous les courriels à</string>
   <string name="manage_identities_edit_action">Modifier</string>
@@ -1040,4 +1040,5 @@ jusqu’à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Autoriser l’accès au contact</string>
   <string name="permission_contacts_rationale_message">Afin de fournir des suggestions de contact et d’afficher les noms et les photos des contacts, l’appli a besoin d’accéder à vos contacts.</string>
+  <string name="generic_loading_error">Une erreur est survenue lors du chargement des données</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml
index 641053039..49e11f6c9 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -104,7 +104,6 @@ Fàilte air bugaichean, com-pàirteachas, iarrtasan airson gleusan ùra is ceist
   <string name="unflag_action">Thoir an rionnag air falbh</string>
   <string name="copy_action">Lethbhreac</string>
   <string name="show_headers_action">Seall na bannan-cinn</string>
-  <string name="hide_headers_action">Falaich na bannan-cinn</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Chaidh an seòladh a chur air an stòr-bhòrd</item>
     <item quantity="two">Chaidh na seòlaidhean a chur air an stòr-bhòrd</item>
@@ -525,6 +524,7 @@ Fàilte air bugaichean, com-pàirteachas, iarrtasan airson gleusan ùra is ceist
   <string name="manage_identities_title">Stiùirich na IDs</string>
   <string name="manage_identities_context_menu_title">Stiùirich an ID</string>
   <string name="edit_identity_title">Deasaich an ID</string>
+  <string name="edit_identity_save">Sàbhail</string>
   <string name="new_identity_action">ID ùr</string>
   <string name="account_settings_always_bcc_label">Cuir Bcc de gach teachdaireachd gu</string>
   <string name="manage_identities_edit_action">Deasaich</string>
diff --git a/app/ui/legacy/src/main/res/values-gl-rES/strings.xml b/app/ui/legacy/src/main/res/values-gl-rES/strings.xml
index cfc33e026..fe4c28762 100644
--- a/app/ui/legacy/src/main/res/values-gl-rES/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl-rES/strings.xml
@@ -72,7 +72,6 @@
   <string name="unflag_action">Eliminar estrela</string>
   <string name="copy_action">Copiar</string>
   <string name="show_headers_action">Mostrar cabeceiras</string>
-  <string name="hide_headers_action">Agochar cabeceiras</string>
   <string name="message_view_theme_action_dark">Tema escuro</string>
   <string name="message_view_theme_action_light">Tema claro</string>
   <string name="mark_as_unread_action">Marcar como non lida</string>
@@ -456,6 +455,7 @@
   <string name="manage_identities_title">Administrar identidades</string>
   <string name="manage_identities_context_menu_title">Administrar identidade</string>
   <string name="edit_identity_title">Editar identidade</string>
+  <string name="edit_identity_save">Gardar</string>
   <string name="new_identity_action">Nova identidade</string>
   <string name="account_settings_always_bcc_label">Bcc todas as mensaxes a</string>
   <string name="manage_identities_edit_action">Editar</string>
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index 690a73af4..f49c3a737 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -107,7 +107,6 @@ Por favor envíen informes de fallos, contribúa con novas características e co
   <string name="unflag_action">Eliminar Estrela</string>
   <string name="copy_action">Copiar</string>
   <string name="show_headers_action">Mostrar cabeceiras</string>
-  <string name="hide_headers_action">Agochar cabeceiras</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Enderezo copiado ao portapapeis</item>
     <item quantity="other">Enderezos copiados ao portapapeis</item>
@@ -526,6 +525,7 @@ Por favor envíen informes de fallos, contribúa con novas características e co
   <string name="manage_identities_title">Identidades</string>
   <string name="manage_identities_context_menu_title">Identidades</string>
   <string name="edit_identity_title">Editar identidade</string>
+  <string name="edit_identity_save">Gardar</string>
   <string name="new_identity_action">Nova identidade</string>
   <string name="account_settings_always_bcc_label">CCo todas as mensaxes para</string>
   <string name="manage_identities_edit_action">Editar</string>
diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml
index 3b1695f40..c2dfd2242 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -86,7 +86,6 @@
   <string name="unflag_action">Ukloni zvjezdicu</string>
   <string name="copy_action">Kopiraj</string>
   <string name="show_headers_action">Prikaži zaglavlje</string>
-  <string name="hide_headers_action">Sakrij zaglavlje</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresa kopirana u međuspremnik</item>
     <item quantity="few">Adrese kopirane u međuspremnik</item>
@@ -549,6 +548,7 @@
   <string name="manage_identities_title">Upravljanje identitetima</string>
   <string name="manage_identities_context_menu_title">Upravljaj identitetom</string>
   <string name="edit_identity_title">Uređivanje identiteta</string>
+  <string name="edit_identity_save">Spremi</string>
   <string name="new_identity_action">Novi identitet</string>
   <string name="account_settings_always_bcc_label">Bcc sve poruke na</string>
   <string name="manage_identities_edit_action">Uredi</string>
diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml
index 1941969de..9625b21d3 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -115,7 +115,6 @@ Hibajelentések beküldésével hozzájárulhatunk új funkciókhoz és kérdés
   <string name="unflag_action">Csillag eltávolítása</string>
   <string name="copy_action">Másolás</string>
   <string name="show_headers_action">Fejlécek megjelenítése</string>
-  <string name="hide_headers_action">Fejlécek elrejtése</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Cím a vágólapra másolva</item>
     <item quantity="other">A címek a vágólapra kerültek.</item>
@@ -576,6 +575,7 @@ Hibajelentések beküldésével hozzájárulhatunk új funkciókhoz és kérdés
   <string name="manage_identities_title">Személyazonosságok kezelése</string>
   <string name="manage_identities_context_menu_title">Személyazonosság kezelése</string>
   <string name="edit_identity_title">Személyazonosság szerkesztése</string>
+  <string name="edit_identity_save">Mentés</string>
   <string name="new_identity_action">Új személyazonosság</string>
   <string name="account_settings_always_bcc_label">Titkos másolat küldése az összes üzenetről ide</string>
   <string name="manage_identities_edit_action">Szerkesztés</string>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index 5d3bb3e2c..7e8a25cec 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -116,7 +116,6 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
   <string name="unflag_action">Buang bintang</string>
   <string name="copy_action">Salin</string>
   <string name="show_headers_action">Tampilkan tajuk</string>
-  <string name="hide_headers_action">Sembunyikan tajuk</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="other">Alamat disalin ke clipboard</item>
   </plurals>
@@ -576,6 +575,7 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
   <string name="manage_identities_title">Mengelola identitas</string>
   <string name="manage_identities_context_menu_title">Mengelola identitas</string>
   <string name="edit_identity_title">Sunting identitas</string>
+  <string name="edit_identity_save">Simpan</string>
   <string name="new_identity_action">Identitas baru</string>
   <string name="account_settings_always_bcc_label">Bcc semua pesan ke</string>
   <string name="manage_identities_edit_action">Sunting</string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index b37fa280a..a16cc7591 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -116,7 +116,6 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="unflag_action">Fjarlægja stjörnu</string>
   <string name="copy_action">Afrita</string>
   <string name="show_headers_action">Birta hausa</string>
-  <string name="hide_headers_action">Fela hausa</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Netfang afritað á klippispjald</item>
     <item quantity="other">Netföng afrituð á klippispjald</item>
@@ -578,6 +577,7 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="manage_identities_title">Sýsla með persónuauðkenni</string>
   <string name="manage_identities_context_menu_title">Sýsla með persónuauðkennið</string>
   <string name="edit_identity_title">Breyta persónuauðkenni</string>
+  <string name="edit_identity_save">Vista</string>
   <string name="new_identity_action">Nýtt persónuauðkenni</string>
   <string name="account_settings_always_bcc_label">Falið afrit (BCC) á öll skilaboð til</string>
   <string name="manage_identities_edit_action">Breyta</string>
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index 0e5a66c6e..cc45ae8dc 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -126,7 +126,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="unflag_action">Rimuovi stella</string>
   <string name="copy_action">Copia</string>
   <string name="show_headers_action">Mostra intestazioni</string>
-  <string name="hide_headers_action">Nascondi intestazioni</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Indirizzo copiato negli appunti </item>
     <item quantity="other">IndirizzI copiati negli appunti</item>
@@ -588,6 +587,7 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="manage_identities_title">Gestione identità</string>
   <string name="manage_identities_context_menu_title">Gestione identità</string>
   <string name="edit_identity_title">Modifica identità</string>
+  <string name="edit_identity_save">Salva</string>
   <string name="new_identity_action">Nuova identità</string>
   <string name="account_settings_always_bcc_label">Invia in Ccn tutti i messaggi a</string>
   <string name="manage_identities_edit_action">Modifica</string>
@@ -961,7 +961,7 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="crypto_msg_encrypted_sign_error">ma i dati end-to-end presentano errori</string>
   <string name="crypto_msg_encrypted_insecure">ma la cifratura non è considerata sicura</string>
   <string name="crypto_info_ok">OK</string>
-  <string name="crypto_info_search_key">Chuave di ricerca</string>
+  <string name="crypto_info_search_key">Chiave di ricerca</string>
   <string name="crypto_info_view_signer">Visualizza firmatario</string>
   <string name="crypto_info_view_sender">Visualizza mittente</string>
   <string name="crypto_info_view_security_warning">Dettagli</string>
@@ -992,7 +992,7 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="crypto_no_provider_message">Questo messaggio è stato cifrato con OpenPGP.\nPer leggerlo, devi installare e configurare un\'applicazione compatibile con OpenPGP.</string>
   <string name="crypto_no_provider_button">Vai alle impostazioni</string>
   <string name="mail_list_widget_text">Elenco messaggi di K-9</string>
-  <string name="mail_list_widget_loading">Caricamento messaggi in corso…</string>
+  <string name="mail_list_widget_loading">Caricamento messaggi…</string>
   <string name="fetching_folders_failed">Recupero elenco cartelle non riuscito</string>
   <string name="error_recipient_crypto_retrieve">Errore durante il recupero dello stato del destinatario dal fornitore OpenPGP!</string>
   <string name="openpgp_enabled_error_title">Cifratura non possibile</string>
@@ -1037,7 +1037,7 @@ Per configurare il tuo nuovo dispositivo per Autocrypt, segui le istruzioni che
 
 Puoi conservare questo messaggio e utilizza come una copia di sicurezza della tua chiave segreta. Se intendi farlo, dovresti annotare la password e conservarla in modo sicuro.
 </string>
-  <string name="ac_transfer_error_send">Si è  verificato un errore durante l\'invio del messaggio. Controlla la tua connessione di rete e la configurazione del server di uscita.</string>
+  <string name="ac_transfer_error_send">Si è verificato un errore durante l\'invio del messaggio. Controlla la tua connessione di rete e la configurazione del server di uscita.</string>
   <string name="switch_on">On</string>
   <string name="switch_off">Off</string>
   <string name="navigation_drawer_open">Apri</string>
@@ -1045,4 +1045,5 @@ Puoi conservare questo messaggio e utilizza come una copia di sicurezza della tu
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Consenti l\'accesso ai contatti</string>
   <string name="permission_contacts_rationale_message">Per poter fornire suggerimenti sui contatti e per visualizzare i nomi e le foto dei contatti, l\'applicazione ha bisogno di accedere ai tuoi contatti.</string>
+  <string name="generic_loading_error">Si è verificato un errore durante il caricamento dei dati</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml
index d938bfe52..ab43e40bf 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -74,7 +74,6 @@
   <string name="unflag_action">מחק כוכב</string>
   <string name="copy_action">העתק</string>
   <string name="show_headers_action">הצג כותרות</string>
-  <string name="hide_headers_action">הסתר כותרות</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">כתובת הועתקה ללוח ההעתקה</item>
     <item quantity="two">כתובות הועתקו ללוח ההעתקה</item>
@@ -404,6 +403,7 @@
   <string name="manage_identities_title">נהל זהויות</string>
   <string name="manage_identities_context_menu_title">נהל זהות</string>
   <string name="edit_identity_title">ערוך זהות</string>
+  <string name="edit_identity_save">שמור</string>
   <string name="new_identity_action">זהות חדשה</string>
   <string name="account_settings_always_bcc_label">עותק מוסתר לכל ההודעות אל</string>
   <string name="manage_identities_edit_action">ערוך</string>
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index 0085c4bf0..f8f7a8c40 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -9,9 +9,18 @@
   <!--Used in the about dialog-->
   <string name="app_authors">The K-9 Dog Walkers</string>
   <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
+  <string name="source_code">ソースコード</string>
   <string name="app_license">Apache License, Version 2.0</string>
+  <string name="about_project_title">オープンソースプロジェクト</string>
+  <string name="about_website_title">Webサイト</string>
+  <string name="user_forum_title">ユーザーフォーラム</string>
+  <string name="about_fediverse_title">Fediverse</string>
+  <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">ライブラリー</string>
   <string name="license">ライセンス</string>
+  <string name="changelog_title">変更履歴</string>
+  <string name="changelog_loading_error">変更履歴を読み込みできませんでした。</string>
+  <string name="changelog_version_title">バージョン %s</string>
   <!--Welcome message-->
   <string name="welcome_message_title">K-9 Mailへようこそ</string>
   <string name="accounts_welcome"><![CDATA[
@@ -117,7 +126,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="unflag_action">スターをはずす</string>
   <string name="copy_action">コピー</string>
   <string name="show_headers_action">ヘッダを表示</string>
-  <string name="hide_headers_action">ヘッダを隠す</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="other">アドレスをクリップボードにコピーしました</item>
   </plurals>
@@ -576,6 +584,7 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="manage_identities_title">差出人情報管理</string>
   <string name="manage_identities_context_menu_title">差出人情報管理</string>
   <string name="edit_identity_title">差出人情報管理</string>
+  <string name="edit_identity_save">保存</string>
   <string name="new_identity_action">差出人情報の新規作成</string>
   <string name="account_settings_always_bcc_label">Bcc</string>
   <string name="manage_identities_edit_action">編集</string>
@@ -676,6 +685,7 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="volume_navigation_title">ボリュームキー操作</string>
   <string name="volume_navigation_message">メッセージ表示</string>
   <string name="volume_navigation_list">一覧表示</string>
+  <string name="show_unified_inbox_title">統合フォルダを表示</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier"> - 未読</string>
   <string name="search_all_messages_title">全メッセージ</string>
@@ -1028,4 +1038,5 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <!--permissions-->
   <string name="permission_contacts_rationale_title">連絡先へのアクセスを許可</string>
   <string name="permission_contacts_rationale_message">連絡先の提案をできるようにし、連絡先の名前と写真を表示するには、アプリが連絡先にアクセスする必要があります。</string>
+  <string name="generic_loading_error">データの読み込み中にエラーが発生しました</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml
index 8bd164c9b..4220e8df9 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -77,7 +77,6 @@
   <string name="unflag_action">별표 해제하기</string>
   <string name="copy_action">복사</string>
   <string name="show_headers_action">헤더 보이기</string>
-  <string name="hide_headers_action">헤더 숨기기</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="other">클립보드에 이메일 주소 복사</item>
   </plurals>
@@ -490,6 +489,7 @@
   <string name="manage_identities_title">신원 관리</string>
   <string name="manage_identities_context_menu_title">신원 관리</string>
   <string name="edit_identity_title">신원 수정</string>
+  <string name="edit_identity_save">저장</string>
   <string name="new_identity_action">새로운 신원</string>
   <string name="account_settings_always_bcc_label">모든 메시지를 비밀 첨부 보냄</string>
   <string name="manage_identities_edit_action">수정</string>
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index 0db392d08..310120768 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -72,7 +72,6 @@
   <string name="unflag_action">Pašalinti žvaigždutę</string>
   <string name="copy_action">Kopijuoti</string>
   <string name="show_headers_action">Rodyti antraštes</string>
-  <string name="hide_headers_action">Slėpti antraštes</string>
   <string name="message_view_theme_action_dark">Persijungti į tamsią temą</string>
   <string name="message_view_theme_action_light">Persijungti į šviesią temą</string>
   <string name="mark_as_unread_action">Pažymėti kaip neskaitytą</string>
@@ -430,6 +429,7 @@
   <string name="manage_identities_title">Tvarkyti tapatybes</string>
   <string name="manage_identities_context_menu_title">Tvarkyti tapatybę</string>
   <string name="edit_identity_title">Redaguoti tapatybę</string>
+  <string name="edit_identity_save">Išsaugoti</string>
   <string name="new_identity_action">Nauja tapatybė</string>
   <string name="account_settings_always_bcc_label">Siųsti slaptą visų laiškų kopiją į</string>
   <string name="manage_identities_edit_action">Keisti</string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index 3c3147e8e..2dc39d527 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -116,7 +116,6 @@ Lūdzu, iesniedziet kļūdu ziņojumus, ierosiniet jaunas iespējas un uzdodiet
   <string name="unflag_action">Noņemt zvaigznīti</string>
   <string name="copy_action">Kopēt</string>
   <string name="show_headers_action">Rādīt vēstules papildinformāciju</string>
-  <string name="hide_headers_action">Noslēpt vēstules papildinformāciju</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="zero">Adrese nokopēta starpliktuvē</item>
     <item quantity="one">Adrese nokopēta starpliktuvē</item>
@@ -580,6 +579,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="manage_identities_title">Pārvaldīt identitātes</string>
   <string name="manage_identities_context_menu_title">Pārvaldīt identitāti</string>
   <string name="edit_identity_title">Rediģēt identitāti</string>
+  <string name="edit_identity_save">Saglabāt</string>
   <string name="new_identity_action">Jauna identitāte</string>
   <string name="account_settings_always_bcc_label">Bcc visas vēstules uz</string>
   <string name="manage_identities_edit_action">Rediģēt</string>
diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml
index 73a7faa8c..ae887fc30 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -125,7 +125,6 @@
   <string name="unflag_action">നക്ഷത്രം കളയുക</string>
   <string name="copy_action">പകർത്തുക</string>
   <string name="show_headers_action">തലക്കെട്ടുകൾ പ്രദർശിപ്പിക്കുക</string>
-  <string name="hide_headers_action">തലക്കെട്ടുകൾ അപ്രത്യക്ഷമാക്കുക</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">വിലാസം ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</item>
     <item quantity="other">വിലാസങ്ങൾ ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</item>
diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml
index 924e18d6d..2fc29cb31 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -117,7 +117,6 @@ Send feilmeldinger, bidra med nye funksjoner og still spørsmål her:
   <string name="unflag_action">Fjern stjerne</string>
   <string name="copy_action">Kopier</string>
   <string name="show_headers_action">Vis meldingshode</string>
-  <string name="hide_headers_action">Skul meldingshode</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Kopierte adressen til utklippstavlen</item>
     <item quantity="other">Kopierte adressene til utklippstavlen</item>
@@ -577,6 +576,7 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="manage_identities_title">Behandle identiteter</string>
   <string name="manage_identities_context_menu_title">Behandle identitet</string>
   <string name="edit_identity_title">Rediger identitet</string>
+  <string name="edit_identity_save">Lagre</string>
   <string name="new_identity_action">Ny identitet</string>
   <string name="account_settings_always_bcc_label">Blindkopi til</string>
   <string name="manage_identities_edit_action">Rediger</string>
diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml
index fc1e2b2e0..5d24e5b58 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -121,7 +121,6 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="unflag_action">Verwijder ster</string>
   <string name="copy_action">Kopieer</string>
   <string name="show_headers_action">Laat koppen zien</string>
-  <string name="hide_headers_action">Verberg koppen</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adres naar klembord gekopieerd</item>
     <item quantity="other">Adressen naar klembord gekopieerd</item>
@@ -582,6 +581,7 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="manage_identities_title">Beheer identiteiten</string>
   <string name="manage_identities_context_menu_title">Beheer identiteit</string>
   <string name="edit_identity_title">Identiteit aanpassen</string>
+  <string name="edit_identity_save">Bewaar</string>
   <string name="new_identity_action">Nieuwe identiteit</string>
   <string name="account_settings_always_bcc_label">Bcc alle berichten naar</string>
   <string name="manage_identities_edit_action">Aanpassen</string>
@@ -1039,4 +1039,5 @@ U kunt dit bericht bewaren als backup voor uw geheime sleutel. Als u dit wilt do
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Sta toegang tot contacten toe</string>
   <string name="permission_contacts_rationale_message">Om contact suggesties te kunnen bieden en om namen en/of foto\'s van contacten weer te geven, heeft de app toegang nodig tot je contactenlijst.</string>
+  <string name="generic_loading_error">Er is een fout opgetreden bij het laden van de gegevens</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index 97523d538..4ce6ea9b1 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -119,7 +119,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi
   <string name="unflag_action">Usuń gwiazdkę</string>
   <string name="copy_action">Skopiuj</string>
   <string name="show_headers_action">Pokaż nagłówki</string>
-  <string name="hide_headers_action">Ukryj nagłówki</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adres skopiowany do schowka</item>
     <item quantity="few">Adresy skopiowane do schowka</item>
@@ -584,6 +583,7 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi
   <string name="manage_identities_title">Zarządzaj tożsamościami</string>
   <string name="manage_identities_context_menu_title">Zarządzaj tożsamością</string>
   <string name="edit_identity_title">Edytcja tożsamość</string>
+  <string name="edit_identity_save">Zapisz</string>
   <string name="new_identity_action">Nowa tożsamość</string>
   <string name="account_settings_always_bcc_label">Adres UDW dla wysyłanych wiadomości (opcja)</string>
   <string name="manage_identities_edit_action">Edytuj</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
index 471f8491d..65e8926c9 100644
--- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
@@ -125,7 +125,6 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="unflag_action">Remover estrela</string>
   <string name="copy_action">Copiar</string>
   <string name="show_headers_action">Exibir cabeçalhos</string>
-  <string name="hide_headers_action">Ocultar cabeçalhos</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Endereço copiado para área de transferência</item>
     <item quantity="other">Endereços copiados para a área de transferência</item>
@@ -586,6 +585,7 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="manage_identities_title">Gerenciar identidades</string>
   <string name="manage_identities_context_menu_title">Gerenciar identidade</string>
   <string name="edit_identity_title">Editar identidade</string>
+  <string name="edit_identity_save">Salvar</string>
   <string name="new_identity_action">Nova identidade</string>
   <string name="account_settings_always_bcc_label">Encaminhar todas as mensagens via Cco para</string>
   <string name="manage_identities_edit_action">Editar</string>
@@ -1043,4 +1043,5 @@ Você pode manter esta mensagem e usá-la como um backup para a sua chave secret
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Permitir acesso aos contatos</string>
   <string name="permission_contacts_rationale_message">Para fornecer sugestões e exibir nomes e fotos de contatos, o app precisa de ter acesso aos seus contatos.</string>
+  <string name="generic_loading_error">Um erro ocorreu durante o carregamento dos dados</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
index 72d7a1bd9..629b49868 100644
--- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
@@ -117,7 +117,6 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="unflag_action">Remover estrela</string>
   <string name="copy_action">Copiar</string>
   <string name="show_headers_action">Mostrar cabeçalhos</string>
-  <string name="hide_headers_action">Esconder cabeçalhos</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Endereço copiado para a área de transferência</item>
     <item quantity="other">Endereços copiados para a área de transferência</item>
@@ -457,7 +456,7 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="account_settings_folders">Pastas</string>
   <string name="account_settings_quote_prefix_label">Prefixo do texto citado</string>
   <string name="account_settings_crypto">Encriptação ponta-a-ponta</string>
-  <string name="account_settings_crypto_app">Ativar suporte OenPGP</string>
+  <string name="account_settings_crypto_app">Ativar suporte OpenPGP</string>
   <string name="account_settings_crypto_app_select_title">Selecionar aplicação OpenPGP</string>
   <string name="account_settings_crypto_key">Configurar chave ponta-a-ponta</string>
   <string name="account_settings_crypto_summary_off">Sem aplicação OpenPGP configurada</string>
@@ -578,6 +577,7 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="manage_identities_title">Gerir identidades</string>
   <string name="manage_identities_context_menu_title">Gerir identidade</string>
   <string name="edit_identity_title">Editar identidade</string>
+  <string name="edit_identity_save">Guardar</string>
   <string name="new_identity_action">Nova identidade</string>
   <string name="account_settings_always_bcc_label">Enviar Bcc em todas as mensagens para</string>
   <string name="manage_identities_edit_action">Editar</string>
diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml
index 437104df5..ec03f3968 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -115,7 +115,6 @@ Vă rugăm să ne raportați defecte, să contribuiți cu funcționalități noi
   <string name="unflag_action">Șterge steluță</string>
   <string name="copy_action">Copiază</string>
   <string name="show_headers_action">Arată antete</string>
-  <string name="hide_headers_action">Ascunde antete</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresa a fost copiată în clipboard</item>
     <item quantity="few">Adresele au fost copiate în clipboard</item>
@@ -581,6 +580,7 @@ Uneori datorită faptului că cineva încearcă să te atace pe tine sau serveru
   <string name="manage_identities_title">Gestionează identități</string>
   <string name="manage_identities_context_menu_title">Gestionează identitate</string>
   <string name="edit_identity_title">Modifică identitate</string>
+  <string name="edit_identity_save">Salvează</string>
   <string name="new_identity_action">Identitate nouă</string>
   <string name="account_settings_always_bcc_label">BCC toate mesajele către</string>
   <string name="manage_identities_edit_action">Modifică</string>
diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml
index ebb40ee25..0c7b61c34 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -125,7 +125,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="unflag_action">Обычное</string>
   <string name="copy_action">Копировать</string>
   <string name="show_headers_action">Все заголовки</string>
-  <string name="hide_headers_action">Без заголовков</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Адрес скопирован в буфер</item>
     <item quantity="few">Адреса скопированы в буфер</item>
@@ -590,6 +589,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="manage_identities_title">Управление ролями</string>
   <string name="manage_identities_context_menu_title">Управление</string>
   <string name="edit_identity_title">Правка роли</string>
+  <string name="edit_identity_save">Сохранить</string>
   <string name="new_identity_action">Новая роль</string>
   <string name="account_settings_always_bcc_label">Скрытая копия всех сообщений</string>
   <string name="manage_identities_edit_action">Правка</string>
@@ -1057,4 +1057,5 @@ K-9 Mail — почтовый клиент для Android.
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Разрешить доступ к контактам</string>
   <string name="permission_contacts_rationale_message">Чтобы подсказывать имена и показывать фото, приложению нужен доступ к контактам</string>
+  <string name="generic_loading_error">При загрузке данных возникла ошибка</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml
index f382925bf..2bcabb904 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -104,7 +104,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="unflag_action">Odstrániť hviezdičku</string>
   <string name="copy_action">Kopírovať</string>
   <string name="show_headers_action">Zobraziť hlavičky</string>
-  <string name="hide_headers_action">Skryť hlavičky</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresa bola skopírovaná do schránky.</item>
     <item quantity="few">Adresy boli skopírované do schránky.</item>
@@ -520,6 +519,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="manage_identities_title">Spravovanie identít</string>
   <string name="manage_identities_context_menu_title">Spravovať identitu</string>
   <string name="edit_identity_title">Upraviť identitu</string>
+  <string name="edit_identity_save">Uložiť</string>
   <string name="new_identity_action">Nová identita</string>
   <string name="account_settings_always_bcc_label">Skrytá kópia všetkých správ na</string>
   <string name="manage_identities_edit_action">Upraviť</string>
diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml
index 446553625..8e25b4142 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -125,7 +125,6 @@ Poročila o napakah, predloge za nove funkcije in vprašanja lahko pošljete na
   <string name="unflag_action">Odstrani zvezdico</string>
   <string name="copy_action">Kopiraj</string>
   <string name="show_headers_action">Prikaži glave sporočil</string>
-  <string name="hide_headers_action">Skrij glave sporočil</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Naslov je kopiran v odložišče</item>
     <item quantity="two">Naslova sta kopirana v odložišče</item>
@@ -591,6 +590,7 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="manage_identities_title">Upravljanje profilov</string>
   <string name="manage_identities_context_menu_title">Upravljanje profila</string>
   <string name="edit_identity_title">Uredi profil</string>
+  <string name="edit_identity_save">Shrani</string>
   <string name="new_identity_action">Nov profil</string>
   <string name="account_settings_always_bcc_label">Vedno pošlji skrito kopijo na</string>
   <string name="manage_identities_edit_action">Uredi</string>
@@ -1058,4 +1058,5 @@ Sporočilo lahko shranite in ga uporabite kot varno kopijo šifrirnega ključa.
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Dovoli dostop do stikov</string>
   <string name="permission_contacts_rationale_message">Če hočete dobiti predloge za stike in prikazati imena in fotografije stikov, aplikacija potrebuje dostop do vaših stikov.</string>
+  <string name="generic_loading_error">Med nalaganjem podatkov je prišlo do napake</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index a1c91c26e..d6a2e1ba5 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -126,7 +126,6 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="unflag_action">Hiqi yll</string>
   <string name="copy_action">Kopjoje</string>
   <string name="show_headers_action">Shfaqi kryet</string>
-  <string name="hide_headers_action">Fshihi kryet</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresa u kopjua në të papastër</item>
     <item quantity="other">Adresat u kopjuan në të papastër</item>
@@ -588,6 +587,7 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="manage_identities_title">Administroni identitete</string>
   <string name="manage_identities_context_menu_title">Administroni identitet</string>
   <string name="edit_identity_title">Përpunoni identitet</string>
+  <string name="edit_identity_save">Ruaje</string>
   <string name="new_identity_action">Identitet i ri</string>
   <string name="account_settings_always_bcc_label">Bcc krejt mesazhet për</string>
   <string name="manage_identities_edit_action">Përpunoni</string>
@@ -1045,4 +1045,5 @@ Mund ta mbani këtë mesazh dhe ta përdorni si një kopjeruatje të kyçit tuaj
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Lejo hyrje te kontaktet</string>
   <string name="permission_contacts_rationale_message">Për të qenë në gjendje të jepen sugjerime kontaktesh dhe të shfaqen emra dhe telefona kontaktesh, aplikacioni ka nevojë të hyjë te kontaktet tuaja.</string>
+  <string name="generic_loading_error">Ndodhi një gabim teksa ngarkoheshin të dhënat</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml
index 2901556d6..76bab8fa8 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -125,7 +125,6 @@
   <string name="unflag_action">Уклони звездицу</string>
   <string name="copy_action">Копирај</string>
   <string name="show_headers_action">Прикажи заглавље</string>
-  <string name="hide_headers_action">Сакриј заглавље</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Адреса копирана на клипборд</item>
     <item quantity="few">Адресе копиране на клипборд</item>
@@ -589,6 +588,7 @@
   <string name="manage_identities_title">Управљање идентитетима</string>
   <string name="manage_identities_context_menu_title">Управљај идентитетом</string>
   <string name="edit_identity_title">Уреди идентитет</string>
+  <string name="edit_identity_save">Сачувај</string>
   <string name="new_identity_action">Нови идентитет</string>
   <string name="account_settings_always_bcc_label">СКоп све поруке на</string>
   <string name="manage_identities_edit_action">Уреди</string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index 945120a3e..11bd18a5c 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -125,7 +125,6 @@ Skicka gärna in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="unflag_action">Ta bort stjärna</string>
   <string name="copy_action">Kopiera</string>
   <string name="show_headers_action">Visa meddelanderubriker</string>
-  <string name="hide_headers_action">Dölj meddelanderubriker</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adress kopierad till urklipp</item>
     <item quantity="other">Adresser kopierade till urklipp</item>
@@ -587,6 +586,7 @@ Skicka gärna in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="manage_identities_title">Hantera identiteter</string>
   <string name="manage_identities_context_menu_title">Hantera identitet</string>
   <string name="edit_identity_title">Redigera identitet</string>
+  <string name="edit_identity_save">Spara</string>
   <string name="new_identity_action">Ny identitet</string>
   <string name="account_settings_always_bcc_label">Skicka alltid blindkopia till</string>
   <string name="manage_identities_edit_action">Redigera</string>
@@ -1044,4 +1044,5 @@ Du kan behålla det här meddelandet och använda det som en säkerhetskopia fö
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Tillåt åtkomst till kontakter</string>
   <string name="permission_contacts_rationale_message">För att kunna ge kontaktförslag och visa kontaktnamn och foton behöver appen tillgång till dina kontakter.</string>
+  <string name="generic_loading_error">Ett fel uppstod när data lästes in</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml
index 869bd4e6b..72e9a0de5 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -9,9 +9,18 @@
   <!--Used in the about dialog-->
   <string name="app_authors">K-9 Köpek Gezdiricileri</string>
   <string name="app_copyright_fmt">Telif Hakkı 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Telif hakkı 2006-<xliff:g>%s</xliff:g> Android Açık Kaynak Projesi.</string>
+  <string name="source_code">Kaynak kodu</string>
   <string name="app_license">Apache Lisansı Uyarlama 2.0</string>
+  <string name="about_project_title">Açık Kaynak Projesi</string>
+  <string name="about_website_title">Web sitesi</string>
+  <string name="user_forum_title">Kullanıcı forumu</string>
+  <string name="about_fediverse_title">Fediverse</string>
+  <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">Kütüphaneler</string>
   <string name="license">Lisans</string>
+  <string name="changelog_title">Değişim günlüğü</string>
+  <string name="changelog_loading_error">Değişim günlüğü yüklenemedi. </string>
+  <string name="changelog_version_title">Sürüm %s</string>
   <!--Welcome message-->
   <string name="welcome_message_title">K-9 Posta\'ya Hoşgeldiniz</string>
   <string name="accounts_welcome"><![CDATA[
@@ -116,7 +125,6 @@ Microsoft Exchange ile konuşurken bazı tuhaflıklar yaşadığını not ediniz
   <string name="unflag_action">Yıldızı Kaldır</string>
   <string name="copy_action">Kopyala</string>
   <string name="show_headers_action">Başlıkları göster</string>
-  <string name="hide_headers_action">Başlıkları gizle</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Adresler panoya kopyalandı</item>
     <item quantity="other">Adresler panoya kopyalandı</item>
@@ -577,6 +585,7 @@ Microsoft Exchange ile konuşurken bazı tuhaflıklar yaşadığını not ediniz
   <string name="manage_identities_title">Kimlikleri yönet</string>
   <string name="manage_identities_context_menu_title">Kimlik yönetimi</string>
   <string name="edit_identity_title">Kimlik düzenle</string>
+  <string name="edit_identity_save">Kaydet</string>
   <string name="new_identity_action">Yeni kimlik</string>
   <string name="account_settings_always_bcc_label">Bütün mesajlar için kullanılacak Gizli</string>
   <string name="manage_identities_edit_action">Düzenle</string>
@@ -677,6 +686,7 @@ Microsoft Exchange ile konuşurken bazı tuhaflıklar yaşadığını not ediniz
   <string name="volume_navigation_title">Ses Düğmesi ile dolaşma</string>
   <string name="volume_navigation_message">İleti görünümlerinde</string>
   <string name="volume_navigation_list">liste görünümlerinde</string>
+  <string name="show_unified_inbox_title">Birleşik Gelen Kutusunu Göster</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier"> - Okunmadı</string>
   <string name="search_all_messages_title">Bütün mesajlar</string>
diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml
index 2c2257d67..36aa7057d 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -115,7 +115,6 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="unflag_action">Прибрати зірочку</string>
   <string name="copy_action">Копіювати</string>
   <string name="show_headers_action">Показати заголовки</string>
-  <string name="hide_headers_action">Приховати заголовки</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Адресу скопійовано до комірки обміну</item>
     <item quantity="few">Адресу скопійовано до комірки обміну</item>
@@ -566,6 +565,7 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="manage_identities_title">Управління особами</string>
   <string name="manage_identities_context_menu_title">Управління особою</string>
   <string name="edit_identity_title">Редагувати особу</string>
+  <string name="edit_identity_save">Зберегти</string>
   <string name="new_identity_action">Нова особа</string>
   <string name="account_settings_always_bcc_label">Прихована копія усіх повідомлень до </string>
   <string name="manage_identities_edit_action">Редагувати</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index a007364ec..f386431ca 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -126,7 +126,6 @@ K-9 Mail 是 Android 上一款功能强大的自由 email 客户端。
   <string name="unflag_action">移除星标</string>
   <string name="copy_action">复制</string>
   <string name="show_headers_action">显示邮件头</string>
-  <string name="hide_headers_action">隐藏邮件头</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="other">地址已复制到剪贴板</item>
   </plurals>
@@ -585,6 +584,7 @@ K-9 Mail 是 Android 上一款功能强大的自由 email 客户端。
   <string name="manage_identities_title">管理身份标识</string>
   <string name="manage_identities_context_menu_title">管理身份标识</string>
   <string name="edit_identity_title">编辑身份标识</string>
+  <string name="edit_identity_save">保存</string>
   <string name="new_identity_action">新身份标识</string>
   <string name="account_settings_always_bcc_label">暗送全部邮件到</string>
   <string name="manage_identities_edit_action">编辑</string>
@@ -1037,4 +1037,5 @@ K-9 Mail 是 Android 上一款功能强大的自由 email 客户端。
   <!--permissions-->
   <string name="permission_contacts_rationale_title">允许访问联系人</string>
   <string name="permission_contacts_rationale_message">为了能够提供联系人建议，并显示联系人姓名和照片，应用程序需要访问你的联系人。</string>
+  <string name="generic_loading_error">加载数据期间发生了一个错误</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index bed5a6369..7789176fc 100644
--- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -126,7 +126,6 @@ K-9 Mail 是 Android 上一款功能強大，免費而自由的電子郵件用
   <string name="unflag_action">移除星號</string>
   <string name="copy_action">複製</string>
   <string name="show_headers_action">顯示標題</string>
-  <string name="hide_headers_action">隱藏標題</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="other">位址已複製到剪貼簿</item>
   </plurals>
@@ -585,6 +584,7 @@ K-9 Mail 是 Android 上一款功能強大，免費而自由的電子郵件用
   <string name="manage_identities_title">管理身份識別</string>
   <string name="manage_identities_context_menu_title">管理身份識別</string>
   <string name="edit_identity_title">編輯身份標識</string>
+  <string name="edit_identity_save">儲存</string>
   <string name="new_identity_action">新身份識別</string>
   <string name="account_settings_always_bcc_label">密件副本所有郵件</string>
   <string name="manage_identities_edit_action">編輯</string>