diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2e9850c92..eab2a211b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Ugyldig e-post adresse.</string>
     <string name="password">Adgangskode</string>
     <string name="now">Nu</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min.</string>
     <string name="today">I dag</string>
     <string name="yesterday">I går</string>
     <string name="this_week">Denne uge</string>
     <string name="this_month">Denne uge</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d time</item>
         <item quantity="other">%d timer</item>
@@ -281,7 +279,6 @@
     <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 978bc2758..7e9bd27c5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,18 +29,11 @@
     <string name="bad_email_address">Ungültige E-Mail-Adresse</string>
     <string name="password">Passwort</string>
     <string name="now">Jetzt</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d Min.</string>
     <string name="today">Heute</string>
     <string name="yesterday">Gestern</string>
     <string name="this_week">Diese Woche</string>
     <string name="this_month">Dieser Monat</string>
-    <!-- Translators: show beside messages that are "N minutes old". prefer a short string, prefer abbreviations if they're well-known -->
-    <plurals name="n_minutes">
-        <item quantity="one">%d Min</item>
-        <item quantity="other">%d Min</item>
-    </plurals>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d Std</item>
         <item quantity="other">%d Std</item>
@@ -326,10 +319,9 @@ 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>
-    <!-- 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_appearance">Darstellung</string>
     <string name="pref_theme">Design</string>
     <string name="pref_language">Sprache</string>
     <string name="pref_incognito_keyboard">Inkognito-Tastatur</string>
@@ -465,4 +457,5 @@ Einige Anbieter fügen zusätzliche Informationen beim Eingang der Nachricht hin
     <string name="perm_explain_access_to_mic_denied">Delta Chat benötigt die Erlaubnis des Mikrofons, um Audio-Nachrichten zu senden, aber es wurde dauerhaft abgelehnt. Bitte fahren Sie mit den App-Einstellungen fort, wählen Sie \"Permissions\" und aktivieren Sie \"Microphone\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat benötigt die Speichergenehmigung, um Fotos, Videos oder Audiodateien anzuhängen oder zu exportieren, aber es wurde dauerhaft abgelehnt. Bitte fahren Sie mit dem Menü App-Einstellungen fort, wählen Sie \"Berechtigungen\" und aktivieren Sie \"Speicher\".</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat benötigt eine Standortberechtigung, um einen Standort anzuhängen, aber er wurde dauerhaft abgelehnt. Bitte fahren Sie mit dem Menü App-Einstellungen fort, wählen Sie \"Berechtigungen\" und aktivieren Sie \"Standort\".</string>
-</resources>
+
+    </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ddf9b6eaa..09efb1a6d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Dirección de correo no válida.</string>
     <string name="password">Contraseña</string>
     <string name="now">Ahora</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min</string>
     <string name="today">Hoy</string>
     <string name="yesterday">Ayer</string>
     <string name="this_week">Esta semana</string>
     <string name="this_month">Este mes</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d hora</item>
         <item quantity="other">%d horas</item>
@@ -75,7 +73,7 @@
     <string name="red">Rojo</string>
     <string name="blue">Azul</string>
     <string name="orange">Naranja</string>
-    <string name="cyan">Azul</string>
+    <string name="cyan">Cian</string>
     <string name="magenta">Magenta</string>
     <string name="white">Blanco</string>
 
@@ -291,7 +289,7 @@
     <string name="pref_trim_now_button">Recortar todos los chats ahora</string>
     <string name="pref_trim_now_ask">¿Borrar todos los mensajes antiguos ahora? Esto recortará inmediatamente todos los chats a los %d mensajes más recientes.</string>
     <string name="pref_blocked_contacts">Contactos bloqueados</string>
-    <string name="pref_profile_photo_remove_ask">Eliminar foto de perfil? </string>
+    <string name="pref_profile_photo_remove_ask">¿Eliminar foto de perfil? </string>
     <string name="pref_help_url">https://delta.chat/en/help</string>
     <!-- Translators: The URL should not be localized, it is not clear which language the receiver prefers and the language will be detected on the server -->
     <string name="pref_password_and_account_settings">Contraseña y ajustes de cuenta</string>
