diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 94ad3d097f..842dbaf1f7 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -225,8 +225,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 94ad3d097f..842dbaf1f7 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -225,8 +225,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 94ad3d097f..842dbaf1f7 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -225,8 +225,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 94ad3d097f..842dbaf1f7 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -225,8 +225,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 94ad3d097f..842dbaf1f7 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -225,8 +225,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 246d965eda..66a8af0dff 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -26,7 +26,7 @@
   <string name="menu_answers">Cavab şablonları</string>
   <string name="menu_operations">Əməliyyatlar</string>
   <string name="menu_legend">Mənalar</string>
-  <string name="menu_faq">TCS/dəstək</string>
+  <string name="menu_faq">TSS/dəstək</string>
   <string name="menu_pro">Pro xüsusiyyətlər</string>
   <string name="menu_privacy">Gizlilik</string>
   <string name="menu_about">Haqqında</string>
@@ -114,7 +114,7 @@
   <string name="title_no_primary_drafts">Üstünlük verilən hesab və ya qaralama qovluğu yoxdur</string>
   <string name="title_no_primary_archive">Üstünlük verilən hesab və ya arxiv qovluq yoxdur</string>
   <string name="title_no_idle">Bu təchizatçı ani mesajları dəstəkləmir. Bu, yeni mesajların alınmasını gecikdirəcək və batareyanın istifadəsini artıracaq.</string>
-  <string name="title_no_uidplus">IMAP UIDPLUS dəstəklənmir, TCS-a baxın</string>
+  <string name="title_no_uidplus">IMAP UIDPLUS dəstəklənmir, TSS-a baxın</string>
   <string name="title_account_delete">Bu hesab birdəfəlik silinsin?</string>
   <string name="title_identity_delete">Bu kimlik birdəfəlik silinsin?</string>
   <string name="title_pop">POP dəstəklənmir</string>
@@ -133,7 +133,7 @@
   <string name="title_unified_folder">Birləşmiş gələn qutusunda göstər</string>
   <string name="title_after">Eyniləşdir (günlər)</string>
   <string name="title_folder_exists">%1$s qovluğu mövcuddur</string>
-  <string name="title_folder_delete">Qovluğu birdəfəlik sil?</string>
+  <string name="title_folder_delete">Qovluğu birdəfəlik silinsin?</string>
   <string name="title_folder_unified">Birləşmiş gələn qutusu</string>
   <string name="title_folder_inbox">Gələn qutusu</string>
   <string name="title_folder_outbox">Gedən qutusu</string>
@@ -162,7 +162,7 @@
   <string name="title_delete">Sil</string>
   <string name="title_more">Daha çox</string>
   <string name="title_spam">Spam</string>
-  <string name="title_move">Köçür</string>
+  <string name="title_move">Köçürt</string>
   <string name="title_archive">Arxivlə</string>
   <string name="title_reply">Cavabla</string>
   <string name="title_moving">Mesaj %1$s qovluğuna köçürülür</string>
@@ -170,7 +170,7 @@
   <string name="title_no_viewer">%1$s üçün heç bir görüntüləmə tətbiqi yoxdur</string>
   <string name="title_attachment_saved">Qoşma saxlanıldı</string>
   <string name="title_attachment_unavailable">Bəzi qoşmalar endirilmədi və yönləndirilməyəcək, davam edək?</string>
-  <string name="title_ask_delete">Mesajı birdəfəlik sil?</string>
+  <string name="title_ask_delete">Mesaj birdəfəlik silinsin?</string>
   <string name="title_ask_discard">Qaralama silinsin?</string>
   <string name="title_ask_spam">Mesajı spam kimi bildirilsin?</string>
   <string name="title_fix">Düzəlt</string>
@@ -205,12 +205,12 @@
   <string name="title_sort_on_time">Vaxt</string>
   <string name="title_sort_on_unread">Oxunmadı</string>
   <string name="title_sort_on_starred">Ulduzlu</string>
-  <string name="title_move_sent">Göndərilənlərə köçür</string>
+  <string name="title_move_sent">Göndərilənlərə köçürt</string>
   <string name="title_previous">Əvvəlki</string>
   <string name="title_next">Növbəti</string>
   <string name="title_answer_reply">Cavab şablonu</string>
-  <string name="title_answer_name">Cavab adı</string>
-  <string name="title_answer_text">Cavab mətni</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Gələn qutusu</string>
   <string name="title_legend_unified">Birləşmiş gələn qutusu</string>
   <string name="title_legend_archive">Arxiv</string>
@@ -246,7 +246,7 @@
   <string name="title_pro_list">Pro xüsusiyyətlərinin siyahısı</string>
   <string name="title_pro_purchase">Satın al</string>
   <string name="title_pro_hint">Pro xüsusiyyətlərinin alınması sizə, mövcud və gələcəkdəki pro xüsusiyyətləri istifadə etməyinizə icazə verəcək və tətbiqin uzunömürlü olması üçün bizə dəstək olacaq</string>
-  <string name="title_pro_price">Zəhmət olmasa pro xüsusiyyətlərin qiyməti haqqında <a href="https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ19">bu TCS</a> səhifəsinə baxın</string>
+  <string name="title_pro_price">Zəhmət olmasa pro xüsusiyyətlərin qiyməti haqqında <a href="https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ19">bu TSS</a> səhifəsinə baxın</string>
   <string name="title_pro_activated">Bütün pro xüsusiyyətlər aktivləşdirildi</string>
   <string name="title_pro_valid">Bütün pro xüsusiyyətlər aktivləşdirildi</string>
   <string name="title_pro_invalid">Etibarsız cavab</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6da135ee99..8e65fa800a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Anterior</string>
   <string name="title_next">Següent</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Nom de resposta</string>
-  <string name="title_answer_text">Text de resposta</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Safata d\'entrada</string>
   <string name="title_legend_unified">Safata d\'entrada unificada</string>
   <string name="title_legend_archive">Arxiu</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 83456daded..1f06d57ec8 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -217,8 +217,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 6abeff526c..f2890d4126 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Svarnavn</string>
-  <string name="title_answer_text">Svartekst</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9beade9270..a3109f4cce 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Vorherige</string>
   <string name="title_next">Nächste</string>
   <string name="title_answer_reply">Antwortvorlage</string>
-  <string name="title_answer_name">Antwort Name</string>
-  <string name="title_answer_text">Antworttext</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Posteingang</string>
   <string name="title_legend_unified">Gemeinsamer Posteingang</string>
   <string name="title_legend_archive">Archiv</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 8f5bafdc5d..19d86f313f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Anterior</string>
   <string name="title_next">Siguiente</string>
   <string name="title_answer_reply">Plantilla de respuesta</string>
-  <string name="title_answer_name">Nombre de respuesta</string>
-  <string name="title_answer_text">Texto de respuesta</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Bandeja de Entrada</string>
   <string name="title_legend_unified">Bandeja de Entrada Unificada</string>
   <string name="title_legend_archive">Archivo</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index a0d14d4370..3df09ede8c 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 437236c5c3..4f00e0ca27 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Précédent</string>
   <string name="title_next">Suivant</string>
   <string name="title_answer_reply">Modèle de réponse</string>
