From 450966cce6d2cb78ce6b431771b1f8c49ffa33ec Mon Sep 17 00:00:00 2001
From: "florian.haar" <florian.haar@open-xchange.com>
Date: Fri, 8 Mar 2019 08:53:52 +0100
Subject: [PATCH 01/12] og should be reachable during onboarding #744

---
 res/layout/registration_activity.xml          | 20 ++++++++++++++++---
 res/values/strings.xml                        |  2 +-
 .../securesms/LogViewActivity.java            | 13 +++++-------
 .../securesms/RegistrationActivity.java       |  7 +++++++
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 61c2b22cd..9c2002368 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -92,7 +92,7 @@
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:constraint_referenced_ids="inbox, imap_login, imap_server, imap_port, imap_security_label, imap_security, outbox_view_spacer_top,
-            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, auth_method_label, auth_method" />
+            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, auth_method_label, auth_method, view_log_button" />
 
         <ImageView
             android:id="@+id/advanced_icon"
@@ -310,8 +310,8 @@
             style="@style/TextAppearance.AppCompat.Caption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/login_auth_method"
             android:paddingTop="16dp"
+            android:text="@string/login_auth_method"
             app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/smtp_security" />
@@ -325,6 +325,20 @@
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/auth_method_label" />
 
+        <TextView
+            android:id="@+id/view_log_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/login_view_log"
+            android:textColor="@color/blue_400"
+            android:textSize="16sp"
+            android:textStyle="normal"
+            android:typeface="sans"
+            android:paddingBottom="16dp"
+            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
+            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
+            app:layout_constraintTop_toBottomOf="@id/auth_method" />
+
         <TextView
             android:id="@+id/sub_header"
             android:layout_width="0dp"
@@ -337,7 +351,7 @@
             android:text="@string/login_subheader"
             android:textColor="@color/gray50"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/auth_method" />
+            app:layout_constraintTop_toBottomOf="@id/view_log_button" />
 
     </android.support.constraint.ConstraintLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index be91a01ae..a2f64d3a1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -287,7 +287,7 @@
     <string name="login_error_cannot_login">Cannot login as \"%1$s\". Please check if the email-address and the password are correct.</string>
     <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
     <string name="login_error_server_response">Response from %1$s: %2$s\n\nSome providers place additional information in your inbox; you can check them it eg. in the web frontend. Consult your provider or friends if you run into problems.</string>
-
+    <string name="login_view_log">View log</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 -->
diff --git a/src/org/thoughtcrime/securesms/LogViewActivity.java b/src/org/thoughtcrime/securesms/LogViewActivity.java
index bf50d8f63..8c00ec8ee 100644
--- a/src/org/thoughtcrime/securesms/LogViewActivity.java
+++ b/src/org/thoughtcrime/securesms/LogViewActivity.java
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Util;
 