@@ -301,7 +299,7 @@
     <string name="pref_default_status_label">Texto de estado</string>
     <string name="pref_default_status_text">Enviado con mi aplicación de mensajería Delta Chat: https://delta.chat</string>
     <string name="pref_enter_sends">Tecla Intro envía</string>
-    <string name="pref_enter_sends_explain">La tecla Enter enviará tu mensaje</string>
+    <string name="pref_enter_sends_explain">La tecla Intro enviará tu mensaje</string>
     <string name="pref_vibrate">Vibrar</string>
     <string name="pref_chat_settings">Ajustes de chat</string>
     <string name="pref_change_secret">Cambiar secreto</string>
@@ -319,7 +317,6 @@
     <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>
@@ -354,6 +351,14 @@
     <string name="pref_managekeys_secret_keys_exported_to_x">Claves secretas escritas exitosamente a \"%1$s\".</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Claves secretas importadas de \"%1$s\".</string>
     <string name="pref_background">Fondo de chat</string>
+    <string name="pref_imap_folder_handling">Manejo de carpetas IMAP</string>
+    <string name="pref_watch_inbox_folder">Monitorear la Bandeja de Entrada</string>
+    <string name="pref_watch_sent_folder">Monitorear la carpeta de Enviados</string>
+    <string name="pref_watch_mvbox_folder">Monitorear la carpeta DeltaChat</string>
+    <string name="pref_auto_folder_moves">Mover automáticamente a la carpeta DeltaChat</string>
+    <string name="pref_auto_folder_moves_explain">Las conversaciones son movidas para evitar saturar la Bandeja de entrada</string>
+
+
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt es una nueva especificación abierta para encriptado automático de correo electrónico de extremo a extremo. Su configuración de extremo a extremo es creada automáticamente cuando se necesita y puede transferirla entre dispositivos con los Mensajes de Configuración de Autocrypt.</string>
@@ -450,4 +455,5 @@
     <string name="perm_explain_access_to_mic_denied">Delta Chat requiere el permiso de Micrófono para enviar mensajes de audio, pero ha sido denegado de forma permanente. Por favor, vaya al menú de configuración de aplicaciones, seleccione \"Permisos\" y habilite \"Micrófono\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat requiere el permiso de Almacenamiento para adjuntar o exportar fotos, videos o audio, pero ha sido denegado de forma permanente. Por favor, vaya al menú de configuración de aplicaciones, seleccione \"Permisos\" y habilite \"Almacenamiento\".</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat requiere el permiso de Ubicación para adjuntar una ubicación, pero ha sido denegado de forma permanente. Por favor, vaya al menú de configuración de aplicaciones, seleccione \"Permisos\" y habilite \"Ubicación\".</string>
-</resources>
+
+    </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d7b082298..0d03e98f5 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">E-mail helbide okerra.</string>
     <string name="password">Pasahitza</string>
     <string name="now">Orain</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min</string>
     <string name="today">Gaur</string>
     <string name="yesterday">Atzo</string>
     <string name="this_week">Aste honetan</string>
     <string name="this_month">Hilabete honetan</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">ordu %d</item>
         <item quantity="other">%d ordu</item>
@@ -140,70 +138,233 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Ziur talde honetatik atera nahi duzula?</string>
+    <plurals name="ask_delete_chat">
+        <item quantity="one">Ezabatu txat hau? Ez da gehiago agertuko txaten zerrendan, mezuak zerbitzarian mantenduko dira.</item>
+        <item quantity="other">Ezabatu %d txat? Ez dira gehiago agertuko txaten zerrendan, mezuak zerbitzarian mantenduko dira.</item>
+    </plurals>
+    <plurals name="ask_delete_messages">
+        <item quantity="one">Ezabatu mezua hemen eta zerbitzarian?</item>
+        <item quantity="other">Ezabatu %1$d mezuak hemen eta zerbitzarian?</item>
+    </plurals>
+    <string name="ask_forward">Birbidali mezuak %1$s erabiltzaileari?</string>
+    <string name="ask_export_attachment">Esportatu eranskina? Eranskinak esportatzeak zure beste gailuko beste aplikazioek atzitzea ahalbidetuko du.\n\nJarraitu?</string>
+    <string name="ask_block_contact">Blokeatu kontaktu hau? Ez dituzu kontaktu honen mezu gehiago jasoko.</string>
+    <string name="ask_unblock_contact">Desblokeatu kontaktu hau? Berriro jaso ahal izango dituzu kontaktu honen mezuak.</string>
+    <string name="ask_delete_contacts">Ezabatu kontaktuak? Honek behin betiko ezabatuko ditu hautatutako kontaktuak.\n\nTxaten bat abian duten eta sistemako helbide liburuan dauden kontaktuak ezin dira behin betiko ezabatu.</string>
+    <string name="ask_start_chat_with">Txateatu %1$s erabiltzailearekin?</string>
+
+
     <!-- contact list -->
     <string name="contacts_title">Kontaktuak</string>