-  <string name="title_answer_name">Nom de la réponse</string>
-  <string name="title_answer_text">Texte de la réponse</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Boîte de réception</string>
   <string name="title_legend_unified">Boite de réception unifiée</string>
   <string name="title_legend_archive">Archives</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 9069de0b30..088430dfff 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -217,8 +217,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index febf674be3..419f3c6fd1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -2,58 +2,58 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
-  <string name="channel_service">Service</string>
-  <string name="channel_notification">Notifications</string>
-  <string name="channel_error">Errors</string>
+  <string name="channel_service">Szolgáltatás</string>
+  <string name="channel_notification">Értesítések</string>
+  <string name="channel_error">Hibák</string>
   <plurals name="title_notification_synchronizing">
-    <item quantity="one">Synchronizing %1$d account</item>
-    <item quantity="other">Synchronizing %1$d accounts</item>
+    <item quantity="one">%1$d fiók szinkronizálása</item>
+    <item quantity="other">%1$d fiók szinkronizálása</item>
   </plurals>
   <plurals name="title_notification_operations">
-    <item quantity="one">%1$d operation pending</item>
-    <item quantity="other">%1$d operations pending</item>
+    <item quantity="one">%1$d függőben lévő művelet</item>
+    <item quantity="other">%1$d függőben lévő művelet</item>
   </plurals>
   <plurals name="title_notification_unseen">
-    <item quantity="one">%1$d new message</item>
-    <item quantity="other">%1$d new messages</item>
+    <item quantity="one">%1$d új üzenet</item>
+    <item quantity="other">%1$d új üzenet</item>
   </plurals>
   <plurals name="title_notification_unsent">
-    <item quantity="one">%1$d unsent message</item>
-    <item quantity="other">%1$d unsent messages</item>
+    <item quantity="one">%1$d elküldetlen üzenet</item>
+    <item quantity="other">%1$d elküldetlen üzenet</item>
   </plurals>
-  <string name="title_notification_failed">\'%1$s\' failed</string>
-  <string name="menu_setup">Setup</string>
-  <string name="menu_answers">Reply templates</string>
-  <string name="menu_operations">Operations</string>
-  <string name="menu_legend">Legend</string>
-  <string name="menu_faq">FAQ/support</string>
-  <string name="menu_pro">Pro features</string>
-  <string name="menu_privacy">Privacy</string>
-  <string name="menu_about">About</string>
-  <string name="menu_invite">Invite</string>
-  <string name="menu_rate">Rate this app</string>
-  <string name="menu_other">Other apps</string>
-  <string name="title_eula">End-user license agreement</string>
-  <string name="title_agree">I agree</string>
-  <string name="title_disagree">I disagree</string>
-  <string name="title_version">Version %1$s</string>
-  <string name="title_list_accounts">Accounts</string>
-  <string name="title_list_identities">Identities</string>
-  <string name="title_edit_account">Edit account</string>
-  <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings</string>
-  <string name="title_setup_import">Import settings</string>
-  <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
-  <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
-  <string name="title_setup_exported">Settings exported</string>
-  <string name="title_setup_imported">Settings imported</string>
-  <string name="title_setup_account">Manage accounts</string>
-  <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_identity">Manage identities</string>
-  <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_doze">Disable battery optimizations</string>
+  <string name="title_notification_failed">\'%1$s\' sikertelen</string>
+  <string name="menu_setup">Beállítás</string>
+  <string name="menu_answers">Válaszsablonok</string>
+  <string name="menu_operations">Műveletek</string>
+  <string name="menu_legend">Jelmagyarázat</string>
+  <string name="menu_faq">GyIK/támogatás</string>
+  <string name="menu_pro">Pro funkciók</string>
+  <string name="menu_privacy">Adatvédelem</string>
+  <string name="menu_about">Névjegy</string>
+  <string name="menu_invite">Meghívás</string>
+  <string name="menu_rate">Alkalmazás értékelése</string>
+  <string name="menu_other">Egyéb alkalmazások</string>
+  <string name="title_eula">Végfelhasználói licencszerződés</string>
+  <string name="title_agree">Elfogadom</string>
+  <string name="title_disagree">Nem fogadom el</string>
+  <string name="title_version">Verzió: %1$s</string>
+  <string name="title_list_accounts">Fiókok</string>
+  <string name="title_list_identities">Azonosítók</string>
+  <string name="title_edit_account">Fiók szerkesztése</string>
+  <string name="title_edit_identity">Azonosító szerkesztése</string>
+  <string name="title_edit_folder">Könyvtár szerkesztése</string>
+  <string name="title_setup">Beállítás</string>
+  <string name="title_setup_export">Beállítások exportálása</string>
+  <string name="title_setup_import">Beállítások importálása</string>
+  <string name="title_setup_export_do">A fiókok és azonosítók jelszó nélkül exportálva lesznek</string>
+  <string name="title_setup_import_do">Az importált fiókok felülírás nélkül lesznek hozzáadva</string>
+  <string name="title_setup_exported">Beállítások exportálva</string>
+  <string name="title_setup_imported">Beállítások importálva</string>
+  <string name="title_setup_account">Fiókok kezelése</string>
+  <string name="title_setup_account_remark">E-mailt fogadni</string>
+  <string name="title_setup_identity">Azonosítók kezelése</string>
+  <string name="title_setup_identity_remark">E-mailt küldeni</string>
+  <string name="title_setup_doze">Akkumulátor-optimalizálás kikapcsolása</string>
   <string name="title_setup_doze_remark">To continuously receive email (optional)</string>
   <string name="title_setup_doze_instructions">In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\"</string>
   <string name="title_setup_data">Disable data saving</string>
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index cfd22986ac..b8f2d8bb65 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -90,7 +90,7 @@
   <string name="title_custom">Personalizzato</string>
   <string name="title_host">Nome host</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_allow_insecure">Allow insecure connections</string>
+  <string name="title_allow_insecure">Permetti connessioni non sicure</string>
   <string name="title_port">Numero porta</string>
   <string name="title_user">Nome utente</string>
   <string name="title_password">Password</string>
@@ -110,10 +110,10 @@
   <string name="title_no_host">Nome dell\'host mancante</string>
   <string name="title_no_user">Nome utente mancante</string>
   <string name="title_no_password">Password mancante</string>
-  <string name="title_no_drafts">No drafts folder selected</string>
-  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_primary_archive">No primary account or no archive folder</string>
-  <string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
+  <string name="title_no_drafts">Nessuna cartella bozze selezionata</string>
+  <string name="title_no_primary_drafts">Nessun account principale o nessuna cartella bozze</string>
+  <string name="title_no_primary_archive">Nessun account principale o nessuna cartella di archivio</string>
+  <string name="title_no_idle">Questo fornitore non supporta i messaggi push. Ciò ritarderà la ricezione di nuovi messaggi e aumenterà l\'utilizzo della batteria.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS non supportato, vedi le FAQ</string>
   <string name="title_account_delete">Eliminare questo account permanentemente?</string>
   <string name="title_identity_delete">Eliminare questa identità permanentemente?</string>
