diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c8cabfd2a..5c4219b79 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -283,6 +283,7 @@
     <string name="pref_repeat_notify">Gentage alarmer</string>
     <string name="pref_privacy">Privatliv</string>
     <string name="pref_chats_and_media">Samtaler og medie</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Lys</string>
     <string name="pref_dark_theme">Mørk</string>
     <string name="pref_appearance">Udseende</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 648a6475e..19a68e0b1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -188,7 +188,7 @@
     <string name="chat_record_explain">Tippen und halten, um eine Sprachnachricht aufzunehmen, loslassen um zu senden. </string>
     <string name="chat_no_chats_yet_hint">Geben Sie Ihrem Posteingang etwas, was sie empfangen können. Fangen Sie an, indem Sie einem Freund eine Nachricht schicken.</string>
     <string name="chat_all_done_hint">Inbox zeeerrro</string>
-    <string name="chat_all_done_explain">Zip. Zilch. Zero. Nada.\nIhr seid alle auf dem neuesten Stand!</string>
+    <string name="chat_all_done_explain">Zip. Zilch. Zero. Nada.\nAlle aufgeholt!</string>
     <string name="chat_share_with_title">Teilen mit</string>
     <string name="chat_input_placeholder">Nachricht</string>
     <string name="chat_archived_label">Archiviert</string>
@@ -323,7 +323,8 @@ Einige Anbieter fügen zusätzliche Informationen beim Eingang der Nachricht hin
     <string name="pref_repeat_notify">Wiederholte Warnungen</string>
     <string name="pref_privacy">Datenschutz</string>
     <string name="pref_chats_and_media">Chats und Medien</string>
-    <string name="pref_light_theme">Licht</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
+    <string name="pref_light_theme">Hell</string>
     <string name="pref_dark_theme">Dunkel</string>
     <string name="pref_appearance">Aussehen</string>
     <string name="pref_theme">Design</string>
@@ -357,6 +358,14 @@ Einige Anbieter fügen zusätzliche Informationen beim Eingang der Nachricht hin
     <string name="pref_managekeys_secret_keys_exported_to_x">Geheime Schlüssel erfolgreich nach \"%1$s\" geschrieben.</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Geheime Schlüssel von \"%1$s\" importiert.</string>
     <string name="pref_background">Chat-Hintergrund</string>
+    <string name="pref_imap_folder_handling">IMAP-Ordnereinstellungen</string>
+    <string name="pref_watch_inbox_folder">Posteingang beobachten</string>
+    <string name="pref_watch_sent_folder">Gesendet-Ordner beobachten</string>
+    <string name="pref_watch_mvbox_folder">DeltaChat-Ordner beobachten</string>
+    <string name="pref_auto_folder_moves">Autom. Verschieben in den DeltaChat-Ordner</string>
+    <string name="pref_auto_folder_moves_explain">Nachrichten verschieben, um einen unübersichtlichen Posteingang zu verhindern.</string>
+
+
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt ist eine neue und offene Spezifikation zur Ende-zu-Ende-Verschlüsselung von E-Mails.\n\nDas Ende-zu-Ende-Setup wird dabei automatisch eingerichtet und kann mit Autocrypt-Setup-Nachrichten zwischen Geräten übertragen werden.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3771e5a65..dcc9eab86 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -321,6 +321,7 @@
     <string name="pref_repeat_notify">Repetir alertas</string>
     <string name="pref_privacy">Privacidad</string>
     <string name="pref_chats_and_media">Chats y multimedia</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Claro</string>
     <string name="pref_dark_theme">Oscuro </string>
     <string name="pref_appearance">Apariencia</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 74163971f..f996fb11b 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -183,6 +183,7 @@
     <string name="pref_sound">Soinua</string>
     <string name="pref_silent">Isila</string>
     <string name="pref_privacy">Pribatutasuna</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Argia</string>
     <string name="pref_dark_theme">Iluna</string>
     <string name="pref_appearance">Itxura</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 76cf9c6f9..eaef94a2a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -321,6 +321,7 @@
     <string name="pref_repeat_notify">Ripeti avvisi</string>
     <string name="pref_privacy">Privacy</string>
     <string name="pref_chats_and_media">Chat e media</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Chiaro</string>
     <string name="pref_dark_theme">Scuro</string>
     <string name="pref_appearance">Aspetto</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b1876ab46..d46052ac7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -321,6 +321,7 @@
     <string name="pref_repeat_notify">Alarmeringen herhalen</string>
     <string name="pref_privacy">Privacy</string>
     <string name="pref_chats_and_media">Gesprekken en media</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Licht</string>
     <string name="pref_dark_theme">Donker</string>
     <string name="pref_appearance">Uiterlijk</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1e9667e98..ecbbd4b9e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -330,6 +330,7 @@
     <string name="pref_repeat_notify">Powtarzaj powiadomienia</string>
     <string name="pref_privacy">Prywatność</string>
     <string name="pref_chats_and_media">Czaty i media</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Jasny</string>
     <string name="pref_dark_theme">Ciemny</string>
     <string name="pref_appearance">Wygląd</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f1d6a6136..79fa7b20a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -348,6 +348,7 @@
     <string name="pref_silent">Беззвучный</string>
     <string name="pref_repeat_notify">Повторять оповещения</string>
     <string name="pref_privacy">Приватность</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Светлый</string>
     <string name="pref_dark_theme">Темный</string>
     <string name="pref_appearance">Внешний вид</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index d6d4752ce..bb9744186 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -311,6 +311,7 @@
     <string name="pref_repeat_notify">Përsëriti sinjalizimet</string>
     <string name="pref_privacy">Privatësi</string>
     <string name="pref_chats_and_media">Fjalosje dhe media</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">E çelët</string>
     <string name="pref_dark_theme">E errët</string>
     <string name="pref_appearance">Dukje</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 95937f537..14ce69ec7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -186,6 +186,7 @@
     <string name="chat_new_group_hint">İlk iletiyi oluşturun, diğerlerinin bu grupta yanıt vermesine izin verin.\n\n• Tüm üyeler Delta Chat kullanmıyorsa tamam.\n\n• İlk iletinin gönderilmesi biraz zaman alabilir.</string>
     <string name="chat_record_slide_to_cancel">İptal etmek için kaydırın</string>
     <string name="chat_record_explain">Bir sesli ileti kaydetmek için dokunun ve tutun, göndermek için bırakın</string>
+    <string name="chat_no_chats_yet_hint">Gelen kutunuza, ev hakkında bir şeyler yazıp verin. Bir arkadaşınıza mesaj göndererek başlayın.</string>
     <string name="chat_all_done_hint">Gelen kutusu sıfır</string>
     <string name="chat_all_done_explain">Çok saçmaladıkları için çeviri takımımız bunu çeviremedi. İlgili saçmalığın kaldırılması istenecektir.</string>
     <string name="chat_share_with_title">Paylaş</string>
@@ -317,6 +318,7 @@
     <string name="pref_repeat_notify">Uyarıları yinele</string>
     <string name="pref_privacy">Gizlilik</string>
     <string name="pref_chats_and_media">Sohbetler ve ortamlar</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Işık</string>
     <string name="pref_dark_theme">Koyu</string>
     <string name="pref_appearance">Görünüm</string>