+    <string name="contacts_enter_name_or_email">Sartu izena edo e-mail helbidea</string>
+    <string name="contacts_type_email_above">Idatzi e-mail helbidea goian</string>
     <string name="contacts_empty_hint">Kontakturik ez</string>
 
 
+    <!-- chatlist and chat view -->
+    <plurals name="chat_archived">
+        <item quantity="one">Txata artxibatuta</item>
+        <item quantity="other">%d txat artxibatuta</item>
+    </plurals>
+    <plurals name="chat_unarchived">
+        <item quantity="one">Txata artxibotik atera da</item>
+        <item quantity="other">%d txat artxibotik atera dira</item>
+    </plurals>
     <string name="chat_archived_chats_title">Artxibatutako txatak</string>
+    <string name="chat_please_enter_message">Idatzi mezu bat.</string>
+    <string name="chat_camera_unavailable">Kamera ez dago eskuragarri.</string>
+    <string name="chat_unable_to_record_audio">Ezin izan da audioa grabatu.</string>
+    <plurals name="chat_n_unread_messages">
+        <item quantity="one">Irakurri gabeko mezu %d</item>
+        <item quantity="other">Irakurri gabeko %d mezu </item>
+    </plurals>
+    <string name="chat_no_messages_hint">Bidali mezuak %1$s erabiltzaileari:\n\n• Ez du axola %2$s(e)k ez badu Delta Chat erabiltzen.\n\n• Lehen mezua bidaltzeko denbora bat behar daiteke, eta agian ez da zifratuta egongo.</string>
+    <string name="chat_new_group_hint">Idatzi lehen mezua, besteek taldera erantzutea baimenduz\n\n• Ez du axola denek ez badute Delta Chat erabiltzen.\n\n• Lehen mezua bidaltzeko denbora bat behar daiteke.</string>
     <string name="chat_record_slide_to_cancel">Irristatu ezeztatzeko</string>
+    <string name="chat_record_explain">Sakatu eta mantendu ahots-mezu bat grabatzeko, askatu bidaltzeko.</string>
+    <string name="chat_no_chats_yet_hint">Eman zure sarrera ontziari bizitza. Hasi lagun bati idatziz.</string>
+    <string name="chat_all_done_hint">Sarrera ontzi hutsa</string>
+    <string name="chat_all_done_explain">Ezer ere ez.\n Egunean zaude!</string>
     <string name="chat_share_with_title">Partekatu honekin</string>
     <string name="chat_input_placeholder">Mezua</string>
     <string name="chat_archived_label">Artxibatuta</string>
     <string name="chat_no_messages">Mezurik ez.</string>
+    <string name="chat_self_talk_subtitle">Nire buruari bidalitako mezuak</string>
+
     <!-- search -->
     <string name="search">Bilatu</string>
+    <string name="search_explain">Bilatu txatak, kontaktuak, eta mezuak.</string>
+    <string name="search_no_result_for_x">Ez da emaitzarik aurkitu \"%s\" bilaketarentzat</string>
+
+
+    <!-- create/edit groups, contact/group profile -->
+    <string name="group_name">Taldearen izena</string>
+    <string name="group_avatar">Taldearen abatarra</string>
     <string name="group_create_button">Sortu taldea</string>