@@ -166,14 +166,14 @@
   <string name="title_archive">Archivo</string>
   <string name="title_reply">Rispondi</string>
   <string name="title_moving">Spostamento messaggio in %1$s</string>
-  <string name="title_no_answers">No reply templates defined</string>
+  <string name="title_no_answers">Nessun modello di risposta definito</string>
   <string name="title_no_viewer">Nessuna app di visualizzazione disponibile per %1$s</string>
   <string name="title_attachment_saved">Allegato salvato</string>
   <string name="title_attachment_unavailable">Alcuni allegati non vengono scaricati e non verranno inoltrati, continuare?</string>
   <string name="title_ask_delete">Eliminare il messaggio permanentemente?</string>
   <string name="title_ask_discard">Eliminare la bozza?</string>
   <string name="title_ask_spam">Segnalare il messaggio come posta indesiderata?</string>
-  <string name="title_fix">Fix</string>
+  <string name="title_fix">Correggi</string>
   <string name="title_compose">Scrivi</string>
   <string name="title_from">Da:</string>
   <string name="title_to">A:</string>
@@ -205,12 +205,12 @@
   <string name="title_sort_on_time">Ora</string>
   <string name="title_sort_on_unread">Non letti</string>
   <string name="title_sort_on_starred">Stellati</string>
-  <string name="title_move_sent">Move to sent</string>
+  <string name="title_move_sent">Sposta in posta inviata</string>
   <string name="title_previous">Precedente</string>
   <string name="title_next">Successivo</string>
   <string name="title_answer_reply">Modello di risposta</string>
-  <string name="title_answer_name">Nome risposta</string>
-  <string name="title_answer_text">Testo risposta</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Posta in arrivo</string>
   <string name="title_legend_unified">Posta in arrivo unificata</string>
   <string name="title_legend_archive">Archivio</string>
@@ -233,7 +233,7 @@
   <string name="title_hint_folder_actions">Tieni premuto per le opzioni</string>
   <string name="title_hint_support">Se hai una domanda o un problema, usa il menu di supporto per ottenere aiuto</string>
   <string name="title_hint_message_actions">Scorri a sinistra per cestinare; scorri a destra per archiviare (se disponibile)</string>
-  <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
+  <string name="title_hint_message_selection">Premi a lungo un messaggio per iniziare a selezionare più messaggi</string>
   <string name="title_hint_sync">Scaricare i messaggi può richiedere del tempo, a seconda del numero di messaggi, della velocità della tua connessione internet e del tuo fornitore di email</string>
   <string name="title_open_link">Apri collegamento</string>
   <string name="title_updated">È disponibile un aggiornamento alla versione %1$s</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 9069de0b30..088430dfff 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -217,8 +217,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3b9764540d..d83489bc7e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -205,8 +205,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 3b9764540d..d83489bc7e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -205,8 +205,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index febf674be3..29d9eec2c7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,259 +1,259 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 door M. Bokhorst</string>
   <string name="channel_service">Service</string>
-  <string name="channel_notification">Notifications</string>
-  <string name="channel_error">Errors</string>
+  <string name="channel_notification">Meldingen</string>
+  <string name="channel_error">Fouten</string>
   <plurals name="title_notification_synchronizing">
-    <item quantity="one">Synchronizing %1$d account</item>
-    <item quantity="other">Synchronizing %1$d accounts</item>
+    <item quantity="one">Synchroniseren: %1$d account</item>
+    <item quantity="other">Synchroniseren: %1$d accounts</item>
   </plurals>
   <plurals name="title_notification_operations">
-    <item quantity="one">%1$d operation pending</item>
-    <item quantity="other">%1$d operations pending</item>
+    <item quantity="one">%1$d handeling te doen</item>
+    <item quantity="other">%1$d handelingen te doen</item>
   </plurals>
   <plurals name="title_notification_unseen">
-    <item quantity="one">%1$d new message</item>
-    <item quantity="other">%1$d new messages</item>
+    <item quantity="one">%1$d nieuw bericht</item>
+    <item quantity="other">%1$d nieuwe berichten</item>
   </plurals>
   <plurals name="title_notification_unsent">
-    <item quantity="one">%1$d unsent message</item>
-    <item quantity="other">%1$d unsent messages</item>
+    <item quantity="one">%1$d niet verzonden bericht</item>
+    <item quantity="other">%1$d niet verzonden berichten</item>
   </plurals>
-  <string name="title_notification_failed">\'%1$s\' failed</string>
-  <string name="menu_setup">Setup</string>
-  <string name="menu_answers">Reply templates</string>
-  <string name="menu_operations">Operations</string>
-  <string name="menu_legend">Legend</string>
-  <string name="menu_faq">FAQ/support</string>
-  <string name="menu_pro">Pro features</string>
+  <string name="title_notification_failed">\'%1$s\' is mislukt</string>
+  <string name="menu_setup">Installatie</string>
+  <string name="menu_answers">Antwoord sjablonen</string>
+  <string name="menu_operations">Handelingen</string>
+  <string name="menu_legend">Legenda</string>
+  <string name="menu_faq">FAQ/ondersteuning</string>
+  <string name="menu_pro">Pro functies</string>
   <string name="menu_privacy">Privacy</string>
-  <string name="menu_about">About</string>
-  <string name="menu_invite">Invite</string>
-  <string name="menu_rate">Rate this app</string>
-  <string name="menu_other">Other apps</string>
-  <string name="title_eula">End-user license agreement</string>
-  <string name="title_agree">I agree</string>
-  <string name="title_disagree">I disagree</string>
-  <string name="title_version">Version %1$s</string>
+  <string name="menu_about">Over</string>
+  <string name="menu_invite">Uitnodigen</string>
+  <string name="menu_rate">Beoordeel deze app</string>
+  <string name="menu_other">Andere apps</string>
+  <string name="title_eula">Licentieovereenkomst voor eindgebruikers</string>
+  <string name="title_agree">Ik ga akkoord</string>
+  <string name="title_disagree">Ik ga niet akkoord</string>
+  <string name="title_version">Versie %1$s</string>
   <string name="title_list_accounts">Accounts</string>