-public class LogViewActivity extends PassphraseRequiredActionBarActivity {
+public class LogViewActivity extends BaseActionBarActivity {
 
   private static final String TAG = LogViewActivity.class.getSimpleName();
 
@@ -21,18 +21,15 @@ public class LogViewActivity extends PassphraseRequiredActionBarActivity {
   LogViewFragment logViewFragment;
 
   @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle icicle, boolean ready) {
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
     setContentView(R.layout.log_view_activity);
     logViewFragment = LogViewFragment.newInstance();
     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
     transaction.replace(R.id.fragment_container, logViewFragment);
     transaction.commit();
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
   }
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 0a066aa34..d8d944f33 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -79,6 +79,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         TextInputEditText imapPortInput = findViewById(R.id.imap_port_text);
         TextInputEditText smtpServerInput = findViewById(R.id.smtp_server_text);
         TextInputEditText smtpPortInput = findViewById(R.id.smtp_port_text);
+        TextView viewLogText = findViewById(R.id.view_log_button);
 
         imapSecurity = findViewById(R.id.imap_security);
         smtpSecurity = findViewById(R.id.smtp_security);
@@ -99,6 +100,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         advancedTextView.setOnClickListener(l -> onAdvancedSettings());
         advancedIcon.setOnClickListener(l -> onAdvancedSettings());
         advancedIcon.setRotation(45);
+        viewLogText.setOnClickListener((view) -> showLog());
         boolean isConfigured = DcHelper.isConfigured(getApplicationContext());
         if (isConfigured) {
             TextInputEditText imapLoginInput = findViewById(R.id.imap_login_text);
@@ -136,6 +138,11 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         DcHelper.getContext(this).eventCenter.addObserver(this, DcContext.DC_EVENT_CONFIGURE_PROGRESS);
     }
 
+    private void showLog() {
+        Intent intent = new Intent(getApplicationContext(), LogViewActivity.class);
+        startActivity(intent);
+    }
+
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         MenuInflater inflater = this.getMenuInflater();

From fdcf2786a8b36daf547058a1c9c0db6de3589297 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 15:54:55 +0100
Subject: [PATCH 02/12] tweak layout, re-use existing string

---
 res/layout/registration_activity.xml | 6 +++---
 res/values/strings.xml               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 9c2002368..0d00842b7 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -327,14 +327,14 @@
 
         <TextView
             android:id="@+id/view_log_button"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/login_view_log"
+            android:text="@string/pref_view_log"
             android:textColor="@color/blue_400"
             android:textSize="16sp"
             android:textStyle="normal"
             android:typeface="sans"
-            android:paddingBottom="16dp"
+            android:paddingBottom="32dp"
             app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/auth_method" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a2f64d3a1..be91a01ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -287,7 +287,7 @@
     <string name="login_error_cannot_login">Cannot login as \"%1$s\". Please check if the email-address and the password are correct.</string>
     <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
     <string name="login_error_server_response">Response from %1$s: %2$s\n\nSome providers place additional information in your inbox; you can check them it eg. in the web frontend. Consult your provider or friends if you run into problems.</string>
-    <string name="login_view_log">View log</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 -->

From 0913fc2f1b473a7e84b1113a1d5d302b9de51be9 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 16:30:22 +0100
Subject: [PATCH 03/12] update translations

---
 res/values-da/strings.xml | 37 ++++++++++++---------
 res/values-es/strings.xml | 44 ++++++++++++++----------
 res/values-ru/strings.xml | 70 ++++++++++++++++++++++-----------------
 3 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c5c39dfdb..aa26b3f26 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">I går</string>
     <string name="this_week">Denne uge</string>
     <string name="this_month">Denne uge</string>
+    <string name="last_week">Sidste uge</string>
+    <string name="last_month">Sidste måned</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>
@@ -47,20 +49,20 @@
         <item quantity="other">%d timer</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 samtale</item>
-        <item quantity="other">%1$d samtaler</item>
+        <item quantity="one">%d samtale</item>
+        <item quantity="other">%d samtaler</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 kontakt</item>
-        <item quantity="other">%1$d kontakter</item>
+        <item quantity="one">%d kontakt</item>
+        <item quantity="other">%d kontakter</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 besked</item>
-        <item quantity="other">%1$d beskeder</item>
+        <item quantity="one">%d besked</item>
+        <item quantity="other">%d beskeder</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 medlem</item>
-        <item quantity="other">%1$d medlemmer</item>
+        <item quantity="one">%d medlem</item>
+        <item quantity="other">%d medlemmer</item>
     </plurals>
 
     <string name="self">Undertegnede</string>
@@ -152,12 +154,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Forlade denne gruppe?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Slette samtale? Den vil ikke længere blive vist i samtale listen, dens beskeder vil forblive på serveren.</item>
+        <item quantity="one">Slette %d samtale? Den vil ikke længere blive vist i samtale listen, dens beskeder vil forblive på serveren.</item>
         <item quantity="other">Slette %d samtaler? De vil ikke længere blive vist i samtale listen, deres beskeder vil forblive på serveren.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Slette besked her og på server?</item>
-        <item quantity="other">Slette %1$d beskeder her og på server?</item>
+        <item quantity="one">Slette %d besked her og på serveren?</item>
+        <item quantity="other">Slette %d beskeder her og på serveren?</item>
     </plurals>
     <string name="ask_forward">Videresende beskeder til %1$s?</string>
     <string name="ask_export_attachment">Eksportere vedhæftninger? Eksport af vedhæftninger vil tillade alle programmer på din enhed adgang til dem.\n\nFortsætte?</string>
@@ -177,12 +179,12 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Samtale arkiveret</item>
+        <item quantity="one">%d samtale arkiveret</item>
         <item quantity="other">%d samtaler arkiveret</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Samtale fjernet fra arkiv</item>
-        <item quantity="other">%d samtaler fjernet fra arkiv</item>
+        <item quantity="one">%d samtale frigjort fra arkiv</item>
+        <item quantity="other">%d samtaler frigjort fra arkiv</item>
     </plurals>
     <string name="chat_archived_chats_title">Arkiverede samtaler</string>
     <string name="chat_please_enter_message">Indtast besked</string>
@@ -267,6 +269,8 @@
     <string name="login_smtp_server">SMTP server</string>
     <string name="login_smtp_port">SMTP port</string>
     <string name="login_smtp_security">SMTP sikkerhed</string>
+    <string name="login_auth_method">Tilladelse metode</string>
+    <string name="login_info_oauth2_title">Fortsætte med forenklet opsætning?</string>
     <string name="login_info_gmail_text">For GMail konti skal der oprettes en App-Password hvis 2FA er aktiveret. Hvis denne opsætning ikke er tilgængelig skal Less Secure Apps aktiveres.</string>
     <string name="login_error_mail">Indtast gyldig e-post adresse</string>
     <string name="login_error_server">Indtast gyldig server / IP adresse</string>
@@ -403,7 +407,7 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Skærm lås</string>
-    <string name="screenlock_explain">Lås Delta Chat adgang med Android skærmlås eller fingeraftryk</string>
+    <string name="screenlock_explain">Låse adgang med Android skærmlås eller fingeraftryk; for at undgå at vise det forrige indhold, skal \"Skærm sikkerhed\" også aktiveres.</string>
     <string name="screenlock_authentication_failed">Godkendelse mislykket.</string>
     <string name="screenlock_unlock_title">Lås Delta Chat op</string>
     <string name="screenlock_unlock_description">Indtast system bestemt hemmelighed for at låse Delta Chat op.</string>
@@ -468,6 +472,9 @@
     <string name="perm_explain_access_to_mic_denied">Delta Chat kræver mikrofon tilladelse for at sende lydbeskeder, men den er blevet nægtet permanent. Fortsæt til program indstillinger, vælg \"Tilladelser\" og aktiver \"Mikrofon\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat kræver lagring tilladelse for at vedhæfte eller eksportere billeder, video eller lyd, men det er blevet afvist permanent. Fortsæt til program indstillings-menuen, vælg \"Tilladelser\" og aktiver \"Lagring\".</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat kræver placering tilladelse for at kunne vedhæfte placering, men det er blevet afvist permanent. Fortsæt til program indstillings-menuen, vælg \"Tilladelser\" og aktiver \"Placering\".</string>
+    <string name="perm_enable_bg_reminder_title">Tryk her for at modtage beskeder når Delta Chat er i baggrunden.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat bruger minimal resurse og passer på ikke at dræne batteriet.</string>
+
     <!-- languages -->
     <string name="language_be">Belgisk</string>
     <string name="language_ca">Catalansk</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b640f854b..18afeb7d9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Ayer</string>
     <string name="this_week">Esta semana</string>
     <string name="this_month">Este mes</string>
+    <string name="last_week">La semana pasada</string>
+    <string name="last_month">El mes pasado</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>
@@ -47,20 +49,20 @@
         <item quantity="other">%d horas</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 chat</item>
-        <item quantity="other">%1$d chats</item>
+        <item quantity="one">%d chat</item>
+        <item quantity="other">%d chats</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 contacto</item>
-        <item quantity="other">%1$d contactos</item>
+        <item quantity="one">%d contacto</item>
+        <item quantity="other">%d contactos</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 mensaje</item>
-        <item quantity="other">%1$d mensajes</item>
+        <item quantity="one">%d mensaje</item>
+        <item quantity="other">%d mensajes</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 miembro</item>
-        <item quantity="other">%1$d miembros</item>
+        <item quantity="one">%d miembro</item>
+        <item quantity="other">%d miembros</item>
     </plurals>
 
     <string name="self">Yo</string>
@@ -152,12 +154,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">¿Seguro que deseas abandonar este grupo? </string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">¿Eliminar este chat? No volverá a ser mostrado en la lista de chats, pero sus mensajes permanecerán en el servidor.</item>
+        <item quantity="one">¿Eliminar %d chat? No volverá a ser mostrado en la lista de chats, pero sus mensajes permanecerán en el servidor.</item>
         <item quantity="other">¿Eliminar %d chats? No volverán a ser mostrados en la lista de chats, pero sus mensajes permanecerán en el servidor.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">¿Eliminar el mensaje aquí y en el servidor?</item>
-        <item quantity="other">¿Eliminar %1$d mensajes aquí y en el servidor?</item>
+        <item quantity="one">¿Eliminar %d mensaje aquí y en el servidor?</item>
+        <item quantity="other">¿Eliminar %d mensajes aquí y en el servidor?</item>
     </plurals>
     <string name="ask_forward">¿Reenviar mensajes a %1$s?</string>
     <string name="ask_export_attachment">¿Exportar adjuntos? Si exporta los adjuntos, serán accesibles desde cualquier otra aplicación en su dispositivo. ¿Desea continuar?</string>
@@ -177,11 +179,11 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">chat archivado</item>
+        <item quantity="one">%d chat archivado</item>
         <item quantity="other">%d chats archivados</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Chat des-archivado</item>
+        <item quantity="one">%d chat des-archivado</item>
         <item quantity="other">%d chats des-archivados</item>
     </plurals>
     <string name="chat_archived_chats_title">Chats archivados</string>
@@ -267,6 +269,9 @@
     <string name="login_smtp_server">Servidor SMTP</string>
     <string name="login_smtp_port">Puerto SMTP</string>
     <string name="login_smtp_security">Seguridad SMTP</string>
+    <string name="login_auth_method">Método de autorización</string>
+    <string name="login_info_oauth2_title">¿Continuar con la configuración simplificada?</string>
+    <string name="login_info_oauth2_text">La dirección de correo introducida admite una configuración simplificada (OAuth2).\n\nEn el próximo paso, permita que Delta Chat actúe como su aplicación de chat por correo electrónico.\n\nDelta Chat no tiene servidores, tus datos permanecen en tu dispositivo!</string>
     <string name="login_info_gmail_text">Para las cuentas de Gmail, debe crear una contraseña de aplicación si tiene habilitado la verificación en 2 pasos. Si esta opción no está disponible, debe habilitar la opción \"Acceso de aplicaciones poco seguras\".</string>
     <string name="login_error_mail">Por favor, introduzca una dirección de correo válida</string>
     <string name="login_error_server">Por favor, introduzca un servidor / dirección IP válido</string>
@@ -342,8 +347,8 @@
     <string name="pref_incognito_keyboard">Teclado incógnito</string>
     <!-- Translators: Keep in mind that this is a Request - it must be clear in the wording that this cannot be enforced. -->
     <string name="pref_incognito_keyboard_explain">Solicitar al teclado deshabilitar el aprendizaje personalizado</string>
-    <string name="pref_read_receipts">Recibos de lectura</string>
-    <string name="pref_read_receipts_explain">Si los recibos de lectura están deshabilitados, no podrá ver los recibos de lectura de otros.</string>
+    <string name="pref_read_receipts">Acuse de recibo</string>
+    <string name="pref_read_receipts_explain">Si los acuse de recibo están deshabilitados, no podrá ver los acuse de recibo de otros.</string>
     <string name="pref_manage_keys">Administrar claves</string>
     <string name="pref_use_system_emoji">Usar emoji del sistema</string>
     <string name="pref_use_system_emoji_explain">Deshabilitar el soporte de emoji integrado de Delta Chat</string>
@@ -403,8 +408,8 @@
     <string name="systemmsg_member_added">Miembro %1$s añadido.</string>
     <string name="systemmsg_member_removed">Miembro %1$s eliminado.</string>
     <string name="systemmsg_group_left">Grupo abandonado.</string>
-    <string name="systemmsg_read_receipt_subject">Recibo de lectura</string>
-    <string name="systemmsg_read_receipt_body">Este es un recibo de lectura para el mensaje \"%1$s\".\n\nSignifica que el mensaje se mostró en el dispositivo del destinatario, pero no necesariamente que se leyó el contenido.</string>
+    <string name="systemmsg_read_receipt_subject">Acuse de recibo</string>
+    <string name="systemmsg_read_receipt_body">Este es un acuse de recibo para el mensaje \"%1$s\".\n\nSignifica que el mensaje se mostró en el dispositivo del destinatario, pero no necesariamente que se leyó el contenido.</string>
     <string name="systemmsg_cannot_decrypt">Este mensaje no puede ser descifrado.\n\n• Es posible que sea útil simplemente responderlo y pedirle al remitente que lo envíe nuevamente.\n\n• En caso de que haya reinstalado Delta Chat u otro programa de correo en este u otro dispositivo, puede que quiera enviar un Mensaje de Configuración de Autocrypt desde allí.</string>
     <!-- Translators: %1$s will be replaced by sth. as "member xy added" (trailing full-stop removed). -->
     <string name="systemmsg_action_by_me">%1$s por mi.</string>
@@ -414,7 +419,7 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Bloqueo de pantalla</string>
-    <string name="screenlock_explain">Bloquear el acceso a Delta Chat con el bloqueo de pantalla o de huella de Android</string>
+    <string name="screenlock_explain">Bloquea el acceso con el bloqueo de pantalla de Android o huella; para evitar que aparezca el contenido anterior, habilite también \"Seguridad de pantalla\"</string>
     <string name="screenlock_authentication_failed">La autenticación falló.</string>
     <string name="screenlock_unlock_title">Desbloquear Delta Chat</string>
     <string name="screenlock_unlock_description">Por favor, ingrese la clave definida en su sistema para desbloquear Delta Chat.</string>
@@ -480,6 +485,9 @@
     <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>
+    <string name="perm_enable_bg_reminder_title">Toque aquí para recibir mensajes mientras Delta Chat está en segundo plano.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat utiliza los recursos al mínimo y tiene cuidado de no drenar tu batería.</string>
+
     <!-- languages -->
     <string name="language_be">Belga</string>
     <string name="language_ca">Catalán</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1a2150809..d98fff5be 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Вчера</string>
     <string name="this_week">На этой неделе</string>
     <string name="this_month">В этом месяце</string>
+    <string name="last_week">Прошлая неделя</string>
+    <string name="last_month">Прошлый месяц</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 минуту</item>
@@ -51,28 +53,28 @@
         <item quantity="other">%d часов</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 чат</item>
-        <item quantity="few">%1$d чата</item>
-        <item quantity="many">%1$d чатов</item>
-        <item quantity="other">%1$d чатов</item>
+        <item quantity="one">%d  чатов</item>
+        <item quantity="few">%d  чатов</item>
+        <item quantity="many">%d  чатов</item>
+        <item quantity="other">%d чатов</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 контакт</item>
-        <item quantity="few">%1$d контакта</item>
-        <item quantity="many">%1$d контактов</item>
-        <item quantity="other">%1$d контактов</item>
+        <item quantity="one">%d </item>
+        <item quantity="few">%d contact</item>
+        <item quantity="many">%d  контактов</item>
+        <item quantity="other">%d контактов</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 сообщение</item>
-        <item quantity="few">%1$d сообщения</item>
-        <item quantity="many">%1$d сообщений</item>
-        <item quantity="other">%1$d сообщений</item>
+        <item quantity="one">%d message</item>
+        <item quantity="few">%d messages</item>
+        <item quantity="many">%d messages</item>
+        <item quantity="other">%d сообщений</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 участник</item>
-        <item quantity="few">%1$d участника</item>
-        <item quantity="many">%1$d участников</item>
-        <item quantity="other">%1$d участников</item>
+        <item quantity="one">%d  участников</item>
+        <item quantity="few">%d member</item>
+        <item quantity="many">%d member</item>
+        <item quantity="other">%d участников</item>
     </plurals>
 
     <string name="self">Мои сообщения</string>
@@ -164,16 +166,16 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Вы уверены, что хотите покинуть эту группу?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Удалить этот чат? Он более не будет виден в списке чатов, его сообщения останутся на сервере.</item>
-        <item quantity="few">Удалить %d чатов? Они более не будут видны в списке чатов, их сообщения останутся на сервере.</item>
-        <item quantity="many">Удалить %d чатов? Они более не будут видны в списке чатов, их сообщения останутся на сервере.</item>
-        <item quantity="other">Удалить %d чата? Они больше не будут видны в списке чатов, их сообщения останутся на сервере.</item>
+        <item quantity="one">Удалить %d чат? Он больше не будет отображаться в списке чатов, его сообщения останутся на сервере.</item>
+        <item quantity="few">Удалить %d чата? Они больше не будет отображаться в списке чатов, их сообщения останутся на сервере.</item>
+        <item quantity="many">Удалить %d чатов? Они больше не будет отображаться в списке чатов, их сообщения останутся на сервере.</item>
+        <item quantity="other">Удалить %d чатов? Они больше не будет отображаться в списке чатов, их сообщения останутся на сервере.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Удалить сообщение отсюда и с сервера?</item>
-        <item quantity="few">Удалить %1$d сообщений отсюда и с сервера?</item>
-        <item quantity="many">Удалить %1$d сообщений отсюда и с сервера?</item>
-        <item quantity="other">Удалить %1$d сообщения отсюда и с сервера?</item>
+        <item quantity="one">Delete %d message here and on the server?</item>
+        <item quantity="few">Удалить %d сообщений здесь и на сервере?</item>
+        <item quantity="many">Delete %d message here and on the server?</item>
+        <item quantity="other">Удалить %d сообщений здесь и на сервере?</item>
     </plurals>
     <string name="ask_forward">Переслать сообщения для %1$s?</string>
     <string name="ask_export_attachment">Экспортировать вложения? Экспорт вложений, позволит любому приложению на вашем устройстве получить к ним доступ.\n\nПродолжить?</string>
@@ -193,14 +195,14 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Чат заархивирован.</item>
-        <item quantity="few">%d чатов были заархивированы.</item>
-        <item quantity="many">%d чатов были заархивированы.</item>
-        <item quantity="other">%dчатов архивировано</item>
+        <item quantity="one">%d chat archived</item>
+        <item quantity="few">%d chat archived</item>
+        <item quantity="many">%d чатов архивировано</item>
+        <item quantity="other">%d архивированных чатов</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Чат разархивирован</item>
-        <item quantity="few">%d чата разархивировано</item>
+        <item quantity="one">%d chat unarchived</item>
+        <item quantity="few">%d chat unarchived</item>
         <item quantity="many">%d чатов разархивировано</item>
         <item quantity="other">%d чатов разархивировано</item>
     </plurals>
@@ -289,6 +291,9 @@
     <string name="login_smtp_server">SMTP сервер</string>
     <string name="login_smtp_port">SMTP порт</string>
     <string name="login_smtp_security">Настройки безопасности SMTP</string>
+    <string name="login_auth_method">Метод авторизации</string>
+    <string name="login_info_oauth2_title">Продолжить упрощенную настройку?</string>
+    <string name="login_info_oauth2_text">Введенный адрес электронной почты поддерживает упрощенную настройку (OAuth2). \n\nВ следующем шаге разрешите Delta Chat выступать в качестве приложения чата с электронной почтой. \n\nDelta Chat не имеет серверов, ваши данные остаются на вашем устройстве!</string>
     <string name="login_info_gmail_text">Для аккаунтов GMail необходимо задать пароль для приложений - App-Password , если включена 2FA двухфакторная аутентификация. Если эти настройки недоступны, вам нужно активировать параметр Less Secure Apps.</string>
     <string name="login_error_mail">Укажите действительный адрес эл. почты</string>
     <string name="login_error_server">Укажите действительный сервер / IP адрес</string>
@@ -436,7 +441,7 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Блокировка экрана</string>
-    <string name="screenlock_explain">Блокирование доступа к Delta Chat с помощью блокировки экрана Android или отпечатка пальца</string>
+    <string name="screenlock_explain">Блокировка доступа с помощью блокировки экрана Android или отпечатков пальцев; чтобы избежать появления предыдущего контента, пожалуйста, включите \"Безопасность экрана\"</string>
     <string name="screenlock_authentication_failed">Не удалось пройти аутентификацию</string>
     <string name="screenlock_unlock_title">Разблокировать Delta Chat</string>
     <string name="screenlock_unlock_description">Введите защитный код, чтобы разблокировать Delta Chat.</string>
@@ -502,6 +507,9 @@
     <string name="perm_explain_access_to_mic_denied">Для отправки аудио сообщений приложению Delta Chat нужно разрешение использовать микрофон, но сейчас микрофон заблокирован. Перейдите в меню настроек приложения, выберите \"Разрешения приложений\" и включите \"Микрофон\".</string>
     <string name="perm_explain_access_to_storage_denied">Для вложения или экспорта фотографий, видео или аудио файлов в Delta Chat требуется доступ к памяти устройства, однако в этом разрешении было отказано навсегда. Перейдите в меню настроек приложения, выберите \"Разрешения приложений\" и включите \"Память\".</string>
     <string name="perm_explain_access_to_location_denied">Чтобы передать местоположение приложению Delta Chat нужно разрешить доступ к нему, но сейчас он заблокирован. Перейдите в меню настроек приложения, выберите \"Разрешения приложений\" и включите \"Местоположение\".</string>
+    <string name="perm_enable_bg_reminder_title">Нажмите здесь, чтобы получать сообщения, когда Delta Chat находится в фоновом режиме.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat использует минимальные ресурсы и старается не разряжать батарею.</string>
+
     <!-- languages -->
     <string name="language_be">Фламандский</string>
     <string name="language_ca">Каталанский</string>

From e39c569aa1586b3ede68e7bb8a966ab4a4a97e0e Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 17:07:00 +0100
Subject: [PATCH 04/12] update translations

---
 res/values-az/strings.xml |  35 ------------
 res/values-da/strings.xml |   4 --
 res/values-de/strings.xml |  47 ++++++++++------
 res/values-es/strings.xml |   5 --
 res/values-eu/strings.xml |  40 ++++---------
 res/values-fr/strings.xml | 114 +++++++++++++++++++++++++++++++++++--
 res/values-it/strings.xml |  41 +++++++-------
 res/values-lt/strings.xml |  63 +++++++++++----------
 res/values-nl/strings.xml | 115 +++++++++++++++++++-------------------
 res/values-pl/strings.xml |  55 ------------------
 res/values-pt/strings.xml |  39 -------------
 res/values-ru/strings.xml |   5 --
 res/values-sq/strings.xml |  44 ++++++++-------
 res/values-sv/strings.xml |  35 ------------
 res/values-tr/strings.xml |  35 ------------
 res/values-uk/strings.xml |  55 ------------------
 16 files changed, 290 insertions(+), 442 deletions(-)

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a96d1ce90..988b45b8e 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -46,23 +46,6 @@
         <item quantity="one">%d saat</item>
         <item quantity="other">%d saat</item>
     </plurals>
-    <plurals name="n_chats">
-        <item quantity="one">çat</item>
-        <item quantity="other">%1$d çat</item>
-    </plurals>
-    <plurals name="n_contacts">
-        <item quantity="one">1 kontakt</item>
-        <item quantity="other">%1$dkontakt</item>
-    </plurals>
-    <plurals name="n_messages">
-        <item quantity="one">mesaj</item>
-        <item quantity="other">%1$dmesaj</item>
-    </plurals>
-    <plurals name="n_members">
-        <item quantity="one">üzv</item>
-        <item quantity="other">%1$düzv</item>
-    </plurals>
-
     <string name="self">Mənə</string>
     <string name="draft">Laihə</string>
     <string name="image">Şəkil</string>
@@ -151,14 +134,6 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Bu qrupu tərk etmək istədiyinizə əminsiniz?</string>
-    <plurals name="ask_delete_chat">
-        <item quantity="one">çat silmək? Artıq çat siyahısında göstərilməyəcək, mesajlar serverdə qalacaq.</item>
-        <item quantity="other">%d çat silmək? Artıq çat siyahısında göstərilməyəcək, mesajlar serverdə qalacaq.</item>
-    </plurals>
-    <plurals name="ask_delete_messages">
-        <item quantity="one">mesaj burada və serverdə silin?</item>
-        <item quantity="other">%1$d mesaj burada və serverdə silin?</item>
-    </plurals>
     <string name="ask_forward">Mesajları yönləndirin %1$sə-?</string>
     <string name="ask_export_attachment">Faylı ixrac etmək? Faylların ixracı cihazınızdakı hər hansı digər tətbiqlərə daxil olmağa imkan verəcəkdir. \n\n Razısan?</string>
     <string name="ask_block_contact">Bu kontaktı bloklamaq? Bu kontaktdan artıq mesaj qəbul etməyəcəksiniz.</string>
@@ -175,15 +150,6 @@
     <string name="contacts_empty_hint">Kontakt yoxdur.</string>
 
 
-    <!-- chatlist and chat view -->
-    <plurals name="chat_archived">
-        <item quantity="one"> çat arxivləndi</item>
-        <item quantity="other">%d çat arxivləndi</item>
-    </plurals>
-    <plurals name="chat_unarchived">
-        <item quantity="one">arxivdən çıxarıldı</item>
-        <item quantity="other">%d arxivdən çıxarıldı</item>
-    </plurals>
     <string name="chat_archived_chats_title">Çatlar saxlanıldı</string>
     <string name="chat_please_enter_message">Mesajı daxıl edin</string>
     <string name="chat_camera_unavailable">Camera əlçatmazdır.</string>
@@ -203,7 +169,6 @@
     <string name="chat_archived_label">Xəzinələndi</string>
     <string name="chat_no_messages">Mesaj yoxdur</string>
     <string name="chat_self_talk_subtitle">Özümə göndərdiyim mesajlar</string>
-
     <!-- search -->
     <string name="search">Axtarış</string>
     <string name="search_explain">Çatlar, kontaktlar və mesajlar axtar</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index aa26b3f26..eff0805e5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -206,7 +206,6 @@
     <string name="chat_archived_label">Arkiveret</string>
     <string name="chat_no_messages">Ingen beskeder</string>
     <string name="chat_self_talk_subtitle">Beskeder sendt til undertegnede</string>
-
     <!-- search -->
     <string name="search">Søge</string>
     <string name="search_explain">Søge efter samtaler, kontakter og beskeder</string>
@@ -374,8 +373,6 @@
     <string name="pref_watch_mvbox_folder">Overvåge DeltaChat mappe</string>
     <string name="pref_auto_folder_moves">Flytter automatisk til DeltaChat mappe</string>
     <string name="pref_auto_folder_moves_explain">Samtaler er flyttet for at undgå rodet indbakke mappe</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_send_asm_title">Sende Autocrypt opsætning besked</string>
@@ -597,5 +594,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Skanne dette for at tilslutte gruppe \"%1$s\".</string>
 
-
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b7a08ee97..450e4a320 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Gestern</string>
     <string name="this_week">Diese Woche</string>
     <string name="this_month">Dieser Monat</string>
+    <string name="last_week">Letzte Woche</string>
+    <string name="last_month">Letzter 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>
@@ -47,20 +49,20 @@
         <item quantity="other">%d Std</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 Chat</item>
-        <item quantity="other">%1$d Chats</item>
+        <item quantity="one">%d Chat</item>
+        <item quantity="other">%d Chats</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 Kontakt</item>
-        <item quantity="other">%1$d Kontakte</item>
+        <item quantity="one">%d Kontakt</item>
+        <item quantity="other">%d Kontakte</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 Nachricht</item>
-        <item quantity="other">%1$d Nachrichten</item>
+        <item quantity="one">%d Nachricht</item>
+        <item quantity="other">%d Nachrichten</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 Mitglied</item>
-        <item quantity="other">%1$d Mitglieder</item>
+        <item quantity="one">%d Mitglied</item>
+        <item quantity="other">%d Mitglieder</item>
     </plurals>
 
     <string name="self">Ich</string>
@@ -152,12 +154,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Diese Gruppe verlassen?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Diesen Chat löschen? Ein gelöschter Chat wird nicht länger in der Chat-Liste angezeigt, die Nachrichten verbleiben auf dem Server.</item>
+        <item quantity="one">%d Chat löschen? Gelöschte Chats werden nicht länger in der Chat-Liste angezeigt, die Nachrichten verbleiben auf dem Server.</item>
         <item quantity="other">%d Chats löschen? Gelöschte Chats werden nicht länger in der Chat-Liste angezeigt, die Nachrichten verbleiben auf dem Server.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Nachricht lokal und vom Server löschen?</item>
-        <item quantity="other">%1$d Nachrichten lokal und vom Server löschen?</item>
+        <item quantity="one">%d Nachricht lokal und vom Server löschen?</item>
+        <item quantity="other">%d Nachrichten lokal und vom Server löschen?</item>
     </plurals>
     <string name="ask_forward">Nachricht weiterleiten an %1$s?</string>
     <string name="ask_export_attachment">Anlage exportieren? Das Exportieren von Anhängen ermöglicht es allen anderen Anwendungen auf Ihrem Gerät, auf diese zuzugreifen.\n\nFortfahren? </string>
@@ -177,11 +179,11 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Chat archiviert</item>
+        <item quantity="one">%d Chat archiviert</item>
         <item quantity="other">%d Chats archiviert</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Chat unarchived</item>
+        <item quantity="one">%d Chat dearchiviert </item>
         <item quantity="other">%d Chats dearchiviert </item>
     </plurals>
     <string name="chat_archived_chats_title">Archivierte Chats</string>
@@ -204,6 +206,8 @@
     <string name="chat_archived_label">Archiviert</string>
     <string name="chat_no_messages">Keine Nachrichten.</string>
     <string name="chat_self_talk_subtitle">Nachrichten, die ich mir selber geschickt habe</string>
+    <string name="chat_contact_request">Kontaktanfrage</string>
+    <string name="chat_no_contact_requests">Keine Kontaktanfragen.\n\nWenn normale E-Mails hier erscheinen sollen, müssen Sie die entsprechende erweiterte Einstellung ändern.</string>
 
     <!-- search -->
     <string name="search">Suchen</string>
@@ -256,6 +260,7 @@
     <string name="login_title">Login</string>
     <string name="login_header">Beim Server anmelden</string>
     <string name="login_subheader">Für bekannte E-Mail-Anbieter werden zusätzliche Einstellungen automatisch vorgenommen. Manchmal muss IMAP im Web-Frontend aktiviert werden. Bitten Sie Ihren Anbieter oder Freunde um Rat, wenn es Probleme gibt.</string>
+    <string name="login_no_servers_hint">Es gibt keine Delta Chat Server! Ihre Daten bleiben auf Ihrem Gerät!</string>
     <string name="login_inbox">Posteingang</string>
     <string name="login_imap_login">IMAP-Anmeldename</string>
     <string name="login_imap_server">IMAP-Server</string>
@@ -267,6 +272,9 @@
     <string name="login_smtp_server">SMTP-Server</string>
     <string name="login_smtp_port">SMTP-Port</string>
     <string name="login_smtp_security">SMTP-Sicherheit</string>
+    <string name="login_auth_method">Berechtigungsmethode </string>
+    <string name="login_info_oauth2_title">Mit vereinfachter Einrichtung fortfahren?</string>
+    <string name="login_info_oauth2_text">Die eingegebene E-Mail-Addresse unterstützt eine vereinfachte Einrichtung (OAuth2).\n\nBitte erlauben Sie Delta Chat im nächsten Schritt als Chat-Über-E-Mail-App zu arbeiten.\n\nEs gibt keine Delta Chat Server! Ihre Daten bleiben auf Ihrem Gerät!</string>
     <string name="login_info_gmail_text">Für GMail-Konten muss ein App-Passwort erstellt werden, wenn die 2FA (Zwei-Faktor-Authentifizierung) aktiviert ist. Wenn diese Einstellung nicht verfügbar ist, muss \"Zugriff durch weniger sichere Anwendungen\" aktiviert werden.</string>
     <string name="login_error_mail">Bitte eine gültige E-Mail-Adresse eingeben</string>
     <string name="login_error_server">Bitte eine gültige Server/IP-Adresse eingeben</string>
@@ -378,6 +386,11 @@ Einige Anbieter platzieren zusätzliche Informationen im Posteingang, die Sie z.
     <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>
+    <string name="pref_email_interaction_title">E-Mail-Zusammenspiel</string>
+    <string name="pref_show_emails">Normale E-Mails anzeigen</string>
+    <string name="pref_show_emails_no">Nein, nur Chats</string>
+    <string name="pref_show_emails_accepted_contacts">Akzeptierte Kontakte</string>
+    <string name="pref_show_emails_all">Alle</string>
 
 
     <!-- autocrypt -->
@@ -405,7 +418,7 @@ Einige Anbieter platzieren zusätzliche Informationen im Posteingang, die Sie z.
     <string name="systemmsg_member_added">%1$s hinzugefügt.</string>
     <string name="systemmsg_member_removed">%1$s entfernt.</string>
     <string name="systemmsg_group_left">Gruppe verlassen.</string>
-    <string name="systemmsg_read_receipt_subject">Empfangsbestätigung lesen</string>
+    <string name="systemmsg_read_receipt_subject">Empfangsbestätigung</string>
     <string name="systemmsg_read_receipt_body">Dies ist eine Empfangsbestätigung für die Nachricht \"%1$s\".\n\nEs bedeutet, dass die Nachricht auf dem Gerät des Empfängers angezeigt wurde, nicht unbedingt, dass der Inhalt gelesen wurde.</string>
     <string name="systemmsg_cannot_decrypt">Diese Nachricht kann nicht entschlüsselt werden.\n\n• Es könnte bereits helfen, einfach auf diese Nachricht zu antworten und den Absender zu bitten, die Nachricht erneut zu senden.\n\n• Falls Delta Chat oder ein anderes E-Mail-Programm auf diesem oder einem anderen Gerät neu installiert wurde, kann von dort aus eine Autocrypt Setup-Nachricht gesendet werden.</string>
     <!-- Translators: %1$s will be replaced by sth. as "member xy added" (trailing full-stop removed). -->
@@ -416,7 +429,7 @@ Einige Anbieter platzieren zusätzliche Informationen im Posteingang, die Sie z.
 
     <!-- screen lock -->
     <string name="screenlock_title">Bildschirmsperre</string>
-    <string name="screenlock_explain">Sperre den Delta Chat Zugang mit der Android Bildschirmsperre oder Fingerabdruck.</string>
+    <string name="screenlock_explain">Sperren Sie den Zugriff mit der Android-Bildschirmsperre oder Ihrem Fingerabdruck; um nicht die vorherigen Inhalte zu sehen, aktivieren Sie bitte auch \"Bildschirmsicherheit\".</string>
     <string name="screenlock_authentication_failed">Die Authentifizierung ist fehlgeschlagen.</string>
     <string name="screenlock_unlock_title">Delta Chat entsperren</string>
     <string name="screenlock_unlock_description">Den System-Entsperrcode eingeben, um Delta Chat freizuschalten.</string>
@@ -482,6 +495,9 @@ Einige Anbieter platzieren zusätzliche Informationen im Posteingang, die Sie z.
     <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 fahre mit den App-Einstellungen fort, wähle \"Berechtigungen\" und aktiviere \"Mikrofon\".</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 fahre mit dem Menü App-Einstellungen fort, wähle \"Berechtigungen\" und aktiviere \"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 fahre mit dem Menü App-Einstellungen fort, wähle \"Berechtigungen\" und aktiviere \"Standort\".</string>
+    <string name="perm_enable_bg_reminder_title">Tippen Sie hier, um Nachrichten zu empfangen, während Delta Chat im Hintergrund läuft.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat verbraucht nur minimale Ressourcen und achtet darauf, den Akku zu schonen.</string>
+
     <!-- languages -->
     <string name="language_be">Belgisch</string>
     <string name="language_ca">Katalanisch</string>
@@ -605,5 +621,4 @@ Einige Anbieter platzieren zusätzliche Informationen im Posteingang, die Sie z.
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Dies scannen, um der Gruppe \"%1$s\" beizutreten.</string>
 
-
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 18afeb7d9..2b7bf4d01 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -206,7 +206,6 @@
     <string name="chat_archived_label">Archivado</string>
     <string name="chat_no_messages">No hay mensajes.</string>
     <string name="chat_self_talk_subtitle">Mensajes que envié a mí mismo</string>
-
     <!-- search -->
     <string name="search">Buscar</string>
     <string name="search_explain">Buscar chats, contactos, y mensajes</string>
@@ -271,7 +270,6 @@
     <string name="login_smtp_security">Seguridad SMTP</string>
     <string name="login_auth_method">Método de autorización</string>
     <string name="login_info_oauth2_title">¿Continuar con la configuración simplificada?</string>
-    <string name="login_info_oauth2_text">La dirección de correo introducida admite una configuración simplificada (OAuth2).\n\nEn el próximo paso, permita que Delta Chat actúe como su aplicación de chat por correo electrónico.\n\nDelta Chat no tiene servidores, tus datos permanecen en tu dispositivo!</string>
     <string name="login_info_gmail_text">Para las cuentas de Gmail, debe crear una contraseña de aplicación si tiene habilitado la verificación en 2 pasos. Si esta opción no está disponible, debe habilitar la opción \"Acceso de aplicaciones poco seguras\".</string>
     <string name="login_error_mail">Por favor, introduzca una dirección de correo válida</string>
     <string name="login_error_server">Por favor, introduzca un servidor / dirección IP válido</string>
@@ -381,8 +379,6 @@
     <string name="pref_watch_mvbox_folder">Monitorear 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>
@@ -611,5 +607,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Escanea esto para unirte al grupo \"%1$s\".</string>
 
-
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index cf4da64a0..0abed0199 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Atzo</string>
     <string name="this_week">Aste honetan</string>
     <string name="this_month">Hilabete honetan</string>
+    <string name="last_week">Azken astea</string>
+    <string name="last_month">Azken hilabetea</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">min %d</item>
@@ -47,20 +49,20 @@
         <item quantity="other">%d ordu</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">txat 1</item>
-        <item quantity="other">%1$d txat</item>
+        <item quantity="one">Txat %d</item>
+        <item quantity="other">%d txat </item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">kontaktu 1</item>
-        <item quantity="other">%1$d kontaktu</item>
+        <item quantity="one">Kontaktu %d</item>
+        <item quantity="other">%dkontaktu </item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">mezu 1</item>
-        <item quantity="other">%1$d mezu</item>
+        <item quantity="one">Mezu %d</item>
+        <item quantity="other">%d mezu</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">kide 1</item>
-        <item quantity="other">%1$d kide</item>
+        <item quantity="one">Kide %d</item>
+        <item quantity="other">%d kide</item>
     </plurals>
 
     <string name="self">Ni</string>
@@ -151,14 +153,6 @@
 
     <!-- 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>
@@ -175,15 +169,6 @@
     <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>
@@ -204,7 +189,6 @@
     <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>
@@ -375,8 +359,6 @@
     <string name="pref_watch_mvbox_folder">Begiztatu DeltaChat karpeta</string>
     <string name="pref_auto_folder_moves">Automatikoki mugitzen du DeltaChat karpetara</string>
     <string name="pref_auto_folder_moves_explain">Txat elkarrizketak lekuz aldatzen dira sarrera ontzian enbarazu ez egiteko</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_send_asm_title">Bidali Autocrypt ezarpen mezua</string>
@@ -403,7 +385,6 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Pantila-blokeoa</string>
-    <string name="screenlock_explain">Blokeatu Delta Chat Android-en pantaila blokeoa edo hatz-markarekin</string>
     <string name="screenlock_authentication_failed">Autentifikazioak huts egin du.</string>
     <string name="screenlock_unlock_title">Desblokeatu Delta Chat</string>
     <string name="screenlock_unlock_description">Sartu sisteman zehaztutako sekretua Delta Chat desblokeatzeko.</string>
@@ -583,5 +564,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Eskaneatu hau \"%1$s\" taldera elkartzeko.</string>
 
-
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5514b75f5..4d86b0046 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -6,6 +6,8 @@
     <string name="cancel">Annuler</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
+    <string name="on">Allumé</string>
+    <string name="off">Éteint</string>
     <string name="def">Par défaut</string>
     <string name="custom">Personalisé</string>
     <string name="none">Aucun</string>
@@ -22,7 +24,7 @@
     <string name="no_app_to_handle_data">Aucune application trouvée pour traiter ces données.</string>
     <string name="no_browser_installed">Aucun navigateur installé.</string>
     <string name="file_not_found">Impossible de trouver %1$s</string>
-    <string name="copied_to_clipboard">Copié dans le presse papier</string>
+    <string name="copied_to_clipboard">Copié dans le presse-papiers</string>
     <string name="contacts_headline">Contacts</string>
     <string name="email_address">Adresse email</string>
     <string name="bad_email_address">Mauvaise adresse email.</string>
@@ -33,7 +35,31 @@
     <string name="today">Aujourd\'hui</string>
     <string name="yesterday">Hier</string>
     <string name="this_week">Cette semaine</string>
-    <string name="this_month">Ce mois</string>
+    <string name="this_month">Ce mois-ci</string>
+    <string name="last_week">La semaine dernière</string>
+    <string name="last_month">Le mois dernier</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 heure</item>
+        <item quantity="other">%d heures</item>
+    </plurals>
+    <plurals name="n_chats">
+        <item quantity="one">%d discussion</item>
+        <item quantity="other">%d discussions</item>
+    </plurals>
+    <plurals name="n_contacts">
+        <item quantity="one">%d contact</item>
+        <item quantity="other">%d contacts</item>
+    </plurals>
+    <plurals name="n_messages">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <plurals name="n_members">
+        <item quantity="one">%d membre</item>
+        <item quantity="other">%d membres</item>
+    </plurals>
+
     <string name="self">Moi</string>
     <string name="draft">Brouillon</string>
     <string name="image">Image</string>
@@ -56,6 +82,7 @@
     <string name="blue">Bleu</string>
     <string name="orange">Orange</string>
     <string name="cyan">Cyan</string>
+    <string name="purple">Pourpre</string>
     <string name="magenta">Magenta</string>
     <string name="white">Blanc</string>
 
@@ -87,14 +114,17 @@
     <string name="menu_delete_messages">Effacer les messages</string>
     <string name="menu_delete_image">Effacer l\'image</string>
     <string name="menu_message_details">Détails du message</string>
+    <string name="menu_copy_to_clipboard">Copier vers presse-papiers</string>
     <string name="menu_forward">Transmettre le message</string>
     <string name="menu_resend">Renvoyer le message</string>
     <string name="menu_reply">Répondre au message</string>
+    <string name="menu_mute">Déactiver les notifications</string>
+    <string name="menu_unmute">Réactiver</string>
     <string name="menu_export_attachment">Exporter le fichier joint</string>
     <string name="menu_all_media">Tous les médias</string>
     <string name="menu_share">Partager</string>
-    <string name="menu_block_contact">Bloquer le contact</string>
-    <string name="menu_unblock_contact">Débloquer le contact</string>
+    <string name="menu_block_contact">Bloquer ce contact</string>
+    <string name="menu_unblock_contact">Débloquer ce contact</string>
     <string name="menu_play">Jouer</string>
     <string name="menu_pause">Pause</string>
     <string name="menu_invite">Inviter des amis</string>
@@ -104,13 +134,26 @@
     <string name="menu_edit_name">Éditer le nom</string>
     <string name="menu_settings">Paramètres</string>
     <string name="menu_advanced">Avancé</string>
+    <string name="menu_deaddrop">Demande de contact</string>
+    <string name="menu_deaddrop_subtitle">Appuyez sur le message pour démarrer la conversation</string>
     <string name="menu_view_profile">Voir le profil</string>
 
+    <string name="mute_for_one_hour">Déactiver pour 1 heure</string>
+    <string name="mute_for_two_hours">Déactiver pour 2 heures</string>
+    <string name="mute_for_one_day">Déactiver pour 1 jour</string>
+    <string name="mute_for_seven_days">Déactiver pour 7 jours</string>
+    <string name="mute_for_one_year">Déactiver pour 1 an</string>
+
+
     <!-- get confirmations -->
     <string name="ask_leave_group">Voulez-vous vraiment quitter ce groupe ?</string>
     <string name="ask_block_contact">Bloquer ce contact ? Vous ne recevrez plus ses messages.</string>
     <string name="ask_unblock_contact">Débloquer ce contact ? Vous recevrez à nouveau ses messages.</string>
+    <string name="ask_delete_contacts">Effacer ces contacts? Cela supprimera définitivement les contacts sélectionnés.\n\nLes contacts avec des conversations en cours et ceux venant du carnet d\'adresses du système ne peuvent pas être définitivement effacés.</string>
     <string name="cannot_delete_contacts_in_use">Impossible d\'effacer des contacts ayant une discussion active.</string>
+    <string name="ask_start_chat_with">Discuter avec %1$s ?</string>
+
+
     <!-- contact list -->
     <string name="contacts_title">Contacts</string>
     <string name="contacts_enter_name_or_email">Entrez le nom ou l\'email</string>
@@ -118,17 +161,26 @@
     <string name="contacts_empty_hint">Pas de contacts.</string>
 
 
+    <!-- chatlist and chat view -->
+    <plurals name="chat_archived">
+        <item quantity="one"> %d discussion archivée</item>
+        <item quantity="other">%d discussions archivées</item>
+    </plurals>
+    <plurals name="chat_unarchived">
+        <item quantity="one">%d discussion désarchivée</item>
+        <item quantity="other">%d  discussions désarchivées</item>
+    </plurals>
     <string name="chat_archived_chats_title">Discussions archivées.</string>
     <string name="chat_please_enter_message">Entrez un message.</string>
     <string name="chat_camera_unavailable">Caméra indisponible.</string>
     <string name="chat_unable_to_record_audio">Impossible d\'enregistrer le son.</string>
     <string name="chat_record_slide_to_cancel">Glisser pour annuler</string>
+    <string name="chat_no_chats_yet_hint">Donnez de quoi lire à votre boîte de réception. Commencez à communiquer avec un ami.</string>
     <string name="chat_share_with_title">Partager avec</string>
     <string name="chat_input_placeholder">Message</string>
     <string name="chat_archived_label">Archivé</string>
     <string name="chat_no_messages">Aucun message.</string>
     <string name="chat_self_talk_subtitle">Messages envoyés à moi-même</string>
-
     <!-- search -->
     <string name="search">Chercher</string>
     <string name="search_explain">Rechercher des discussions, des contacts ou des messages</string>
@@ -138,14 +190,21 @@
     <string name="group_create_button">Créer un groupe</string>
     <string name="group_please_enter_group_name">Entrez un nom pour le groupe.</string>
     <string name="group_add_members">Ajouter des participants</string>
+    <string name="group_hello_draft">Salut, je viens juste de nous créer le groupe \"%1$s\".</string>
     <string name="group_self_not_in_group">Vous devez être membre du groupe pour effectuer cette action.</string>
     <string name="profile_encryption">Chiffrement</string>
 
 
+    <!-- chat media view -->
+    <string name="media_preview">Prévisualiser le fichier multimédia</string>
+    <string name="media_tab_media">Fichier multimédia</string>
     <string name="media_tab_documents">Documents</string>
+    <string name="media_no_media_hint">Pas de fichier multimédia</string>
     <string name="media_no_documents_hint">Pas de documents</string>
 
 
+    <!-- invite -->
+    <string name="invite_slogan">Les amis ne laissent pas leurs amis enfermés dans des silos de communication.</string>
     <!-- welcome and login -->
     <string name="welcome_intro1_headline">Delta Chat</string>
     <string name="welcome_intro2_headline">Indépendant</string>
@@ -157,6 +216,9 @@
     <string name="welcome_intro5_headline">Libre</string>
     <string name="welcome_intro6_headline">Chiffré</string>
     <string name="welcome_intro7_headline">Digne de confiance</string>
+    <string name="welcome_start_messaging">Démarrage communication</string>
+    <string name="login_title">Connexion</string>
+    <string name="login_header">Connexion vers votre serveur</string>
     <string name="login_inbox">Boîte de réception</string>
     <string name="login_imap_login">Utilisateur IMAP</string>
     <string name="login_imap_server">Serveur IMAP</string>
@@ -173,6 +235,9 @@
     <string name="login_error_port">Entrez un port valide (1-65535)</string>
     <string name="login_error_required_fields">Entrez une adresse email et un mot de passe valides</string>
     <string name="import_backup_title">Importer la sauvegarde</string>
+    <string name="import_backup_no_backup_found">Aucune sauvegarde trouvée.\n\nCopiez le fichier de sauvegarde vers \"%1$s\" et essayez à nouveau. Ou bien, appuyez sur \"Démarrage communication\" pour suivre le processus normal de configuration.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="login_error_cannot_login">Connexion en tant que \"%1$s\" échouée. Vérifiez s.v.p. que votre adresse email et votre mot de passe sont corrects.</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">Transférer à ...</string>
@@ -180,6 +245,7 @@
 
     <string name="pref_profile_photo">Photo du profile</string>
     <string name="pref_trim_option">Effacer les anciens messages</string>
+    <string name="pref_trim_now_ask">Effacer tous les messages anciens? Cela écrêtera immédiatement toutes les conversations jusqu\'aux %d messages les plus récents.</string>
     <string name="pref_blocked_contacts">Contacts bloqués</string>
     <string name="pref_help_url">https://delta.chat/en/help</string>
     <string name="pref_password_and_account_settings">Configuration des comptes et mots de passe</string>
@@ -189,15 +255,19 @@
     <!-- 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_default_status_text">Envoyé depuis Delta Chat: https://delta.chat</string>
     <string name="pref_screen_security">Écran de sécurité</string>
+    <string name="pref_notifications">Notifications</string>
     <string name="pref_sound">Son</string>
     <string name="pref_silent">Silencieux</string>
     <string name="pref_repeat_notify">Répéter les alertes</string>
+    <string name="pref_chats_and_media">Discussions et fichiers multimédia</string>
     <!-- Translators: "light" in the meaning "opposite of dark" -->
     <string name="pref_light_theme">Clair</string>
     <string name="pref_dark_theme">Foncé</string>
     <string name="pref_appearance">Apparence</string>
     <string name="pref_theme">Thème</string>
     <string name="pref_language">Langage</string>
+    <string name="pref_chats">Discussions</string>
+    <string name="pref_backup_export_explain">Une sauvegarde vous aide pour une nouvelle installation sur cet appareil ou un autre.\n\nLa sauvegarde contiendra tous les messages, contacts et discussions ainsi que vos réglages bout en bout d\'Autocrypt. Garder le fichier de sauvegarde dans un endroit sûr ou effacez le aussitôt utilisé.</string>
     <string name="pref_backup_export_start_button">Démarrer la sauvegarde</string>
     <string name="pref_managekeys_menu_title">Gérer les clés</string>
     <string name="pref_managekeys_export_secret_keys">Exporter les clés secrètes</string>
@@ -209,6 +279,40 @@
     <string name="autocrypt_send_asm_button">Envoyer le message de configuration Autocrypt</string>
     <string name="autocrypt_asm_subject">Message de configuration Autocrypt</string>
     <string name="autocrypt_continue_transfer_title">Message de configuration Autocrypt</string>
+    <!-- system messages -->
+    <string name="systemmsg_group_name_changed">Nom de groupe modifié de \"%1$s\" en \"%2$s\".</string>
+    <string name="systemmsg_group_image_changed">Image de groupe modifiée.</string>
+    <string name="systemmsg_group_image_deleted">Image de groupe effacée.</string>
     <string name="systemmsg_group_left">Groupe quitté.</string>
     <string name="systemmsg_read_receipt_subject">Reçu de lecture</string>
+    <string name="qrscan_ask_join_group">Voulez-vous joindre le groupe \"%1$s\" ?</string>
+    <string name="qrshow_x_has_joined_group">%1$s a joint le groupe.</string>
+    <string name="qrshow_join_group_hint">Scannez ceci pour joindre le groupe \"%1$s\".</string>
+    <string name="qrshow_join_contact_hint">Scanner ceci pour avoir un contact avec %1$s</string>
+    <string name="notify_media_message_with_text">Message multimédia: %s</string>
+    <string name="notify_media_message">Message multimédia</string>
+    <!-- desktop specific strings -->
+    <string name="welcome_desktop">Bienvenue sur DeltaChat</string>
+    <string name="global_menu_edit_selectall_desktop">Tout sélectionner</string>
+    <string name="no_chat_selected_suggestion_desktop">Sélectionner une discussion ou en créer une nouvelle</string>
+    <string name="contact_detail_title_desktop">Demande de contact</string>
+    <string name="contact_request_title_desktop">Demande de contact</string>
+    <string name="no_archived_chats_desktop">Aucune discussion archivée</string>
+    <string name="no_chats_desktop">Aucune discussion</string>
+    <string name="group_name_desktop">Nom de groupe</string>
+    <string name="add_contact_desktop">Ajouter un contact</string>
+    <string name="select_group_image_desktop">Choisir l\'image de groupe</string>
+    <string name="unblock_contacts_desktop">Débloquer des contacts</string>
+    <string name="none_blocked_desktop">Aucun contact bloqué</string>
+    <string name="create_chat_error_desktop">La discussion n\'a pas pu être créée</string>
+    <string name="ask_delete_chat_desktop">Êtes-vous sûr(e) de vouloir effacer cette discussion?</string>
+    <string name="email_validation_failed_desktop">Adresse email requise.</string>
+    <string name="forget_login_confirmation_desktop">Effacer cette connexion? Tout sera supprimé, y compris vos réglages bout en bout, contacts, discussions, messages et les fichiers multimédia. Cette action est définitive et ne peut pas être inversée.</string>
+    <!-- deprecated on android, please remove if unused on desktop -->
+    <!-- see qrscan_ask_join_group -->
+    <string name="qrscan_ask_join_verified_group">Voulez-vous joindre le groupe  \"%1$s\" ?</string>
+    <!-- see ask_start_chat_with -->
+    <string name="qrscan_ask_fingerprint_ask_oob">Discuter avec %1$s?</string>
+    <!-- see ask_start_chat_with -->
+    <string name="qrscan_ask_chatting_fingerprint_ok">Discuter avec %1$s?</string>
     </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a80df3175..1fbe1463c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Ieri</string>
     <string name="this_week">Questa settimana</string>
     <string name="this_month">Questo mese</string>
+    <string name="last_week">Ultima settimana</string>
+    <string name="last_month">Ultimo mese</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>
@@ -47,20 +49,20 @@
         <item quantity="other">%d ore</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 chat</item>
-        <item quantity="other">%1$d chat</item>
+        <item quantity="one">%d chat</item>
+        <item quantity="other">%d chat</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 contatto</item>
-        <item quantity="other">%1$d contatti</item>
+        <item quantity="one">%d contatto</item>
+        <item quantity="other">%d contatti</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 messaggio</item>
-        <item quantity="other">%1$d messaggi</item>
+        <item quantity="one">%d messaggio</item>
+        <item quantity="other">%d messaggi</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 membro</item>
-        <item quantity="other">%1$d membri</item>
+        <item quantity="one">%d membri</item>
+        <item quantity="other">%d membri</item>
     </plurals>
 
     <string name="self">Io</string>
@@ -152,12 +154,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Sei sicuro di voler abbandonare il gruppo?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Eliminare questa chat? Non sarà più visibile nella lista, ma i suoi messaggi rimarranno sul server.</item>
-        <item quantity="other">Elimiare %d chat? Non saranno più visualizzate nella lista, ma i messaggi rimarranno sul server.</item>
+        <item quantity="one">Eliminare %d chat? Non verrà più mostrata nella lista delle chat, ma i messaggi rimarranno sul server.</item>
+        <item quantity="other">Eliminare %d chat? Non verranno più mostrate nella lista delle chat, ma i messaggi rimarranno sul server.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Eliminare il messaggio sia qui che sul server?</item>
-        <item quantity="other">Eliminare %1$d messaggi sia qui che dal server?</item>
+        <item quantity="one">Eliminare %d messaggio qui e sul sever?</item>
+        <item quantity="other">Eliminare %d messaggi qui e sul sever?</item>
     </plurals>
     <string name="ask_forward">Inoltrare messaggi a %1$s?</string>
     <string name="ask_export_attachment">Esportare allegato? Questo permetterà ad ogni altra app sul tuo dispositivo di accedervi.\n\nContinuare?</string>
@@ -177,11 +179,11 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Chat archiviata</item>
+        <item quantity="one">%d chat archiviata</item>
         <item quantity="other">%d chat archiviate</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Chat ripristinata</item>
+        <item quantity="one">%d chat ripristinata</item>
         <item quantity="other">%d chat ripristinate</item>
     </plurals>
     <string name="chat_archived_chats_title">Chat archiviate</string>
@@ -204,7 +206,6 @@
     <string name="chat_archived_label">Archiviato</string>
     <string name="chat_no_messages">Nessun messaggio.</string>
     <string name="chat_self_talk_subtitle">Messaggi inviati a me stesso</string>
-
     <!-- search -->
     <string name="search">Cerca</string>
     <string name="search_explain">Cerca in chat, contatti e messaggi</string>
@@ -267,6 +268,8 @@
     <string name="login_smtp_server">Server SMTP</string>
     <string name="login_smtp_port">Porta SMTP</string>
     <string name="login_smtp_security">Sicurezza SMTP</string>
+    <string name="login_auth_method">Metodo di autorizzazione</string>
+    <string name="login_info_oauth2_title">Usare il setup semplificato?</string>
     <string name="login_info_gmail_text">Per gli account GMail è necessario creare una password per le app se è attiva la verifica in 2 passaggi. Se queste impostazioni non sono disponibili, è necessario abilitare le app meno sicure.</string>
     <string name="login_error_mail">Inserisci un indirizzo email valido</string>
     <string name="login_error_server">Inserisci un server / indirizzo IP valido</string>
@@ -376,8 +379,6 @@
     <string name="pref_watch_mvbox_folder">Vedi cartella DeltaChat</string>
     <string name="pref_auto_folder_moves">Sposta automaticamente nella cartella DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Le chat vengono spostate per evitare di riempire la cartella In Arrivo</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt è una nuova specifica aperta per la cifratura end-to-end delle email.\n\nLa tua configurazione end-to-end viene creata automaticamente quando necessario e puoi trasferirla tra dispositivi tramite i Messaggi di configurazione.</string>
@@ -414,7 +415,7 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Blocco schermo</string>
-    <string name="screenlock_explain">Blocca l\'accesso a Delta Chat con il blocco schermo di Android o l\'impronta digitale</string>
+    <string name="screenlock_explain">Impedisci l\'accesso grazie al blocco schermo di Android o all\'impronta digitale; per non mostrare i contenuti precedenti, abilita \"Sicurezza Schermo\"</string>
     <string name="screenlock_authentication_failed">Autenticazione fallita.</string>
     <string name="screenlock_unlock_title">Sblocca Delta Chat</string>
     <string name="screenlock_unlock_description">Inserisci il codice di sistema per sbloccare Delta Chat</string>
@@ -480,6 +481,9 @@
     <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>
+    <string name="perm_enable_bg_reminder_title">Premi qui per ricevere messaggi quando Delta Chat è in background.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat usa poche risorse ed è progettata per consumare meno batteria possibile.</string>
+
     <!-- languages -->
     <string name="language_be">Belga</string>
     <string name="language_ca">Catalano</string>
@@ -603,5 +607,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Scansionalo per entrare nel gruppo \"%1$s\".</string>
 
-
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a8e55818d..aabc5be3d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -34,6 +34,8 @@
     <string name="yesterday">Vakar</string>
     <string name="this_week">Šią savaitę</string>
     <string name="this_month">Šį mėnesį</string>
+    <string name="last_week">Praeitą savaitę</string>
+    <string name="last_month">Praeitą mėnesį</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>
@@ -49,28 +51,28 @@
         <item quantity="other">%d val.</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">%1$d pokalbis</item>
-        <item quantity="few">%1$d pokalbiai</item>
-        <item quantity="many">%1$d pokalbių</item>
-        <item quantity="other">%1$d pokalbis</item>
+        <item quantity="one">%d pokalbis</item>
+        <item quantity="few">%d pokalbiai</item>
+        <item quantity="many">%d pokalbių</item>
+        <item quantity="other">%d pokalbis</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">%1$d adresatas</item>
-        <item quantity="few">%1$d adresatai</item>
-        <item quantity="many">%1$d adresatų</item>
-        <item quantity="other">%1$d adresatas</item>
+        <item quantity="one">%d adresatas</item>
+        <item quantity="few">%d adresatai</item>
+        <item quantity="many">%d adresatų</item>
+        <item quantity="other">%d adresatas</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">%1$d žinutė</item>
-        <item quantity="few">%1$d žinutės</item>
-        <item quantity="many">%1$d žinučių</item>
-        <item quantity="other">%1$d žinutė</item>
+        <item quantity="one">%d žinutė</item>
+        <item quantity="few">%d žinutės</item>
+        <item quantity="many">%d žinučių</item>
+        <item quantity="other">%d žinutė</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">%1$d dalyvis</item>
-        <item quantity="few">%1$d dalyviai</item>
-        <item quantity="many">%1$d dalyvių</item>
-        <item quantity="other">%1$d dalyvis</item>
+        <item quantity="one">%d dalyvis</item>
+        <item quantity="few">%d dalyviai</item>
+        <item quantity="many">%d dalyvių</item>
+        <item quantity="other">%d dalyvis</item>
     </plurals>
 
     <string name="self">Aš</string>
@@ -162,16 +164,16 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Ar tikrai norite išeiti iš šios grupės?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Ištrinti šį pokalbį? Jis daugiau nebebus rodomas pokalbių sąraše, jo žinutės liks serveryje.</item>
+        <item quantity="one">Ištrinti %d pokalbį? Jis daugiau nebebus rodomas pokalbių sąraše, jo žinutės liks serveryje.</item>
         <item quantity="few">Ištrinti %d pokalbius? Jie daugiau nebebus rodomi pokalbių sąraše, jų žinutės liks serveryje.</item>
         <item quantity="many">Ištrinti %d pokalbių? Jie daugiau nebebus rodomi pokalbių sąraše, jų žinutės liks serveryje.</item>
-        <item quantity="other">Ištrinti %d pokalbį? Jie daugiau nebebus rodomi pokalbių sąraše, jų žinutės liks serveryje.</item>
+        <item quantity="other">Ištrinti %d pokalbį? Jis daugiau nebebus rodomas pokalbių sąraše, jo žinutės liks serveryje.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Ištrinti žinutę čia ir serveryje?</item>
-        <item quantity="few">Ištrinti %1$d žinutes čia ir serveryje?</item>
-        <item quantity="many">Ištrinti %1$d žinučių čia ir serveryje?</item>
-        <item quantity="other">Ištrinti %1$d žinutę čia ir serveryje?</item>
+        <item quantity="one">Ištrinti %d žinutę čia ir serveryje?</item>
+        <item quantity="few">Ištrinti %d žinutes čia ir serveryje?</item>
+        <item quantity="many">Ištrinti %d žinučių čia ir serveryje?</item>
+        <item quantity="other">Ištrinti %d žinutę čia ir serveryje?</item>
     </plurals>
     <string name="ask_forward">Persiųsti žinutes %1$s?</string>
     <string name="ask_export_attachment">Eksportuoti priedą? Priedų eksportavimas leis bet kurioms kitoms programėlėms jūsų įrenginyje turėti prieigą prie šių priedų.\n\nTęsti?</string>
@@ -189,13 +191,13 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Pokalbis archyvuotas</item>
+        <item quantity="one">Archyvuotas %d pokalbis</item>
         <item quantity="few">Archyvuoti %d pokalbiai</item>
         <item quantity="many">Archyvuota %d pokalbių</item>
         <item quantity="other">Archyvuotas %d pokalbis</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Pokalbis išarchyvuotas</item>
+        <item quantity="one">Išarchyvuotas %d pokalbis</item>
         <item quantity="few">Išarchyvuoti %d pokalbiai</item>
         <item quantity="many">Išarchyvuota %d pokalbių</item>
         <item quantity="other">Išarchyvuotas %d pokalbis</item>
@@ -221,7 +223,6 @@
     <string name="chat_archived_label">Archyvuotas</string>
     <string name="chat_no_messages">Žinučių nėra.</string>
     <string name="chat_self_talk_subtitle">Žinutės, kurias siunčiu asmeniškai sau</string>
-
     <!-- search -->
     <string name="search">Ieškoti</string>
     <string name="search_explain">Ieškokite pokalbių, adresatų ir žinučių</string>
@@ -284,6 +285,7 @@
     <string name="login_smtp_server">SMTP serveris</string>
     <string name="login_smtp_port">SMTP prievadas</string>
     <string name="login_smtp_security">SMTP saugumas</string>
+    <string name="login_info_oauth2_title">Tęsti, naudojant supaprastintą sąranką?</string>
     <string name="login_error_mail">Įveskite teisingą el. pašto adresą.</string>
     <string name="login_error_server">Įveskite teisingą serverį / IP adresą</string>
     <string name="login_error_port">Įveskite teisingą prievadą (1–65535)</string>
@@ -313,6 +315,7 @@
     <string name="pref_trim_length_limit">Pokalbio ilgio riba</string>
     <string name="pref_trim_length_limit_summary">%d žinučių pokalbyje</string>
     <string name="pref_trim_now_button">Apkarpyti visus pokalbius dabar</string>
+    <string name="pref_trim_now_ask">Ištrinti visas senas žinutes dabar? Tai nedelsiant apkarpys visus pokalbius iki %d paskiausių žinučių.</string>
     <string name="pref_blocked_contacts">Užblokuoti adresatai</string>
     <string name="pref_profile_photo_remove_ask">Šalinti profilio nuotrauką?</string>
     <string name="pref_help_url">https://delta.chat/en/help</string>
@@ -381,9 +384,8 @@
     <string name="pref_watch_inbox_folder">Stebėti gautųjų aplanką</string>
     <string name="pref_watch_sent_folder">Stebėti išsiųstųjų aplanką</string>
     <string name="pref_watch_mvbox_folder">Stebėti DeltaChat aplanką</string>
+    <string name="pref_auto_folder_moves">Automatiniai perkėlimai į DeltaChat aplanką</string>
     <string name="pref_auto_folder_moves_explain">Pokalbiai yra perkeliami, kad nebūtų sujauktas Gautųjų aplankas</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt yra naujoji ir atviroji specifikacija automatiniam ištisiniam el. pašto šifravui.\n\nPrireikus, jūsų ištisinė sąranka yra sukuriama automatiškai ir gali būti perduodama tarp įrenginių, naudojant Autocrypt sąrankos žinutes.</string>
@@ -413,7 +415,6 @@
     <string name="systemmsg_cannot_decrypt">Nepavyksta iššifruoti šios žinutės.\n\n• Galima, tiesiog, atsakyti į šią žinutę ir paprašyti siuntėjo dar kartą išsiųsti šią žinutę.\n\n• Tuo atveju, jeigu iš naujo įdiegėte Delta Chat ar kitą el. pašto programą šiame ar kitame įrenginyje, jūs galite pageidauti išsiųsti Autocrypt sąrankos žinutę iš to įrenginio.</string>
     <!-- screen lock -->
     <string name="screenlock_title">Ekrano užraktas</string>
-    <string name="screenlock_explain">Užrakinti prieigą prie Delta Chat, naudojant Android ekrano užraktą ar piršto atspaudą</string>
     <string name="screenlock_authentication_failed">Tapatybės nustatymas nepavyko.</string>
     <string name="screenlock_unlock_title">Atrakinti Delta Chat</string>
     <string name="screenlock_unlock_description">Norėdami atrakinti Delta Chat, įveskite savo sistemos apibrėžtą paslaptį.</string>
@@ -434,6 +435,7 @@
     <string name="qrshow_join_group_title">QR pakvietimo kodas</string>
     <string name="qrshow_join_group_hint">Nuskenuokite tai, norėdami prisijungti prie \"%1$s\" grupės.</string>
     <string name="qrshow_join_contact_title">QR pakvietimo kodas</string>
+    <string name="qrshow_join_contact_hint">Nuskenuokite tai, norėdami užmegzti kontaktą su %1$s</string>
     <string name="contact_not_verified">Nepavyksta patvirtinti %1$s</string>
     <string name="notify_most_recent_from">Naujausia nuo: %1$s</string>
     <string name="notify_media_message_with_text">Medijos žinutė: %s</string>
@@ -462,6 +464,9 @@
     <string name="perm_explain_need_for_camera_access">Norėdami fotografuoti ir filmuoti, suteikite Delta Chat prieigą prie kameros.</string>
     <string name="perm_explain_need_for_mic_access">Norėdami siųsti garso žinutes, suteikite Delta Chat prieigą prie mikrofono.</string>
     <string name="perm_explain_need_for_storage_access">Norint eksportuoti failus ar daryti atsargines kopijas, Delta Chat reikia prieigos prie jūsų failų.</string>
+    <string name="perm_enable_bg_reminder_title">Bakstelėkite čia, norėdami gauti žinutes, kol Delta Chat veikia fone.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat naudoja mažai išteklių ir rūpinasi, kad neiškrautų jūsų baterijos.</string>
+
     <string name="language_ca">Katalonų</string>
     <string name="language_da">Danų</string>
     <string name="language_de">Vokiečių</string>
@@ -539,6 +544,7 @@
     <string name="show_qr_invite_code_desktop">Rodyti QR pakvietimo kodą</string>
     <string name="add_contact_desktop">Pridėti adresatą</string>
     <string name="login_required_desktop">būtina</string>
+    <string name="name_desktop">Vardas</string>
     <string name="autocrypt_key_transfer_desktop">Autocrypt rakto perdavimas</string>
     <string name="initiate_key_transfer_title_desktop">Inicijuoti rakto perdavimą</string>
     <string name="initiate_key_transfer_desktop">Autocrypt sąrankos žinutė saugiai bendrina jūsų ištisinę sąranką su kitomis su Autocrypt suderinamomis programomis. Sąranka bus užšifruota sąrankos kodu, kuris yra rodomas čia ir privalės būti įvestas kitame įrenginyje.</string>
@@ -581,5 +587,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Nuskenuokite tai, norėdami prisijungti prie \"%1$s\" grupės.</string>
 
-
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0f66b8aa1..3bcbe9968 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,7 +20,7 @@
     <string name="undo">Ongedaan maken</string>
     <string name="error">Fout</string>
     <string name="error_x">Fout: %1$s</string>
-    <string name="error_no_network">Geen netwerk beschikbaar.</string>
+    <string name="error_no_network">Geen internetverbinding.</string>
     <string name="no_app_to_handle_data">Kan geen app vinden die deze gegevens kan behandelen.</string>
     <string name="no_browser_installed">Geen webbrowser geïnstalleerd.</string>
     <string name="file_not_found">Kan %1$s niet vinden.</string>
@@ -36,6 +36,8 @@
     <string name="yesterday">Gisteren</string>
     <string name="this_week">Deze week</string>
     <string name="this_month">Deze maand</string>
+    <string name="last_week">Vorige week</string>
+    <string name="last_month">Vorige maand</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 minuut</item>
@@ -47,20 +49,20 @@
         <item quantity="other">%d uur</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 gesprek</item>
-        <item quantity="other">%1$d gesprekken</item>
+        <item quantity="one">%d gesprek</item>
+        <item quantity="other">%d gesprekken</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 contactpersoon</item>
-        <item quantity="other">%1$d contactpersonen</item>
+        <item quantity="one">%d contactpersoon</item>
+        <item quantity="other">%d contactpersonen</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 bericht</item>
-        <item quantity="other">%1$d berichten</item>
+        <item quantity="one">%d bericht</item>
+        <item quantity="other">%d berichten</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 lid</item>
-        <item quantity="other">%1$d leden</item>
+        <item quantity="one">%d deelnemer</item>
+        <item quantity="other">%d deelnemers</item>
     </plurals>
 
     <string name="self">Mij</string>
@@ -152,12 +154,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Weet je zeker dat je deze groep wilt verlaten?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Wil je dit gesprek verwijderen? Het worden niet langer getoond in de gesprekslijst, maar de berichten blijven bewaard op de server.</item>
+        <item quantity="one">Wil je %d gesprek verwijderen? Het gesprek wordt niet langer getoond in de gesprekslijst, maar de berichten blijven bewaard op de server.</item>
         <item quantity="other">Wil je %d gesprekken verwijderen? Ze worden niet langer getoond in de gesprekslijst, maar de berichten blijven bewaard op de server.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Wil je het bericht verwijderen, zowel hier als op de server?</item>
-        <item quantity="other">Wil je %1$d berichten verwijderen, zowel hier als op de server?</item>
+        <item quantity="one">Wil je %d bericht verwijderen, zowel hier als op de server?</item>
+        <item quantity="other">Wil je %d berichten verwijderen, zowel hier als op de server?</item>
     </plurals>
     <string name="ask_forward">Wil je de berichten doorsturen aan %1$s?</string>
     <string name="ask_export_attachment">Als je de bijlage exporteert, geef je andere apps op je apparaat toegang om hem uit te lezen.\n\nWil je doorgaan?</string>
@@ -171,17 +173,17 @@
     <!-- contact list -->
     <string name="contacts_title">Contactpersonen</string>
     <string name="contacts_enter_name_or_email">Voer een naam of e-mailadres in.</string>
-    <string name="contacts_type_email_above">Typ het e-mailadres hierboven</string>
+    <string name="contacts_type_email_above">Typ hierboven het e-mailadres</string>
     <string name="contacts_empty_hint">Geen contactpersonen.</string>
 
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Gesprek gearchiveerd</item>
+        <item quantity="one">%d gesprek gearchiveerd</item>
         <item quantity="other">%d gesprekken gearchiveerd</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">Gesprek ge-dearchiveerd</item>
+        <item quantity="one">%d gesprek gede-archiveerd</item>
         <item quantity="other">%d gesprekken gede-archiveerd</item>
     </plurals>
     <string name="chat_archived_chats_title">Gearchiveerde gesprekken</string>
@@ -196,15 +198,14 @@
     <string name="chat_new_group_hint">Stel het eerste bericht op, zodat anderen binnen deze groep kunnen reageren.\n\n• Niet alle leden hoeven Delta Chat te gebruiken.\n\n• Het afleveren van het eerste bericht kan even duren.</string>
     <string name="chat_record_slide_to_cancel">Veeg opzij om te annuleren</string>
     <string name="chat_record_explain">Houdt ingedrukt om een spraakbericht op te nemen; laat los om te versturen</string>
-    <string name="chat_no_chats_yet_hint">Geef je Postvak IN iets om over naar huis te schrijven. Begin door een bericht te sturen aan een vriend(in).</string>
+    <string name="chat_no_chats_yet_hint">Geef je Postvak IN iets om over naar huis te schrijven: begin een gesprek met een vriend(in).</string>
     <string name="chat_all_done_hint">Postvak nullllll</string>
-    <string name="chat_all_done_explain">Niks. Noppes. Nakkes. Nada. \nJe bent helemaal bij!</string>
+    <string name="chat_all_done_explain">Niks. Noppes. Nakkes. Nada.\nJe bent van alles op de hoogte!</string>
     <string name="chat_share_with_title">Delen met</string>
     <string name="chat_input_placeholder">Bericht</string>
     <string name="chat_archived_label">Gearchiveerd</string>
     <string name="chat_no_messages">Geen berichten.</string>
     <string name="chat_self_talk_subtitle">Aan mijzelf gestuurde berichten</string>
-
     <!-- search -->
     <string name="search">Zoeken</string>
     <string name="search_explain">Zoek naar gesprekken, contactpersonen en berichten</string>
@@ -218,7 +219,7 @@
     <string name="group_please_enter_group_name">Voer een naam in voor de groep.</string>
     <string name="group_add_members">Deelnemers toevoegen</string>
     <string name="group_hello_draft">Hallo, ik heb zojuist de groep \"%1$s\" voor ons gemaakt.</string>
-    <string name="group_self_not_in_group">Je moet lid zijn van de groep om deze actie uit te voeren.</string>
+    <string name="group_self_not_in_group">Om deze actie uit te kunnen voeren moet je deelnemen aan de groep.</string>
     <string name="profile_encryption">Versleuteling</string>
 
 
@@ -231,17 +232,17 @@
 
 
     <!-- invite -->
-    <string name="invite_slogan">Vrienden houden vrienden niet opgesloten in berichtsilo\'s.</string>
+    <string name="invite_slogan">Vrienden houden vrienden niet opgesloten in berichtkluizen.</string>
     <string name="invite_default_text">Laten we overgaan op Delta Chat - %1$s - je kunt me een bericht sturen op %2$s</string>
 
 
     <!-- welcome and login -->
     <string name="welcome_intro1_headline">Delta Chat</string>
-    <string name="welcome_intro1_message">De berichtapp met het breedste publiek ter wereld. Gratis en onafhankelijk.</string>
+    <string name="welcome_intro1_message">Dé berichtenapp met het breedste publiek ter wereld. Gratis en onafhankelijk.</string>
     <string name="welcome_intro2_headline">Onafhankelijk</string>
     <string name="welcome_intro2_message">Er is geen Delta Chat-server; de app gebruikt alleen je mailserver.</string>
     <string name="welcome_intro3_headline">Snel</string>
-    <string name="welcome_intro3_message">Verstuur berichten binnen een paar seconden.\nSnelle gebruikersomgeving.</string>
+    <string name="welcome_intro3_message">Verstuur berichten in een paar seconden.\nSnelle gebruikersomgeving.</string>
     <string name="welcome_intro4_headline">Krachtig</string>
     <string name="welcome_intro4_message">Ongelimiteerd aantal gesprekken, afbeeldingen, video\'s, spraakberichten en meer. Kan omgaan met meerdere clients.</string>
     <!-- Translators: "free" as in freedom here, not "free" as in "free beer" -->
@@ -252,7 +253,7 @@
     <string name="welcome_intro6_message">Versleuteld met alle bekende algoritmen. Berichten blijven op jouw server.</string>
     <string name="welcome_intro7_headline">Betrouwbaar</string>
     <string name="welcome_intro7_message">Delta Chat is veilig voor zakelijk gebruik, compatibel en gebaseerd op standaarden.</string>
-    <string name="welcome_start_messaging">Beginnen</string>
+    <string name="welcome_start_messaging">Aan de slag</string>
     <string name="login_title">Inloggen</string>
     <string name="login_header">Inloggen op je server</string>
     <string name="login_subheader">Bij bekende e-mailproviders gaat het instellen vrijwel geheel automatisch. Soms moet je IMAP inschakelen in de webversie van je e-mailclient. Vraag je e-mailprovider of vrienden om hulp.</string>
@@ -267,18 +268,20 @@
     <string name="login_smtp_server">SMTP-server</string>
     <string name="login_smtp_port">SMTP-poort</string>
     <string name="login_smtp_security">SMTP-beveiliging</string>
-    <string name="login_info_gmail_text">Bij een Gmail-account moet je een app-wachtwoord creëren als je authenticatie in twee stappen hebt ingeschaked. Als dit niet beschikbaar is, schakel dan Minder veilige apps in.</string>
+    <string name="login_auth_method">Autorisatiemethode</string>
+    <string name="login_info_oauth2_title">Wil je doorgaan met vereenvoudigd instellen?</string>
+    <string name="login_info_gmail_text">Bij Gmail-accounts moet je een app-wachtwoord creëren als je authenticatie in twee stappen hebt ingeschakeld. Als dit niet beschikbaar is, schakel dan \'Minder veilige apps\' in.</string>
     <string name="login_error_mail">Voer een geldig e-mailadres in</string>
     <string name="login_error_server">Voer een geldig(e) IP-adres/server in</string>
     <string name="login_error_port">Voer een geldige poort in (1-65535)</string>
     <string name="login_error_required_fields">Voer een geldig e-mailadres en wachtwoord in</string>
     <string name="import_backup_title">Back-up importeren</string>
     <string name="import_backup_ask">Back-up aangetroffen in \"%1$s\".\n\nWil je de instellingen en gegevens daaruit importeren?</string>
-    <string name="import_backup_no_backup_found">Geen back-ups aangetroffen.\n\nKopieer de back-up naar \"%1$s\" en probeer het opnieuw of druk op \"Beginnen\" om het normale instelproces te doorlopen.</string>
+    <string name="import_backup_no_backup_found">Geen back-ups aangetroffen.\n\nKopieer de back-up naar \"%1$s\" en probeer het opnieuw of druk op \"Aan de slag\" om het normale instelproces te doorlopen.</string>
     <!-- Translators: %1$s will be replaced by the email address -->
     <string name="login_error_cannot_login">Kan niet inloggen als \"%1$s\". Controleer het e-mailadres en wachtwoord.</string>
     <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
-    <string name="login_error_server_response">Antwoord van %1$s: %2$s\n\nSommige providers plaatsen extra informatie in je Postvak IN. Je kunt dit controleren in bijv. de webversie. Neem contact op met je provider of vrienden als je problemen ervaart.</string>
+    <string name="login_error_server_response">Antwoord van %1$s: %2$s\n\nSommige providers plaatsen extra informatie in je Postvak IN. Je kunt dit controleren in, bijv., de webversie. Neem contact op met je provider of vrienden als je problemen ervaart.</string>
 
 
     <!-- share and forward messages -->
@@ -293,7 +296,7 @@
     <string name="pref_summary_custom">aangepast</string>
     <string name="pref_using_custom">Aangepast wordt gebruikt: %s</string>
     <string name="pref_using_default">Standaard wordt gebruikt: %s</string>
-    <string name="pref_profile_info_headline">Jouw profielinformatie</string>
+    <string name="pref_profile_info_headline">Je profielinformatie</string>
     <string name="pref_profile_photo">Profielfoto</string>
     <string name="pref_trim_headline">Gespreksinkorting</string>
     <string name="pref_trim_option">Oude berichten verwijderen</string>
@@ -307,14 +310,14 @@
     <string name="pref_help_url">https://delta.chat/en/help</string>
     <string name="pref_password_and_account_settings">Wachtwoord en accountinstellingen</string>
     <string name="pref_who_can_see_this_information">Wie kan deze informatie bekijken?</string>
-    <string name="pref_who_can_see_profile_explain">Je profielfoto en -naam worden in gesprekken naast jouw berichten getoond. Reeds verstuurde informatie kan niet worden verwijderd of teruggehaald.</string>
+    <string name="pref_who_can_see_profile_explain">Je profielfoto en -naam worden getoond in gesprekken, naast je berichten. Reeds verstuurde informatie kan niet worden verwijderd of teruggehaald.</string>
     <string name="pref_your_name">Je naam</string>
     <!-- Translators: The value entered here is visible only to recipients who DO NOT use Deltachat, so its not a "Status" but the last line in the E-Mail. -->
     <string name="pref_default_status_label">Handtekeningtekst</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_default_status_text">Verstuurd met mijn Delta Chat Messenger: https://delta.chat</string>
+    <string name="pref_default_status_text">Verstuurd met mijn Delta Chat-berichtenapp: https://delta.chat</string>
     <string name="pref_enter_sends">Versturen met Enter-toets</string>
-    <string name="pref_enter_sends_explain">De Enter-toets gebruiken om tekstberichten te versturen</string>
+    <string name="pref_enter_sends_explain">Druk op de Enter-toets om tekstberichten te versturen</string>
     <string name="pref_vibrate">Trillen</string>
     <string name="pref_chat_settings">Gespreksinstellingen</string>
     <string name="pref_change_secret">Geheim wijzigen</string>
@@ -357,15 +360,15 @@
     <string name="pref_other">Overig</string>
     <string name="pref_backup">Back-up</string>
     <string name="pref_backup_explain">Gesprekken back-uppen naar externe opslag</string>
-    <string name="pref_backup_export_explain">Een back-up helpt je om een nieuwe installatie in te stellen op dit of een ander apparaat.\n\nDe back-up bevat alle berichten, contactpersonen en gesprekken en tevens je end-to-end Autocrypt-instellingen. Bewaar het back-upbestand op een veilige plaats of verwijder het zo snel mogelijk.</string>
-    <string name="pref_backup_export_start_button">Back-up starten</string>
+    <string name="pref_backup_export_explain">Een back-up helpt je om een nieuwe installatie in te stellen op dit of een ander apparaat.\n\nDe back-up bevat alle berichten, contactpersonen, gesprekken en je end-to-end Autocrypt-instellingen. Bewaar het back-upbestand op een veilige plaats of verwijder het zo snel mogelijk.</string>
+    <string name="pref_backup_export_start_button">Nu back-uppen</string>
     <string name="pref_backup_written_to_x">Back-up weggeschreven naar %1$s</string>
     <string name="pref_managekeys_menu_title">Sleutels beheren</string>
     <string name="pref_managekeys_ask_for_storage_permission">Delta Chat heeft toegang nodig tot je bestanden om sleutels te im- en exporteren.</string>
     <string name="pref_managekeys_export_secret_keys">Geheime sleutels exporteren</string>
     <string name="pref_managekeys_export_explain">Geheime sleutels exporteren naar \"%1$s\"?</string>
     <string name="pref_managekeys_import_secret_keys">Geheime sleutels importeren</string>
-    <string name="pref_managekeys_import_explain">Wil je geheime sleutels importeren uit \"%1$s\"?\n\n• Bestaande geheime sleutels worden niet verwijderd.\n\n• De laatst geïmporteerde sleutel wordt als standaard gebruikt tenzij de bestandsnaam \"legacy\" bevat.</string>
+    <string name="pref_managekeys_import_explain">Wil je geheime sleutels importeren uit \"%1$s\"?\n\n• Bestaande sleutels worden niet verwijderd.\n\n• De laatst geïmporteerde sleutel wordt als standaard gebruikt tenzij de bestandsnaam \"legacy\" bevat.</string>
     <string name="pref_managekeys_secret_keys_exported_to_x">Geheime sleutels weggeschreven naar \"%1$s\".</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Geheime sleutels geïmporteerd uit \"%1$s\".</string>
     <string name="pref_background">Achtergrond</string>
@@ -375,25 +378,23 @@
     <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>
     <string name="pref_auto_folder_moves">Automatisch verplaatsen naar DeltaChat-map</string>
-    <string name="pref_auto_folder_moves_explain">Gesprekken worden verplaatst om Postvak IN geordend te houden</string>
-
-
+    <string name="pref_auto_folder_moves_explain">Gesprekken worden verplaatst om je Postvak IN netjes te houden</string>
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
-    <string name="autocrypt_explain">Autocrypt is een nieuwe, open specificatie voor het automatisch instellen van end-to-end e-mailversleuteling.\n\nJe end-to-end-instellingen worden, indien nodig, automatisch gecreëerd en kunnen worden overgezet naar andere apparaten middels Autocrypt-instelberichten.</string>
+    <string name="autocrypt_explain">Autocrypt is een nieuwe, open specificatie voor het automatisch instellen van end-to-end e-mailversleuteling.\n\nJe instellingen worden, indien nodig, automatisch gecreëerd en kunnen worden overgezet naar andere apparaten middels instelberichten.</string>
     <string name="autocrypt_send_asm_title">Autocrypt-instelbericht versturen</string>
-    <string name="autocrypt_send_asm_explain_before">Een \"Autocrypt-instelbericht\" deelt je end-to-end-instellingen op een veilige manier met andere met Autocrypt compatibele apps.\n\nDe instellingen zijn versleuteld middels een code die hier wordt getoond en moet worden overgetypt op het andere apparaat.</string>
+    <string name="autocrypt_send_asm_explain_before">Een \"Autocrypt-instelbericht\" deelt je end-to-end-instellingen veilig met andere met Autocrypt compatibele apps.\n\nDe instellingen zijn versleuteld middels een code die hier wordt getoond en moet worden overgetypt op het andere apparaat.</string>
     <string name="autocrypt_send_asm_button">Autocrypt-instelbericht versturen</string>
-    <string name="autocrypt_send_asm_explain_after">Je instellingen zijn naar jezelf verstuurd. Schakel over naar het andere apparaat en open het instelbericht. Je zou nu moeten worden gevraagd om een code. Typ de volgende getallen in het invoerveld:\n\n%1$s\n\nZodra je klaar bent, is je andere apparaat klaar voor gebruik.</string>
+    <string name="autocrypt_send_asm_explain_after">Je instellingen zijn naar jezelf verstuurd. Schakel over naar het andere apparaat en open het instelbericht. Je zou nu moeten worden gevraagd om een code. Typ de volgende getallen in het invoerveld:\n\n%1$s\n\nAls je klaar bent, is je andere apparaat klaar voor gebruik.</string>
     <string name="autocrypt_prefer_e2ee">Voorkeur voor end-to-end-versleuteling</string>
     <string name="autocrypt_asm_subject">Autocrypt-instelbericht</string>
-    <string name="autocrypt_asm_general_body">Dit is het Autocrypt-instelbericht dat wordt gebruikt om je end-to-end-instellingen over te zetten naar andere clients.\n\nOm het te ontsleutelen en gebruiken, open je het bericht in een met Autocrypt compatibele app en voer je de code in die wordt getoond op het genererende apparaat.</string>
+    <string name="autocrypt_asm_general_body">Dit is het Autocrypt-instelbericht dat wordt gebruikt om je instellingen over te zetten naar andere clients.\n\nOm te ontsleutelen en te gebruiken, open je het bericht in een met Autocrypt compatibele app en voer je de code in die wordt getoond op het genererende apparaat.</string>
     <string name="autocrypt_asm_click_body">Dit is het Autocrypt-instelbericht dat wordt gebruikt om je end-to-end-instellingen over te zetten naar andere clients.\n\nOm het te ontsleutelen en gebruiken, druk je op dit bericht.</string>
     <string name="autocrypt_continue_transfer_title">Autocrypt-instelbericht</string>
     <string name="autocrypt_continue_transfer_please_enter_code">Voer de code die wordt getoond op het andere apparaat.</string>
-    <string name="autocrypt_continue_transfer_succeeded">End-to-end-instellingen overgezet. Dit apparaat is nu klaar voor gebruik i.c.m. Autocrypt, met dezelfde instellingen als het andere apparaat.</string>
+    <string name="autocrypt_continue_transfer_succeeded">End-to-end-instellingen overgezet. Dit apparaat kan nu worden gebruikt i.c.m. Autocrypt, met dezelfde instellingen als het andere apparaat.</string>
     <string name="autocrypt_continue_transfer_retry">Opnieuw</string>
-    <string name="autocrypt_bad_setup_code">Onjuist code; probeer het opnieuw.\n\nAls je je code niet meer weet, verstuurd dan nog een Autocrypt-instelbericht vanaf het andere apparaat.</string>
+    <string name="autocrypt_bad_setup_code">Onjuist; probeer het opnieuw.\n\nAls je je code niet meer weet, verstuurd dan nóg een Autocrypt-instelbericht vanaf het andere apparaat.</string>
 
 
     <!-- system messages -->
@@ -405,7 +406,7 @@
     <string name="systemmsg_group_left">Groep verlaten.</string>
     <string name="systemmsg_read_receipt_subject">Leesbevestiging</string>
     <string name="systemmsg_read_receipt_body">Dit is een leesbevestiging voor het bericht \"%1$s\".\n\nDit betekent dat het bericht getoond is op het apparaat van de ontvanger, maar niet dat het ook gelezen is.</string>
-    <string name="systemmsg_cannot_decrypt">Dit bericht kan niet worden ontsleuteld.\n\n• Het kan helpen om dit bericht te beantwoorden en de afzender te vragen het opnieuw te versturen.\n\n• Als je Delta Chat of een andere e-mailapp opnieuw hebt geïnstalleerd op dit of een ander apparaat, verstuur het instelbericht dan opnieuw.</string>
+    <string name="systemmsg_cannot_decrypt">Dit bericht kan niet worden ontsleuteld.\n\n• Het kan helpen dit bericht te beantwoorden en de afzender te vragen het opnieuw te versturen.\n\n• Als je Delta Chat of een andere e-mailapp opnieuw hebt geïnstalleerd op dit of een ander apparaat, verstuur het instelbericht dan opnieuw.</string>
     <!-- Translators: %1$s will be replaced by sth. as "member xy added" (trailing full-stop removed). -->
     <string name="systemmsg_action_by_me">%1$s door mij.</string>
     <!-- Translators: %1$s will be replaced by sth. as "member xy added" (trailing full-stop removed). %2$s will be replaced by the name/addr of the person who did this action. -->
@@ -414,11 +415,11 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Schermvergrendeling</string>
-    <string name="screenlock_explain">Delta Chat-toegang vergrendelen met Android-schermvergrendeling of vingerafdruk</string>
+    <string name="screenlock_explain">Vergendel de toegang middels het Android-vergrendelscherm of je vingerafdruk. Schakel daarnaast ook \"Schermbeveiliging\" in.</string>
     <string name="screenlock_authentication_failed">Authenticatie mislukt.</string>
     <string name="screenlock_unlock_title">Delta Chat ontgrendelen</string>
     <string name="screenlock_unlock_description">Voer je op het systeem opgegeven geheim in om Delta Chat te ontgrendelen.</string>
-    <string name="screenlock_inactivity_timeout">Vergrendling na inactiviteit</string>
+    <string name="screenlock_inactivity_timeout">Vergrendeling na inactiviteit</string>
     <string name="screenlock_inactivity_timeout_explain">Delta Chat automatisch vergrendelen na een opgegeven periode van inactiviteit</string>
     <string name="screenlock_inactivity_timeout_interval">Periode van inactiviteit</string>
 
@@ -426,19 +427,19 @@
     <!-- qr code stuff -->
     <string name="qrscan_title">QR-code scannen</string>
     <string name="qrscan_hint">Plaatst je camera boven de QR-code</string>
-    <string name="qrscan_ask_join_group">Wil je lid worden van de groep \"%1$s\"?</string>
+    <string name="qrscan_ask_join_group">Wil je deelnemen aan de groep \"%1$s\"?</string>
     <string name="qrscan_fingerprint_mismatch">De gescande vingerafdruk komt niet overeen met de vorige voor %1$s</string>
     <string name="qrscan_no_addr_found">Deze QR-code bevat een vingerafdruk, maar geen e-mailadres.\n\nVoor out-of-band-goedkeuring, moet je eerst een beveiligde verbinding opzetten met de ontvanger.</string>
     <string name="qrscan_contains_text">Gescande QR-codetekst:\n\n %1$s</string>
     <string name="qrscan_contains_url">Gescande QR-code-URL:\n\n %1$s</string>
     <string name="qrscan_fingerprint_label">Vingerafdruk</string>
-    <string name="qrscan_x_verified_introduce_myself">%1$s goedgekeurd; vertel iets over mezelf...</string>
+    <string name="qrscan_x_verified_introduce_myself">%1$s goedgekeurd; vertel iets over jezelf...</string>
     <string name="qrshow_title">QR-uitnodigingscode</string>
-    <string name="qrshow_x_joining">%1$s is lid geworden.</string>
+    <string name="qrshow_x_joining">%1$s heeft deelgenomen.</string>
     <string name="qrshow_x_verified">%1$s is goedgekeurd.</string>
-    <string name="qrshow_x_has_joined_group">%1$s is lid geworden van de groep.</string>
+    <string name="qrshow_x_has_joined_group">%1$s heeft deelgenomen aan de groep.</string>
     <string name="qrshow_join_group_title">QR-uitnodigingscode</string>
-    <string name="qrshow_join_group_hint">Scan dit om lid te worden van de groep \"%1$s\".</string>
+    <string name="qrshow_join_group_hint">Scan dit om deel te nemen aan de groep \"%1$s\".</string>
     <string name="qrshow_join_contact_title">QR-uitnodigingscode</string>
     <string name="qrshow_join_contact_hint">Scan dit om een contactpersoon in te stellen met %1$s</string>
     <string name="contact_verified">%1$s is goedgekeurd.</string>
@@ -480,6 +481,9 @@
     <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>
+    <string name="perm_enable_bg_reminder_title">Druk hier om berichten te ontvangen terwijl Delta Cat geminimaliseerd is.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat gebruikt een minimaal aantal systeembronnen, waardoor het accuverbruik laag is.</string>
+
     <!-- languages -->
     <string name="language_be">Belgisch</string>
     <string name="language_ca">Catalaans</string>
@@ -518,7 +522,7 @@
     <!-- desktop specific strings -->
     <string name="welcome_desktop">Welkom bij DeltaChat</string>
     <string name="login_known_accounts_title_desktop">Bekende accounts</string>
-    <string name="global_menu_preferences_desktop">Voorkeuren</string>
+    <string name="global_menu_preferences_desktop">Instellingen</string>
     <string name="global_menu_preferences_language_desktop">Kies een taal...</string>
     <string name="global_menu_file_desktop">Bestand</string>
     <string name="global_menu_file_quit_desktop">Afsluiten</string>
@@ -563,14 +567,14 @@
     <string name="name_desktop">Naam</string>
     <string name="autocrypt_key_transfer_desktop">Autocrypt-sleuteloverdracht</string>
     <string name="initiate_key_transfer_title_desktop">Sleuteloverdracht starten</string>
-    <string name="initiate_key_transfer_desktop">Een Autocrypt-instelbericht deelt je end-to-end-instellingen op een veilige manier met andere met Autocrypt compatibele apps. De instellingen zijn versleuteld middels een code die hier wordt getoond en moet worden overgetypt op het andere apparaat.</string>
+    <string name="initiate_key_transfer_desktop">Een Autocrypt-instelbericht deelt je end-to-end-instellingen veilig met andere met Autocrypt compatibele apps. De instellingen zijn versleuteld middels een code die hier wordt getoond en moet worden overgetypt op het andere apparaat.</string>
     <string name="reply_to_message_desktop">Bericht beantwoorden</string>
     <string name="select_group_image_desktop">Kies een groepsafbeelding</string>
     <string name="imex_progress_title_desktop">Voortgang van back-up</string>
     <string name="download_attachment_desktop">Bijlage downloaden</string>
     <string name="export_backup_desktop">Back-up exporteren</string>
     <string name="transfer_key_desktop">Sleuteloverdracht</string>
-    <string name="show_key_transfer_message_desktop">Je sleutel is naar jezelf verstuurd. Schakel over naar het andere apparaat en open het instelbericht. Je zou nu moeten worden gevraagd om een code. Typ de volgende getallen in het invoerveld. Zodra je klaar bent, is je andere apparaat klaar voor gebruik.</string>
+    <string name="show_key_transfer_message_desktop">Je sleutel is naar jezelf verstuurd. Ga naar het andere apparaat en open het instelbericht. Je zou nu moeten worden gevraagd om een code. Typ de volgende getallen in het invoerveld. Als je klaar bent, is je andere apparaat klaar voor gebruik.</string>
     <string name="new_message_from_desktop">Nieuw bericht van</string>
     <string name="unblock_contacts_desktop">Contactpersonen deblokkeren</string>
     <string name="none_blocked_desktop">Nog geen geblokkeerde contactpersonen</string>
@@ -593,7 +597,7 @@
 
     <!-- deprecated on android, please remove if unused on desktop -->
     <!-- see qrscan_ask_join_group -->
-    <string name="qrscan_ask_join_verified_group">Wil je lid worden van de groep \"%1$s\"?</string>
+    <string name="qrscan_ask_join_verified_group">Wil je deelnemen aan de groep \"%1$s\"?</string>
     <!-- see ask_start_chat_with -->
     <string name="qrscan_ask_fingerprint_ask_oob">Wil je een gesprek voeren met %1$s?</string>
     <!-- see ask_start_chat_with -->
@@ -601,7 +605,6 @@
     <!-- see qrshow_join_group_title -->
     <string name="qrshow_join_verified_group_title">QR-uitnodigingscode</string>
     <!-- see qrshow_join_group_hint -->
-    <string name="qrshow_join_verified_group_hint">Scan dit om lid te worden van de groep \"%1$s\".</string>
-
+    <string name="qrshow_join_verified_group_hint">Scan dit om deel te nemen aan de groep \"%1$s\".</string>
 
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7d238c059..b88b27eb5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -48,31 +48,6 @@
         <item quantity="many">%d godzin</item>
         <item quantity="other">%d godziny</item>
     </plurals>
-    <plurals name="n_chats">
-        <item quantity="one">1 czat</item>
-        <item quantity="few">%1$d czaty</item>
-        <item quantity="many">%1$d czatów</item>
-        <item quantity="other">%1$d czatu</item>
-    </plurals>
-    <plurals name="n_contacts">
-        <item quantity="one">1 kontakt</item>
-        <item quantity="few">%1$d kontakty</item>
-        <item quantity="many">%1$d kontaktów</item>
-        <item quantity="other">%1$d kontaktu</item>
-    </plurals>
-    <plurals name="n_messages">
-        <item quantity="one">1 wiadomość</item>
-        <item quantity="few">%1$d wiadomości</item>
-        <item quantity="many">%1$d wiadomości</item>
-        <item quantity="other">%1$d wiadomości</item>
-    </plurals>
-    <plurals name="n_members">
-        <item quantity="one">1 członek</item>
-        <item quantity="few">%1$d członków</item>
-        <item quantity="many">%1$d członków</item>
-        <item quantity="other">%1$d członków</item>
-    </plurals>
-
     <string name="self">Ja</string>
     <string name="draft">Szkic</string>
     <string name="image">Obraz</string>
@@ -158,18 +133,6 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Czy na pewno chcesz opuścić tą grupę?</string>
-    <plurals name="ask_delete_chat">
-        <item quantity="one">Usunąć ten czat? Nie będzie on już widoczny na liście czatów, jego wiadomości pozostaną na serwerze.</item>
-        <item quantity="few">Usunąć %d czaty? Nie będą one już widoczne na liście czatów, ich wiadomości pozostaną na serwerze.</item>
-        <item quantity="many">Usunąć %d czatów? Nie będą one już widoczne na liście czatów, ich wiadomości pozostaną na serwerze.</item>
-        <item quantity="other">Usunąć %d czatów? Nie będą one już widoczne na liście czatów, ich wiadomości pozostaną na serwerze.</item>
-    </plurals>
-    <plurals name="ask_delete_messages">
-        <item quantity="one">Usunąć wiadomość tutaj i na serwerze?</item>
-        <item quantity="few">Usunąć %1$d wiadomości tutaj i na serwerze?</item>
-        <item quantity="many">Usunąć %1$d wiadomości tutaj i na serwerze?</item>
-        <item quantity="other">Usunąć %1$d wiadomości tutaj i na serwerze?</item>
-    </plurals>
     <string name="ask_forward">Przekazać wiadomości do użytkownika %1$s?</string>
     <string name="ask_export_attachment">Eksportować załącznik? Eksportowanie załączników umożliwi dostęp do nich wszystkim aplikacjom na urządzeniu.\n\nKontynuować?</string>
     <string name="ask_block_contact">Zablokować ten kontakt? Nie będziesz już odbierać wiadomości od tego kontaktu.</string>
@@ -185,19 +148,6 @@
     <string name="contacts_empty_hint">Nie ma kontaktów.</string>
 
 
-    <!-- chatlist and chat view -->
-    <plurals name="chat_archived">
-        <item quantity="one">Czat zarchiwizowany</item>
-        <item quantity="few">%d czaty zarchiwizowane</item>
-        <item quantity="many">%d czatów zarchiwizowanych</item>
-        <item quantity="other">%d czatów zarchiwizowanych</item>
-    </plurals>
-    <plurals name="chat_unarchived">
-        <item quantity="one">Przywrócono czat z archiwum</item>
-        <item quantity="few">Przywrócono %d czaty z archiwum </item>
-        <item quantity="many">Przywrócono %d czatów z archiwum</item>
-        <item quantity="other">Przywrócono %d czatów z archiwum</item>
-    </plurals>
     <string name="chat_archived_chats_title">Zarchiwizowane czaty</string>
     <string name="chat_please_enter_message">Napisz wiadomość.</string>
     <string name="chat_camera_unavailable">Aparat niedostępny.</string>
@@ -218,7 +168,6 @@
     <string name="chat_archived_label">Zarchiwizowane</string>
     <string name="chat_no_messages">Brak wiadomości.</string>
     <string name="chat_self_talk_subtitle">Wiadomości wysłane do siebie</string>
-
     <!-- search -->
     <string name="search">Szukaj</string>
     <string name="search_explain">Wyszukaj czaty, kontakty i wiadomości</string>
@@ -378,8 +327,6 @@
     <string name="pref_watch_mvbox_folder">Oglądaj katalog DeltaChat</string>
     <string name="pref_auto_folder_moves">Automatyczne przenoszenie do folderu DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Rozmowy na czacie są przenoszone, aby nie zaśmiecać folderu Skrzynka odbiorcza</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt to nowa i otwarta specyfikacja szyfrowania e-maili typu end-to-end.\n\nTwoja konfiguracja end-to-end w razie potrzeby jest tworzona automatycznie i można ją przesłać między urządzeniami za pomocą Wiadomości konfiguracyjnej automatycznego szyfrowania.</string>
@@ -416,7 +363,6 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Blokada ekranu</string>
-    <string name="screenlock_explain">Zablokuj dostęp do Delta Chat za pomocą blokady ekranu Android lub odcisku palca</string>
     <string name="screenlock_authentication_failed">Uwierzytelnianie nie powiodło się.</string>
     <string name="screenlock_unlock_title">Odblokuj Delta Chat</string>
     <string name="screenlock_unlock_description">Aby odblokować Delta Chat, wpisz swój tajny kod systemu.</string>
@@ -578,5 +524,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Zeskanuj to, aby dołączyć do grupy „%1$s”.</string>
 
-
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 383677a81..31f951de7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -46,23 +46,6 @@
         <item quantity="one">%d hora</item>
         <item quantity="other">%d horas</item>
     </plurals>
-    <plurals name="n_chats">
-        <item quantity="one">1 chat</item>
-        <item quantity="other">%1$d chats</item>
-    </plurals>
-    <plurals name="n_contacts">
-        <item quantity="one">1 contacto</item>
-        <item quantity="other">%1$d contactos</item>
-    </plurals>
-    <plurals name="n_messages">
-        <item quantity="one">1 mensangem</item>
-        <item quantity="other">%1$d mensagens</item>
-    </plurals>
-    <plurals name="n_members">
-        <item quantity="one">1 membro</item>
-        <item quantity="other">%1$d membros</item>
-    </plurals>
-
     <string name="self">Eu</string>
     <string name="draft">Rascunho</string>
     <string name="image">Imagem</string>
@@ -150,14 +133,6 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Tem certeza que deseja deixar este grupo?</string>
-    <plurals name="ask_delete_chat">
-        <item quantity="one">Apagar este chat? Ela não será mais mostrada na lista de converas, suas mensagens permanecerão no servidor</item>
-        <item quantity="other">Apagar %d chats? Elas não serão mais mostrados na lista de chats, suas mensagens permanecerão no servidor</item>
-    </plurals>
-    <plurals name="ask_delete_messages">
-        <item quantity="one">Apagar a mensagem aqui e no servidor?</item>
-        <item quantity="other">Apagar %1$d mensagens aqui e no servidor?</item>
-    </plurals>
     <string name="ask_forward">Reencaminhar mensages para %1$s?</string>
     <string name="ask_export_attachment">Exportar anexo? A exportação de anexos permitirá o seu acesso a qualquer outra aplicação no seu dispositivo.\n\nContinuar?</string>
     <string name="ask_block_contact">Bloquear este contacto? Não receberá mais mensagens deste contacto.</string>
@@ -174,15 +149,6 @@
     <string name="contacts_empty_hint">Sem contactos</string>
 
 
-    <!-- chatlist and chat view -->
-    <plurals name="chat_archived">
-        <item quantity="one">chat arquivada</item>
-        <item quantity="other">%d chats arquivadas</item>
-    </plurals>
-    <plurals name="chat_unarchived">
-        <item quantity="one">chat desarquivada</item>
-        <item quantity="other">%d chats não desarquivadas</item>
-    </plurals>
     <string name="chat_archived_chats_title">chats arquivadas</string>
     <string name="chat_please_enter_message">Por favor introduza uma mensagem.</string>
     <string name="chat_camera_unavailable">Camera indisponivel.</string>
@@ -203,7 +169,6 @@
     <string name="chat_archived_label">Arquivada</string>
     <string name="chat_no_messages">Sem mensagens</string>
     <string name="chat_self_talk_subtitle">Mensagens que enviei para mim</string>
-
     <!-- search -->
     <string name="search">Pesquisar</string>
     <string name="search_explain">Pesquisar chats, contactos, emensagens</string>
@@ -375,8 +340,6 @@
     <string name="pref_watch_mvbox_folder">Ver a pasta do Delta Chat</string>
     <string name="pref_auto_folder_moves">Mover pasta automaticamente para o Delta Chat</string>
     <string name="pref_auto_folder_moves_explain">As chats de chat são movidas para evitar atravancar da pasta Inbox</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Encriptação automática</string>
     <string name="autocrypt_explain">A encriptação automática (autocrypt) é uma especificação nova e aberta para encriptação e-mail de ponta a ponta. \n\n A sua configuração de ponta a ponta é criada automaticamente conforme necessário e pode transferi-la entre dispositivos com mensagens de configuração de autocrypt.</string>
@@ -413,7 +376,6 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Bloqueio do ecrã</string>
-    <string name="screenlock_explain">Bloquear acesso ao Delta Chat com bloqueio de ecrã ou impressão digital do Android</string>
     <string name="screenlock_authentication_failed">Falhou autenticação.</string>
     <string name="screenlock_unlock_title">Desbloquear Delta Chat</string>
     <string name="screenlock_unlock_description">Por favor, entre o valor definido pelo sistema para desbloquear o Delta Chat.</string>
@@ -602,5 +564,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Digitalizar para se juntar ao grupo \"%1$s\".</string>
 
-
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d98fff5be..1e076e608 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -228,7 +228,6 @@
     <string name="chat_archived_label">Ахивировано</string>
     <string name="chat_no_messages">Нет сообщений.</string>
     <string name="chat_self_talk_subtitle">Сообщения отправленные себе</string>
-
     <!-- search -->
     <string name="search">Поиск</string>
     <string name="search_explain">Поиск чатов, контактов и сообщений</string>
@@ -293,7 +292,6 @@
     <string name="login_smtp_security">Настройки безопасности SMTP</string>
     <string name="login_auth_method">Метод авторизации</string>
     <string name="login_info_oauth2_title">Продолжить упрощенную настройку?</string>
-    <string name="login_info_oauth2_text">Введенный адрес электронной почты поддерживает упрощенную настройку (OAuth2). \n\nВ следующем шаге разрешите Delta Chat выступать в качестве приложения чата с электронной почтой. \n\nDelta Chat не имеет серверов, ваши данные остаются на вашем устройстве!</string>
     <string name="login_info_gmail_text">Для аккаунтов GMail необходимо задать пароль для приложений - App-Password , если включена 2FA двухфакторная аутентификация. Если эти настройки недоступны, вам нужно активировать параметр Less Secure Apps.</string>
     <string name="login_error_mail">Укажите действительный адрес эл. почты</string>
     <string name="login_error_server">Укажите действительный сервер / IP адрес</string>
@@ -403,8 +401,6 @@
     <string name="pref_watch_mvbox_folder">Следить за папкой DeltaChat</string>
     <string name="pref_auto_folder_moves">Автоматически Перемещать в папку DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Чаты были перемещены, чтобы избежать путаницы в папке Входящие</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt — новый и открытый протокол установления сквозного шифрования для электронной почты.\n\n Необходимые параметры шифрования назначаются автоматически и их возможно передавать между своими устройствами используя  сообщения с параметрами Autocrypt.</string>
@@ -633,5 +629,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Чтобы присоединиться к группе \"%1$s\", отсканируйте этот код</string>
 
-
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 99e6f7e6d..4802fd293 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Dje</string>
     <string name="this_week">Këtë javë</string>
     <string name="this_month">Këtë muaj</string>
+    <string name="last_week">Javën e shkuar</string>
+    <string name="last_month">Muajin e shkuar</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>
@@ -47,20 +49,20 @@
         <item quantity="other">%d orë</item>
     </plurals>
     <plurals name="n_chats">
-        <item quantity="one">1 fjalosje</item>
-        <item quantity="other">%1$d fjalosje</item>
+        <item quantity="one">%d fjalosje</item>
+        <item quantity="other">%d fjalosje</item>
     </plurals>
     <plurals name="n_contacts">
-        <item quantity="one">1 kontakt</item>
-        <item quantity="other">%1$d kontakte</item>
+        <item quantity="one">%d kontakt</item>
+        <item quantity="other">%d kontakte</item>
     </plurals>
     <plurals name="n_messages">
-        <item quantity="one">1 mesazh</item>
-        <item quantity="other">%1$d mesazhe</item>
+        <item quantity="one">%d mesazh</item>
+        <item quantity="other">%d mesazhe</item>
     </plurals>
     <plurals name="n_members">
-        <item quantity="one">1 anëtar</item>
-        <item quantity="other">%1$d anëtarë</item>
+        <item quantity="one">%d anëtar</item>
+        <item quantity="other">%d anëtarë</item>
     </plurals>
 
     <string name="self">Unë</string>
@@ -152,12 +154,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Jeni i sigurt se doni ta braktisni këtë grup?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Të fshihet kjo fjalosje? S’do të shfaqet më te lista e fjalosjeve, mesazhet e saj do të mbeten në shërbyes.</item>
-        <item quantity="other">Të fshihen %d fjalosje? Ato s’do të shfaqen më te lista e fjalosjeve, mesazhet e tyre do të mbeten në shërbyes.</item>
+        <item quantity="one">Të fshihet %d fjalosje? S’do të duket më te lista e bisedave, mesazhet e saj do të mbeten te shërbyesi.</item>
+        <item quantity="other">Të fshihen %d fjalosje? S’do të duken më te lista e bisedave, mesazhet e tyre do të mbeten te shërbyesi.</item>
     </plurals>
     <plurals name="ask_delete_messages">
-        <item quantity="one">Të fshihet mesazhi këtu dhe te shërbyesi?</item>
-        <item quantity="other">Të fshihen %1$d mesazhet këtu dhe te shërbyesi?</item>
+        <item quantity="one">Të fshihet %d mesazh këtu dhe te shërbyesi?</item>
+        <item quantity="other">Të fshihen %d mesazhe këtu dhe te shërbyesi?</item>
     </plurals>
     <string name="ask_forward">Të përcillen mesazhet te %1$s?</string>
     <string name="ask_export_attachment">Të eksportohet bashkëngjitja? Eksportimi i bashkëngjitjeve do t\’i lejojë çfarëdo aplikacioni tjetër në pajisjen tuaj t\’i përdorë ato.\n\nTë vazhdohet?</string>
@@ -177,11 +179,11 @@
 
     <!-- chatlist and chat view -->
     <plurals name="chat_archived">
-        <item quantity="one">Fjalosja u arkivua</item>
+        <item quantity="one">U arkivua %d fjalosje</item>
         <item quantity="other">U arkivuan %d fjalosje</item>
     </plurals>
     <plurals name="chat_unarchived">
-        <item quantity="one">U çarkivua fjalosja</item>
+        <item quantity="one">U çarkivua %d fjalosje</item>
         <item quantity="other">U çarkivuan %d fjalosje</item>
     </plurals>
     <string name="chat_archived_chats_title">Fjalosje të arkivuara</string>
@@ -204,7 +206,6 @@
     <string name="chat_archived_label">Arkivuar</string>
     <string name="chat_no_messages">S’ka mesazhe.</string>
     <string name="chat_self_talk_subtitle">Mesazhe që i kam dërguar vetes</string>
-
     <!-- search -->
     <string name="search">Kërko</string>
     <string name="search_explain">Kërkoni për fjalosje, kontakte dhe mesazhe.</string>
@@ -267,6 +268,8 @@
     <string name="login_smtp_server">Shërbyes SMTP</string>
     <string name="login_smtp_port">Portë SMTP</string>
     <string name="login_smtp_security">Siguri SMTP</string>
+    <string name="login_auth_method">Metodë autorizimi</string>
+    <string name="login_info_oauth2_title">Të vazhdohet me rregullimin e thjeshtuar?</string>
     <string name="login_info_gmail_text">Për llogari GMail lypset të krijoni një App-Password, nëse keni të aktivizuar mirëfilltësimin dyfaktorësh. Nëse ky rregullim s’gjendet, lypset të aktivizoni Aplikacione Më Pak të Sigurta.</string>
     <string name="login_error_mail">Ju lutemi, jepni një adresë email të vlefshme</string>
     <string name="login_error_server">Ju lutemi, jepni një shërbyes / adresë IP të vlefshme</string>
@@ -339,6 +342,7 @@
     <string name="pref_appearance">Dukje</string>
     <string name="pref_theme">Temë</string>
     <string name="pref_language">Gjuhë</string>
+    <string name="pref_incognito_keyboard">Mos ruaj gjë</string>
     <!-- Translators: Keep in mind that this is a Request - it must be clear in the wording that this cannot be enforced. -->
     <string name="pref_incognito_keyboard_explain">Kërkoji tastierës të çaktivizojë nxënie të personalizuar</string>
     <string name="pref_read_receipts">Lexoni dëftesa</string>
@@ -346,6 +350,7 @@
     <string name="pref_manage_keys">Administroni kyçe</string>
     <string name="pref_use_system_emoji">Përdor emoji sistemi</string>
     <string name="pref_use_system_emoji_explain">Çaktivizo mbulimin e brendshëm Delta Chat për emoji-t</string>
+    <string name="pref_app_access">Hyrje aplikacioni</string>
     <string name="pref_communication">Komunikim</string>
     <string name="pref_chats">Fjalosje</string>
     <string name="pref_messages">Mesazhe</string>
@@ -374,8 +379,6 @@
     <string name="pref_watch_mvbox_folder">Vëzhgo dosje DeltaChat</string>
     <string name="pref_auto_folder_moves">Lëvizje të Vetvetishme te dosja DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Bisedat zhvendosen, që të shmanget rrëmuja te dosja Të marrë</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
     <string name="autocrypt_explain">Autocrypt-i është një protokoll i ri dhe i hapur për fshehtëzim automatik email-esh skaj-më-skaj.\n\nRregullimi skaj-më-skaj për ju krijohet vetvetiu kur duhet dhe mund ta shpërngulni nga një pajisje në tjetër përmes Mesazhesh Rregullimi Autocrypt-i.</string>
@@ -412,7 +415,7 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Kyçje ekrani</string>
-    <string name="screenlock_explain">Kyçe përdorimin e Delta Chat-it përmes kyçjesh ekrani apo shenja gishtash në Android</string>
+    <string name="screenlock_explain">Kyçni hyrjen me kyçje ekrani apo shenja gishtas Android; për të shmangur shfaqje të lëndës së mëparshme, ju lutemi, aktivizoni edhe \"Siguri ekrani\"</string>
     <string name="screenlock_authentication_failed">Mirëfilltësimi dështoi.</string>
     <string name="screenlock_unlock_title">Shkyçe Delta Chat-in</string>
     <string name="screenlock_unlock_description">Që të shkyçet Delta Chat-i, ju lutemi, jepni të fshehtën e përcaktuar nga sistemi juaj.</string>
@@ -478,6 +481,9 @@
     <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>
+    <string name="perm_enable_bg_reminder_title">Prekeni këtu që të merrni mesazhe, teksa Delta Chat rri në prapaskenë.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat-i përdor burime minimale dhe kujdeset të mos thajë baterinë.</string>
+
     <!-- languages -->
     <string name="language_be">Belge</string>
     <string name="language_ca">Katalane</string>
@@ -529,6 +535,7 @@
     <string name="global_menu_edit_delete_desktop">Fshije</string>
     <string name="global_menu_edit_selectall_desktop">Përzgjidhi Krejt</string>
     <string name="global_menu_view_desktop">Shiheni</string>
+    <string name="global_menu_view_floatontop_desktop">Pezull Përsipër</string>
     <string name="global_menu_view_developer_desktop">Zhvillues</string>
     <string name="global_menu_view_developer_tools_desktop">Mjete Zhvilluesi</string>
     <string name="global_menu_help_desktop">Ndihmë</string>
@@ -600,5 +607,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Që të bëheni pjesë e grupit \"%1$s\", skanoni këtë.</string>
 
-
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 47f19ab1d..701b34b2b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -46,23 +46,6 @@
         <item quantity="one">%d timme</item>
         <item quantity="other">%d timmar</item>
     </plurals>
-    <plurals name="n_chats">
-        <item quantity="one">1 chatt</item>
-        <item quantity="other">%1$d chatt</item>
-    </plurals>
-    <plurals name="n_contacts">
-        <item quantity="one">1 kontakt</item>
-        <item quantity="other">%1$d kontakter</item>
-    </plurals>
-    <plurals name="n_messages">
-        <item quantity="one">1 meddelande</item>
-        <item quantity="other">%1$d meddelanden</item>
-    </plurals>
-    <plurals name="n_members">
-        <item quantity="one">1 medlem</item>
-        <item quantity="other">%1$d medlemmar</item>
-    </plurals>
-
     <string name="self">Jag</string>
     <string name="draft">Utkast</string>
     <string name="image">Bild</string>
@@ -150,14 +133,6 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Är du säker på att du vill lämna den här gruppen?</string>
-    <plurals name="ask_delete_chat">
-        <item quantity="one">Radera denna chatt? Den kommer inte längre visas i chattlistan, meddelanden finns kvar på servern.</item>
-        <item quantity="other">Radera %d chatt? De kommer inte längre visas i chattlistan, meddelanden finns kvar på servern.</item>
-    </plurals>
-    <plurals name="ask_delete_messages">
-        <item quantity="one">Ta bort meddelandet här och på servern?</item>
-        <item quantity="other">Ta bort %1$d meddelandem här och på servern?</item>
-    </plurals>
     <string name="ask_forward">Vidarebefordra meddelanden till %1$s?</string>
     <string name="ask_export_attachment">Exportera bifogad fil? Exportera bilagor tillåter andra appar på din enhet att komma åt dem.\n\nFortsätt?</string>
     <string name="ask_block_contact">Blockera den här kontakten? Du kommer inte längre att få meddelanden från den här kontakten.</string>
@@ -174,15 +149,6 @@
     <string name="contacts_empty_hint">Inga kontakter.</string>
 
 
-    <!-- chatlist and chat view -->
-    <plurals name="chat_archived">
-        <item quantity="one">Chat arkiverad</item>
-        <item quantity="other">%dchattar arkiverade </item>
-    </plurals>
-    <plurals name="chat_unarchived">
-        <item quantity="one">Chatt avarkiverats</item>
-        <item quantity="other">%dchatt avarkiverats</item>
-    </plurals>
     <string name="chat_archived_chats_title">Arkiverade chattar</string>
     <string name="chat_please_enter_message">Skriv in ett meddelande.</string>
     <string name="chat_camera_unavailable">Kamera otillgänglig.</string>
@@ -203,7 +169,6 @@
     <string name="chat_archived_label">Arkiverat</string>
     <string name="chat_no_messages">Inga meddelanden.</string>
     <string name="chat_self_talk_subtitle">Meddelanden jag skickade till mig själv</string>
-
     <!-- search -->
     <string name="search">Sök</string>
     <string name="search_explain">Sök efter chattar, kontakter och meddelanden</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 87aca6385..fe4bae999 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -45,23 +45,6 @@
         <item quantity="one">%d saat</item>
         <item quantity="other">%d saat</item>
     </plurals>
-    <plurals name="n_chats">
-        <item quantity="one">1 sohbet</item>
-        <item quantity="other">%1$d sohbet</item>
-    </plurals>
-    <plurals name="n_contacts">
-        <item quantity="one">1 kişi</item>
-        <item quantity="other">%1$d kişi</item>
-    </plurals>
-    <plurals name="n_messages">
-        <item quantity="one">1 ileti</item>
-        <item quantity="other">%1$d ileti</item>
-    </plurals>
-    <plurals name="n_members">
-        <item quantity="one">1 üye</item>
-        <item quantity="other">%1$d üye</item>
-    </plurals>
-
     <string name="self">Ben</string>
     <string name="draft">Taslak</string>
     <string name="image">Görüntü</string>
@@ -146,14 +129,6 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Bu gruptan ayrılmak istediğinizden emin misiniz?</string>
-    <plurals name="ask_delete_chat">
-        <item quantity="one">Bu sohbet silinsin mi? O artık sohbet listesinde gösterilmeyecek, iletileri sunucuda kalacak.</item>
-        <item quantity="other">%d sohbet silinsin mi? Onlar artık sohbet listesinde gösterilmeyecek, iletileri sunucuda kalacak.</item>
-    </plurals>
-    <plurals name="ask_delete_messages">
-        <item quantity="one">İleti buradan ve sunucudan silinsin mi?</item>
-        <item quantity="other">%1$d ileti buradan ve sunucudan silinsin mi?</item>
-    </plurals>
     <string name="ask_forward">İletiler %1$s alıcısına iletilsin mi?</string>
     <string name="ask_export_attachment">Ek dışa aktarılsın mı? Ekleri dışa aktarma, aygıtınızdaki tüm diğer uygulamaların onlara erişmesine izin verecek.\n\nSürdürülsün mü?</string>
     <string name="ask_block_contact">Bu kişi engellensin mi? Artık bu kişiden iletiler almayacaksınız.</string>
@@ -169,15 +144,6 @@
     <string name="contacts_empty_hint">Kişi yok.</string>
 
 
-    <!-- chatlist and chat view -->
-    <plurals name="chat_archived">
-        <item quantity="one">Sohbet arşivlendi</item>
-        <item quantity="other">%d sohbet arşivlendi</item>
-    </plurals>
-    <plurals name="chat_unarchived">
-        <item quantity="one">Sohbet arşivden çıkartıldı</item>
-        <item quantity="other">%d sohbet arşivden çıkartıldı</item>
-    </plurals>
     <string name="chat_archived_chats_title">Arşivlenen sohbetler</string>
     <string name="chat_please_enter_message">Lütfen bir ileti girin.</string>
     <string name="chat_camera_unavailable">Kamera kullanım dışı.</string>
@@ -198,7 +164,6 @@
     <string name="chat_archived_label">Arşivlendi</string>
     <string name="chat_no_messages">İleti yok.</string>
     <string name="chat_self_talk_subtitle">Kendime gönderdiğim iletiler</string>
-
     <!-- search -->
     <string name="search">Ara</string>
     <string name="search_explain">Sohbetleri, kişileri ve iletileri arayın</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 92c9f50b0..4d082b0ea 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -50,31 +50,6 @@
         <item quantity="many">%d годин</item>
         <item quantity="other">%d годин</item>
     </plurals>
-    <plurals name="n_chats">
-        <item quantity="one">1 чат</item>
-        <item quantity="few">%1$d чати</item>
-        <item quantity="many">%1$d чатів</item>
-        <item quantity="other">%1$d чатів</item>
-    </plurals>
-    <plurals name="n_contacts">
-        <item quantity="one">1 контакт</item>
-        <item quantity="few">%1$d контакти</item>
-        <item quantity="many">%1$d контактів</item>
-        <item quantity="other">%1$d контактів</item>
-    </plurals>
-    <plurals name="n_messages">
-        <item quantity="one">1 повідомлення</item>
-        <item quantity="few">%1$d повідомлення</item>
-        <item quantity="many">%1$d повідомлень</item>
-        <item quantity="other">%1$d повідомлень</item>
-    </plurals>
-    <plurals name="n_members">
-        <item quantity="one">1 учасник</item>
-        <item quantity="few">%1$d учасники</item>
-        <item quantity="many">%1$d учасників</item>
-        <item quantity="other">%1$d учасників</item>
-    </plurals>
-
     <string name="self">Мої</string>
     <string name="draft">Чернетка</string>
     <string name="image">Зображення</string>
@@ -163,18 +138,6 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Ви впевнені, що хочете залишити цю групу?</string>
-    <plurals name="ask_delete_chat">
-        <item quantity="one">Видалити цей чат? Він більше не буде виден у списку чатів, його повідомлення залишаться на сервері.</item>
-        <item quantity="few">Видалити %d чати? Вони більше не будуть видні в списку чатів, їх повідомлення залишаться на сервері.</item>
-        <item quantity="many">Видалити %d чатів? Вони більше не будуть видні в списку чатів, їх повідомлення залишаться на сервері.</item>
-        <item quantity="other">Видалити %d чатів? Вони більше не будуть видні в списку чатів, їх повідомлення залишаться на сервері.</item>
-    </plurals>
-    <plurals name="ask_delete_messages">
-        <item quantity="one">Видалити повідомлення звідси і з сервера?</item>
-        <item quantity="few">Видалити %1$d повідомлення звідси і з сервера?</item>
-        <item quantity="many">Видалити %1$d повідомлень звідси і з сервера?</item>
-        <item quantity="other">Видалити %1$d повідомлень звідси і з сервера?</item>
-    </plurals>
     <string name="ask_forward">Переслати повідомлення %1$s?</string>
     <string name="ask_export_attachment">Експортувати вкладення? Експорт вкладень дозволить будь-якому іншому додатку на Вашому пристрої отримати до них доступ.\n\nПродовжити?</string>
     <string name="ask_block_contact">Заблокувати цей контакт? Ви більше не будете отримувати від нього повідомлення.</string>
@@ -191,19 +154,6 @@
     <string name="contacts_empty_hint">Немає контактів.</string>
 
 
-    <!-- chatlist and chat view -->
-    <plurals name="chat_archived">
-        <item quantity="one">Чат заархівовано</item>
-        <item quantity="few">%dчати заархівовано</item>
-        <item quantity="many">%dчатів заархівовано</item>
-        <item quantity="other">%d чатів заархівовано</item>
-    </plurals>
-    <plurals name="chat_unarchived">
-        <item quantity="one">Чат розархівовано</item>
-        <item quantity="few">%d чати розархівовано</item>
-        <item quantity="many">%d чатів розархівовано</item>
-        <item quantity="other">%d чатів розархівовано</item>
-    </plurals>
     <string name="chat_archived_chats_title">Заархівовані чати</string>
     <string name="chat_please_enter_message">Будь ласка, введіть повідомлення.</string>
     <string name="chat_camera_unavailable">Камера недоступна.</string>
@@ -226,7 +176,6 @@
     <string name="chat_archived_label">Заархівовано</string>
     <string name="chat_no_messages">Немає повідомлень.</string>
     <string name="chat_self_talk_subtitle">Повідомлення, відправлені самому собі</string>
-
     <!-- search -->
     <string name="search">Пошук</string>
     <string name="search_explain">Пошук чатів, контактів і повідомлень</string>
@@ -398,8 +347,6 @@
     <string name="pref_watch_mvbox_folder">Стежити за папкою DeltaChat</string>
     <string name="pref_auto_folder_moves">Автоматично пересувати до папки DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Чати були переміщені, щоб уникнути плутанини у папці «Вхідні».</string>
-
-
     <!-- autocrypt -->
     <string name="autocrypt">Автошифрування</string>
     <string name="autocrypt_explain">Autocrypt – новий і відкритий протокол встановлення наскрізного шифрування для електронної пошти.\n\nНеобхідні параметри шифрування призначаються автоматично і їх можна передавати між своїми пристроями, використовуючи повідомлення з параметрами Autocrypt.</string>
@@ -436,7 +383,6 @@
 
     <!-- screen lock -->
     <string name="screenlock_title">Блокування екрану</string>
-    <string name="screenlock_explain">Блокування доступу до Delta Chat за допомогою блокування екрану Android або відбитку пальця</string>
     <string name="screenlock_authentication_failed">Не вдалося здійснити аутентифікацію.</string>
     <string name="screenlock_unlock_title">Розблокувати Delta Chat</string>
     <string name="screenlock_unlock_description">Введіть захисний код, щоб розблокувати Delta Chat.</string>
@@ -625,5 +571,4 @@
     <!-- see qrshow_join_group_hint -->
     <string name="qrshow_join_verified_group_hint">Відскануйте цей код, щоб приєднатися до групи «%1$s».</string>
 
-
 </resources>

From 37bbc4163998e0aa1fbc2a2cc7a2fd343d7cffab Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 17:38:12 +0100
Subject: [PATCH 05/12] add a script to check for some basic translation syntax
 errors

---
 tools/check-translations.sh   | 7 +++++++
 tools/tx-pull-source.sh       | 1 +
 tools/tx-pull-translations.sh | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100755 tools/check-translations.sh
 create mode 100755 tools/tx-pull-translations.sh

diff --git a/tools/check-translations.sh b/tools/check-translations.sh
new file mode 100755
index 000000000..1ded643fe
--- /dev/null
+++ b/tools/check-translations.sh
@@ -0,0 +1,7 @@
+echo potential errors, if any:
+
+# a space after the percent sign 
+# results in an IllegalFormatException in getString()
+grep --include='strings.xml' -r '\% '
+grep --include='strings.xml' -r '\$ '
+grep --include='strings.xml' -r ' \$'
diff --git a/tools/tx-pull-source.sh b/tools/tx-pull-source.sh
index bcf17948f..29ae3a188 100755
--- a/tools/tx-pull-source.sh
+++ b/tools/tx-pull-source.sh
@@ -1,3 +1,4 @@
 tx pull -l en
 mv res/values-en/strings.xml res/values/strings.xml
 rmdir res/values-en
+./tools/check-translations.sh
diff --git a/tools/tx-pull-translations.sh b/tools/tx-pull-translations.sh
new file mode 100755
index 000000000..fbb878274
--- /dev/null
+++ b/tools/tx-pull-translations.sh
@@ -0,0 +1,2 @@
+tx pull
+./tools/check-translations.sh

From 47b87ac203283266015d6eb8902006450b13a713 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 17:40:25 +0100
Subject: [PATCH 06/12] force pulling new translations, skip all evil caches

---
 tools/tx-pull-translations.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tx-pull-translations.sh b/tools/tx-pull-translations.sh
index fbb878274..0367a535b 100755
--- a/tools/tx-pull-translations.sh
+++ b/tools/tx-pull-translations.sh
@@ -1,2 +1,2 @@
-tx pull
+tx pull -f
 ./tools/check-translations.sh

From 60aab2998a38bec4edb37f7decfb6309bc42ac22 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 17:42:21 +0100
Subject: [PATCH 07/12] update translations

---
 res/values-uk/strings.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4d082b0ea..b9af91fe7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -36,6 +36,8 @@
     <string name="yesterday">Вчора</string>
     <string name="this_week">Цього тижня</string>
     <string name="this_month">Цього місяця</string>
+    <string name="last_week">Останнього тижня</string>
+    <string name="last_month">Останнього місяця</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 хвилину</item>
@@ -50,6 +52,12 @@
         <item quantity="many">%d годин</item>
         <item quantity="other">%d годин</item>
     </plurals>
+    <plurals name="n_chats">
+        <item quantity="one">%d чат</item>
+        <item quantity="few">%d чати</item>
+        <item quantity="many">%d чатів</item>
+        <item quantity="other">%d чатів</item>
+    </plurals>
     <string name="self">Мої</string>
     <string name="draft">Чернетка</string>
     <string name="image">Зображення</string>
@@ -171,7 +179,7 @@
     <string name="chat_no_chats_yet_hint">Дайте Вашим «Вхідним» привід наповнитися. Почніть з листа другові або подрузі.</string>
     <string name="chat_all_done_hint">Вхідних немає</string>
     <string name="chat_all_done_explain">Нічого!\nНа цьому поки все</string>
-    <string name="chat_share_with_title">Поділітися</string>
+    <string name="chat_share_with_title">Поділитися</string>
     <string name="chat_input_placeholder">Повідомлення</string>
     <string name="chat_archived_label">Заархівовано</string>
     <string name="chat_no_messages">Немає повідомлень.</string>
@@ -225,7 +233,7 @@
     <string name="welcome_intro7_message">Delta Chat безпечний для бізнесу, поєднується з іншими технологіями і грунтується на стандартах.</string>
     <string name="welcome_start_messaging">Почати спілкування</string>
     <string name="login_title">Увійти</string>
-    <string name="login_header">Увійти на Ваш сервер</string>
+    <string name="login_header">Увійти на свій сервер</string>
     <string name="login_subheader">Для відомих провайдерів електронної пошти додаткові налаштування встановлюються автоматично. Іноді IMAP потрібен дозвіл в веб-інтерфейсі. Проконсультуйтеся з Вашим провайдером електронної пошти або друзями для отримання допомоги.</string>
     <string name="login_inbox">Вхідні</string>
     <string name="login_imap_login">IMAP-логін</string>
@@ -238,6 +246,7 @@
     <string name="login_smtp_server">SMTP-сервер</string>
     <string name="login_smtp_port">SMTP-порт</string>
     <string name="login_smtp_security">Налаштування безпеки SMTP</string>
+    <string name="login_auth_method">Метод авторизації</string>
     <string name="login_info_gmail_text">Якщо Ви користуєтеся GMail і у вас увімкнена двофакторна аутентифікація, Вам потрібно створити спеціальний пароль для додатків - App-Password. Якщо ці налаштування недоступні, Вам потрібно активувати параметр Less Secure Apps.</string>
     <string name="login_error_mail">Вкажіть дійсну адресу електронної пошти</string>
     <string name="login_error_server">Вкажіть дійсний сервер / IP-адресу</string>

From 2b67413b62ce41d41aa6b581cddef2513ac87c53 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 18:15:47 +0100
Subject: [PATCH 08/12] also update locale of ApplicationContext as this is
 neeed eg. by the core

---
 src/org/thoughtcrime/securesms/ApplicationContext.java    | 8 ++++++++
 .../preferences/AppearancePreferenceFragment.java         | 6 ++++++
 src/org/thoughtcrime/securesms/util/DynamicLanguage.java  | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 490b79296..2735ed422 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.persistence.JavaJobSerializer;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.SignalProtocolLoggerProvider;
@@ -71,6 +72,13 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
     initializeJobManager();
     initializeIncomingMessageNotifier();
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
+
+    try {
+      DynamicLanguage.setContextLocale(this, DynamicLanguage.getSelectedLocale(this));
+    }
+    catch (Exception e) {
+      e.printStackTrace();
+    }
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
index 0373b903d..876527229 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 
+import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -59,6 +60,11 @@ public class AppearancePreferenceFragment extends ListSummaryPreferenceFragment
   public void onStop() {
     super.onStop();
     getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener((ApplicationPreferencesActivity) getActivity());
+
+    // update the locale of the applicationContext so that the core gets the correct strings
+    // (for pending activities, the locale is updated by calling DynamicLanguage.onResume)
+    Context applicationContext = this.getActivity().getApplicationContext();
+    DynamicLanguage.setContextLocale(applicationContext, DynamicLanguage.getSelectedLocale(applicationContext));
   }
 
   public static CharSequence getSummary(Context context) {
diff --git a/src/org/thoughtcrime/securesms/util/DynamicLanguage.java b/src/org/thoughtcrime/securesms/util/DynamicLanguage.java
index bedf76b9b..182956e11 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicLanguage.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicLanguage.java
@@ -48,7 +48,7 @@ public class DynamicLanguage {
     return configuration.getLayoutDirection();
   }
 
-  private static void setContextLocale(Context context, Locale selectedLocale) {
+  public static void setContextLocale(Context context, Locale selectedLocale) {
     Configuration configuration = context.getResources().getConfiguration();
 
     if (!configuration.locale.equals(selectedLocale)) {

From 0c5e1b95f5e9c926f44a17194e8449971432cd7c Mon Sep 17 00:00:00 2001
From: "daniel.boehrs" <daniel.boehrs@open-xchange.com>
Date: Fri, 22 Feb 2019 16:21:57 +0100
Subject: [PATCH 09/12] sharing files does not work #434

---
 AndroidManifest.xml                           |  12 +
 res/values/strings.xml                        |   3 +
 .../thoughtcrime/securesms/ShareActivity.java | 216 +++++++++++++++---
 3 files changed, 196 insertions(+), 35 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d791f5155..702742c60 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,18 @@
             <data android:mimeType="*/*"/>
         </intent-filter>
 
+        <intent-filter>
+            <action android:name="android.intent.action.SEND_MULTIPLE" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="audio/*" />
+            <data android:mimeType="image/*" />
+            <data android:mimeType="text/plain" />
+            <data android:mimeType="video/*" />
+            <data android:mimeType="application/*"/>
+            <data android:mimeType="text/*"/>
+            <data android:mimeType="*/*"/>
+        </intent-filter>
+
         <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value=".service.DirectShareService" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index be91a01ae..df1edffe3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -292,6 +292,8 @@
     <!-- 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">Forward to …</string>
+    <string name="share_multiple_attachments">Do you want to sent %1$d files to the selected chat?</string>
+    <string name="share_abort">Sharing aborted due to missing permissions.</string>
 
 
     <!-- preferences -->
@@ -489,6 +491,7 @@
     <string name="perm_explain_need_for_camera_access">To capture photos and video, allow Delta Chat access to the camera.</string>
     <string name="perm_explain_need_for_mic_access">To send audio messages, allow Delta Chat access to your microphone.</string>
     <string name="perm_explain_need_for_storage_access">Delta Chat needs access to your files in order to export files or to create backups.</string>
+    <string name="perm_explain_need_for_storage_access_share">Delta Chat needs access to your files in order to share the selected files.</string>
     <string name="perm_explain_access_to_camera_denied">Delta Chat requires the Camera permission in order to take photos or videos, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Camera\".</string>
     <string name="perm_explain_access_to_mic_denied">Delta Chat requires the Microphone permission in order to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat requires the Storage permission in order to attach or export photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index fe52bf7ce..8267d6ac0 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -17,6 +17,7 @@
 
 package org.thoughtcrime.securesms;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -44,10 +45,12 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.b44t.messenger.DcChatlist;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEventCenter;
+import com.b44t.messenger.DcMsg;
 
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcChatlistLoader;
@@ -55,17 +58,24 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.PartAuthority;
+import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -95,8 +105,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
   private ShareFragment shareFragment;
   private View                         progressWheel;
-  private Uri                          resolvedExtra;
-  private String                       mimeType;
+  private List<Uri>                    resolvedExtras;
   private boolean                      isPassingAlongMedia;
   private ApplicationDcContext         dcContext;
   private boolean                      isForward;
@@ -142,8 +151,12 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   @Override
   protected void onDestroy() {
     super.onDestroy();
-    if (!isPassingAlongMedia && resolvedExtra != null) {
-      PersistentBlobProvider.getInstance(this).delete(this, resolvedExtra);
+    if (!isPassingAlongMedia && resolvedExtras.size() != 0) {
+        for(Uri uri : resolvedExtras) {
+          if (uri != null) {
+            PersistentBlobProvider.getInstance(this).delete(this, uri);
+          }
+        }
     }
   }
 
@@ -195,20 +208,70 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeMedia() {
-    final Context context = this;
     isPassingAlongMedia = false;
+    resolvedExtras = new ArrayList<>();
 
-    Uri streamExtra = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
-    mimeType        = getMimeType(streamExtra);
-
-    if (streamExtra != null && PartAuthority.isLocalUri(streamExtra)) {
-      isPassingAlongMedia = true;
-      resolvedExtra       = streamExtra;
-      handleResolvedMedia(getIntent(), false);
+    List<Uri> streamExtras = new ArrayList<>();
+    if (Intent.ACTION_SEND.equals(getIntent().getAction())) {
+      streamExtras.add(getIntent().getParcelableExtra(Intent.EXTRA_STREAM));
     } else {
-      shareFragment.getView().setVisibility(View.GONE);
-      progressWheel.setVisibility(View.VISIBLE);
-      new ResolveMediaTask(context).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, streamExtra);
+      streamExtras = getIntent().getParcelableArrayListExtra(Intent.EXTRA_STREAM);
+    }
+    if (streamExtras == null || streamExtras.isEmpty()) {
+      progressWheel.setVisibility(View.GONE);
+      return;
+    }
+    if (needsFilePermission(streamExtras)) {
+      if (Permissions.hasAll(this, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+        resolveUris(streamExtras);
+      } else {
+        requestPermissionForFiles(streamExtras);
+      }
+    } else {
+      resolveUris(streamExtras);
+    }
+  }
+
+  private boolean needsFilePermission(List<Uri> uris) {
+    for(Uri uri : uris) {
+      if (hasFileScheme(uri)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private void requestPermissionForFiles(List<Uri> streamExtras) {
+    Permissions.with(this)
+            .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
+            .ifNecessary()
+            .withRationaleDialog(this.getString(R.string.perm_explain_need_for_storage_access_share), R.drawable.ic_folder_white_48dp)
+            .onAllGranted(() -> resolveUris(streamExtras))
+            .onAnyDenied(this::abortShare)
+            .execute();
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  private void abortShare() {
+    Toast.makeText(this, R.string.share_abort, Toast.LENGTH_LONG).show();
+    finish();
+  }
+
+  private void resolveUris(List<Uri> streamExtras) {
+    for (Uri streamExtra : streamExtras) {
+      if (streamExtra != null && PartAuthority.isLocalUri(streamExtra)) {
+        isPassingAlongMedia = true;
+        resolvedExtras.add(streamExtra);
+        handleResolvedMedia(getIntent(), false);
+      } else {
+        shareFragment.getView().setVisibility(View.GONE);
+        progressWheel.setVisibility(View.VISIBLE);
+        new ResolveMediaTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, streamExtra);
+      }
     }
   }
 
@@ -249,19 +312,91 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void createConversation(int threadId) {
-    final Intent intent = getBaseShareIntent(ConversationActivity.class);
-    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
-    isPassingAlongMedia = true;
-    startActivity(intent);
+    if (resolvedExtras.size() > 1) {
+      String message = String.format(getString(R.string.share_multiple_attachments), resolvedExtras.size());
+      new AlertDialog.Builder(this)
+              .setMessage(message)
+              .setCancelable(true)
+              .setNegativeButton(android.R.string.cancel, null)
+              .setPositiveButton(R.string.menu_send, (dialog, which) -> sendMultipleAttachmentsAndCreateConversation(threadId)).show();
+    } else {
+      openConversation(threadId);
+    }
+  }
+
+  private void sendMultipleAttachmentsAndCreateConversation(int threadId) {
+    for(Uri uri : resolvedExtras) {
+      DcMsg message = createMessage(uri);
+      dcContext.sendMsg(threadId, message);
+    }
+    openConversation(threadId);
+  }
+
+  private void openConversation(int threadId) {
+      final Intent intent = getBaseShareIntent(ConversationActivity.class);
+      intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
+      isPassingAlongMedia = true;
+      startActivity(intent);
+  }
+
+  private DcMsg createMessage(Uri uri) {
+    DcMsg message;
+    String mimeType = MediaUtil.getMimeType(this, uri);
+    if (MediaUtil.isImageType(mimeType)) {
+      message = new DcMsg(dcContext, DcMsg.DC_MSG_IMAGE);
+    }
+    else if (MediaUtil.isAudioType(mimeType)) {
+      message = new DcMsg(dcContext,DcMsg.DC_MSG_AUDIO);
+    }
+    else if (MediaUtil.isVideoType(mimeType)) {
+      message = new DcMsg(dcContext, DcMsg.DC_MSG_VIDEO);
+    }
+    else {
+      message = new DcMsg(dcContext, DcMsg.DC_MSG_FILE);
+    }
+    message.setFile(getRealPathFromUri(uri), mimeType);
+    return message;
+  }
+
+  private String getRealPathFromUri(Uri uri) {
+    try {
+      String filename = uri.getPathSegments().get(2); // Get real file name from Uri
+      String ext = "";
+      int i = filename.lastIndexOf(".");
+      if(i>=0) {
+        ext = filename.substring(i);
+        filename = filename.substring(0, i);
+      }
+      String path = dcContext.getBlobdirFile(filename, ext);
+
+      // copy content to this file
+      if(path!=null) {
+        InputStream inputStream = PartAuthority.getAttachmentStream(this, uri);
+        OutputStream outputStream = new FileOutputStream(path);
+        Util.copy(inputStream, outputStream);
+      }
+
+      return path;
+    }
+    catch(Exception e) {
+      e.printStackTrace();
+      return null;
+    }
   }
 
   private Intent getBaseShareIntent(final @NonNull Class<?> target) {
-    final Intent intent      = new Intent(this, target);
-    final String textExtra   = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-    intent.putExtra(ConversationActivity.TEXT_EXTRA, textExtra);
-    if (resolvedExtra != null) intent.setDataAndType(resolvedExtra, mimeType);
-
-    return intent;
+    if (resolvedExtras.size() == 1) {
+      final Intent intent = new Intent(this, target);
+      final String textExtra = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+      intent.putExtra(ConversationActivity.TEXT_EXTRA, textExtra);
+      Uri data = resolvedExtras.get(0);
+      if (data != null) {
+        String mimeType = getMimeType(data);
+        intent.setDataAndType(data, mimeType);
+      }
+      return intent;
+    }
+    return new Intent(this, target);
   }
 
   private String getMimeType(@Nullable Uri uri) {
@@ -283,25 +418,31 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     @Override
     protected Uri doInBackground(Uri... uris) {
       try {
-        if (uris.length != 1 || uris[0] == null) {
+        Uri uri = uris[0];
+        if (uris.length != 1 || uri == null) {
           return null;
         }
 
         InputStream inputStream;
+        String fileName = null;
+        Long   fileSize = null;
 
-        if ("file".equals(uris[0].getScheme())) {
-          inputStream = openFileUri(uris[0]);
+        if (hasFileScheme(uri)) {
+          inputStream = openFileUri(uri);
+          if (uri.getPath() != null) {
+            File file = new File(uri.getPath());
+            fileName = file.getName();
+            fileSize = file.length();
+          }
         } else {
-          inputStream = context.getContentResolver().openInputStream(uris[0]);
+          inputStream = context.getContentResolver().openInputStream(uri);
         }
 
         if (inputStream == null) {
           return null;
         }
 
-        Cursor cursor   = getContentResolver().query(uris[0], new String[] {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE}, null, null, null);
-        String fileName = null;
-        Long   fileSize = null;
+        Cursor cursor   = getContentResolver().query(uri, new String[] {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE}, null, null, null);
 
         try {
           if (cursor != null && cursor.moveToFirst()) {
@@ -315,7 +456,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
         } finally {
           if (cursor != null) cursor.close();
         }
-
+        String mimeType = getMimeType(uri);
         return PersistentBlobProvider.getInstance(context).create(context, inputStream, mimeType, fileName, fileSize);
       } catch (IOException ioe) {
         Log.w(TAG, ioe);
@@ -325,14 +466,15 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
     @Override
     protected void onPostExecute(Uri uri) {
-      resolvedExtra = uri;
+      resolvedExtras.add(uri);
       handleResolvedMedia(getIntent(), true);
     }
 
     private InputStream openFileUri(Uri uri) throws IOException {
       FileInputStream fin   = new FileInputStream(uri.getPath());
       int             owner = FileUtils.getFileDescriptorOwner(fin.getFD());
-      
+
+
       if (owner == -1 || owner == Process.myUid()) {
         fin.close();
         throw new IOException("File owned by application");
@@ -343,6 +485,10 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
   }
 
+  private boolean hasFileScheme(Uri uri) {
+    return "file".equals(uri.getScheme());
+  }
+
   public static class ShareFragment
           extends Fragment
           implements LoaderManager.LoaderCallbacks<DcChatlist>, ConversationListAdapter.ItemClickListener, DcEventCenter.DcEventDelegate {

From d6a94fd544d42b30d4fb8d29ea6a0ec28889bcc9 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Mar 2019 18:52:15 +0100
Subject: [PATCH 10/12] wording: make clear, images are not recoded

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index df1edffe3..fb3ed3bb1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -292,7 +292,7 @@
     <!-- 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">Forward to …</string>
-    <string name="share_multiple_attachments">Do you want to sent %1$d files to the selected chat?</string>
+    <string name="share_multiple_attachments">Do you want to sent %1$d files to the selected chat?\n\nThe files are sent unmodified in their original size, eg. images and videos are not recoded.</string>
     <string name="share_abort">Sharing aborted due to missing permissions.</string>
 
 

From 5e73a679b6864c1bc6770e01e1acf463950e08f9 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 10 Mar 2019 16:29:53 +0100
Subject: [PATCH 11/12] fix crash when sharing link, closes #762

---
 src/org/thoughtcrime/securesms/ShareActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index 8267d6ac0..c350a734d 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -234,6 +234,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
   private boolean needsFilePermission(List<Uri> uris) {
     for(Uri uri : uris) {
+      // uri may be null, however, hasFileScheme() just returns false in this case
       if (hasFileScheme(uri)) {
         return true;
       }
@@ -486,6 +487,9 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   private boolean hasFileScheme(Uri uri) {
+    if (uri==null) {
+      return false;
+    }
     return "file".equals(uri.getScheme());
   }
 

From 2ace2a5bdf2ee93d91b9e4018ff8d8cbefd319cc Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 10 Mar 2019 17:14:19 +0100
Subject: [PATCH 12/12] fix handling mailto:-share-links, closes #764

---
 src/org/thoughtcrime/securesms/ShareActivity.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index 8267d6ac0..16585cbf2 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -216,11 +216,12 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
       streamExtras.add(getIntent().getParcelableExtra(Intent.EXTRA_STREAM));
     } else {
       streamExtras = getIntent().getParcelableArrayListExtra(Intent.EXTRA_STREAM);
+      if (streamExtras == null || streamExtras.isEmpty()) {
+        streamExtras = new ArrayList<>();
+        streamExtras.add(null); // force checking at least EXTRA_TEXT & Co.
+      }
     }
-    if (streamExtras == null || streamExtras.isEmpty()) {
-      progressWheel.setVisibility(View.GONE);
-      return;
-    }
+
     if (needsFilePermission(streamExtras)) {
       if (Permissions.hasAll(this, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)) {
         resolveUris(streamExtras);