+    <string name="group_please_enter_group_name">Idatzi izen bat taldearentzat.</string>
+    <string name="group_add_members">Gehitu kideak</string>
+    <string name="group_hello_draft">Kaixo, \"%1$s\" taldea sortu berri dut guretzat. </string>
+    <string name="group_self_not_in_group">Taldeko kidea izan behar zara ekintza hau burutzeko.</string>
     <string name="profile_encryption">Zifratzea</string>
 
 
+    <!-- chat media view -->
+    <string name="media_preview">Multimediaren aurrebista</string>
+    <string name="media_tab_media">Multimedia</string>
     <string name="media_tab_documents">Dokumentuak</string>
+    <string name="media_no_media_hint">Multimediarik ez.</string>
     <string name="media_no_documents_hint">Dokumenturik ez</string>
 
 
+    <!-- invite -->
+    <string name="invite_slogan">Lagun onek ez diete bere lagunei itxitako mezularitza guneetan giltzaperatzea.</string>
+    <string name="invite_default_text">Alda gaitezen Delta Chat-era %1$s - %2$s helbidera idatzi diezadakezu</string>
+
+
+    <!-- welcome and login -->
+    <string name="welcome_intro1_headline">Delta Chat</string>
+    <string name="welcome_intro1_message">Munduan erabiltzaile gehien dituen mezularitza aplikazioa. Librea eta independentea.</string>
+    <string name="welcome_intro2_headline">Independientea</string>
+    <string name="welcome_intro2_message">Ez dago Delta Chat zerbitzaririk. Aplikazioak zure e-mail zerbitzaria darabil.</string>
     <string name="welcome_intro3_headline">Azkarra</string>
+    <string name="welcome_intro3_message">Bidali mezuak segundotan.\nInterfaze azkarra</string>
     <string name="welcome_intro4_headline">Ahaltsua</string>
+    <string name="welcome_intro4_message">Txat, irudi, bideo, audio-mezua mugarik gabe eta gehiago. Hainbat bezeroekin bateragarria.</string>
     <!-- Translators: "free" as in freedom here, not "free" as in "free beer" -->
     <string name="welcome_intro5_headline">Librea</string>
+    <!-- Translators: "free" as in freedom here, not "free" as in "free beer" -->
+    <string name="welcome_intro5_message">Delta Txat doan da betirako. Librea. Iragarkirik gabe. Harpidetzarik gabe. Hornitzaile bakarrerako loturarik gabe.</string>
     <string name="welcome_intro6_headline">Zifratua</string>
+    <string name="welcome_intro6_message">Zifratuta ohiko algoritmoekin. Mezuak zure zerbitzarian gordetzen dira.</string>
     <string name="welcome_intro7_headline">Fidagarria</string>
+    <string name="welcome_intro7_message">Delta Chat segurua da negozioetarako, bateragarria eta estandarretan oinarritua.</string>
     <string name="welcome_start_messaging">Ekin mezuak bidaltzeari</string>
+    <string name="login_title">Hasi saioa</string>
+    <string name="login_header">Hasi saioa zure zerbitzarian</string>
+    <string name="login_subheader">E-mail hornitzaile ezagunentzat ezarpen gehigarriak automatikoki sortzen dira. Batzuetan IMAP gaitu behar da web interfazearen bidez. Kontsultatu zure e-mail hornitzaileari edo eskatu laguntza lagunei.</string>
     <string name="login_inbox">Sarrera ontzia</string>