-  <string name="title_list_identities">Identities</string>
-  <string name="title_edit_account">Edit account</string>
-  <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings</string>
-  <string name="title_setup_import">Import settings</string>
-  <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
-  <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
-  <string name="title_setup_exported">Settings exported</string>
-  <string name="title_setup_imported">Settings imported</string>
-  <string name="title_setup_account">Manage accounts</string>
-  <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_identity">Manage identities</string>
-  <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_doze">Disable battery optimizations</string>
-  <string name="title_setup_doze_remark">To continuously receive email (optional)</string>
-  <string name="title_setup_doze_instructions">In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\"</string>
-  <string name="title_setup_data">Disable data saving</string>
-  <string name="title_setup_permissions">Grant permissions</string>
-  <string name="title_setup_permissions_remark">To get contact information (optional)</string>
-  <string name="title_setup_to_do">To do</string>
-  <string name="title_setup_done">Done</string>
-  <string name="title_setup_light_theme">Light theme</string>
-  <string name="title_setup_dark_theme">Dark theme</string>
-  <string name="title_advanced">Advanced options</string>
-  <string name="title_advanced_enabled">Enabled</string>
-  <string name="title_advanced_avatars">Show contact photos</string>
-  <string name="title_advanced_light">Use notification light</string>
-  <string name="title_advanced_browse">Browse messages on the server</string>
-  <string name="title_advanced_swipe">Swipe actions</string>
-  <string name="title_advanced_compact">Compact message view</string>
-  <string name="title_advanced_debug">Debug mode</string>
-  <string name="title_select">Select &#8230;</string>
-  <string name="title_identity_name">Your name</string>
-  <string name="title_identity_email">Your email address</string>
-  <string name="title_identity_reply_to">Reply to address</string>
-  <string name="title_optional">Optional</string>
-  <string name="title_account_linked">Linked account</string>
-  <string name="title_account_name">Account name</string>
-  <string name="title_account_name_hint">Used to differentiate folders</string>
-  <string name="title_account_signature">Signature text</string>
-  <string name="title_account_color">Color</string>
-  <string name="title_domain">Domain name</string>
-  <string name="title_autoconfig">Get settings</string>
-  <string name="title_no_settings">Settings not found</string>
+  <string name="title_list_identities">Identiteiten</string>
+  <string name="title_edit_account">Account bewerken</string>
+  <string name="title_edit_identity">Identiteit bewerken</string>
+  <string name="title_edit_folder">Map bewerken</string>
+  <string name="title_setup">Installatie</string>
+  <string name="title_setup_export">Exporteer instellingen</string>
+  <string name="title_setup_import">Importeer instellingen</string>
+  <string name="title_setup_export_do">Accounts en identiteiten worden geëxporteerd zonder wachtwoorden</string>
+  <string name="title_setup_import_do">Geïmporteerde accounts zullen worden toegevoegd, niet overschreven</string>
+  <string name="title_setup_exported">Instellingen geëxporteerd</string>
+  <string name="title_setup_imported">Instellingen geïmporteerd</string>
+  <string name="title_setup_account">Beheer accounts</string>
+  <string name="title_setup_account_remark">Om e-mail te ontvangen</string>
+  <string name="title_setup_identity">Beheer identiteiten</string>
+  <string name="title_setup_identity_remark">Om e-mail te verzenden</string>
+  <string name="title_setup_doze">Accuoptimalisaties uitschakelen</string>
+  <string name="title_setup_doze_remark">Om voortdurend e-mail te ontvangen (optioneel)</string>
+  <string name="title_setup_doze_instructions">In het volgende dialoogvenster, selecteer \"Alle apps\" bovenin, selecteer deze app en bevestig met \"Niet optimaliseren\"</string>
+  <string name="title_setup_data">Databesparing uitschakelen</string>
+  <string name="title_setup_permissions">Toestemming verlenen</string>
+  <string name="title_setup_permissions_remark">Voor toegang tot contactinformatie (optioneel)</string>
+  <string name="title_setup_to_do">Te doen</string>
+  <string name="title_setup_done">Gedaan</string>
+  <string name="title_setup_light_theme">Licht thema</string>
+  <string name="title_setup_dark_theme">Donker thema</string>
+  <string name="title_advanced">Geavanceerde opties</string>
+  <string name="title_advanced_enabled">Ingeschakeld</string>
+  <string name="title_advanced_avatars">Toon contact foto\'s</string>
+  <string name="title_advanced_light">Gebruik meldingslicht</string>
+  <string name="title_advanced_browse">Blader door berichten op de server</string>
+  <string name="title_advanced_swipe">Veegacties</string>
+  <string name="title_advanced_compact">Compacte berichtweergave</string>
+  <string name="title_advanced_debug">Foutopsporing modus</string>
+  <string name="title_select">Selecteer &#8230;</string>
+  <string name="title_identity_name">Uw naam</string>
+  <string name="title_identity_email">Uw e-mailadres</string>
+  <string name="title_identity_reply_to">Antwoord op adres</string>
+  <string name="title_optional">Optioneel</string>
+  <string name="title_account_linked">Gekoppeld account</string>
+  <string name="title_account_name">Accountnaam</string>
+  <string name="title_account_name_hint">Wordt gebruikt voor het onderscheiden van mappen</string>
+  <string name="title_account_signature">Handtekening</string>
+  <string name="title_account_color">Kleur</string>
+  <string name="title_domain">Domeinnaam</string>
+  <string name="title_autoconfig">Instellingen ophalen</string>
+  <string name="title_no_settings">Instelling niet gevonden</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
-  <string name="title_provider">Provider</string>
-  <string name="title_custom">Custom</string>
-  <string name="title_host">Host name</string>
+  <string name="title_provider">Aanbieder</string>
+  <string name="title_custom">Aangepast</string>
+  <string name="title_host">Hostnaam</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_allow_insecure">Allow insecure connections</string>
-  <string name="title_port">Port number</string>
-  <string name="title_user">User name</string>
-  <string name="title_password">Password</string>
-  <string name="title_authorize">Select account</string>
-  <string name="title_authorizing">Authorizing account &#8230;</string>
-  <string name="title_setup_advanced">Advanced</string>
+  <string name="title_allow_insecure">Onveilige verbindingen toestaan</string>
+  <string name="title_port">Poortnummer</string>
+  <string name="title_user">Gebruikersnaam</string>
+  <string name="title_password">Wachtwoord</string>
+  <string name="title_authorize">Selecteer account</string>
+  <string name="title_authorizing">Account autoriseren &#8230;</string>
+  <string name="title_setup_advanced">Geavanceerd</string>
   <string name="title_store_sent">Store sent messages (normally not needed)</string>
-  <string name="title_synchronize_account">Synchronize (receive messages)</string>
-  <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (default account)</string>
-  <string name="title_primary_identity">Primary (default identity)</string>
+  <string name="title_synchronize_account">Synchroniseren (ontvang berichten)</string>
+  <string name="title_synchronize_identity">Synchroniseren (stuur berichten)</string>
+  <string name="title_primary_account">Primair account (standaard account)</string>
+  <string name="title_primary_identity">Primaire identiteit (standaard identiteit)</string>
   <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