+    <string name="login_imap_login">IMAP erabiltzaile-izena</string>
+    <string name="login_imap_server">IMAP zerbitzaria</string>
+    <string name="login_imap_port">IMAP ataka</string>
+    <string name="login_imap_security">IMAP segurtasuna</string>
+    <string name="login_outbox">Irteera ontzia</string>
+    <string name="login_smtp_login">SMTP erabiltzaile-izena</string>
+    <string name="login_smtp_password">SMTP pasahitza</string>
+    <string name="login_smtp_server">SMTP zerbitzaria</string>
+    <string name="login_smtp_port">SMTP ataka</string>
+    <string name="login_smtp_security">SMTP segurtasuna</string>
+    <string name="login_info_gmail_text">GMail kontu bat erabiltzeko Aplikazio-pasahitza sortu behar duzu 2FA aktibatuta baduzu. Ezarpen hau eskuragarri ez baduzu, aplikazio ez hain seguruak gaitu behar dituzu.</string>
+    <string name="login_error_mail">Sartu baliozko e-mail helbide bat</string>
+    <string name="login_error_server">Sartu baliozko zerbitzari / IP helbide bat</string>
+    <string name="login_error_port">Sartu baliozko ataka bat  (1–65535)</string>
+    <string name="login_error_required_fields">Sartu baliozko e-mail helbidea eta pasahitza</string>
+    <string name="import_backup_title">Inportatu babes-kopia</string>
+    <string name="import_backup_ask">Babes-kopia aurkitu da:  \"%1$s\".\n\nInportatu nahi duzu eta bertako datu eta ezarpenak erabili?</string>
+    <!-- share and forward messages -->
+    <!-- Translators: Title shown above a chat/contact list; the user selects the recipient of the messages he wants to forward to -->
+    <string name="forward_to">Birbidali honi …</string>
+
+    <string name="pref_summary_on">bai</string>
+    <string name="pref_summary_off">ez</string>
     <string name="pref_summary_default">lehenetsia</string>
     <string name="pref_summary_custom">pertsonalizatua</string>
+    <string name="pref_using_custom">Pertsonalizatua erabiltzen: %s</string>
+    <string name="pref_using_default">Lehenetsia erabiltzen: %s</string>
+    <string name="pref_profile_info_headline">Zure profileko informazioa</string>
     <string name="pref_profile_photo">Profileko argazkia</string>
+    <string name="pref_trim_headline">Mezu kimaketa</string>
+    <string name="pref_trim_option">Ezabatu mezu zaharrak</string>
+    <string name="pref_trim_length_limit">Txaten luzera muga</string>
+    <string name="pref_trim_length_limit_summary">%d mezu txateko</string>
+    <string name="pref_trim_now_button">Kimatu txat guztiak orain</string>
+    <string name="pref_trim_now_ask">Ezabatu mezu zaharrak orain? Honek berehala kimatuko ditu txat guztiak %d mezu berrienetara.</string>
     <string name="pref_blocked_contacts">Blokeatutako kontaktuak</string>
+    <string name="pref_profile_photo_remove_ask">Kendu profileko argazkia?</string>
+    <string name="pref_help_url">https://delta.chat/en/help</string>
+    <!-- Translators: The URL should not be localized, it is not clear which language the receiver prefers and the language will be detected on the server -->
+    <string name="pref_password_and_account_settings">Pasahitza eta kontuaren ezarpenak</string>
+    <string name="pref_who_can_see_this_information">Nork ikusi dezake informazio hau?</string>
     <string name="pref_your_name">Zure izena</string>
+    <string name="pref_default_status_label">Egoera mezua</string>
+    <string name="pref_enter_sends">Enter teklarekin bidali</string>
+    <string name="pref_enter_sends_explain">Enter tekla sakatzeak mezua bidaliko du</string>
     <string name="pref_vibrate">Bibratu</string>
+    <string name="pref_chat_settings">Txat ezarpenak</string>
+    <string name="pref_change_secret">Aldatu sekretua</string>
+    <string name="pref_screen_security">Pantaila segurtasuna</string>
     <string name="pref_notifications">Jakinarazpenak</string>
     <string name="pref_notifications_show">Erakutsi</string>
     <string name="pref_notifications_priority">Lehentasuna</string>
+    <string name="pref_led_color">LED kolorea</string>
     <string name="pref_sound">Soinua</string>
     <string name="pref_silent">Isila</string>
+    <string name="pref_repeat_notify">Errepikatu alertak</string>
     <string name="pref_privacy">Pribatutasuna</string>
-    <!-- Translators: "light" in the meaning "opposite of dark" -->
+    <string name="pref_chats_and_media">Txatak eta multimedia</string>
     <string name="pref_light_theme">Argia</string>
     <string name="pref_dark_theme">Iluna</string>
     <string name="pref_appearance">Itxura</string>
     <string name="pref_theme">Gaia</string>
     <string name="pref_language">Hizkuntza</string>
+    <string name="pref_incognito_keyboard">Teklatu pribatua</string>
+    <string name="pref_read_receipts">Irakurragiriak</string>
+    <string name="pref_manage_keys">Kudeatu gakoak</string>
+    <string name="pref_use_system_emoji">Erabili sistemako emojiak</string>
+    <string name="pref_app_access">Aplikazio sarbidea</string>
+    <string name="pref_communication">Komunikazioa</string>
     <string name="pref_chats">Txatak</string>
     <string name="pref_messages">Mezuak</string>
+    <string name="pref_in_chat_sounds">Txat bitarteko soinuak</string>
+    <string name="pref_message_text_size">Mezuen letra tamaina</string>
+    <string name="pref_view_log">Ikusi egunkaria</string>
+    <string name="pref_other">Bestelakoa</string>
     <string name="pref_backup">Babeskopia</string>
+    <string name="pref_backup_export_start_button">Hasi babes-kopia</string>
+    <string name="pref_backup_written_to_x">Babes-kopia ongi idatzi da hemen: %1$s</string>
     <string name="pref_managekeys_menu_title">Kudeatu gakoak</string>
+    <string name="pref_managekeys_export_secret_keys">Esportatu gako sekretuak</string>
+    <string name="pref_managekeys_export_explain">Esportatu gako sekretuak \"%1$s\"-ra?</string>
+    <string name="pref_managekeys_import_secret_keys">Inportatu gako sekretuak</string>
+    <string name="pref_background">Txataren atzealdea</string>
+    <string name="pref_imap_folder_handling">IMAP karpeten kudeaketa</string>
+    <string name="pref_watch_inbox_folder">Begiztatu sarrera karpeta</string>
+    <string name="pref_watch_sent_folder">Begiztatu bidalitakoak karpeta</string>
+    <string name="pref_watch_mvbox_folder">Begiztatu DeltaChat karpeta</string>
+    <string name="pref_auto_folder_moves">Automatikoki mugitzen du DeltaChat karpetara</string>
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
+    <string name="autocrypt_send_asm_button">Bidali Autocrypt ezarpen mezua</string>
+    <string name="autocrypt_prefer_e2ee">Hobetsi muturretik muturrerako zifratzea</string>
+    <string name="autocrypt_asm_subject">Autocrypt ezarpen mezua</string>
+    <string name="autocrypt_continue_transfer_title">Autocrypt ezarpen mezua</string>
     <string name="autocrypt_continue_transfer_retry">Saiatu berriro</string>
+    <string name="systemmsg_group_image_changed">Taldeko irudia aldatuta.</string>
+    <string name="systemmsg_member_added">%1$s kidea gehituta.</string>
+    <string name="systemmsg_member_removed">%1$s kidea kenduta.</string>
+    <string name="systemmsg_group_left">Talderik aterata.</string>
+    <string name="systemmsg_read_receipt_subject">Irakurragiria</string>
     <!-- screen lock -->
     <string name="screenlock_title">Pantila-blokeoa</string>
+    <string name="screenlock_authentication_failed">Autentifikazioak huts egin du.</string>
+    <string name="screenlock_unlock_title">Desblokeatu Delta Chat</string>
+    <!-- qr code stuff -->
+    <string name="qrscan_title">Eskaneatu QR kodea</string>
     <string name="qrscan_fingerprint_label">Hatz-marka</string>
+    <string name="qrshow_title">Erakutsi QR egiaztaketa kodea</string>
+    <string name="qrshow_x_joining">%1$s elkartu da.</string>
+    <string name="qrshow_x_verified">%1$s egiaztatuta.</string>
+    <string name="qrshow_join_verified_group_title">QR gonbidapen kodea</string>
+    <string name="qrshow_join_contact_title">QR egiaztaketa kodea</string>
     <string name="notify_mark_all_read">Markatu denak irakurrita gisa</string>
     <string name="notify_mark_read">Markatu irakurrita gisa</string>
+    <string name="notify_media_message">Multimedia mezua</string>
     <string name="notify_reply_button">Erantzun</string>
     <string name="notify_new_message">Mezu berria</string>
     <string name="notify_priority_high">Altua</string>
     <string name="notify_priority_max">Maximoa</string>