-  <string name="title_check">Check</string>
-  <string name="title_no_name">Name missing</string>
-  <string name="title_no_email">Email address missing</string>
-  <string name="title_no_account">Account missing</string>
-  <string name="title_no_host">Host name missing</string>
-  <string name="title_no_user">User name missing</string>
-  <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_check">Controleer</string>
+  <string name="title_no_name">Naam ontbreekt</string>
+  <string name="title_no_email">Email adres ontbreekt</string>
+  <string name="title_no_account">Account ontbreekt</string>
+  <string name="title_no_host">Hostnaam ontbreekt</string>
+  <string name="title_no_user">Gebruikersnaam ontbreekt</string>
+  <string name="title_no_password">Wachtwoord ontbreekt</string>
+  <string name="title_no_drafts">Geen concepten map geslecteerd</string>
   <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
   <string name="title_no_primary_archive">No primary account or no archive folder</string>
-  <string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
-  <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
-  <string name="title_account_delete">Delete this account permanently?</string>
-  <string name="title_identity_delete">Delete this identity permanently?</string>
-  <string name="title_pop">POP is not supported</string>
-  <string name="title_insecure">Insecure connections are not supported</string>
-  <string name="title_synchronize_now">Synchronize now</string>
-  <string name="title_delete_local">Delete local messages</string>
-  <string name="title_empty_trash">Empty trash</string>
-  <string name="title_edit_properties">Edit properties</string>
-  <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
-  <string name="title_folder_name">Folder name</string>
-  <string name="title_display_name">Display name</string>
-  <string name="title_hide_folder">Hide from list</string>
-  <string name="title_hide_folders">Hide hidden folders</string>
-  <string name="title_show_folders">Show hidden folders</string>
-  <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-  <string name="title_unified_folder">Show in unified inbox</string>
-  <string name="title_after">Synchronize (days)</string>
-  <string name="title_folder_exists">Folder %1$s exists</string>
-  <string name="title_folder_delete">Delete folder permanently?</string>
-  <string name="title_folder_unified">Unified inbox</string>
-  <string name="title_folder_inbox">Inbox</string>
-  <string name="title_folder_outbox">Outbox</string>
-  <string name="title_folder_all">Archive</string>
-  <string name="title_folder_drafts">Drafts</string>
-  <string name="title_folder_trash">Trash</string>
+  <string name="title_no_idle">Deze provider biedt geen ondersteuning voor push-berichten. Dit zal het ontvangen van nieuwe berichten vertragen en het gebruik van de batterij te verhogen.</string>
+  <string name="title_no_uidplus">IMAP UIDPLUS niet ondersteund, zie de FAQ</string>
+  <string name="title_account_delete">Verwijder dit account permanent?</string>
+  <string name="title_identity_delete">Verwijder deze identiteit permanent?</string>
+  <string name="title_pop">POP wordt niet ondersteund</string>
+  <string name="title_insecure">Onveilige verbindingen worden niet ondersteund</string>
+  <string name="title_synchronize_now">Nu synchroniseren</string>
+  <string name="title_delete_local">Verwijder lokale berichten</string>
+  <string name="title_empty_trash">Prullenbak leegmaken</string>
+  <string name="title_edit_properties">Bewerk eigenschappen</string>
+  <string name="title_empty_trash_ask">Alle weggegooid berichten permanent verwijderen?</string>
+  <string name="title_folder_name">Mapnaam</string>
+  <string name="title_display_name">Weergavenaam</string>
+  <string name="title_hide_folder">Verberg in de lijst</string>
+  <string name="title_hide_folders">Verberg verborgen mappen</string>
+  <string name="title_show_folders">Toon verborgen mappen</string>
+  <string name="title_synchronize_folder">Synchroniseren (ontvang berichten)</string>
+  <string name="title_unified_folder">Toon in het gecombineerde postvak in</string>
+  <string name="title_after">Synchroniseren (dagen)</string>
+  <string name="title_folder_exists">Map %1$s bestaat</string>
+  <string name="title_folder_delete">Verwijder map permanent?</string>
+  <string name="title_folder_unified">Gecombineerd postvak in</string>
+  <string name="title_folder_inbox">Postvak in</string>
+  <string name="title_folder_outbox">Postvak uit</string>
+  <string name="title_folder_all">Archief</string>
+  <string name="title_folder_drafts">Concepten</string>
+  <string name="title_folder_trash">Prullenbak</string>
   <string name="title_folder_junk">Spam</string>
-  <string name="title_folder_sent">Sent</string>
-  <string name="title_folder_system">System</string>
-  <string name="title_folder_user">User</string>
-  <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Conversation</string>
-  <string name="title_no_messages">No messages</string>
-  <string name="title_show_images">Show images</string>
+  <string name="title_folder_sent">Verzonden</string>
+  <string name="title_folder_system">Systeem</string>
+  <string name="title_folder_user">Gebruiker</string>
+  <string name="title_folder_primary">Primaire account mappen</string>
+  <string name="title_folder_thread">Conversatie</string>
+  <string name="title_no_messages">Geen berichten</string>
+  <string name="title_show_images">Toon afbeeldingen</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark read</string>
-  <string name="title_unseen">Mark unread</string>
-  <string name="title_flag">Add star</string>
-  <string name="title_unflag">Remove star</string>
-  <string name="title_forward">Forward</string>
-  <string name="title_reply_all">Reply to all</string>
-  <string name="title_show_headers">Show headers</string>
-  <string name="title_show_html">Show original</string>
-  <string name="title_trash">Trash</string>
-  <string name="title_delete">Delete</string>
-  <string name="title_more">More</string>
+  <string name="title_seen">Markeer als gelezen</string>
+  <string name="title_unseen">Markeer als ongelezen</string>
+  <string name="title_flag">Ster toevoegen</string>
+  <string name="title_unflag">Ster verwijderen</string>
+  <string name="title_forward">Doorsturen</string>
+  <string name="title_reply_all">Allen beantwoorden</string>
+  <string name="title_show_headers">Toon headers</string>
+  <string name="title_show_html">Toon origineel</string>
+  <string name="title_trash">Prullenbak</string>
+  <string name="title_delete">Verwijder</string>
+  <string name="title_more">Meer</string>
   <string name="title_spam">Spam</string>
-  <string name="title_move">Move</string>
-  <string name="title_archive">Archive</string>
-  <string name="title_reply">Reply</string>
-  <string name="title_moving">Moving message to %1$s</string>
-  <string name="title_no_answers">No reply templates defined</string>
-  <string name="title_no_viewer">No viewer app available for %1$s</string>
-  <string name="title_attachment_saved">Attachment saved</string>
+  <string name="title_move">Verplaats</string>
+  <string name="title_archive">Archief</string>
+  <string name="title_reply">Beantwoorden</string>
+  <string name="title_moving">Bericht verplaatsen naar %1$s</string>
+  <string name="title_no_answers">Geen sjablonen gedefinieerd</string>
+  <string name="title_no_viewer">Geen app beschikbaar om %1$s te tonen</string>
+  <string name="title_attachment_saved">Bijlage opgeslagen</string>
   <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