+    <string name="notify_name_and_message">Izena eta mezua</string>
     <string name="notify_name_only">Izena besterik ez</string>
+    <string name="notify_no_name_or_message">Izenik edo mezurik ez</string>
     <string name="notify_repeat_one_time">Behin</string>
     <string name="notify_repeat_two_times">Bi aldiz</string>
     <string name="notify_repeat_three_times">Hiru aldiz</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fafa2079b..c5bf12f9d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,7 +27,6 @@
     <string name="bad_email_address">Mauvaise adresse email.</string>
     <string name="password">Mot de passe</string>
     <string name="now">Maintenant</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min</string>
     <string name="today">Aujourd\'hui</string>
     <string name="yesterday">Hier</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b0b5d1ccc..2a7d005bf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Indirizzo non valido</string>
     <string name="password">Password</string>
     <string name="now">Ora</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min</string>
     <string name="today">Oggi</string>
     <string name="yesterday">Ieri</string>
     <string name="this_week">Questa settimana</string>
     <string name="this_month">Questo mese</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d ora</item>
         <item quantity="other">%d ore</item>
@@ -319,7 +317,6 @@
     <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>
@@ -458,4 +455,5 @@
     <string name="perm_explain_access_to_mic_denied">Delta Chat richiede l\'autorizzazione inviare messaggi audio, ma è stata bloccata permanentemente. Vai nelle impostazioni delle App, seleziona \"Autorizzazioni\" e abilita \"Microfono\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat richiede l\'autorizzazione per creare allegati, esportare foto, video e audio, ma è stata bloccata permanentemente. Vai nelle impostazioni delle App, seleziona \"Autorizzazioni\" e abilita \"Archiviazione\".</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat richiede l\'autorizzazione per allegare la posizione, ma è stata bloccata permanentemente. Vai nelle impostazioni delle App, seleziona \"Autorizzazioni\" e abilita \"Posizione\".</string>
-</resources>
+
+    </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index efcc1c2dd..c53b16410 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Ongeldig e-mailadres.</string>
     <string name="password">Wachtwoord</string>
     <string name="now">Nu</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min</string>
     <string name="today">Vandaag</string>
     <string name="yesterday">Gisteren</string>
     <string name="this_week">Deze week</string>
     <string name="this_month">Deze maand</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d uur</item>
         <item quantity="other">%d uur</item>
@@ -319,7 +317,6 @@
     <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>
@@ -355,7 +352,6 @@
     <string name="pref_managekeys_secret_keys_imported_from_x">Geheime sleutels geïmporteerd uit \"%1$s\".</string>
     <string name="pref_background">Gespreksachtergrond</string>
     <string name="pref_imap_folder_handling">Controleren in IMAP-mappen</string>
-    <string name="pref_imap_folder_warn_disable_defaults">Als je deze optie uitschakelt, zorg er dan voor dat je server en overige clients goed ingesteld zijn.\n\nAls dat niet zo is, dan werkt het misschien helemaal niet.</string>
     <string name="pref_watch_inbox_folder">Postvak IN controleren op nieuwe berichten</string>
     <string name="pref_watch_sent_folder">Map Verzonden controleren op nieuwe berichten</string>
     <string name="pref_watch_mvbox_folder">DeltaChat-map controleren op nieuwe berichten</string>
@@ -459,4 +455,5 @@
     <string name="perm_explain_access_to_mic_denied">Delta Chat vereist de microfoonmachtiging om audioberichten te kunnen versturen, maar je hebt dit permanent geweigerd. Ga naar de appinstellingen, kies \"Machtigingen\" en schakel \"Microfoon\" in.</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat vereist de opslagmachtiging om foto\'s, video\'s of audio te kunnen bijvoegen of exporteren, maar je hebt dit permanent geweigerd. Ga naar de appinstellingen, kies \"Machtigingen\" en schakel \"Opslag\" in.</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat vereist de locatiemachtiging om je locatie in te kunnen voegen, maar je hebt dit permanent geweigerd. Ga naar de appinstellingen, kies \"Machtigingen\" en schakel Locatie\" in.</string>