-  <string name="title_ask_delete">Delete message permanently?</string>
-  <string name="title_ask_discard">Discard draft?</string>
-  <string name="title_ask_spam">Report message as spam?</string>
-  <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
-  <string name="title_from">From:</string>
-  <string name="title_to">To:</string>
-  <string name="title_reply_to">Reply to:</string>
+  <string name="title_ask_delete">Verwijder bericht permanent?</string>
+  <string name="title_ask_discard">Verwijder concept?</string>
+  <string name="title_ask_spam">Rapporteren als spam?</string>
+  <string name="title_fix">Oplossen</string>
+  <string name="title_compose">Opstellen</string>
+  <string name="title_from">Van:</string>
+  <string name="title_to">Aan:</string>
+  <string name="title_reply_to">Antwoord op:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
-  <string name="title_subject">Subject:</string>
-  <string name="title_body_hint">Your message</string>
-  <string name="title_discard">Discard</string>
-  <string name="title_save">Save</string>
-  <string name="title_send">Send</string>
-  <string name="title_clipboard_empty">Clipboard empty</string>
-  <string name="title_style_bold">Bold</string>
-  <string name="title_style_italic">Italic</string>
-  <string name="title_style_link">Insert link</string>
-  <string name="title_style_image">Insert image</string>
-  <string name="title_add_attachment">Add attachment</string>
-  <string name="title_show_addresses">Show CC/BCC</string>
-  <string name="title_from_missing">Sender missing</string>
-  <string name="title_to_missing">Recipient missing</string>
+  <string name="title_subject">Onderwerp:</string>
+  <string name="title_body_hint">Uw bericht</string>
+  <string name="title_discard">Weggooien</string>
+  <string name="title_save">Bewaren</string>
+  <string name="title_send">Verzenden</string>
+  <string name="title_clipboard_empty">Klembord is leeg</string>
+  <string name="title_style_bold">Vet</string>
+  <string name="title_style_italic">Cursief</string>
+  <string name="title_style_link">Link invoegen</string>
+  <string name="title_style_image">Afbeelding invoegen</string>
+  <string name="title_add_attachment">Bijlage toevoegen</string>
+  <string name="title_show_addresses">Toon CC/BCC</string>
+  <string name="title_from_missing">Zender ontbreekt</string>
+  <string name="title_to_missing">Ontvanger ontbreekt</string>
   <string name="title_attachments_missing">Attachments still loading</string>
-  <string name="title_draft_deleted">Draft discarded</string>
-  <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Sending message</string>
-  <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
-  <string name="title_searching">Searching \'%1$s\'</string>
-  <string name="title_sort_on">Sort on</string>
-  <string name="title_sort_on_time">Time</string>
-  <string name="title_sort_on_unread">Unread</string>
-  <string name="title_sort_on_starred">Starred</string>
-  <string name="title_move_sent">Move to sent</string>
-  <string name="title_previous">Previous</string>
-  <string name="title_next">Next</string>
-  <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
-  <string name="title_legend_inbox">Inbox</string>
-  <string name="title_legend_unified">Unified inbox</string>
-  <string name="title_legend_archive">Archive</string>
-  <string name="title_legend_trash">Trash</string>
-  <string name="title_legend_primary_disconnected">Account disconnected</string>
-  <string name="title_legend_primary_connected">Account connected</string>
+  <string name="title_draft_deleted">Concept weggegooid</string>
+  <string name="title_draft_saved">Concept opgeslagen</string>
+  <string name="title_queued">Bericht wordt verzonden</string>
+  <string name="title_search">Zoek</string>
+  <string name="title_search_hint">Zoek op server</string>
+  <string name="title_searching">Zoeken naar \'%1$s\'</string>
+  <string name="title_sort_on">Sorteer op</string>
+  <string name="title_sort_on_time">Tijd</string>
+  <string name="title_sort_on_unread">Ongelezen</string>
+  <string name="title_sort_on_starred">Met ster</string>
+  <string name="title_move_sent">Verplaats naar verzonden</string>
+  <string name="title_previous">Vorige</string>
+  <string name="title_next">Volgende</string>
+  <string name="title_answer_reply">Antwoord sjabloon</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
+  <string name="title_legend_inbox">Postvak in</string>
+  <string name="title_legend_unified">Gecombineerd postvak in</string>
+  <string name="title_legend_archive">Archief</string>
+  <string name="title_legend_trash">Prullenbak</string>
+  <string name="title_legend_primary_disconnected">Account niet verbonden</string>
+  <string name="title_legend_primary_connected">Account verbonden</string>
   <string name="title_legend_cc">CC/BCC</string>
-  <string name="title_legend_attachment">Attachment</string>
-  <string name="title_legend_thread">Conversation</string>
-  <string name="title_legend_contacts">Contacts</string>
-  <string name="title_legend_synchronize_on">Synchronize on</string>
-  <string name="title_legend_synchronize_off">Synchronize off</string>
+  <string name="title_legend_attachment">Bijlage</string>
+  <string name="title_legend_thread">Conversatie</string>
+  <string name="title_legend_contacts">Contacten</string>
+  <string name="title_legend_synchronize_on">Synchronisatie aan</string>
+  <string name="title_legend_synchronize_off">Synchronisatie uit</string>
   <string name="title_legend_primary">Primary/starred</string>
-  <string name="title_legend_disconnected">Disconnected</string>
-  <string name="title_legend_connecting">Connecting</string>
-  <string name="title_legend_connected">Connected</string>
-  <string name="title_legend_synchronizing">Synchronizing</string>
-  <string name="title_legend_downloading">Downloading</string>
-  <string name="title_legend_closing">Closing</string>
-  <string name="title_hint_folder_actions">Long press for options</string>
+  <string name="title_legend_disconnected">Verbinding verbroken</string>
+  <string name="title_legend_connecting">Verbinding maken</string>
+  <string name="title_legend_connected">Verbonden</string>
+  <string name="title_legend_synchronizing">Synchroniseren</string>
+  <string name="title_legend_downloading">Downloaden</string>
+  <string name="title_legend_closing">Sluiten</string>
+  <string name="title_hint_folder_actions">Druk lang voor opties</string>
   <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
   <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
   <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
   <string name="title_hint_sync">Downloading messages can take some time, depending on the number of messages, the speed of your internet connection and your email provider</string>
-  <string name="title_open_link">Open link</string>
-  <string name="title_updated">There is an update to version %1$s available</string>
+  <string name="title_open_link">Link openen</string>
+  <string name="title_updated">Er is een update naar versie %1$s beschikbaar</string>
   <string name="title_issue">Do you have a question or problem?</string>
-  <string name="title_yes">Yes</string>
-  <string name="title_no">No</string>
-  <string name="title_undo">Undo</string>
+  <string name="title_yes">Ja</string>
+  <string name="title_no">Nee</string>
+  <string name="title_undo">Ongedaan maken</string>
   <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
-  <string name="title_pro_feature">This is a pro feature</string>
-  <string name="title_pro_list">List of pro features</string>
-  <string name="title_pro_purchase">Buy</string>
+  <string name="title_pro_feature">Dit is een pro-functie</string>
+  <string name="title_pro_list">Lijst van pro-functies</string>
+  <string name="title_pro_purchase">Koop</string>
   <string name="title_pro_hint">Buying pro features will allow you to use all current and future pro features, will keep this app maintained, and supported</string>
   <string name="title_pro_price">Please see <a href="https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ19">this FAQ</a> about the price of the pro features</string>
-  <string name="title_pro_activated">All pro features are activated</string>
-  <string name="title_pro_valid">All pro features activated</string>
-  <string name="title_pro_invalid">Invalid response</string>
+  <string name="title_pro_activated">Alle pro-functies zijn geactiveerd</string>
+  <string name="title_pro_valid">Alle pro-functies geactiveerd</string>
+  <string name="title_pro_invalid">Ongeldige reactie</string>
   <string name="title_pro_support">FairEmail needs your help. Tap to purchase pro features to keep the project going.</string>
-  <string name="title_unexpected_error">Unexpected error</string>
-  <string name="title_log">Log</string>
-  <string name="title_debug_info">Debug info</string>
+  <string name="title_unexpected_error">Onverwachte fout</string>
+  <string name="title_log">Logboek</string>
+  <string name="title_debug_info">Informatie voor foutopsporing</string>
   <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
   <string name="title_crash_info_remark">Please describe what you were doing when the app crashed:</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7a53b5dd5c..8862df60b4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -217,8 +217,8 @@
   <string name="title_previous">Poprzedni</string>
   <string name="title_next">Następny</string>
   <string name="title_answer_reply">Szablon odpowiedzi</string>
-  <string name="title_answer_name">Nazwa odpowiedzi</string>
-  <string name="title_answer_text">Tekst odpowiedzi</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Odebrane</string>
   <string name="title_legend_unified">Wspólna skrzynka odbiorcza</string>
   <string name="title_legend_archive">Archiwum</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0801f1bdfe..5de1529941 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index febf674be3..fbfa57ae61 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 814a48568e..e85c938175 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -170,7 +170,7 @@
   <string name="title_archive">Arhivă</string>
   <string name="title_reply">Răspunde</string>
   <string name="title_moving">Mesajul se mută în %1$s</string>
-  <string name="title_no_answers">No reply templates defined</string>
+  <string name="title_no_answers">Nici un răspuns standard definit</string>
   <string name="title_no_viewer">Nici o aplicație nu poate deschide %1$s</string>
   <string name="title_attachment_saved">Atașament salvat</string>
   <string name="title_attachment_unavailable">Unele fișiere atașate nu sunt descărcate şi nu vor fi redirecționate, continuaţi?</string>
@@ -213,8 +213,8 @@
   <string name="title_previous">Precedent</string>
   <string name="title_next">Următor</string>
   <string name="title_answer_reply">Șablon răspuns</string>
-  <string name="title_answer_name">Titlu răspuns</string>
-  <string name="title_answer_text">Text răspuns</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Primite</string>
   <string name="title_legend_unified">Căsuță poștală comună</string>
   <string name="title_legend_archive">Arhivă</string>
@@ -237,7 +237,7 @@
   <string name="title_hint_folder_actions">Atingeți lung pentru opțiuni</string>
   <string name="title_hint_support">Dacă aveți o întrebare sau o problemă, vă rugăm să utilizați meniul de suport tehnic pentru a obține ajutor</string>
   <string name="title_hint_message_actions">Glisare spre stânga trimite la gunoi iar glisare spre dreapta la arhivă (dacă este disponibilă)</string>
-  <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
+  <string name="title_hint_message_selection">Apăsați lung un mesaj pentru a selecta multiple</string>
   <string name="title_hint_sync">Descărcarea mesajelor poate dura ceva timp, în funcţie de numărul de mesaje, viteza de conexiunea la internet și furnizorul dumneavostră de e-mail</string>
   <string name="title_open_link">Deschide legătura</string>
   <string name="title_updated">Este disponibilă o actualizare la versiunea %1$s</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 83456daded..1f06d57ec8 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -217,8 +217,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 55d5d69d73..d16433866f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -213,8 +213,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 23a58042ca..483c967997 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Svarnamn</string>
-  <string name="title_answer_text">Svarstexten</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inkorg</string>
   <string name="title_legend_unified">Samlad inkorg</string>
   <string name="title_legend_archive">Arkivera</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 103b6bb521..e4fd0b7bbd 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -23,14 +23,14 @@
   </plurals>
   <string name="title_notification_failed">\'%1$s\' başarısız oldu</string>
   <string name="menu_setup">Kurulum</string>
-  <string name="menu_answers">Reply templates</string>
+  <string name="menu_answers">Yanıt şablonları</string>
   <string name="menu_operations">İşlemler</string>
   <string name="menu_legend">Açıklamalar</string>
   <string name="menu_faq">SSS/destek</string>
   <string name="menu_pro">Pro özellikleri</string>
   <string name="menu_privacy">Gizlilik</string>
   <string name="menu_about">Hakkında</string>
-  <string name="menu_invite">Invite</string>
+  <string name="menu_invite">Davet et</string>
   <string name="menu_rate">Bu uygulamaya puan verin</string>
   <string name="menu_other">Diğer uygulamalar</string>
   <string name="title_eula">Son Kullanıcı Lisans Sözleşmesi</string>
@@ -43,12 +43,12 @@
   <string name="title_edit_identity">Kimliği düzenle</string>
   <string name="title_edit_folder">Klasörü düzenle</string>
   <string name="title_setup">Kurulum</string>
-  <string name="title_setup_export">Export settings</string>
-  <string name="title_setup_import">Ayarları İçe Aktar</string>
-  <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
-  <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
+  <string name="title_setup_export">Ayarları dışa aktar</string>
+  <string name="title_setup_import">Ayarları içe aktar</string>
+  <string name="title_setup_export_do">Hesaplar ve kimlikler şifreler olmadan dışa aktarılır</string>
+  <string name="title_setup_import_do">İçe aktarılan hesaplar eklenecek, üzerine yazılmayacak</string>
   <string name="title_setup_exported">Ayarları dışa aktarıldı</string>
-  <string name="title_setup_imported">Ayarları içe aktarıldı</string>
+  <string name="title_setup_imported">Ayarlar içe aktarıldı</string>
   <string name="title_setup_account">Hesapları Yönet</string>
   <string name="title_setup_account_remark">E-posta almak için</string>
   <string name="title_setup_identity">Kimlikleri Yönet</string>
@@ -64,12 +64,12 @@
   <string name="title_setup_light_theme">Aydınlık tema</string>
   <string name="title_setup_dark_theme">Koyu Tema</string>
   <string name="title_advanced">Gelişmiş ayarlar</string>
-  <string name="title_advanced_enabled">Enabled</string>
+  <string name="title_advanced_enabled">Etkin</string>
   <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
   <string name="title_advanced_light">Bildirim ışığını kullan</string>