-</resources>
+
+    </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index dc66db565..19ced4cbd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,11 +29,9 @@
     <string name="bad_email_address">Zły adres e-mail</string>
     <string name="password">Hasło</string>
     <string name="now">Teraz</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min.</string>
     <string name="today">Dzisiaj</string>
     <string name="yesterday">Wczoraj</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d godzina</item>
         <item quantity="few">%d godziny</item>
@@ -326,7 +324,6 @@
     <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 854f03866..f452634b3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Неправильный адрес email.</string>
     <string name="password">Пароль</string>
     <string name="now">Сейчас</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d минута</string>
     <string name="today">Сегодня</string>
     <string name="yesterday">Вчера</string>
     <string name="this_week">На этой неделе</string>
     <string name="this_month">В этом месяце</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d час</item>
         <item quantity="few">%d часа</item>
@@ -344,7 +342,6 @@
     <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>
@@ -458,4 +455,5 @@
     <string name="perm_explain_access_to_mic_denied">Для отправки аудио сообщений приложению нужно разрешение использовать микрофон, но сейчас микрофон заблокирован. Перейдите в меню настроек приложения, выберите \"Права доступа\" и включите \"Микрофон\".</string>
     <string name="perm_explain_access_to_storage_denied">Для вложения или экспорта фотографий, видео или аудио файлов приложению нужно разрешение на хранение, но сейчас хранение заблокировано. Перейдите в меню настроек приложения, выберите \"Права доступа\" и включите функцию \"Хранение\".</string>
     <string name="perm_explain_access_to_location_denied">Чтобы прикрепить местоположение, приложению нужно разрешить доступ к вашему \"Расположению\", но сейчас местоположение заблокировано. Пожалуйста, перейдите в меню настроек приложения, выберите \"Права доступа\" и включите \"Расположение\".</string>
-</resources>
+
+    </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1cd1b0e9d..11a0f6b8f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Adresë email e keqe.</string>
     <string name="password">Fjalëkalim</string>
     <string name="now">Tani</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d min.</string>
     <string name="today">Sot</string>
     <string name="yesterday">Dje</string>
     <string name="this_week">Këtë javë</string>
     <string name="this_month">Këtë muaj</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d orë</item>
         <item quantity="other">%d orë</item>
@@ -309,7 +307,6 @@
     <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>
@@ -434,4 +431,5 @@
     <string name="perm_explain_access_to_mic_denied">Delta Chat lyp leje mbi Mikrofonin që të mund të dërgojë mesazhe audio, por kjo i është mohuar. Ju lutemi, vazhdoni te menuja e rregullimeve të aplikacionit, përzgjidhni \"Leje\", dhe aktivizojini për \"Mikrofonin\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat lyp leje mbi Depozitimin që të mund të bashkëngjisë apo eksportojë foto, video ose audio, por kjo i është mohuar. Ju lutemi, vazhdoni te menuja e rregullimeve të aplikacionit, përzgjidhni \"Leje\", dhe aktivizojini për \"Depozitimin\".</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat lyp leje mbi Vendndodhjen që të mund të bashkëngjisë një vendndodhje, por kjo i është mohuar. Ju lutemi, vazhdoni te menuja e rregullimeve të aplikacionit, përzgjidhni \"Leje\", dhe aktivizojini për \"Vendndodhjen\".</string>
-</resources>
+
+    </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 65ba29288..23acb6516 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,13 +29,11 @@
     <string name="bad_email_address">Kötü e-posta adresi.</string>
     <string name="password">Parola</string>
     <string name="now">Şimdi</string>
-    <!-- n_min_ago is deprecated, use n_minutes instead -->
     <string name="n_min_ago">%d dk</string>
     <string name="today">Bugün</string>
     <string name="yesterday">Dün</string>
     <string name="this_week">Bu hafta</string>
     <string name="this_month">Bu ay</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%d saat</item>
         <item quantity="other">%d saat</item>
@@ -316,7 +314,6 @@
     <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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 17f2a3945..9f33ee7f6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -30,7 +30,6 @@
     <string name="yesterday">Вчора</string>
     <string name="this_week">Цього тижня</string>
     <string name="this_month">Цього місяця</string>
-    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_hours">
         <item quantity="one">%dгодина</item>
         <item quantity="few">%dгодини</item>