-  <string name="title_advanced_browse">Browse messages on the server</string>
-  <string name="title_advanced_swipe">Swipe actions</string>
-  <string name="title_advanced_compact">Compact message view</string>
+  <string name="title_advanced_browse">Sunucudaki iletilere göz atın</string>
+  <string name="title_advanced_swipe">Kaydırma eylemleri</string>
+  <string name="title_advanced_compact">Kompakt mesaj görünümü</string>
   <string name="title_advanced_debug">Hata ayıklama</string>
   <string name="title_select">Seçin &#8230;</string>
   <string name="title_identity_name">Adınız</string>
@@ -82,15 +82,15 @@
   <string name="title_account_signature">İmza Metni</string>
   <string name="title_account_color">Renk</string>
   <string name="title_domain">Domain name</string>
-  <string name="title_autoconfig">Get settings</string>
-  <string name="title_no_settings">Settings not found</string>
+  <string name="title_autoconfig">Ayarları al</string>
+  <string name="title_no_settings">Ayarlar bulunamadı</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Sağlayıcı</string>
   <string name="title_custom">Özel</string>
   <string name="title_host">Sunucu adı</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_allow_insecure">Allow insecure connections</string>
+  <string name="title_allow_insecure">Güvensiz bağlantılara izin ver</string>
   <string name="title_port">Port numarası</string>
   <string name="title_user">Kullanıcı adı</string>
   <string name="title_password">Şifre</string>
@@ -102,7 +102,7 @@
   <string name="title_synchronize_identity">Senkronize et (iletileri gönder)</string>
   <string name="title_primary_account">Birincil (varsayılan hesap)</string>
   <string name="title_primary_identity">Birincil (varsayılan kimlik)</string>
-  <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+  <string name="title_keep_alive_interval">Canlı tutma aralığı (dakika)</string>
   <string name="title_check">Kontrol et</string>
   <string name="title_no_name">İsim eksik</string>
   <string name="title_no_email">E-posta adresi eksik</string>
@@ -110,25 +110,25 @@
   <string name="title_no_host">Sunucu adı eksik</string>
   <string name="title_no_user">Kullanıcı adı eksik</string>
   <string name="title_no_password">Parola Eksik</string>
-  <string name="title_no_drafts">No drafts folder selected</string>
-  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_primary_archive">No primary account or no archive folder</string>
-  <string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
-  <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
+  <string name="title_no_drafts">Taslaklar klasörü seçilmedi</string>
+  <string name="title_no_primary_drafts">Birincil hesap yok veya taslak klasörü yok</string>
+  <string name="title_no_primary_archive">Birincil hesap yok veya arşiv klasörü yok</string>
+  <string name="title_no_idle">Bu sağlayıcı anlık mesajları desteklemiyor. Bu, yeni mesajların alınmasını geciktirecek ve pil kullanımını artıracaktır.</string>
+  <string name="title_no_uidplus">IMAP UIDPLUS desteklenmiyor, SSS bölümüne bakın</string>
   <string name="title_account_delete">Bu hesabı kalıcı olarak sil?</string>
   <string name="title_identity_delete">Bu kimliği kalıcı olarak sil?</string>
   <string name="title_pop">POP desteklenmiyor</string>
   <string name="title_insecure">Güvenli olmayan bağlantılar desteklenmiyor</string>
   <string name="title_synchronize_now">Şimdi senkronize et</string>
   <string name="title_delete_local">Yerel mesajları sil</string>
-  <string name="title_empty_trash">Empty trash</string>
+  <string name="title_empty_trash">Çöp kutusunu boşalt</string>
   <string name="title_edit_properties">Özellikleri düzenle</string>
-  <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
+  <string name="title_empty_trash_ask">Tüm çöpe atılan iletiler kalıcı olarak silinsin mi?</string>
   <string name="title_folder_name">Klasör adı</string>
-  <string name="title_display_name">Display name</string>
-  <string name="title_hide_folder">Hide from list</string>
-  <string name="title_hide_folders">Hide hidden folders</string>
-  <string name="title_show_folders">Show hidden folders</string>
+  <string name="title_display_name">Ekran adı</string>
+  <string name="title_hide_folder">Listeden gizle</string>
+  <string name="title_hide_folders">Gizli klasörleri gizle</string>
+  <string name="title_show_folders">Gizli klasörleri göster</string>
   <string name="title_synchronize_folder">Senkronize et (iletileri al)</string>
   <string name="title_unified_folder">Birleşik gelen kutusunda göster</string>
   <string name="title_after">Senkronize (günler)</string>
@@ -142,7 +142,7 @@
   <string name="title_folder_trash">Çöp Kutusu</string>
   <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Gönderilen</string>
-  <string name="title_folder_system">System</string>
+  <string name="title_folder_system">Sistem</string>
   <string name="title_folder_user">Kullanıcı</string>
   <string name="title_folder_primary">Klasörler birincil hesap</string>
   <string name="title_folder_thread">Sohbet</string>
@@ -160,13 +160,13 @@
   <string name="title_show_html">Orjinali göster</string>
   <string name="title_trash">Çöp Kutusu</string>
   <string name="title_delete">Sil</string>
-  <string name="title_more">More</string>
+  <string name="title_more">Daha fazla</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Taşı</string>
   <string name="title_archive">Arşivle</string>
   <string name="title_reply">Yanıtla</string>
   <string name="title_moving">İleti şuraya taşınıyor %1$s</string>
-  <string name="title_no_answers">No reply templates defined</string>
+  <string name="title_no_answers">Yanıt şablonları tanımlanmadı</string>
   <string name="title_no_viewer">%1$s için kullanılabilir hiçbir görüntüleme uygulaması yok</string>
   <string name="title_attachment_saved">Ek kaydedildi</string>
   <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
@@ -209,8 +209,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Yanıt adı</string>
-  <string name="title_answer_text">Yanıt metni</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Gelen kutusu</string>
   <string name="title_legend_unified">Birleştirilmiş gelen kutusu</string>
   <string name="title_legend_archive">Arşiv</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 83456daded..1f06d57ec8 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -217,8 +217,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 3b9764540d..d83489bc7e 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -205,8 +205,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bb510e1143..00c3c4d0b1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -205,8 +205,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">回复名称</string>
-  <string name="title_answer_text">回复文本</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">收件箱</string>
   <string name="title_legend_unified">聚合收件箱</string>
   <string name="title_legend_archive">存档</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3b9764540d..d83489bc7e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -205,8 +205,8 @@
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
+  <string name="title_answer_name">Template name</string>
+  <string name="title_answer_text">Template text</string>
   <string name="title_legend_inbox">Inbox</string>
   <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_archive">Archive</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc84811e97..7711c6109b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -243,8 +243,8 @@
     <string name="title_next">Next</string>
 
     <string name="title_answer_reply">Reply template</string>
-    <string name="title_answer_name">Answer name</string>
-    <string name="title_answer_text">Answer text</string>
+    <string name="title_answer_name">Template name</string>
+    <string name="title_answer_text">Template text</string>
 
     <string name="title_legend_inbox">Inbox</string>
     <string name="title_legend_unified">Unified inbox</string>