From 10c4a105bb8c42874547613bd36b3714ff6e09b4 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Wed, 2 Apr 2025 18:14:49 +0200
Subject: [PATCH 01/19] feat: Move to addTransport / addTransportFromQr API
 (#3676), remove AEAP message (#3698)

---
 CHANGELOG.md                                  |   1 +
 .../java/com/b44t/messenger/DcContext.java    |   1 -
 .../b44t/messenger/rpc/EnteredLoginParam.java | 171 ++++++++++++++++++
 src/main/java/com/b44t/messenger/rpc/Rpc.java |  23 ++-
 .../securesms/InstantOnboardingActivity.java  |  26 +--
 .../securesms/RegistrationActivity.java       |  85 +++++----
 .../securesms/connect/DcHelper.java           |   1 -
 src/main/res/values/strings.xml               |   2 +-
 8 files changed, 256 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/com/b44t/messenger/rpc/EnteredLoginParam.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe0b2d7f7..cd1093f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * hide superfluous "Show Classic E-mails" advanced setting for chatmail
 * remove mostly non-telling transport addresses when referring to a contact;
   the contact's profile gives a much better overview
+* Disable AEAP to enable us to overhaul some things - there are big changes underway in this area, which will come in a few months
 
 ## v1.56.1
 2025-03
diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java
index 009d5d999..a428659af 100644
--- a/src/main/java/com/b44t/messenger/DcContext.java
+++ b/src/main/java/com/b44t/messenger/DcContext.java
@@ -118,7 +118,6 @@ public class DcContext {
     public native void         setStockTranslation  (int stockId, String translation);
     public native String       getBlobdir           ();
     public native String       getLastError         ();
-    public native void         configure            ();
     public native void         stopOngoingProcess   ();
     public native int          isConfigured         ();
     public native boolean      open                 (String passphrase);
diff --git a/src/main/java/com/b44t/messenger/rpc/EnteredLoginParam.java b/src/main/java/com/b44t/messenger/rpc/EnteredLoginParam.java
new file mode 100644
index 000000000..9c65486d5
--- /dev/null
+++ b/src/main/java/com/b44t/messenger/rpc/EnteredLoginParam.java
@@ -0,0 +1,171 @@
+package com.b44t.messenger.rpc;
+
+public class EnteredLoginParam {
+    // Email address.
+    private final String addr;
+
+    // Password.
+    private final String password;
+
+    // ============ IMAP settings ============
+
+    // Server hostname or IP address.
+    private final String imapServer;
+
+    // Server port.
+    private final int imapPort;
+
+    // Socket security.
+    private final SocketSecurity imapSecurity;
+
+    // Username.
+    private final String imapUser;
+
+    // ============ SMTP settings ============
+
+    // Server hostname or IP address.
+    private final String smtpServer;
+
+    // Server port.
+    private final int smtpPort;
+
+    // Socket security.
+    private final SocketSecurity smtpSecurity;
+
+    // Username.
+    private final String smtpUser;
+
+    // SMTP Password. Only needs to be specified if different than IMAP password.
+    private final String smtpPassword;
+
+    // TLS options: whether to allow invalid certificates and/or
+    // invalid hostnames
+    private final EnteredCertificateChecks certificateChecks;
+
+    // If true, login via OAUTH2 (not recommended anymore)
+    private final boolean oauth2;
+
+    public EnteredLoginParam(String addr,
+                             String password,
+                             String imapServer,
+                             int imapPort,
+                             SocketSecurity imapSecurity,
+                             String imapUser,
+                             String smtpServer,
+                             int smtpPort,
+                             SocketSecurity smtpSecurity,
+                             String smtpUser,
+                             String smtpPassword,
+                             EnteredCertificateChecks certificateChecks,
+                             boolean oauth2) {
+        this.addr = addr;
+        this.password = password;
+        this.imapServer = imapServer;
+        this.imapPort = imapPort;
+        this.imapSecurity = imapSecurity;
+        this.imapUser = imapUser;
+        this.smtpServer = smtpServer;
+        this.smtpPort = smtpPort;
+        this.smtpSecurity = smtpSecurity;
+        this.smtpUser = smtpUser;
+        this.smtpPassword = smtpPassword;
+        this.certificateChecks = certificateChecks;
+        this.oauth2 = oauth2;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getImapServer() {
+        return imapServer;
+    }
+
+    public int getImapPort() {
+        return imapPort;
+    }
+
+    public SocketSecurity getImapSecurity() {
+        return imapSecurity;
+    }
+
+    public String getImapUser() {
+        return imapUser;
+    }
+
+    public String getSmtpServer() {
+        return smtpServer;
+    }
+
+    public int getSmtpPort() {
+        return smtpPort;
+    }
+
+    public SocketSecurity getSmtpSecurity() {
+        return smtpSecurity;
+    }
+
+    public String getSmtpUser() {
+        return smtpUser;
+    }
+
+    public String getSmtpPassword() {
+        return smtpPassword;
+    }
+
+    public EnteredCertificateChecks getCertificateChecks() {
+        return certificateChecks;
+    }
+
+    public boolean isOauth2() {
+        return oauth2;
+    }
+
+    public enum EnteredCertificateChecks {
+        automatic, strict, acceptInvalidCertificates,
+    }
+
+    public static EnteredCertificateChecks certificateChecksFromInt(int position) {
+        switch (position) {
+            case 0:
+                return EnteredCertificateChecks.automatic;
+            case 1:
+                return EnteredCertificateChecks.strict;
+            case 2:
+                return EnteredCertificateChecks.acceptInvalidCertificates;
+        }
+        throw new IllegalArgumentException("Invalid certificate position: " + position);
+    }
+
+    public enum SocketSecurity {
+        // Unspecified socket security, select automatically.
+        automatic,
+
+        // TLS connection.
+        ssl,
+
+        // STARTTLS connection.
+        starttls,
+
+        // No TLS, plaintext connection.
+        plain,
+    }
+
+    public static SocketSecurity socketSecurityFromInt(int position) {
+        switch (position) {
+            case 0:
+                return SocketSecurity.automatic;
+            case 1:
+                return SocketSecurity.ssl;
+            case 2:
+                return SocketSecurity.starttls;
+            case 3:
+                return SocketSecurity.plain;
+        }
+        throw new IllegalArgumentException("Invalid socketSecurity position: " + position);
+    }
+}
diff --git a/src/main/java/com/b44t/messenger/rpc/Rpc.java b/src/main/java/com/b44t/messenger/rpc/Rpc.java
index 2b588cdc9..ba7e37746 100644
--- a/src/main/java/com/b44t/messenger/rpc/Rpc.java
+++ b/src/main/java/com/b44t/messenger/rpc/Rpc.java
@@ -1,5 +1,7 @@
 package com.b44t.messenger.rpc;
 
+import android.util.Log;
+
 import com.b44t.messenger.DcJsonrpcInstance;
 import com.b44t.messenger.util.concurrent.SettableFuture;
 import com.google.gson.Gson;
@@ -8,12 +10,16 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import org.thoughtcrime.securesms.qr.QrShowFragment;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 
 public class Rpc {
+    private final static String TAG = Rpc.class.getSimpleName();
+
     private final Map<Integer, SettableFuture<JsonElement>> requestFutures = new ConcurrentHashMap<>();
     private final DcJsonrpcInstance dcJsonrpcInstance;
     private int requestId = 0;
@@ -38,7 +44,14 @@ public class Rpc {
         }
 
         if (response.error != null) {
-            future.setException(new RpcException(response.error.toString()));
+            String message;
+            try {
+                message = response.error.getAsJsonObject().get("message").getAsString();
+            } catch (Exception e) {
+                Log.e(TAG, "Can't get response error message: " + e);
+                message = response.error.toString();
+            }
+            future.setException(new RpcException(message));
         } else if (response.result != null) {
             future.set(response.result);
         } else {
@@ -137,6 +150,14 @@ public class Rpc {
         return getResult("add_account").getAsInt();
     }
 
+    public void addTransportFromQr(int accountId, String qrCode) throws RpcException {
+        getResult("add_transport_from_qr", accountId, qrCode);
+    }
+
+    public void addTransport(int accountId, EnteredLoginParam param) throws RpcException {
+        getResult("add_transport", accountId, param);
+    }
+
     private static class Request {
         private final String jsonrpc = "2.0";
         public final String method;
diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index 276ba4a5d..5830eac8a 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -32,6 +32,8 @@ import androidx.loader.app.LoaderManager;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcLot;
+import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
@@ -408,14 +410,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
     if (eventId == DcContext.DC_EVENT_CONFIGURE_PROGRESS) {
       long progress = event.getData1Int();
-      if (progress==0/*error/aborted*/) {
-        progressError(event.getData2Str());
-      } else if (progress<1000/*progress in permille*/) {
-        progressUpdate((int)progress);
-      } else if (progress==1000/*done*/) {
-        DcHelper.getAccounts(this).startIo();
-        progressSuccess();
-      }
+      progressUpdate((int)progress);
     }
   }
 
@@ -499,14 +494,13 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
     DcHelper.getEventCenter(this).captureNextError();
 
     new Thread(() -> {
-      if (!dcContext.setConfigFromQr(qrCode)) {
-        Util.runOnMain(() -> {
-          progressError(dcContext.getLastError());
-        });
-        return;
-      }
-      DcHelper.getAccounts(this).stopIo();
-      dcContext.configure();
+      Rpc rpc = DcHelper.getRpc(this);
+        try {
+          rpc.addTransportFromQr(dcContext.getAccountId(), qrCode);
+          progressSuccess();
+        } catch (RpcException e) {
+          Util.runOnMain(() -> progressError(e.getMessage()));
+        }
     }).start();
   }
 
diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
index 8a01dc900..b83c2e9b4 100644
--- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -46,6 +46,9 @@ import androidx.constraintlayout.widget.Group;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcProvider;
+import com.b44t.messenger.rpc.EnteredLoginParam;
+import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
 import com.b44t.messenger.util.concurrent.ListenableFuture;
 import com.b44t.messenger.util.concurrent.SettableFuture;
 import com.google.android.material.textfield.TextInputEditText;
@@ -280,19 +283,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         int id = item.getItemId();
 
         if (id == R.id.do_register) {
-            String oldAddr = DcHelper.getSelfAddr(this);
-            String newAddr = emailInput.getText().toString();
-            if (!TextUtils.isEmpty(oldAddr)
-                    && !TextUtils.equals(oldAddr.toLowerCase(Locale.ROOT), newAddr.toLowerCase(Locale.ROOT))) {
-                // Tell the user about AEAP if they are about to change their address
-                new AlertDialog.Builder(this)
-                        .setMessage(getString(R.string.aeap_explanation, oldAddr, newAddr))
-                        .setNegativeButton(R.string.cancel, (d, w) -> {})
-                        .setPositiveButton(R.string.perm_continue, (d, w) -> do_register())
-                        .show();
-            } else {
-                do_register();
-            }
+            do_register();
             return true;
         } else if (id == android.R.id.home) {
             // handle close button click here
@@ -616,9 +607,42 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
 
         // calling configure() results in
         // receiving multiple DC_EVENT_CONFIGURE_PROGRESS events
-        DcHelper.getAccounts(this).stopIo();
         DcHelper.getEventCenter(this).captureNextError();
-        DcHelper.getContext(this).configure();
+
+        EnteredLoginParam param = new EnteredLoginParam(
+                getParam(R.id.email_text, true),
+                getParam(R.id.password_text, false),
+                getParam(R.id.imap_server_text, true),
+                Util.objectToInt(getParam(R.id.imap_port_text, true)),
+                EnteredLoginParam.socketSecurityFromInt(imapSecurity.getSelectedItemPosition()),
+                getParam(R.id.imap_login_text, false),
+                getParam(R.id.smtp_server_text, true),
+                Util.objectToInt(getParam(R.id.smtp_port_text, true)),
+                EnteredLoginParam.socketSecurityFromInt(smtpSecurity.getSelectedItemPosition()),
+                getParam(R.id.smtp_login_text, false),
+                getParam(R.id.smtp_password_text, false),
+                EnteredLoginParam.certificateChecksFromInt(certCheck.getSelectedItemPosition()),
+                authMethod.getSelectedItemPosition() == 1
+        );
+
+        new Thread(() -> {
+            Rpc rpc = DcHelper.getRpc(this);
+            try {
+                rpc.addTransport(DcHelper.getContext(this).getAccountId(), param);
+                DcHelper.getAccounts(this).startIo();
+                DcHelper.getEventCenter(this).endCaptureNextError();
+                progressDialog.dismiss();
+                Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class);
+                startActivity(conversationList);
+                finish();
+            } catch (RpcException e) {
+                Util.runOnMain(() -> {
+                    DcHelper.getEventCenter(this).endCaptureNextError();
+                    progressDialog.dismiss();
+                    WelcomeActivity.maybeShowConfigurationError(this, e.getMessage());
+                });
+            }
+        }).start();
     }
 
     private void setConfig(@IdRes int viewId, String configTarget, boolean doTrim) {
@@ -630,6 +654,15 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         DcHelper.getContext(this).setConfig(configTarget, value.isEmpty()? null : value);
     }
 
+    private String getParam(@IdRes int viewId, boolean doTrim) {
+        TextInputEditText view = findViewById(viewId);
+        String value = view.getText().toString();
+        if(doTrim) {
+            value = value.trim();
+        }
+        return value.isEmpty()? null : value;
+    }
+
     private void stopLoginProcess() {
         DcHelper.getContext(this).stopOngoingProcess();
     }
@@ -637,25 +670,9 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
     @Override
     public void handleEvent(@NonNull DcEvent event) {
         if (event.getId()==DcContext.DC_EVENT_CONFIGURE_PROGRESS) {
-            long progress = event.getData1Int();
-            if (progress==0/*error/aborted*/) {
-                DcHelper.getAccounts(this).startIo(); // start-io is also needed on errors to make previous config work in case of changes
-                DcHelper.getEventCenter(this).endCaptureNextError();
-                progressDialog.dismiss();
-                WelcomeActivity.maybeShowConfigurationError(this, event.getData2Str());
-            }
-            else if (progress<1000/*progress in permille*/) {
-                int percent = (int)progress / 10;
-                progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent));
-            }
-            else if (progress==1000/*done*/) {
-                DcHelper.getAccounts(this).startIo();
-                DcHelper.getEventCenter(this).endCaptureNextError();
-                progressDialog.dismiss();
-                Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class);
-                startActivity(conversationList);
-                finish();
-            }
+            long progress = event.getData1Int(); // progress in permille
+            int percent = (int)progress / 10;
+            progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent));
         }
     }
 }
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
index e1c3c2493..143df3b4c 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -237,7 +237,6 @@ public class DcHelper {
     dcContext.setStockTranslation(120, context.getString(R.string.qrshow_join_group_hint).replace("\"", ""));
     dcContext.setStockTranslation(121, context.getString(R.string.connectivity_not_connected));
     dcContext.setStockTranslation(122, context.getString(R.string.aeap_addr_changed));
-    dcContext.setStockTranslation(123, context.getString(R.string.aeap_explanation));
     dcContext.setStockTranslation(162, context.getString(R.string.multidevice_qr_subtitle));
     dcContext.setStockTranslation(163, context.getString(R.string.multidevice_transfer_done_devicemsg));
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a638379b2..95659b957 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -531,7 +531,7 @@
     <string name="send_message">Send Message</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s changed their address from %2$s to %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">You changed your email address from %1$s to %2$s.\n\nIf you now send a message to a verified group, contacts there will automatically replace the old with your new address.\n\nIt\'s highly advised to set up your old email provider to forward all emails to your new email address. Otherwise you might miss messages of contacts who did not get your new address yet.</string>
 
 

From 05d2d0964f4d1d5bec1127c1c779b57592851eee Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Thu, 3 Apr 2025 14:11:08 +0200
Subject: [PATCH 02/19] fix: Avoid NPE because of progressDialog (#3715)

---
 .../securesms/InstantOnboardingActivity.java       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index 5830eac8a..fe575a452 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -88,7 +88,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
   private AttachmentManager attachmentManager;
   private Bitmap avatarBmp;
-  private ProgressDialog progressDialog;
+  private @Nullable ProgressDialog progressDialog;
   private DcContext dcContext;
 
   @Override
@@ -416,17 +416,23 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
   private void progressUpdate(int progress) {
     int percent = progress / 10;
-    progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent));
+    if (progressDialog != null) {
+      progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent));
+    }
   }
 
   private void progressError(String data2) {
-    progressDialog.dismiss();
+    if (progressDialog != null) {
+      progressDialog.dismiss();
+    }
     WelcomeActivity.maybeShowConfigurationError(this, data2);
   }
 
   private void progressSuccess() {
     DcHelper.getEventCenter(this).endCaptureNextError();
-    progressDialog.dismiss();
+    if (progressDialog != null) {
+      progressDialog.dismiss();
+    }
 
     Intent intent = new Intent(getApplicationContext(), ConversationListActivity.class);
     intent.putExtra(ConversationListActivity.FROM_WELCOME, true);

From 9daa2d77cdb678587958113af6373d6d116499f6 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Thu, 3 Apr 2025 14:12:09 +0200
Subject: [PATCH 03/19]  refactor: Remove dead 'configure' code  (#3714)

* refactor: Remove dead configure code

* refactor: Remove unnecessary startIo() call; addTransport starts IO itself
---
 .../securesms/RegistrationActivity.java       | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
index b83c2e9b4..88533ca6c 100644
--- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -64,7 +64,6 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;
 
 import java.lang.ref.WeakReference;
-import java.util.Locale;
 import java.util.concurrent.ExecutionException;
 
 public class RegistrationActivity extends BaseActionBarActivity implements DcEventCenter.DcEventDelegate {
@@ -585,28 +584,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
     }
 
     private void setupConfig() {
-        setConfig(R.id.email_text, CONFIG_ADDRESS, true);
-        setConfig(R.id.password_text, CONFIG_MAIL_PASSWORD, false);
-        setConfig(R.id.imap_server_text, CONFIG_MAIL_SERVER, true);
-        setConfig(R.id.imap_port_text, CONFIG_MAIL_PORT, true);
-        setConfig(R.id.imap_login_text, CONFIG_MAIL_USER, false);
-        setConfig(R.id.smtp_server_text, CONFIG_SEND_SERVER, true);
-        setConfig(R.id.smtp_port_text, CONFIG_SEND_PORT, true);
-        setConfig(R.id.smtp_login_text, CONFIG_SEND_USER, false);
-        setConfig(R.id.smtp_password_text, CONFIG_SEND_PASSWORD, false);
-
-        DcHelper.getContext(this).setConfigInt(CONFIG_MAIL_SECURITY, imapSecurity.getSelectedItemPosition());
-        DcHelper.getContext(this).setConfigInt(CONFIG_SEND_SECURITY, smtpSecurity.getSelectedItemPosition());
-
-        int server_flags = 0;
-        if(authMethod.getSelectedItemPosition()==1)   server_flags |= DcContext.DC_LP_AUTH_OAUTH2;
-        DcHelper.getContext(this).setConfigInt(CONFIG_SERVER_FLAGS, server_flags);
-
-        DcHelper.getContext(this).setConfigInt("smtp_certificate_checks", certCheck.getSelectedItemPosition());
-        DcHelper.getContext(this).setConfigInt("imap_certificate_checks", certCheck.getSelectedItemPosition());
-
-        // calling configure() results in
-        // receiving multiple DC_EVENT_CONFIGURE_PROGRESS events
         DcHelper.getEventCenter(this).captureNextError();
 
         EnteredLoginParam param = new EnteredLoginParam(
@@ -629,7 +606,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             Rpc rpc = DcHelper.getRpc(this);
             try {
                 rpc.addTransport(DcHelper.getContext(this).getAccountId(), param);
-                DcHelper.getAccounts(this).startIo();
                 DcHelper.getEventCenter(this).endCaptureNextError();
                 progressDialog.dismiss();
                 Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class);
@@ -645,15 +621,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         }).start();
     }
 
-    private void setConfig(@IdRes int viewId, String configTarget, boolean doTrim) {
-        TextInputEditText view = findViewById(viewId);
-        String value = view.getText().toString();
-        if(doTrim) {
-            value = value.trim();
-        }
-        DcHelper.getContext(this).setConfig(configTarget, value.isEmpty()? null : value);
-    }
-
     private String getParam(@IdRes int viewId, boolean doTrim) {
         TextInputEditText view = findViewById(viewId);
         String value = view.getText().toString();

From be159407ff133d0e751c6ddbb1980fe4060e8de0 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Thu, 3 Apr 2025 14:35:00 +0200
Subject: [PATCH 04/19] feat: In ndk-make.sh, support custom CARGO_TARGET_DIR
 (#3716)

Running ndk-make.sh triggers a complete rust rebuild, because some compiler flags are changed. Then when you run a normal cargo command again (cargo check etc.), there is another rebuild. My solution is to locally change the target directory. This PR makes ndk-make.sh support such custom target directories.
---
 scripts/ndk-make.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/ndk-make.sh b/scripts/ndk-make.sh
index 7e345c481..7812b0fea 100755
--- a/scripts/ndk-make.sh
+++ b/scripts/ndk-make.sh
@@ -65,6 +65,10 @@ if test -z "$NDK_HOST_TAG"; then
     NDK_HOST_TAG="$KERNEL-$ARCH"
 fi
 
+if test -z "$CARGO_TARGET_DIR"; then
+    CARGO_TARGET_DIR=target
+fi
+
 unset RUSTFLAGS
 
 TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
@@ -120,7 +124,7 @@ if test -z $1 || test $1 = armeabi-v7a; then
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
     cargo build $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi
-    cp target/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
+    cp "$CARGO_TARGET_DIR/armv7-linux-androideabi/$RELEASE/libdeltachat.a" "$jnidir/armeabi-v7a"
 fi
 
 if test -z $1 || test $1 = arm64-v8a; then
@@ -129,7 +133,7 @@ if test -z $1 || test $1 = arm64-v8a; then
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
     cargo build $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi
-    cp target/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
+    cp "$CARGO_TARGET_DIR/aarch64-linux-android/$RELEASE/libdeltachat.a" "$jnidir/arm64-v8a"
 fi
 
 if test -z $1 || test $1 = x86; then
@@ -138,7 +142,7 @@ if test -z $1 || test $1 = x86; then
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
     cargo build $RELEASEFLAG --target i686-linux-android -p deltachat_ffi
-    cp target/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
+    cp "$CARGO_TARGET_DIR/i686-linux-android/$RELEASE/libdeltachat.a" "$jnidir/x86"
 fi
 
 if test -z $1 || test $1 = x86_64; then
@@ -147,7 +151,7 @@ if test -z $1 || test $1 = x86_64; then
     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
     cargo build $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi
-    cp target/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
+    cp "$CARGO_TARGET_DIR/x86_64-linux-android/$RELEASE/libdeltachat.a" "$jnidir/x86_64"
 fi
 
 rm -fr "$TMPLIB"

From bdebd98627c9b1770fdb10a1366721661f98ffc7 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 4 Apr 2025 20:00:07 +0200
Subject: [PATCH 05/19] update translations

---
 src/main/res/values-it/strings.xml     |  3 ++-
 src/main/res/values-nl/strings.xml     |  1 +
 src/main/res/values-pl/strings.xml     | 21 +++++++++++----------
 src/main/res/values-ru/strings.xml     | 11 ++++++-----
 src/main/res/values-sq/strings.xml     |  1 +
 src/main/res/values-tr/strings.xml     | 21 +++++++++++----------
 src/main/res/values-zh-rCN/strings.xml |  1 +
 7 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7a92398fa..15d1ee479 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -955,7 +955,7 @@
     <!-- this may be shown instead of the chat's input field, with buttons "More Info" and "OK" -->
     <string name="chat_protection_broken">%1$s ha inviato un messaggio da un altro dispositivo.</string>
     <string name="chat_protection_enabled_tap_to_learn_more">D\'ora in poi i messaggi saranno garantiti crittografati end-to-end.  Tocca per saperne di più.</string>
-    <string name="chat_protection_enabled_explanation">Ora è garantito che tutti i messaggi in questa chat siano crittografati end-to-end.\n\nLa crittografia end-to-end mantiene i messaggi privati ​​tra te e i tuoi partner di chat. Nemmeno il tuo provider email può leggerli.</string>
+    <string name="chat_protection_enabled_explanation">Ora è garantito che tutti i messaggi in questa chat siano cifrati end-to-end.\n\nLa crittografia end-to-end mantiene i messaggi privati ​​tra te e i tuoi partner di chat. Nemmeno il tuo provider email può leggerli.</string>
     <string name="chat_protection_broken_tap_to_learn_more">%1$s ha inviato un messaggio da un altro dispositivo. Tocca per saperne di più.</string>
     <string name="chat_protection_broken_explanation">La crittografia end-to-end non può più essere garantita, probabilmente perché %1$s ha reinstallato Delta Chat o inviato un messaggio da un altro dispositivo.\n\nPuoi incontrarlo di persona e scansionare nuovamente il suo Codice QR per ristabilire la crittografia end-to-end garantita.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s richiede la crittografia end-to-end che non è ancora configurata per questa chat. Tocca per saperne di più.</string>
@@ -1018,6 +1018,7 @@
     <string name="secure_join_wait">Creazione della crittografia end-to-end garantita, per piacere attendere...</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">Non è ancora possibile stabilire la crittografia end-to-end garantita, ma potresti già inviare un messaggio.</string>
+    <string name="secure_join_takes_longer">Sembra metterci molto, forse tu o il contatto non siete in linea.\n\nComunque, il processo continua in sottofondo, puoi fare qualcos\'altro...</string>
     <string name="contact_verified">%1$s verificato.</string>
     <string name="contact_not_verified">Impossibile stabilire una crittografia end-to-end garantita con %1$s.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 12ce638f9..a3be168eb 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1002,6 +1002,7 @@
     <string name="secure_join_wait">Bezig met opzetten van eind-tot-eindversleuteling…</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">Er kan nog geen eind-tot-eindversleuteling worden gegarandeerd, maar je kunt wel alvast een bericht sturen.</string>
+    <string name="secure_join_takes_longer">Het lijkt langer te duren dan verwacht - wellicht is een van jullie offline.\n\nHet proces wordt echter op de achtergrond voortgezet, dus je kunt gerust iets anders gaan doen…</string>
     <string name="contact_verified">%1$s is goedgekeurd.</string>
     <string name="contact_not_verified">Er kan geen eind-tot-eindversleuteling met %1$s worden gegarandeerd.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 7b4a432f5..b987f92fb 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -52,7 +52,7 @@
     <string name="mute">Wyłącz powiadomienia</string>
     <string name="muted">Wyciszony</string>
     <string name="ephemeral_messages">Znikające wiadomości</string>
-    <string name="ephemeral_messages_hint">Te ustawienia dotyczą wszystkich uczestników korzystających z Delta Chat. Mogą jednak kopiować, zapisywać i przekazywać wiadomości lub korzystać z innych klientów poczty e-mail.</string>
+    <string name="ephemeral_messages_hint">Dotyczy wszystkich członków tego czatu. Nadal mogą kopiować, zapisywać i przesyłać wiadomości.</string>
     <string name="save">Zapisz</string>
     <string name="chat">Czat</string>
     <string name="media">Multimedia</string>
@@ -676,7 +676,7 @@
     <string name="proxy_share_link">Udostępnij link</string>
 
     <string name="login_info_oauth2_title">Kontynuuj w uproszczonej konfiguracji?</string>
-    <string name="login_info_oauth2_text">Wprowadzony adres e-mail obsługuje uproszczoną konfigurację (OAuth2.0).\n\nW następnym kroku pozwól, aby Delta Chat działał jako czat z aplikacją e-mail.\n\nNie ma serwerów Delta Chat, Twoje dane pozostają na Twoim urządzeniu!</string>
+    <string name="login_info_oauth2_text">Wprowadzony adres e-mail obsługuje uproszczoną konfigurację (OAuth2.0).\n\nW następnym kroku zezwól Delta Chat na wysyłanie i odbieranie wiadomości.\n\nNie ma serwerów Delta Chat, Twoje dane pozostają na Twoim urządzeniu!</string>
     <string name="login_certificate_checks">Sprawdzanie certyfikatów</string>
     <string name="login_error_mail">Podaj ważny adres e-mail</string>
     <string name="login_error_server">Wprowadź poprawny adres serwera / IP</string>
@@ -686,7 +686,7 @@
     <string name="import_backup_ask">Delta Chat znalazł kopię zapasową w katalogu „%1$s.\n\nCzy chcesz zaimportować i używać wszystkich danych i ustawień z tej kopii zapasowej?</string>
     <string name="import_backup_no_backup_found">Nie znaleziono kopii zapasowej.\n\nSkopiuj kopię zapasową do katalogu „%1$s i spróbuj ponownie. Alternatywnie dotknij \"Uruchom komunikator\", aby rozpocząć normalny proces instalacji.</string>
     <!-- %1$s will be replaced by the failing address -->
-    <string name="login_error_cannot_login">Nie można się zalogować jako „%1$s. Sprawdź, czy adres e-mail i hasło są poprawne.</string>
+    <string name="login_error_cannot_login">Nie można się zalogować jako „%1$s. Sprawdź, czy adres i hasło są poprawne.</string>
     <!-- TLS certificate checks -->
     <string name="accept_invalid_certificates">Zaakceptuj nieprawidłowe certyfikaty</string>
     <string name="switch_account">Przełącz konto</string>
@@ -772,7 +772,7 @@
     <string name="pref_use_system_emoji">Użyj emoji systemowych</string>
     <string name="pref_use_system_emoji_explain">Wyłącza wbudowaną obsługę emoji Delta Chat</string>
     <string name="pref_show_system_contacts">Odczytaj systemową książkę adresową</string>
-    <string name="pref_show_system_contacts_explain">Zaproponuj tworzenie czatów z kontaktami z książki adresowej. Niektórzy dostawcy wymagają najpierw szyfrowania end-to-end.</string>
+    <string name="pref_show_system_contacts_explain">Zaproponuj tworzenie czatów z kontaktami z książki adresowej.</string>
     <!-- deprecated -->
     <string name="pref_app_access">Dostęp do aplikacji</string>
     <string name="pref_chats">Czaty</string>
@@ -873,9 +873,9 @@
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
     <string name="autodel_device_ask">Czy chcesz teraz usunąć %1$d wiadomości i wszystkie nowo pobrane wiadomości w przyszłości „%2$s”?\n\n• Obejmuje to wszystkie multimedia\n\n• Wiadomości zostaną usunięte niezależnie od tego, czy były widoczne, czy nie\n\n• „Zapisane wiadomości” zostaną pominięte podczas lokalnego usuwania</string>
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
-    <string name="autodel_server_ask">Czy chcesz teraz usunąć %1$d wiadomości i wszystkie nowo pobrane wiadomości w przyszłości „%2$s”?\n\n⚠️ Obejmuje to e-maile, multimedia i „Zapisane wiadomości” we wszystkich folderach na serwerze.\n\n⚠️ Nie używaj tej funkcji, jeśli chcesz zachować dane na serwerze\n\n⚠️ Nie używaj tej funkcji, jeśli używasz innych klientów poczty e-mail oprócz Delta Chat</string>
+    <string name="autodel_server_ask">Czy chcesz teraz usunąć %1$d wiadomości i wszystkie nowo pobrane wiadomości w przyszłości „%2$s”?\n\n⚠️ Obejmuje to e-maile, multimedia i „Zapisane wiadomości” we wszystkich folderach na serwerze.\n\n⚠️ Nie używaj tej funkcji, jeśli chcesz zachować dane na serwerze\n\n⚠️ Nie używaj tej funkcji, jeśli chcesz zachować dane na serwerze lub korzystasz także z klasycznych klientów poczty e-mail</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
-    <string name="autodel_server_enabled_hint">Obejmuje to e-maile, multimedia i „Zapisane wiadomości” we wszystkich folderach na serwerze. Nie używaj tej funkcji, jeśli chcesz zachować dane na serwerze lub jeśli używasz innych klientów poczty e-mail oprócz Delta Chat.</string>
+    <string name="autodel_server_enabled_hint">Obejmuje to e-maile, multimedia i „Zapisane wiadomości” we wszystkich folderach na serwerze. Nie używaj tej funkcji, jeśli chcesz zachować dane na serwerze lub jeśli używasz klasycznych klientów poczty e-mail</string>
     <string name="autodel_server_warn_multi_device_title">Włącz natychmiastowe usuwanie</string>
     <string name="autodel_server_warn_multi_device">Jeśli włączysz natychmiastowe usuwanie, nie będzie można używać wielu urządzeń w tym profilu.</string>
     <string name="autodel_confirm">Rozumiem, usuń te wszystkie wiadomości</string>
@@ -971,7 +971,7 @@
     <!-- this may be shown instead of the chat's input field, with buttons "More Info" and "OK" -->
     <string name="chat_protection_broken">Użytkownik %1$s wysłał wiadomość z innego urządzenia.</string>
     <string name="chat_protection_enabled_tap_to_learn_more">Od teraz gwarantujemy, że wiadomości będą szyfrowane metodą end-to-end. Dotknij, aby przeczytać więcej.</string>
-    <string name="chat_protection_enabled_explanation">Teraz gwarantujemy, że wszystkie wiadomości w tym czacie są szyfrowane metodą end-to-end.\n\nSzyfrowanie end-to-end zapewnia prywatność wiadomości między tobą a twoimi partnerami czatów. Nawet dostawca twojej poczty e-mail nie może ich odczytać.</string>
+    <string name="chat_protection_enabled_explanation">Teraz gwarantujemy, że wszystkie wiadomości w tym czacie są szyfrowane metodą end-to-end.\n\nSzyfrowanie end-to-end zapewnia prywatność wiadomości między tobą a twoimi partnerami czatów. Nawet serwery, dostawcy i pośrednicy nie są w stanie ich odczytać.</string>
     <string name="chat_protection_broken_tap_to_learn_more">Użytkownik %1$s wysłał wiadomość z innego urządzenia. Dotknij, aby przeczytać więcej.</string>
     <string name="chat_protection_broken_explanation">Nie można już zagwarantować szyfrowania end-to-end, prawdopodobnie z powodu ponownej instalacji Delta Chat przez %1$s lub wysłania wiadomości z innego urządzenia.\n\nMożesz spotkać się z tą osobą osobiście i ponownie zeskanować jej kod QR, aby przywrócić gwarantowane szyfrowanie end-to-end.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s wymaga szyfrowania end-to-end, które nie zostało jeszcze skonfigurowane dla tego czatu. Dotknij, aby dowiedzieć się więcej.</string>
@@ -997,7 +997,7 @@
     <string name="qrscan_failed">Nie udało się zdekodować kodu QR</string>
     <string name="qrscan_ask_join_group">Czy chcesz dołączyć do grupy „%1$s?</string>
     <string name="qrscan_fingerprint_mismatch">Zeskanowany odcisk palca nie pasuje do odcisku palca ostatnio widzianego u %1$s</string>
-    <string name="qrscan_no_addr_found">Ten kod QR zawiera odcisk palca, ale nie zawiera adresu e-mail.\n\nW celu weryfikacji poza zasadniczym pasmem należy najpierw nawiązać szyfrowane połączenie z odbiorcą.</string>
+    <string name="qrscan_no_addr_found">Ten kod QR zawiera odcisk palca, ale nie zawiera adresu.\n\nW celu weryfikacji poza zasadniczym pasmem należy najpierw nawiązać szyfrowane połączenie z odbiorcą.</string>
     <string name="qrscan_contains_text">Zeskanowany kod QR zawiera następujący tekst:\n\n%1$s</string>
     <string name="qrscan_contains_url">Zeskanowany kod QR zawiera następujący adres:\n\n%1$s</string>
     <string name="qrscan_fingerprint_label">Odciski palca</string>
@@ -1034,6 +1034,7 @@
     <string name="secure_join_wait">Ustanawiam gwarantowane szyfrowanie typu end-to-end, proszę czekać…</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">Nie można jeszcze ustanowić gwarantowanego szyfrowania typu end-to-end, ale być może już wysłałeś wiadomość.</string>
+    <string name="secure_join_takes_longer">Wydaje się, że to trwa dłużej, może kontakt lub ty jesteś offline.\n\nJednak proces trwa w tle, możesz zrobić coś innego…</string>
     <string name="contact_verified">Kontakt %1$s zweryfikowany.</string>
     <string name="contact_not_verified">Nie można zweryfikować szyfrowania typu end-to-end %1$s</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
@@ -1193,7 +1194,7 @@
     <string name="add_to_widget">Dodaj do widżetu</string>
     <!-- iOS permissions, copy from "deltachat-ios/Info.plist", which is used on missing translations in "deltachat-ios/LANG.lproj/InfoPlist.strings" -->
     <string name="InfoPlist_NSCameraUsageDescription">Delta Chat używa aparatu do robienia i wysyłania zdjęć i filmów oraz do skanowania kodów QR.</string>
-    <string name="InfoPlist_NSContactsUsageDescription">Zezwolenie na dostęp do książki adresowej pozwala czatować z kontaktami z urządzenia.</string>
+    <string name="InfoPlist_NSContactsUsageDescription">Delta Chat używa twoich kontaktów, aby pokazać listę adresów, do których możesz pisać. Delta Chat nie ma serwera, twoje kontakty nie są nigdzie wysyłane.</string>
     <string name="InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription">Delta Chat potrzebuje pozwolenia na lokalizację, aby udostępniać twoją lokalizację w okresie, w którym włączono udostępnianie lokalizacji.</string>
     <string name="InfoPlist_NSLocationWhenInUseUsageDescription">Delta Chat potrzebuje pozwolenia na lokalizację, aby udostępniać twoją lokalizację w okresie, w którym włączono udostępnianie lokalizacji.</string>
     <string name="InfoPlist_NSMicrophoneUsageDescription">Zezwolenie na dostęp do mikrofonu pozwala nagrywać dźwięk.</string>
@@ -1209,7 +1210,7 @@
     <string name="pref_reliable_service">Wymuś połączenie w tle</string>
     <string name="pref_reliable_service_explain">Powoduje trwałe powiadomienie</string>
 
-    <string name="pref_background_notifications_rationale">Aby utrzymać połączenie z serwerem e-mail i odbierać wiadomości w tle, zignoruj optymalizacje baterii w następnym kroku.\n\nDelta Chat zużywa niewiele zasobów i dba o to, aby nie wyczerpać baterii.</string>
+    <string name="pref_background_notifications_rationale">Aby utrzymać połączenie z i odbierać wiadomości w tle, zignoruj optymalizacje baterii w następnym kroku.\n\nDelta Chat zużywa niewiele zasobów i dba o to, aby nie wyczerpać baterii.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">Dotknij tutaj, aby odbierać wiadomości, podczas gdy Delta Chat działa w tle.</string>
     <string name="perm_enable_bg_already_done">Pozwolono już Delta Chat na odbieranie wiadomości w tle.\n\nJeśli wiadomości nadal nie docierają w tle, sprawdź też ustawienia systemu.</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 93b486f9d..ef722c3a5 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -52,7 +52,7 @@
     <string name="mute">Отключить уведомления</string>
     <string name="muted">Беззвучный</string>
     <string name="ephemeral_messages">Исчезающие сообщения</string>
-    <string name="ephemeral_messages_hint">Эти настройки применяются ко всем участникам, использующим Delta Chat. Тем не менее, они могут копировать, сохранять и пересылать сообщения или использовать другие почтовые клиенты.</string>
+    <string name="ephemeral_messages_hint">Применяется ко всем участникам этого чата, но они по-прежнему могут копировать, сохранять и пересылать сообщения.</string>
     <string name="save">Сохранить</string>
     <string name="chat">Чат</string>
     <string name="media">Медиафайлы</string>
@@ -676,7 +676,7 @@
     <string name="proxy_share_link">Поделиться ссылкой</string>
 
     <string name="login_info_oauth2_title">Продолжить упрощенную настройку?</string>
-    <string name="login_info_oauth2_text">Введённый адрес электронной почты поддерживает упрощённую настройку (OAuth 2.0).\n\nНа следующем шаге разрешите Delta Chat действовать как ваше приложение для чата по электронной почте.\n\nDelta Chat не собирает данные пользователей, все данные остаются на вашем устройстве.</string>
+    <string name="login_info_oauth2_text">Введённый адрес электронной почты поддерживает упрощённую настройку (OAuth 2.0).\n\nНа следующем шаге, разрешите Delta Chat отправлять и получать сообщения.\n\nDelta Chat не собирает ваши данные, они все остаются на вашем устройстве.</string>
     <string name="login_certificate_checks">Проверки сертификатов</string>
     <string name="login_error_mail">Введите правильный адрес электронной почты</string>
     <string name="login_error_server">Введите действительный адрес сервера / IP-адрес</string>
@@ -772,7 +772,7 @@
     <string name="pref_use_system_emoji">Использовать системные эмодзи</string>
     <string name="pref_use_system_emoji_explain">Отключить поддержку встроенных эмодзи Delta Chat</string>
     <string name="pref_show_system_contacts">Чтение системной адресной книги</string>
-    <string name="pref_show_system_contacts_explain">Предлагать создать чаты с контактами из адресной книги. Некоторые провайдеры требуют предварительной настройки сквозного шифрования.</string>
+    <string name="pref_show_system_contacts_explain">Предлагать создать чаты с контактами из адресной книги.</string>
     <!-- deprecated -->
     <string name="pref_app_access">Доступ приложения</string>
     <string name="pref_chats">Чаты</string>
@@ -873,9 +873,9 @@
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
     <string name="autodel_device_ask">Вы хотите удалить %1$d сообщений сейчас и все новые сообщения \"%2$s\" в дальнейшем?\n\n• Это относится ко всем медиафайлам\n\n• Сообщения будут удалены, независимо от того, были ли они просмотрены или нет.\n\n• \"Сохранённые сообщения\" будут пропущены при локальном удалении</string>
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
-    <string name="autodel_server_ask">Вы хотите удалить %1$d сообщений сейчас и все новые сообщения \"%2$s\" в дальнейшем?\n\n⚠️ Это относится ко всем электронным письмам, медиафайлам и \"Сохранённым сообщениям\" во всех папках на сервере.\n\n⚠️ Не используйте эту функцию, если вы хотите сохранить данные на сервере.\n\n⚠️ Не используйте эту функцию, если вы используете другие почтовые клиенты помимо Delta Chat</string>
+    <string name="autodel_server_ask">Вы хотите удалить %1$d сообщений сейчас и все новые сообщения \"%2$s\" в дальнейшем?\n\n⚠️ Это относится ко всем электронным письмам, медиафайлам и \"Сохранённым сообщениям\" во всех папках на сервере.\n\n⚠️ Не используйте эту функцию, если хотите сохранить данные на сервере или если вы используете классические клиенты электронной почты</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
-    <string name="autodel_server_enabled_hint">Это относится ко всем электронным письмам, медиафайлам и \"Сохранённым сообщениям\" во всех папках на сервере. Не используйте эту функцию, если вы хотите сохранить данные на сервере или если вы используете другие почтовые клиенты помимо Delta Chat</string>
+    <string name="autodel_server_enabled_hint">Это относится ко всем электронным письмам, медиафайлам и \"Сохранённым сообщениям\" во всех папках на сервере. Не используйте эту функцию, если хотите сохранить данные на сервере или если вы используете классические клиенты электронной почты</string>
     <string name="autodel_server_warn_multi_device_title">Включить удаление без запроса</string>
     <string name="autodel_server_warn_multi_device">Если включить удаление без запроса, вы не сможете использовать этот профиль на нескольких устройствах.</string>
     <string name="autodel_confirm">Я понимаю, удалить все эти сообщения</string>
@@ -1034,6 +1034,7 @@
     <string name="secure_join_wait">Устанавливается гарантированное сквозное шифрование, пожалуйста, подождите...</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">Не удалось установить гарантированное сквозное шифрование, но вы уже можете отправить сообщение.</string>
+    <string name="secure_join_takes_longer">Похоже, это длится дольше, чем ожидалось, возможно, из-за проблем с подключением или того, что один из вас сейчас офлайн.\n\nПри этом процесс будет продолжен в фоновом режиме, поэтому вы можете заняться другими делами…</string>
     <string name="contact_verified">%1$s подтверждён.</string>
     <string name="contact_not_verified">Невозможно установить гарантированное сквозное шифрование с %1$s.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index 2e98034fa..e1fab82d5 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -994,6 +994,7 @@
     <string name="secure_join_wait">Po vendoset fshehtëzim skaj-më-skaj i garantuar, ju lutemi, pritni…</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">S’u vendos dot fshehtëzim skaj-më-skaj i garantuar, por mundeni tashmë të dërgoni një mesazh.</string>
+    <string name="secure_join_takes_longer">Duket se po zgjat ca, mos ndoshta kontakti juaj, ose vetë ju s’jeni lidhur në internet.\n\nSidoqoftë, procesi vazhdon në prapaskenë, mund të merreni me diçka tjetër…</string>
     <string name="contact_verified">%1$s u verifikua.</string>
     <string name="contact_not_verified">S’vendoset dot fshehtëzim i garantuar skaj-më-skaj me %1$s.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 52e132ce5..5882e88b8 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -52,7 +52,7 @@
     <string name="mute">Sessize Al</string>
     <string name="muted">Sessize alındı</string>
     <string name="ephemeral_messages">Kaybolan İletiler</string>
-    <string name="ephemeral_messages_hint">Bu sohbetin tüm üyelerine onlar Delta Chat\'i kullanıyorsa uygulanır; onlar hâlâ iletileri kopyalayabilir, kaydedebilir ve iletebilir ya da diğer e-posta istemcilerini kullanabilir.</string>
+    <string name="ephemeral_messages_hint">Bu sohbetin tüm üyelerine uygulanır; onlar hâlâ iletileri kopyalayabilir, kaydedebilir ve iletebilir.</string>
     <string name="save">Kaydet</string>
     <string name="chat">Sohbet</string>
     <string name="media">Ortam</string>
@@ -644,7 +644,7 @@
     <string name="proxy_share_link">Bağlantı Paylaş</string>
 
     <string name="login_info_oauth2_title">Basitleştirilen ayarlamayla sürdürülsün mü?</string>
-    <string name="login_info_oauth2_text">Girilen e-posta adresi basitleştirilen bir ayarlamayı (OAuth 2.0) destekliyor.\n\nSonraki adımda, lütfen Delta Chat\'in E-posta Üzerinden Sohbet uygulamanız olarak davranmasına izin verin.\n\nDelta Chat kullanıcı verisi toplamaz; her şey aygıtınızda kalır.</string>
+    <string name="login_info_oauth2_text">Girilen e-posta adresi basitleştirilen bir ayarlamayı (OAuth 2.0) destekliyor.\n\nSonraki adımda, lütfen Delta Chat\'e iletiler gönderme ve alma izni verin.\n\nDelta Chat kullanıcı verisi toplamaz; her şey aygıtınızda kalır.</string>
     <string name="login_certificate_checks">Sertifika Denetimleri</string>
     <string name="login_error_mail">Lütfen geçerli bir e-posta adresi girin</string>
     <string name="login_error_server">Lütfen geçerli bir sunucu / IP adresi girin</string>
@@ -654,7 +654,7 @@
     <string name="import_backup_ask">“%1$s” üzerinde yedek bulundu.\n\nİçe aktarmak ve ondan gelen tüm verileri ve ayarları kullanmak istiyor musunuz?</string>
     <string name="import_backup_no_backup_found">Yedek bulunamadı.\n\nYedeği “%1$s” üzerine kopyalayın ve yeniden deneyin. Ek olarak, normal ayarlama işlemiyle sürdürmek için “İletileşmeye başla”ya basın.</string>
     <!-- %1$s will be replaced by the failing address -->
-    <string name="login_error_cannot_login">“%1$s” olarak giriş yapılamıyor. Lütfen e-posta adresinin ve parolanın doğru olup olmadığını denetleyin.</string>
+    <string name="login_error_cannot_login">“%1$s” olarak giriş yapılamıyor. Lütfen adresin ve parolanın doğru olup olmadığını denetleyin.</string>
     <!-- TLS certificate checks -->
     <string name="accept_invalid_certificates">Geçersiz sertifikaları kabul et</string>
     <string name="switch_account">Profili Değiştir</string>
@@ -740,7 +740,7 @@
     <string name="pref_use_system_emoji">Sistem Emojisini Kullan</string>
     <string name="pref_use_system_emoji_explain">Delta Chat\'in gömülü emoji desteğini kapat</string>
     <string name="pref_show_system_contacts">Sistem Adres Defterini Oku</string>
-    <string name="pref_show_system_contacts_explain">Adres defterinden gelen kişilerle sohbet oluşturmayı teklif edin. Bazı sağlayıcılara önce uçtan uca şifreleme ayarlaması gerekir.</string>
+    <string name="pref_show_system_contacts_explain">Adres defterinden gelen kişilerle sohbetler oluşturmayı teklif edin.</string>
     <!-- deprecated -->
     <string name="pref_app_access">Uygulama Erişimi</string>
     <string name="pref_chats">Sohbetler</string>
@@ -841,9 +841,9 @@
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
     <string name="autodel_device_ask">%1$d iletiyi şimdi ve gelecekte yeni getirilen tüm iletileri “%2$s” silmek istiyor musunuz?\n\n• Bu, tüm ortamları kapsar\n\n• İletiler görülse de görülmese de silinecek\n\n• “Kaydedilen İletiler” yerel silmeden atlanacak</string>
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
-    <string name="autodel_server_ask">%1$d iletiyi şimdi ve gelecekte yeni getirilen tüm iletileri “%2$s” silmek istiyor musunuz?\n\n⚠️ Bu, tüm sunucu klasörlerindeki e-postaları, ortamları ve “Kaydedilen İletiler”i kapsar\n\n⚠️ Verileri sunucuda tutmak istiyorsanız bu işlevi kullanmayın\n\n⚠️ Delta Chat\'ten başka diğer e-posta istemcilerini kullanıyorsanız bu işlevi kullanmayın</string>
+    <string name="autodel_server_ask">%1$d iletiyi şimdi ve gelecekte yeni getirilen tüm iletileri “%2$s” silmek istiyor musunuz?\n\n⚠️ Bu, tüm sunucu klasörlerindeki e-postaları, ortamları ve “Kaydedilen İletiler”i kapsar\n\n⚠️ Verileri sunucuda tutmak istiyorsanız ya da klasik e-posta istemcilerini de kullanıyorsanız bu işlevi kullanmayın</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
-    <string name="autodel_server_enabled_hint">Bu, tüm sunucu klasörlerindeki e-postaları, ortamları ve “Kaydedilen İletiler”i kapsar. Verileri sunucuda tutmak istiyorsanız ya da Delta Chat\'ten başka diğer e-posta istemcilerini kullanıyorsanız bu işlevi kullanmayın.</string>
+    <string name="autodel_server_enabled_hint">Bu, tüm sunucu klasörlerindeki e-postaları, ortamları ve “Kaydedilen İletiler”i kapsar. Verileri sunucuda tutmak istiyorsanız ya da klasik e-posta istemcilerini de kullanıyorsanız bu işlevi kullanmayın</string>
     <string name="autodel_server_warn_multi_device_title">Bir kerede silmeyi aç</string>
     <string name="autodel_server_warn_multi_device">Bir kerede silmeyi etkinleştirirseniz, bu profilde çoklu aygıtları kullanamazsınız.</string>
     <string name="autodel_confirm">Anladım, tüm bu iletileri sil</string>
@@ -939,7 +939,7 @@
     <!-- this may be shown instead of the chat's input field, with buttons "More Info" and "OK" -->
     <string name="chat_protection_broken">%1$s başka bir aygıttan bir ileti gönderdi.</string>
     <string name="chat_protection_enabled_tap_to_learn_more">Bundan böyle iletiler uçtan uca şifreleme güvencelidir. Daha fazlasını öğrenmek için dokunun.</string>
-    <string name="chat_protection_enabled_explanation">Artık bu sohbetteki tüm iletiler uçtan uca şifreleme güvencelidir.\n\nUçtan uca şifreleme, iletilerinizi sizin ve sohbet ortaklarınızın arasında özel tutar. E-posta sağlayıcınız bile onları okuyamaz.</string>
+    <string name="chat_protection_enabled_explanation">Artık bu sohbetteki tüm iletiler uçtan uca şifreleme güvencelidir.\n\nUçtan uca şifreleme, iletilerinizi sizin ve sohbet ortaklarınızın arasında özel tutar. Sunucular, sağlayıcılar ya da aktarıcılar bile onları okuyamaz.</string>
     <string name="chat_protection_broken_tap_to_learn_more">%1$s başka bir aygıttan bir ileti gönderdi. Daha fazlasını öğrenmek için dokunun.</string>
     <string name="chat_protection_broken_explanation">Uçtan uca şifreleme artık güvencelenemiyor; çünkü büyük olasılıkla %1$s Delta Chat\'i yeniden yükledi ya da başka bir aygıttan ileti gönderdi.\n\nOnlarla kişisel olarak tanışabilir ve güvenceli uçtan uca şifrelemeyi yeniden kurmak için onların QR kodunu yeniden tarayabilirsiniz.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s, bu sohbet için henüz ayarlanmayan uçtan uca şifrelemeyi gerektirir. Daha fazlasını öğrenmek için dokunun.</string>
@@ -965,7 +965,7 @@
     <string name="qrscan_failed">QR kodu çözülemedi</string>
     <string name="qrscan_ask_join_group">“%1$s” öbeğine katılmak istiyor musunuz?</string>
     <string name="qrscan_fingerprint_mismatch">Taranan parmak izi, %1$s için son görülenle eşleşmiyor.</string>
-    <string name="qrscan_no_addr_found">Bu QR kodu, bir parmak izi içeriyor; ama e-posta adresi yok.\n\nBir bant dışı doğrulama için lütfen önce alıcıya şifrelenen bir bağlantı kurun.</string>
+    <string name="qrscan_no_addr_found">Bu QR kodu bir parmak izi içeriyor ama adres yok.\n\nBir bant dışı doğrulama için lütfen önce alıcıya şifrelenen bir bağlantı kurun.</string>
     <string name="qrscan_contains_text">Taranan QR kodu metni:\n\n%1$s</string>
     <string name="qrscan_contains_url">Taranan QR kodu URL\'si:\n\n%1$s</string>
     <string name="qrscan_fingerprint_label">Parmak izi</string>
@@ -1002,6 +1002,7 @@
     <string name="secure_join_wait">Güvencelenen uçtan uca şifreleme kuruluyor, lütfen bekleyin…</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">Henüz güvencelenen uçtan uca şifreleme kurulamadı; ama zaten bir ileti gönderebilirsiniz.</string>
+    <string name="secure_join_takes_longer">Bu daha uzun sürüyor gibi görünüyor, belki kişi ya da siz çevrimdışısınız.\n\nAncak işlem arka planda sürüyor, başka bir şey yapabilirsiniz…</string>
     <string name="contact_verified">%1$s tanıtıldı.</string>
     <string name="contact_not_verified">%1$s ile güvencelenen uçtan uca şifreleme kurulamıyor.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
@@ -1161,7 +1162,7 @@
     <string name="add_to_widget">Widget\'a Ekle</string>
     <!-- iOS permissions, copy from "deltachat-ios/Info.plist", which is used on missing translations in "deltachat-ios/LANG.lproj/InfoPlist.strings" -->
     <string name="InfoPlist_NSCameraUsageDescription">Delta Chat, fotoğraflar ve videolar çekmek ve göndermek için ve QR kodlarını taramak için kameranızı kullanır.</string>
-    <string name="InfoPlist_NSContactsUsageDescription">Delta Chat, yazabileceğiniz e-posta adreslerinin bir listesini göstermek için kişilerinizi kullanır. Delta Chat sunucusu yoktur; kişileriniz herhangi bir yere gönderilmez.</string>
+    <string name="InfoPlist_NSContactsUsageDescription">Delta Chat, yazabileceğiniz adreslerin bir listesini göstermek için kişilerinizi kullanır. Delta Chat\'in sunucusu yoktur; kişileriniz herhangi bir yere gönderilmez.</string>
     <string name="InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription">Konum paylaşımını etkinleştirdiğiniz zaman aralığında konumunuzu paylaşmak için Delta Chat\'e izin gerekir.</string>
     <string name="InfoPlist_NSLocationWhenInUseUsageDescription">Konum paylaşımını etkinleştirdiğiniz zaman aralığında konumunuzu paylaşmak için Delta Chat\'e izin gerekir.</string>
     <string name="InfoPlist_NSMicrophoneUsageDescription">Delta Chat, sesli iletiler ve sesli videolar kaydetmek ve göndermek için mikrofonunuzu kullanır.</string>
@@ -1177,7 +1178,7 @@
     <string name="pref_reliable_service">Arka Plan Bağlantısını Zorla</string>
     <string name="pref_reliable_service_explain">Kalıcı bir bildirime neden olur</string>
 
-    <string name="pref_background_notifications_rationale">E-posta sunucunuza bağlantıyı sürdürmek ve arka planda iletileri almak için sonraki adımda pil iyileştirmelerini yok sayın.\n\nDelta Chat, az kaynak kullanır ve pilinizi boşaltmamaya özen gösterir.</string>
+    <string name="pref_background_notifications_rationale">Bağlantıyı sürdürmek ve arka planda iletileri almak için sonraki adımda pil iyileştirmelerini yok sayın.\n\nDelta Chat, az kaynak kullanır ve pilinizi boşaltmamaya özen gösterir.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">Delta Chat arka plandayken iletileri almak için buraya dokunun.</string>
     <string name="perm_enable_bg_already_done">Delta Chat\'in arka planda iletileri almasına zaten izin verdiniz.\n\nİletiler arka planda hâlâ gelmiyorsa, lütfen sistem ayarlarınızı da denetleyin.</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e8a54484d..77b6ca060 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -986,6 +986,7 @@
     <string name="secure_join_wait">正在建立有保证的端到端加密，请稍候…</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">无法建立有保证的端到端加密，但您可能已经发送了一条消息。</string>
+    <string name="secure_join_takes_longer">这可能需要较长时间，可能是对方或您已离线。\n\n但该过程仍在后台继续，您可以先做其他事情…</string>
     <string name="contact_verified">%1$s 已验证。</string>
     <string name="contact_not_verified">无法与 %1$s 建立有保证的端到端加密。</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->

From cfae361b8898803815a00a721327376ea1dfd516 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sun, 6 Apr 2025 16:03:55 +0200
Subject: [PATCH 06/19] catch IllegalArgumentException in
 InstantOnboardingActivity.progressError()

---
 .../thoughtcrime/securesms/InstantOnboardingActivity.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index fe575a452..bc264b516 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -423,7 +423,12 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
   private void progressError(String data2) {
     if (progressDialog != null) {
-      progressDialog.dismiss();
+      try {
+        progressDialog.dismiss();
+      } catch (IllegalArgumentException e) {
+        // see https://stackoverflow.com/a/5102572/4557005
+        Log.w(TAG, e);
+      }
     }
     WelcomeActivity.maybeShowConfigurationError(this, data2);
   }

From 765e2b490e39105364326041a5f64fb3a25d877d Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sun, 6 Apr 2025 16:12:49 +0200
Subject: [PATCH 07/19] avoid NPE in UriGlideRenderer

---
 .../org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java b/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
index f7cb04ed2..3aaf91267 100644
--- a/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
+++ b/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
@@ -303,7 +303,7 @@ final class UriGlideRenderer implements Renderer {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(imageUri.toString());
+    dest.writeString(imageUri!=null? imageUri.toString() : "");
     dest.writeInt(decryptable ? 1 : 0);
     dest.writeInt(maxWidth);
     dest.writeInt(maxHeight);

From 43941f9075fbbba350caec4ce3a5063b59d598cf Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sun, 6 Apr 2025 18:20:51 +0200
Subject: [PATCH 08/19] avoid SecurityException in
 NotificationsPreferenceFragment

---
 .../NotificationsPreferenceFragment.java           | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
index d0ddbe803..80c72386c 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
@@ -14,6 +14,7 @@ import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -31,6 +32,7 @@ import org.thoughtcrime.securesms.util.Prefs;
 
 public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragment {
 
+  private static final String TAG = NotificationsPreferenceFragment.class.getSimpleName();
   private static final int REQUEST_CODE_NOTIFICATION_SELECTED = 1;
 
   private CheckBoxPreference ignoreBattery;
@@ -159,7 +161,17 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
         Ringtone tone = RingtoneManager.getRingtone(getActivity(), value);
 
         if (tone != null) {
-          preference.setSummary(tone.getTitle(getActivity()));
+          String summary;
+          try {
+            summary = tone.getTitle(getActivity());
+          } catch (SecurityException e) {
+            // this could happen in some phones when user selects ringtone from
+            // external storage and later removes the read from external storage permission
+            // and later this method is called from initializeRingtoneSummary()
+            summary = "???";
+            Log.w(TAG, e);
+          }
+          preference.setSummary(summary);
         }
       }
 

From 2613be7216f9a3f6ac87a976007c28b009a5fe5b Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sun, 6 Apr 2025 18:34:39 +0200
Subject: [PATCH 09/19] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd1093f9e..658b9fa9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * remove mostly non-telling transport addresses when referring to a contact;
   the contact's profile gives a much better overview
 * Disable AEAP to enable us to overhaul some things - there are big changes underway in this area, which will come in a few months
+* avoid crash in Notifications preferences if ringtone title can't be read
 
 ## v1.56.1
 2025-03

From fca0c03087a8d83667e156b734f8b5bec7165133 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Mon, 7 Apr 2025 16:01:47 +0200
Subject: [PATCH 10/19] add a hint to 'Add Second Device' for ASM

---
 src/main/res/values/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 95659b957..6044e21e4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -861,11 +861,13 @@
 
     <!-- autocrypt -->
     <string name="autocrypt_send_asm_title">Send Autocrypt Setup Message</string>
-    <string name="autocrypt_send_asm_explain_before">An Autocrypt Setup Message securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nThe setup will be encrypted by a setup code displayed here and must be typed on the other device.</string>
+    <string name="autocrypt_send_asm_explain_before">An Autocrypt Setup Message securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nIf you use Delta Chat on the other device as well, use \"Settings / Add Second Device\" instead.</string>
     <string name="autocrypt_send_asm_button">Send Autocrypt Setup Message</string>
     <string name="autocrypt_send_asm_explain_after">Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be asked for a setup code. Enter the following digits:</string>
     <string name="autocrypt_prefer_e2ee">Prefer End-To-End Encryption</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt Setup Message</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device.</string>
 
 

From be709fb6dfa5060deb9638a185cb5c0ff8f9ecc7 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Mon, 7 Apr 2025 16:41:18 +0200
Subject: [PATCH 11/19] update translations

---
 src/main/res/values-az/strings.xml     |  2 ++
 src/main/res/values-bg/strings.xml     |  4 ++-
 src/main/res/values-ca/strings.xml     |  4 ++-
 src/main/res/values-ckb/strings.xml    |  1 +
 src/main/res/values-cs/strings.xml     |  4 ++-
 src/main/res/values-da/strings.xml     |  2 ++
 src/main/res/values-de/strings.xml     |  6 ++--
 src/main/res/values-el/strings.xml     |  4 ++-
 src/main/res/values-es/strings.xml     |  4 ++-
 src/main/res/values-eu/strings.xml     |  2 ++
 src/main/res/values-fa/strings.xml     |  4 ++-
 src/main/res/values-fi/strings.xml     |  4 ++-
 src/main/res/values-fr/strings.xml     |  4 ++-
 src/main/res/values-gl/strings.xml     |  4 ++-
 src/main/res/values-hu/strings.xml     |  5 ++-
 src/main/res/values-in/strings.xml     |  2 ++
 src/main/res/values-it/strings.xml     | 42 ++++++++++++++------------
 src/main/res/values-ja/strings.xml     |  1 +
 src/main/res/values-km/strings.xml     |  2 ++
 src/main/res/values-ko/strings.xml     |  4 ++-
 src/main/res/values-lt/strings.xml     |  2 ++
 src/main/res/values-nb/strings.xml     |  2 ++
 src/main/res/values-nl/strings.xml     |  4 ++-
 src/main/res/values-pl/strings.xml     |  4 ++-
 src/main/res/values-pt-rBR/strings.xml |  4 ++-
 src/main/res/values-pt/strings.xml     |  2 ++
 src/main/res/values-ro/strings.xml     |  2 +-
 src/main/res/values-ru/strings.xml     |  4 ++-
 src/main/res/values-sc/strings.xml     |  1 +
 src/main/res/values-sk/strings.xml     |  2 ++
 src/main/res/values-sq/strings.xml     |  4 ++-
 src/main/res/values-sr/strings.xml     |  4 ++-
 src/main/res/values-sv/strings.xml     |  4 ++-
 src/main/res/values-tr/strings.xml     |  4 ++-
 src/main/res/values-uk/strings.xml     |  4 ++-
 src/main/res/values-vi/strings.xml     |  4 ++-
 src/main/res/values-zh-rCN/strings.xml |  4 ++-
 src/main/res/values-zh-rTW/strings.xml |  4 ++-
 38 files changed, 118 insertions(+), 46 deletions(-)

diff --git a/src/main/res/values-az/strings.xml b/src/main/res/values-az/strings.xml
index 0e98c239a..c668cd3a9 100644
--- a/src/main/res/values-az/strings.xml
+++ b/src/main/res/values-az/strings.xml
@@ -361,7 +361,9 @@
     <string name="autocrypt_send_asm_button">Autocrypt Setup Message-ı göndər</string>
     <string name="autocrypt_send_asm_explain_after">Sizin açarınız sizə göndərildi. Başqa bir cihaza keçin və mesajın ayarını açın. Siz quraşdırma kodu daxil etməlisiniz. Orada aşağıdakı rəqəmləri daxil edin. Bitirən zaman, başqa bir cihazda Autocrypt istifadə üçün hazır olacaq.</string>
     <string name="autocrypt_prefer_e2ee">Ucdan-uca şifrələmə üstünlük təşkil edir</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt mesaj ayarı</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Bu, müvəqqəti quraşdırma üçün müştərilər arasında köçürmək üçün istifadə edilən Autocrypt Setup Mesajıdır. \n\nSenfikanızı çözmək və istifadə etmək üçün autocrypt uyğun müştəri içərisində mesajı açın və yaradan cihazda göstərilən quraşdırma kodunu daxil edin.</string>
 
 
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index a4417a303..492cee1ba 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -473,7 +473,7 @@
     <string name="send_message">Изпращане на съобщение</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s промени своя адрес от %2$s на %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Променихте своя email адрес от %1$s на %2$s.\n\nАко от тук нататък изпратите съобщение до проверена група, контактите в нея автоматично ще заменят стария с новия Ви адрес.\n\nСилно се препоръчва да извършите настройка в предишния си доставчик на електронна поща така, че всички email съобщения да се препращат към новия Ви email адрес. В противен случай е възможно да не получавате съобщения от контакти, които все още не са получили новия Ви адрес.</string>
 
 
@@ -778,7 +778,9 @@
     <string name="autocrypt_send_asm_button">Изпращане на съобщението за настройка на Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Изпратихте Вашата настройка до себе си. Отворете съобщението за настройка в другото устройство. Би трябвало да Ви бъде поискан код за настройка. Въведете следните цифри:</string>
     <string name="autocrypt_prefer_e2ee">Да се предпочита криптиране \"от край до край\"</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Съобщение за настройка на Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Това е съобщението за настройка на Autocrypt, чрез което се прехвърля Вашата настройка за криптиране \"от край до край\" между различни клиенти.\n\nЗа да декриптирате и използвате Вашата настройка, отворете съобщението в клиент, съвместим с Autocrypt, и въведете кода за настройка, представен на генериращото устройство.</string>
 
 
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 610024e97..51e0cf094 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -531,7 +531,7 @@
     <string name="send_message">Envia el missatge</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s ha canviat la seva adreça de %2$s a %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Heu canviat la vostra adreça de correu electrònic de %1$s a %2$s.\n\nSi ara envieu un missatge a un grup verificat, els contactes del grup canviaran de forma automàtica l\'adreça antiga per la nova.\n\nUs recomanem que configureu el compte antic a fi que us reenvïi els missatges a l\'adreça nova. Si no ho feu, podríeu perdre missatges de contactes que encara no hagin actualitzat la vostra adreça.</string>
 
 
@@ -865,7 +865,9 @@
     <string name="autocrypt_send_asm_button">Envia el missatge de configuració Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Se us ha enviat la vostra configuració. Canvieu a l\'altre dispositiu i obriu el missatge de configuració. Se us demanarà un codi de configuració. Introduïu els dígits següents a l\'indicador.\n\nUn cop fet, l\'altre dispositiu estarà llest per utilitzar Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Prefereix l\'encriptació d\'extrem a extrem</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Missatge de configuració Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Aquest és el missatge de configuració Autocrypt que s’usa per a transferir la vostra configuració d\'extrem a extrem entre dispositius.\n\nPer a desxifrar i usar aquesta configuració, obriu el missatge en un dispositiu compatible amb Autocript i introduïu el codi de configuració que apareix al dispositiu primari.</string>
 
 
diff --git a/src/main/res/values-ckb/strings.xml b/src/main/res/values-ckb/strings.xml
index 290d1b937..c67566dea 100644
--- a/src/main/res/values-ckb/strings.xml
+++ b/src/main/res/values-ckb/strings.xml
@@ -471,6 +471,7 @@
     <!-- autocrypt -->
     <string name="autocrypt_send_asm_title">هەناردنی پەیامی ڕێکخستنی ئۆتۆکریپت</string>
     <string name="autocrypt_prefer_e2ee">هەڵبژاردنی شفرەکردنی ئەمسەر-ئەوسەر</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">پەیامی ڕێکخستنی ئۆتۆکریپت</string>
     <string name="systemmsg_unknown_sender_for_chat">پەیامنێری ئەم وتووێژە نەناسراوە. بۆ وردەکاری زۆرتر سەیری \'زانیارییەکان\' بکە.</string>
     <string name="systemmsg_subject_for_new_contact">پەیام لەلایەن %1$s</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 6f23c2671..72ce998ec 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -563,7 +563,7 @@
     <string name="send_message">Odeslat zprávu</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">Uživatel %1$s změnil svou adresu z %2$s na %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Změnili jste svou e-mailovou adresu z %1$s na %2$s.\n\nPokud nyní pošlete zprávu ověřené skupině, všem kontaktům v ní se vaše adresa aktualizuje na novou.\n\nJe důrazně doporučeno, abyste u svého starého poskytovatele nastavili přesměrování všech e-mailů na novou adresu, jinak byste mohli přijít o zprávy od kontaktů, které vaši novou adresu dosud nedostaly. </string>
 
 
@@ -897,7 +897,9 @@
     <string name="autocrypt_send_asm_button">Odeslat nastavení Autocryptu</string>
     <string name="autocrypt_send_asm_explain_after">Vaše nastavení bylo odesláno. Vezměte si zařízení, kam si přejete nastavení přenést, a zprávu na něm otevřete. Mělo by se objevit pole pro zadání kódu. Do něj vložte následující číslice:</string>
     <string name="autocrypt_prefer_e2ee">Upřednostňovat koncové šifrování</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Zpráva s nastavením Autocryptu</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Tato zpráva obsahuje nastavení Autocryptu. S její pomocí lze přenést nastavení koncového šifrování mezi klienty.\n\nK dešifrování a použití nastavení otevřete klient podporující Autocrypt a zadejte do něj kód zobrazený na zařízení, které zprávu vygenerovalo.</string>
 
 
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 97da91f36..3a0ae1d32 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -549,7 +549,9 @@
     <string name="autocrypt_send_asm_button">Send autocrypt-opsætningsbesked</string>
     <string name="autocrypt_send_asm_explain_after">Opsætning er sendt til dig selv. Skift til den anden enhed og åben opsætning beskeden. Der skulle blive spurgt til opsætning kode. Indtast følgende cifre i prompt.\n\nNår færdig vil den anden enhed være klar til at bruge Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Foretræk end-to-end kryptering</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt opsætningsbesked</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Dette er Autocrypt opsætning besked brugt til at overføre ende-til-ende opsætning mellem klienter.\n\nFor at af kryptere og bruge opsætning åben beskeden i en Autocrypt kompatibel klient og indtast opsæt koden vist på den genererende enhed.</string>
 
 
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e014f9a32..2f291f056 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -531,7 +531,7 @@
     <string name="send_message">Nachricht senden</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s hat die E-Mail-Adresse von %2$s nach %3$s geändert</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Sie haben Ihre E-Mail-Adresse von %1$s auf %2$s geändert.\n\nWenn Sie jetzt eine Nachricht an eine verifizierte Gruppe senden, wird dort automatisch die alte durch die neue Adresse ersetzt.\n\nEs wird dringend empfohlen, Ihren alten E-Mail-Anbieter so einzurichten, dass er alle E-Mails an Ihre neue E-Mail-Adresse weiterleitet. Andernfalls könnten Sie Nachrichten von Kontakten verpassen, die Ihre neue E-Mail-Adresse noch nicht erhalten haben.</string>
 
 
@@ -861,11 +861,13 @@
 
     <!-- autocrypt -->
     <string name="autocrypt_send_asm_title">Autocrypt-Setup-Nachricht senden</string>
-    <string name="autocrypt_send_asm_explain_before">Eine \"Autocrypt-Setup-Nachricht\" überträgt das Ende-zu-Ende-Setup sicher auf ein anderes Autocrypt-kompatibles Gerät.\n\nDas Setup wird mit einem Setup-Code geschützt; dieser wird hier angezeigt und muss auf dem anderen Gerät eingetippt werden.</string>
+    <string name="autocrypt_send_asm_explain_before">Eine \"Autocrypt-Setup-Nachricht\" überträgt das Ende-zu-Ende-Setup sicher auf ein anderes Autocrypt-kompatibles Gerät.\n\nWenn Sie Delta Chat auf dem anderen Gerät verwenden, verwenden Sie stattdessen „Einstellungen / Zweitgerät hinzufügen“.</string>
     <string name="autocrypt_send_asm_button">Autocrypt-Setup-Nachricht senden</string>
     <string name="autocrypt_send_asm_explain_after">Das Setup wurde an Sie geschickt. Nun zum anderen Gerät wechseln und die Setup-Nachricht öffnen. Den Anweisungen folgen und den folgenden Setup-Code eingeben:</string>
     <string name="autocrypt_prefer_e2ee">Ende-zu-Ende-Verschlüsselung bevorzugen</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt-Setup-Nachricht</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Dies ist die Autocrypt-Setup-Nachricht, um das Ende-zu-Ende-Setup von einem Gerät auf das andere zu übertragen.\n\nUm das Setup zu entschlüsseln und zu verwenden, öffnen Sie diese Nachricht in einer Autocrypt-kompatiblen App und geben Sie den Setup-Code ein, der auf dem anderen Gerät angezeigt wurde.</string>
 
 
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index e5c014fba..7835b507d 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -430,7 +430,7 @@
     <string name="send_message">Αποστολή μηνύματος</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s άλλαξαν την διεύθυνσή τους από %2$s σε %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Αλλάξατε την διεύθυνσή σας από %1$s σε %2$s.\n\nΤώρα, εάν στείλετε ένα μήνυμα σε μια επαληθευμένη ομάδα, οι επαφές εκεί θα αντικαταστήσουν αυτόματα την παλιά με τη νέα σας διεύθυνση.\n\nΣυνιστάται ιδιαίτερα να ρυθμίσετε τον παλιό σας πάροχο email ώστε να προωθεί όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου στη νέα σας διεύθυνση ηλεκτρονικού ταχυδρομείου. Διαφορετικά, ενδέχεται να χάσετε μηνύματα επαφών που δεν έχουν λάβει ακόμη τη νέα σας διεύθυνση.</string>
 
 
@@ -663,7 +663,9 @@
     <string name="autocrypt_send_asm_button">Αποστολή μηνύματος ρύθμισης αυτόματης κρυπτογράφησης</string>
     <string name="autocrypt_send_asm_explain_after">Η ρύθμισή σας έχει σταλεί στον εαυτό σας. Μεταβείτε στην άλλη συσκευή και ανοίξτε το μήνυμα ρύθμισης. Θα πρέπει να σας ζητηθεί κωδικός ρύθμισης. Εισαγάγετε τα ακόλουθα ψηφία:</string>
     <string name="autocrypt_prefer_e2ee">Προτιμήστε την κρυπτογράφηση από άκρο σε άκρο</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Μήνυμα ρύθμισης αυτόματης κρυπτογράφησης</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Αυτό είναι το μήνυμα ρύθμισης αυτόματης κρυπτογράφησης που χρησιμοποιείται για τη μεταφορά της ρύθμισής σας από άκρο σε άκρο μεταξύ πελατών.\n\nΓια να αποκρυπτογραφήσετε και να χρησιμοποιήσετε τη ρύθμισή σας, ανοίξτε το μήνυμα σε ένα πρόγραμμα-πελάτη συμβατό με Αυτόματη κρυπτογράφηση και εισαγάγετε τον κωδικό ρύθμισης που παρουσιάζεται στη συσκευή δημιουργίας.</string>
 
 
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index bce4fe5a1..0de29544c 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -547,7 +547,7 @@
     <string name="send_message">Enviar mensaje</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s cambió su dirección de %2$s a %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Has cambiado tu dirección de correo electrónico de %1$s a %2$s.\n\nSi ahora envías un mensaje a un grupo verificado, los contactos de éste sustituirán automáticamente la antigua por tu nueva dirección.\n\nEs muy recomendable que configures tu antiguo proveedor de correo electrónico para que reenvíe todos los mensajes a tu nueva dirección. De lo contrario, podrías perderte los mensajes de los contactos que aún no han recibido tu nueva dirección.</string>
 
 
@@ -881,7 +881,9 @@
     <string name="autocrypt_send_asm_button">Enviar Mensaje de Configuración de Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Se le ha enviado su configuración. Cambie al otro dispositivo y abra el mensaje de configuración. Se le debe solicitar un código de configuración. Escriba los siguientes dígitos:.\n\nUna vez que haya terminado, su otro dispositivo estará listo para usar Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Preferir el cifrado de extremo a extremo</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Mensaje de Configuración de Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Este es el Mensaje de Configuración de Autocrypt utilizado para transferir su configuración de extremo a extremo entre clientes.\n\nPara descifrar y usar su configuración, abra el mensaje en un cliente compatible con Autocrypt e ingrese el código de configuración presentado en el dispositivo que lo generó.</string>
 
 
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index c889e572d..3a215434f 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -408,7 +408,9 @@
     <string name="autocrypt_send_asm_button">Bidali Autocrypt ezarpen mezua</string>
     <string name="autocrypt_send_asm_explain_after">Zure ezarpena zuri bidali zaizu. Aldatu beste gailura eta ireki ezarpen mezua. Ezarpen kode bat eskatuko zaizu, Idatzi honako zenbaki hauek han.\n\nBehin bukatuta, zure beste gailua Autocrypt erabiltzeko prest egongo da.</string>
     <string name="autocrypt_prefer_e2ee">Hobetsi muturretik muturrerako zifratzea</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt ezarpen mezua</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Hau Autocrypt ezarpen mezua da, zure muturretik muturrerako ezarpena bezeroen artean pasatzeko erabilia.\n\n Zure ezarpena deszifratu eta erabiltzeko, ireki mezua Autocrypt onartzen duen bezero batean eta sartu gailu sortzailean agertutako ezarpen kodea.</string>
 
 
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 2de0f793c..1cdb5bb5c 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -522,7 +522,7 @@ https://meet.jit.si/$ROOM
     <string name="send_message">ارسال پیام</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">مخاطب %1$s نشانی خود را از %2$s به %3$s تغییر داده است.  </string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">شما نشانی رایانامهٔ خود را از %1$s به %2$s تغییر دادید.\n\nاگر به یک گروه تأیید شده پیام بفرستید، مخاطبان آن به صورت خودکار نشانی جدید را جایگزین نشانی پیشین می‌کنند.\n\nبه شدت توصیه می‌شود که نشانی رایانامهٔ پیشین خود را به نحوی تنظیم کنید که تمام رایانامه‌ها را به نشانی جدید شما هدایت کند؛ در غیر این صورت ممکن است پیام‌های مخاطبانی که از تغییر نشانی شما مطلع نشده‌اند را از دست بدهید. </string>
 
 
@@ -846,7 +846,9 @@ https://meet.jit.si/$ROOM
     <string name="autocrypt_send_asm_button">ارسال پیام برپاسازی اتوکریپت</string>
     <string name="autocrypt_send_asm_explain_after">تنظیم‌های شما برای خودتان ارسال شدند. پیام تنظیم‌ها را در دستگاه دیگر باز کنید. یک کد نصب از شما خواسته می‌شود. این ارقام را وارد کنید</string>
     <string name="autocrypt_prefer_e2ee">ترجیح رمزگذاری گیرنده به گیرنده</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">پیام برپاسازی اتوکریپت</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">این پیام برپاسازی اتوکریپت است و تنظیم‌های مربوط به رمزگذاری سرتاسر شما را بین دستگاه‌ها جابه‌جا می‌کند.\n\n برای رمزگشایی و استفاده از آن، پیام را در یک سامانه که با اتوکریپت همخوانی دارد باز کنید و کد برپاسازی که در دستگاه تولیدکنندهٔ پیام، به شما داده می‌شود را وارد نمایید. </string>
 
 
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index f272425dc..bf7569535 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -473,7 +473,7 @@
     <string name="send_message">Lähetä viesti</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s vaihtui osoitteesta %2$s osoitteeksi %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Vaihdoit sähköpostiosoitteesi osoitteesta %1$s osoitteeksi %2$s.\n\nJos lähetät viestin vahvistettuun ryhmään, ryhmän jäsenet saavat automaattisesti uuden osoitteesi.\n\nOn suositeltavaa asettaa vanha tilisi välittämään kaikki viestit uuteen osoitteeseesi. Muuten et välttämättä saa viestejä niiltä yhteystiedoiltasi, joilla ei ole uutta osoitettasi.</string>
 
 
@@ -778,7 +778,9 @@
     <string name="autocrypt_send_asm_button">Lähetä Autocrypt -käyttöönottoviesti</string>
     <string name="autocrypt_send_asm_explain_after">Käyttöönottoviesti on lähetetty sinulle itsellesi. Avaa viesti toisella laitteella. Sinulta pyydetään käyttöönottokoodia. Anna seuraavat numerot:</string>
     <string name="autocrypt_prefer_e2ee">Suosi päästä-päähän -salausta</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt -käyttöönottoviesti</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Tätä Autocrypt -käyttöönottoviestiä käytetään päästä-päähän -salauksen asetusten siirtämiseksi toiselle laitteelle.\n\nSaat purettua salauksia ja käytettyä määrittelyä avaamalla viestin Autocrypt -yhteensopivassa päätesovelluksessa, generoivalla laitteella näytetyn pin koodin syöttämisen jälkeen.</string>
 
 
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e54f713fe..03d30a940 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -536,7 +536,7 @@
     <string name="send_message">Envoyer message</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s a changé son adresse de %2$s à %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Vous avez changé votre adresse courriel de %1$s à %2$s.\n\nSi vous envoyez maintenant un message à un groupe connu, votre ancienne adresse sera automatiquement remplacée par la nouvelle chez tous vos contacts dans ce groupe.\n\nIl est fortement conseillé de configurer votre ancien fournisseur de courriel de sorte à transférer tous vos courriels à votre nouvelle adresse. Sinon, vous risquez de manquer des messages de contacts qui n\'ont pas encore reçu votre nouvelle adresse.</string>
 
 
@@ -862,7 +862,9 @@
     <string name="autocrypt_send_asm_button">Envoyer le message de configuration Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Votre configuration vous a été envoyée. Passez à l\'autre appareil et ouvrez le message de configuration. Un code de configuration devrait vous être demandé. Tapez les chiffres suivants :</string>
     <string name="autocrypt_prefer_e2ee">Préférez le chiffrement de bout en bout</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Message de configuration Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Ceci est le message de configuration Autocrypt utilisé pour transférer votre configuration de bout en bout entre clients. Pour déchiffrer et utiliser votre configuration, ouvrez le message dans un client compatible Autocrypt et entrez le code de configuration présenté sur le périphérique de génération.</string>
 
 
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index eab5eefe5..0b6172aa0 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -526,7 +526,7 @@
     <string name="send_message">Enviar mensaxe</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s cambiou o seu enderezo de %2$s a %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Cambiaches o teu enderezo de email de %1$s a %2$s.\n\nSe envías unha mensaxe a un grupo verificado os contactos cambiarán automáticamente o enderezo antigo polo novo.\n\nÉ moi recomendable que configures o email antigo para que che reenvíe todo o correo ao novo enderezo. De non facelo poderías perder mensaxes de contactos que aínda non coñezan o teu novo enderezo.</string>
 
 
@@ -821,7 +821,9 @@
     <string name="autocrypt_send_asm_button">Enviar Mensaxe de Configuración Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Os axustes envíanse a ti mesma. Vaite ao outro dispositivo e abre a mensaxe de configuración. Debería solicitarche un código. Introduce os seguintes díxitos:</string>
     <string name="autocrypt_prefer_e2ee">Preferir cifrado extremo-a-extremo</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Mensaxe de Configuración Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Esta é a Mensaxe de Configuración Autocrypt utilizado para transferir os teus axustes de cifrado de extremo-a-extremo entre clientes.\n\nPara descifrar e utilizar os axustes abre a mensaxe nun cliente compatible con Autocrypt e introduce o código mostrado no dispositivo de orixe.</string>
 
 
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 0e86c50be..bb752230e 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -531,7 +531,7 @@
     <string name="send_message">Üzenet küldése</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s megváltoztatta a címét következőről: %2$s, erre: %3$s </string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Ön megváltoztatta a saját e-mail-címét erről: %1$s erre: %2$s.\n\nHa most üzenetet küld egy hitelesített csoportba, az ottani partnerei automatikusan lecserélik az Ön régi címét az új címére.\n\nEzért nagyon ajánlott beállítani, hogy a régi e-mail-szolgáltatója továbbítsa-e az összes e-mailt az e-mail-címére. Ellenkező esetben lemaradhat azoknak a partnereinek az üzeneteiről, akik még nem kapták meg az új címét.</string>
 
 
@@ -865,7 +865,9 @@
     <string name="autocrypt_send_asm_button">Autocryptbeállító-üzenet küldése</string>
     <string name="autocrypt_send_asm_explain_after">A beállításokat elküldtük önnek. Váltson a másik eszközre, és nyissa meg a beállítási üzenetet. Meg kell adnia a beállítási kódot. Írja be a következő számjegyeket:</string>
     <string name="autocrypt_prefer_e2ee">Végpontok közötti titkosítás előnyben részesítése</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocryptbeállító-üzenet</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Ez az autocryptbeállító-üzenet a végpontok közötti beállítások kliensek közötti átvitelére szolgál.\n\nA beállítások visszafejtéséhez és használatához nyissa meg az üzenetet egy autocrypt-kompatibilis kliensben, és írja be az előállító eszközön megjelenő beállítási kódot.</string>
 
 
@@ -1002,6 +1004,7 @@
     <string name="secure_join_wait">Garantált végpontok közötti titkosítás létrehozása, várjon…</string>
     <!-- deprecated -->
     <string name="secure_join_wait_timeout">Még nem sikerült a garantált végpontok közötti titkosítást létrehozni, de már küldhet üzenetet.</string>
+    <string name="secure_join_takes_longer">Úgy tűnik, hogy ez tovább tart, mint gondoltuk, talán a partnere vagy Ön offline állapotban van.\n\nMindenesetre a folyamat a háttérben folytatódik, eközben csinálhat valami mást…</string>
     <string name="contact_verified">%1$s bemutatva.</string>
     <string name="contact_not_verified">Nem lehet garantált végpontok közötti titkosítást létrehozni vele: %1$s.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index d02367946..58f0fd29b 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -525,7 +525,9 @@
     <string name="autocrypt_send_asm_button">Kirim Pengaturan Pesan Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Pengaturan Anda sudah dikirim ke Anda sendiri. Lihat pesan pengaturan di perangkat yang lain. Seharusnya Anda akan diminta kode pengaturan. Masukkan angka berikut:</string>
     <string name="autocrypt_prefer_e2ee">Lebih baik enkripsi ujung ke ujung</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Pengaturan Pesan Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Inilah Autocrypt Setup Message yang digunakan utuk mentransfer pengaturan ujung ke ujung Anda antar pelanggan.\n\nUntuk membuka enkirpsi dan menggunakan pengaturan Anda, bukan pesan di Autocrypt-compliant pelanggan dan masukkan kode pengaturan yang ditampikan untuk perangkat terkait.</string>
 
 
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 15d1ee479..aa461a9ff 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -126,7 +126,7 @@
     <plurals name="n_chats">
         <item quantity="one">%d chat</item>
         <item quantity="many">%d chats</item>
-        <item quantity="other">%d chats</item>
+        <item quantity="other">%d chat</item>
     </plurals>
     <plurals name="n_contacts">
         <item quantity="one">%d contatto</item>
@@ -324,9 +324,9 @@
     <string name="device_talk_welcome_message2">Mettiti in contatto!\n\n🙌 Tocca \"Codice QR\" sulla schermata principale di entrambi i dispositivi. Scegli \"Scansiona codice QR\" su un dispositivo e puntalo verso l\'altro\n\n🌍 Se non siete nella stessa stanza, esegui la scansione tramite videochiamata o condividi un collegamento di invito da \"Scansiona codice QR\"\n\nQuindi: goditi la ​​tua esperienza di messaggistica sulla più grande rete decentralizzata mai esistita: l\'E-mail. E a differenza di altre app popolari, senza controllo centrale né monitoraggio o vendita dei tuoi dati, ne dei tuoi amici, colleghi o familiari a grandi organizzazioni.</string>
     <string name="edit_contact">Modifica Contatto</string>
     <!-- Verb "to pin", making something sticky, not a noun or abbreviation for "pin number". -->
-    <string name="pin_chat">Blocca Chat</string>
+    <string name="pin_chat">Fissa in alto</string>
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
-    <string name="unpin_chat">Sblocca Chat</string>
+    <string name="unpin_chat">Non fissare</string>
     <!-- Verb "to pin", making something sticky, not a noun or abbreviation for "pin number". -->
     <string name="pin">Blocca</string>
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
@@ -394,7 +394,7 @@
         <item quantity="other">Eliminare %d messaggi?</item>
     </plurals>
     <string name="ask_forward">Inoltrare messaggi a %1$s?</string>
-    <string name="ask_forward_multiple">Inoltra messaggi a %1$d chats?</string>
+    <string name="ask_forward_multiple">Inoltra messaggi a %1$d chat?</string>
     <string name="ask_export_attachment">Esportare allegati permetterà ad ogni altra app sul tuo dispositivo di accedervi.\n\nContinuare?</string>
     <string name="ask_block_contact">Vuoi bloccare questo contatto?\n\nI messaggi diretti o i gruppi creati dai contatti bloccati non verranno visualizzati.\n\nGli altri gruppi con contatti bloccati continueranno a visualizzare i loro messaggi.</string>
     <string name="ask_unblock_contact">Sbloccare questo contatto?</string>
@@ -419,14 +419,14 @@
     <plurals name="chat_archived">
         <item quantity="one">%d chat archiviata</item>
         <item quantity="many">%d chats archiviate</item>
-        <item quantity="other">%d chats archiviate</item>
+        <item quantity="other">%d chat archiviate</item>
     </plurals>
     <plurals name="chat_unarchived">
         <item quantity="one">%d chat ripristinata</item>
         <item quantity="many">%d chats ripristinate</item>
-        <item quantity="other">%d chats ripristinate</item>
+        <item quantity="other">%d chat ripristinate</item>
     </plurals>
-    <string name="chat_archived_chats_title">Chats Archiviate</string>
+    <string name="chat_archived_chats_title">Chat Archiviate</string>
     <string name="chat_please_enter_message">Per piacere scrivi un messaggio.</string>
     <string name="chat_camera_unavailable">Fotocamera non disponibile.</string>
     <string name="chat_unable_to_record_audio">Impossibile registrare audio.</string>
@@ -441,15 +441,15 @@
     <string name="chat_new_group_hint">Gli altri vedranno questo gruppo solo dopo che avrai inviato un primo messaggio.</string>
     <string name="chat_record_slide_to_cancel">Scorri per annullare</string>
     <string name="chat_record_explain">Tocca e mantieni per registrare un messaggio vocale, rilascia per inviare </string>
-    <string name="chat_no_chats_yet_title">Nessuna Chats.\nPremi \"+\" per iniziare una nuova chat.</string>
-    <string name="chat_all_archived">Tutte le chats archiviate.\nPremi \"+\" per iniziare una nuova chat.</string>
+    <string name="chat_no_chats_yet_title">Nessuna Chat.\nPremi \"+\" per iniziare una nuova chat.</string>
+    <string name="chat_all_archived">Tutte le chat archiviate.\nPremi \"+\" per iniziare una nuova chat.</string>
     <string name="chat_share_with_title">Condividi con</string>
     <string name="chat_input_placeholder">Messaggio</string>
     <string name="chat_archived_label">Archiviato</string>
     <string name="chat_request_label">Richiesta</string>
     <string name="chat_no_messages">Nessun messaggio.</string>
     <string name="chat_self_talk_subtitle">Messaggi a Me</string>
-    <string name="archive_empty_hint">Le chats archiviate verranno mostrate qui.</string>
+    <string name="archive_empty_hint">Le chat archiviate verranno mostrate qui.</string>
     <string name="saved_messages">Messaggi Salvati</string>
     <string name="saved_messages_explain">• Inoltra i messaggi qui per un facile accesso\n\n• Prendi appunti o promemoria vocali\n\n• Allega file multimediali per salvarli</string>
     <!-- Should match "Saved" from "Saved messages" -->
@@ -520,8 +520,8 @@
     <string name="group_add_members">Aggiungi Membri</string>
     <string name="group_self_not_in_group">Devi essere un membro del gruppo per fare questa azione.</string>
     <string name="profile_encryption">Crittografia</string>
-    <string name="profile_shared_chats">Chats Condivise</string>
-    <string name="related_chats">Chats Correlate</string>
+    <string name="profile_shared_chats">Chat Condivise</string>
+    <string name="related_chats">Chat Correlate</string>
     <!-- Separator between the list of actual members and past members -->
     <string name="past_members">Membri Passati</string>
     <string name="tab_contact">Contatto</string>
@@ -547,7 +547,7 @@
     <string name="send_message">Invia Messaggio</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s ha cambiato il suo indirizzo da %2$s a %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Hai cambiato il tuo indirizzo email da %1$s a %2$s.\n\nSe ora invii un messaggio a un gruppo verificato, i contatti sostituiranno automaticamente il vecchio indirizzo con il tuo nuovo indirizzo.\n\nSi consiglia vivamente di impostare il tuo vecchio fornitore email per inoltrare tutte le email al tuo nuovo indirizzo. Altrimenti potresti perdere i messaggi di contatti che non hanno ancora ricevuto il tuo nuovo indirizzo.</string>
 
 
@@ -696,9 +696,9 @@
     <string name="forward_to">Inoltra a…</string>
     <!-- first placeholder is replaced by the number of files (always 2 or more); second placeholder is replaced by a chat name -->
     <string name="ask_send_files_to_chat">Inviare %1$d files a \"%2$s\"?</string>
-    <string name="ask_send_files_to_selected_chats">Invia %1$d file(s) a %2$d chats?</string>
+    <string name="ask_send_files_to_selected_chats">Invia %1$d file(s) a %2$d chat?</string>
     <string name="videos_sent_without_recoding">(I video vengono inviati come file originali, di grandi dimensioni. Per inviare i video come file più piccoli, allegali separatamente)</string>
-    <string name="share_text_multiple_chats">Invia questo testo a %1$d chats?\n\n\"%2$s\"</string>
+    <string name="share_text_multiple_chats">Invia questo testo a %1$d chat?\n\n\"%2$s\"</string>
     <string name="share_abort">Condivisione annullata per permessi mancanti.</string>
 
 
@@ -751,12 +751,12 @@
     <string name="pref_read_receipts">Ricevute di Lettura</string>
     <string name="pref_read_receipts_explain">Se le conferme di lettura sono disattivate, non potrai vedere le conferme di lettura degli altri.</string>
     <string name="pref_server">Server</string>
-    <string name="pref_encryption">Criptazione</string>
+    <string name="pref_encryption">Crittografia</string>
     <string name="pref_manage_keys">Gestisci Chiavi</string>
     <string name="pref_use_system_emoji">Usa Emoji di Sistema</string>
     <string name="pref_use_system_emoji_explain">Disattiva il supporto delle emoji integrato in Delta Chat</string>
     <string name="pref_show_system_contacts">Leggi Rubrica di Sistema</string>
-    <string name="pref_show_system_contacts_explain">Offri la possibilità di creare chats con i contatti della rubrica. Alcuni provider necessitano prima della configurazione della crittografia end-to-end.</string>
+    <string name="pref_show_system_contacts_explain">Offri la possibilità di creare chat con i contatti della rubrica. Alcuni provider necessitano prima della configurazione della crittografia end-to-end.</string>
     <!-- deprecated -->
     <string name="pref_app_access">Accesso App</string>
     <string name="pref_chats">Chats</string>
@@ -767,7 +767,7 @@
     <string name="pref_log_header">Registro</string>
     <string name="pref_other">Altro</string>
     <string name="pref_backup">Backup</string>
-    <string name="pref_backup_explain">Backup Chats su Memoria Esterna</string>
+    <string name="pref_backup_explain">Backup Chat su Memoria Esterna</string>
     <string name="pref_backup_export_explain">Un backup ti aiuta a impostare una nuova installazione su questo o un altro dispositivo.\n\nIl backup conterrà tutti i messaggi, i contatti, le chat e le impostazioni end-to-end Autocrypt. Tieni il file di backup in un luogo sicuro oppure eliminarlo il prima possibile.</string>
     <!-- the placeholder will be replaced by the profile name -->
     <string name="pref_backup_export_x">Esporta %1$s</string>
@@ -881,7 +881,9 @@
     <string name="autocrypt_send_asm_button">Invia Messaggio Configurazione Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">La tua configurazione ti è stata inviata. Passa all\'altro dispositivo e apri il messaggio. Dovrebbe venirti richiesto un codice. Inserisci il seguente codice:</string>
     <string name="autocrypt_prefer_e2ee">Preferisci Cifratura End-To-End</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Messaggio Configurazione Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Questo è il Messaggio Configurazione Autocrypt utilizzato per trasferire la configurazione end-to-end tra i client.\n\nPer decifrare e utilizzare la configurazione, aprire il messaggio in un client compatibile con Autocrypt e immettere il codice di configurazione presentato sul dispositivo di generazione.</string>
 
 
@@ -1070,7 +1072,7 @@
     <string name="ImageEditorHud_rotate">Ruota</string>
 
     <!-- dc_str_* resources -->
-    <string name="encrypted_message">Messaggio crittato</string>
+    <string name="encrypted_message">Messaggio cifrato</string>
 
     <!-- strings introduced on desktop. we want to share strings between the os, in general, please do not add generic strings here -->
     <string name="about_offical_app_desktop">Questa è l\'app Desktop Delta Chat ufficiale.</string>
@@ -1132,7 +1134,7 @@
 
     <!-- accessibility, the general idea is to use the normal strings for accessibility hints wherever possible -->
     <string name="a11y_delivery_status_error">Stato consegna: Errore</string>
-    <string name="a11y_encryption_padlock">Lucchetto crittazione</string>
+    <string name="a11y_encryption_padlock">Lucchetto di cifratura</string>
     <string name="a11y_delivery_status_sending">Stato consegna: In uscita</string>
     <string name="a11y_delivery_status_draft">Stato consegna: Bozza</string>
     <string name="a11y_delivery_status_delivered">Stato consegna: Consegnato</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index fd8c999c3..9f052a9ad 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -521,6 +521,7 @@
     <string name="autocrypt_send_asm_explain_before">｢自動暗号化設定用メッセージ｣は安全に一対一暗号化設定を対応するアプリケーションとの間に設定します｡\n \n 受信側は設定時に表示されるパスコードを入力する必要が有ります｡</string>
     <string name="autocrypt_send_asm_button">自動暗号化設定用ﾒｯｾｰｼﾞを送信する</string>
     <string name="autocrypt_prefer_e2ee">エンドツーエンド暗号化を好む</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">自動暗号化設定用ﾒｯｾｰｼﾞ</string>
     <string name="systemmsg_subject_for_new_contact">%1$sさんからのメッセージ</string>
     <string name="systemmsg_failed_sending_to">%1$sさんへのメッセージ送信に失敗しました。</string>
diff --git a/src/main/res/values-km/strings.xml b/src/main/res/values-km/strings.xml
index 7ac64c3b2..6e18918f2 100644
--- a/src/main/res/values-km/strings.xml
+++ b/src/main/res/values-km/strings.xml
@@ -602,7 +602,9 @@
     <string name="autocrypt_send_asm_button">ផ្ញើសារអ៊ិនគ្រីបស្វ័យប្រវត្តិសម្រាប់ការរៀបចំ</string>
     <string name="autocrypt_send_asm_explain_after">ការរៀបចំរបស់អ្នកត្រូវបានផ្ញើទៅខ្លួនឯងហើយ។ ប្តូរឆ្លាស់ឧបករណ៍ផ្សេង និងបើកសារការរៀបចំ។ អ្នកនឹងទទួលសំណួរពីកូដរៀបចំ។ បញ្ចូលលេខដូចខាងក្រោម:</string>
     <string name="autocrypt_prefer_e2ee">ចូលចិត្តការអ៊ិនគ្រីបច្រើនជាង</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">ផ្ញើសារអ៊ិនគ្រីបស្វ័យប្រវត្តិសម្រាប់ការរៀបចំ</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">នេះជាសាររៀបចំចាក់អ៊ិនគ្រីបស្វ័យប្រវត្តិសម្រាប់ចែកចាយចាត់ការរៀបចំចាក់ឧបករណ៍ដល់ឧបករណ៍ជាមួយឧបករណ៍ផ្សេងទៀត។\n\nដើម្បីឌិគ្រីប (ការទទួលសារដែលបានធ្វើជាសារសញ្ញាសម្ងាត់ដល់អាចអានបានវិញ) និងប្រើប្រាសការរៀបចំចាក់របសអ្នក បើកសារនៅក្នុងកម្មវិធីដែលស្គាល់អ៊ិនគ្រីបស្វ័យប្រវត្តិ និងកូដការរៀបចំដែលបានអំណោយពីឧបករណ៍បានបង្កើតវា។</string>
 
 
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index bfba5b4b3..a4de66137 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -411,7 +411,7 @@
     <string name="send_message">메시지 전송</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s의 주소가 %2$s에서 %3$s로 변경됨.</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">이메일 주소를 %1$s에서 %2$s로 바꿨습니다.\n\n확인된 그룹으로 메시지를 보내면 해당 그룹의 연락처가 자동으로 이전 주소를 새 주소로 대체합니다.\n\n모든 이메일을 새 이메일 주소로 전달하도록 이전 이메일 공급자를 설정하는 것이 좋습니다. 그렇지 않으면 새 주소를 받지 못한 연락처의 메시지를 놓칠 수 있습니다.</string>
 
 
@@ -630,7 +630,9 @@
     <string name="autocrypt_send_asm_explain_before">자동 암호화 설치 메시지는 사용자의 설정을 다른 자동 암호화 호환 앱과 안전하게 공유합니다.\n\n설치는 여기에 표시된 설치 코드에 의해 암호화되며 다른 장치에 입력해야 합니다.</string>
     <string name="autocrypt_send_asm_button">자동 암호화 설정된 메시지 전송</string>
     <string name="autocrypt_send_asm_explain_after">설정이 사용자 자신에게 전송되었습니다. 다른 장치로 전환하고 설정 메시지를 엽니다. 설정 코드를 입력하라는 메시지가 표시됩니다. 다음 숫자를 입력합니다.</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">자동 암호화 설정 메시지</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">클라이언트 간에 종단 간 설정을 전송하는 데 사용되는 자동 암호화 설정 메시지입니다.\n\n설치를 해독하고 사용하려면 자동 암호화 호환 클라이언트에서 메시지를 열고 생성 장치에 표시된 설치 코드를 입력하십시오.</string>
 
 
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index 5ffedc1a2..f9415994e 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -666,7 +666,9 @@
     <string name="autocrypt_send_asm_button">Siųsti Autocrypt sąrankos žinutę</string>
     <string name="autocrypt_send_asm_explain_after">Jūsų sąranka buvo išsiųsta jums. Persijukite į kitą įrenginį ir atverkite sąrankos žinutę. Jūsų turėtų būti paprašyta sąrankos kodo. Į užklausą įrašykite šiuos skaitmenis.\n\nJums užbaigus, kitas įrenginys bus paruoštas naudoti Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Teikti pirmenybę ištisiniam šifravimui</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt sąrankos žinutė</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Tai yra Autocrypt sąrankos žinutė, kuri yra naudojama perduoti jūsų ištisinę sąranką tarp klientų.\n\nNorėdami iššifruoti ir naudoti savo sąranką, atverkite žinutę su Autocrypt suderinamame kliente ir įveskite generuojančiame įrenginyje rodomą sąrankos kodą.</string>
 
 
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index b6614391a..1cd511a61 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -341,7 +341,9 @@
     <string name="autocrypt_send_asm_button">Igangsett Autocrypt-nøkkeloverføring</string>
     <string name="autocrypt_send_asm_explain_after">Nøkkelen din har blitt sendt til deg selv. Bytt til den andre enheten og åpne oppsettsmeldingen. Du bør bli forespurt om å oppgi en oppsettskode. Skriv in følgende siffer.\n\nNår du er ferdig, vil din andre enhet også kunne bruke Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Foretrekk ende-til-ende -kryptering</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt-nøkkeloverføring</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Dette er Autocrypt-oppsettsmeldingen brukt til å overføre nøkkelen din mellom klienter.\n\nFor å dekryptere å bruke din nøkkel, åpne meldingen i en Autocrypt-kompatibel klient og skriv inn oppsettskoden som vises på enheten som genererer den.</string>
 
 
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index a3be168eb..450905ac3 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -531,7 +531,7 @@
     <string name="send_message">Bericht versturen</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s heeft zijn/haar adres veranderd van %2$s naar %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Je hebt je e-mailadres veranderd van %1$s naar %2$s.\n\nAls je een bericht stuurt aan een goedgekeurde groep, dan zien contactpersonen in de groep je nieuwe adres.\n\nWel raden we aan om bij je oude provider in te stellen dat je e-mails wilt doorsturen naar je nieuwe adres, anders missen sommige contactpersonen mogelijk je berichten.</string>
 
 
@@ -865,7 +865,9 @@
     <string name="autocrypt_send_asm_button">Autocrypt-instelbericht versturen</string>
     <string name="autocrypt_send_asm_explain_after">Je instellingen zijn aan 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:</string>
     <string name="autocrypt_prefer_e2ee">Voorkeur voor eind-tot-eindversleuteling</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt-instelbericht</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Dit is het Autocrypt-instelbericht dat wordt gebruikt om je instellingen over te zetten.\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 apparaat dat de code heeft gegenereerd.</string>
 
 
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index b987f92fb..f21947efb 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -563,7 +563,7 @@
     <string name="send_message">Wyślij wiadomość</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s zmieniła swój adres z %2$s na %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Zmieniłeś swój adres e-mail z %1$s na %2$s.\n\nJeśli teraz wyślesz wiadomość do zweryfikowanej grupy, kontakty tam zawarte automatycznie zastąpią stary adres Twoim nowym.\n\nBardzo zalecane jest, aby ustawić swojego starego dostawcę emaila tak, aby przekazywał wszystkie emaile na Twój nowy adres email. W przeciwnym razie możesz przegapić wiadomości od kontaktów, które jeszcze nie dostały Twojego nowego adresu.</string>
 
 
@@ -897,7 +897,9 @@
     <string name="autocrypt_send_asm_button">Wyślij wiadomość konfiguracyjną Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Klucz został wysłany do ciebie. Przejdź do innego urządzenia i otwórz wiadomość konfiguracyjną. Zostanie wyświetlona prośba o podanie kodu konfiguracyjnego. Wpisz następujące cyfry w podpowiedzi.\n\nGdy skończysz, drugie urządzenie będzie gotowe do użycia funkcji automatycznego szyfrowania.</string>
     <string name="autocrypt_prefer_e2ee">Preferuj szyfrowanie typu end-to-end</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Wiadomość konfiguracyjna automatycznego szyfrowania</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Jest to wiadomość konfiguracyjna automatycznego szyfrowania typu end-to-end służąca do przesyłania klucza między klientami.\n\nAby odszyfrować i użyć klucza, otwórz wiadomość w kliencie zgodnym z automatycznym szyfrowaniem i wprowadź kod konfiguracyjny przedstawiony na urządzeniu generującym.</string>
 
 
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 08e73c28a..6ec960c78 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -466,7 +466,7 @@
     <string name="send_message">Enviar mensagem</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s mudou seu endereço de %2$s para %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Você mudou seu endereço de e-mail de %1$s para %2$s.\n\nSe você agora enviar uma mensagem para um grupo verificado, os contatos lá substituirão automaticamente o antigo por seu novo endereço.\n\nÉ altamente recomendável configurar seu antigo provedor de e-mail para encaminhar todos os e-mails para seu novo endereço de e-mail. Caso contrário, você pode perder mensagens de contatos que ainda não receberam seu novo endereço.</string>
 
 
@@ -721,7 +721,9 @@
     <string name="autocrypt_send_asm_button">Enviar \"mensagem de configuração do Autocrypt\"?</string>
     <string name="autocrypt_send_asm_explain_after">Sua chave foi enviada para você mesmo. Abra a mensagem de configuração no seu outro dispositivo. Lá será exibido uma solicitação de código. Digite-o lá.\n\nDepois disso, seu dispositivo estará pronto para usar o Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Preferir criptografia ponta a ponta</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Mensagem de configuração do Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Esta é uma \"mensagem de configuração do Autocrypt\" que serve para transferir suas chaves entre dispositivos diferentes.\n\nPara descriptografar sua chave abra esta mensagem num cliente compatível e digite o código exibido no dispositivo de origem.</string>
 
 
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 43e8f3164..153241617 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -295,7 +295,9 @@
     <string name="autocrypt_send_asm_button">Enviar mensagem com a definição da encriptação automática</string>
     <string name="autocrypt_send_asm_explain_after">A sua configuração foi-lhe enviada. Entre no outro dispositivo e abra a mensagem de configuração. Deve ser solicitado a fornecer um código de configuração. Digite os seguintes dígitos no prompt.\n\n Assim que estiver concluido, o outro dispositivo estará pronto para usar o Autocrypt.</string>
     <string name="autocrypt_prefer_e2ee">Preferir encriptação ponta a ponta</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Mensagem de configuração do Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Esta é a Mensagem de Configuração de Autocrypt usada para transferir sua configuração de ponta a ponta entre clientes (dispositivos). \n\nPara descriptar e usar, abra a mensagem em um cliente compatível com Autocrypt e insira o código de configuração apresentado no dispositivo de geração.</string>
 
 
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 00b8483dd..e5481bd9b 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -451,7 +451,7 @@
     <string name="send_message">Trimiteți Mesaj</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s și-au schimbat adresa de la %2$s la %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">V-ați schimbat adresa de e-mail de la %1$s la %2$s.\n\nDacă trimiteți acum un mesaj către un grup verificat, contactele de acolo vor înlocui automat vechea adresă cu noua dumneavoastră adresă.\n\nSe recomandă să vă configurați vechiul furnizor de e-mail pentru a redirecționa toate e-mailurile către noua dumneavoastră adresă de e-mail. În caz contrar, s-ar putea să pierdeți mesaje ale contactelor care nu au primit încă noua dumneavoastră adresă.</string>
 
 
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index ef722c3a5..332d21173 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -563,7 +563,7 @@
     <string name="send_message">Отправить сообщение</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s меняет адрес с %2$s на %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Вы изменили свой адрес электронной почты с %1$s на %2$s.\n\nЕсли вы отправите сообщение в подтвержденную группу, контакты в ней автоматически обновят ваш старый адрес на новый.\n\nНастоятельно рекомендуется настроить старого поставщика электронной почты на пересылку всех писем на новый адрес. Иначе вы можете пропустить сообщения от контактов, которые еще не получили ваш новый адрес.</string>
 
 
@@ -897,7 +897,9 @@
     <string name="autocrypt_send_asm_button">Сообщение с параметрами Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Ваши настройки были оправлены вам. Переключитесь на другое устройство и откройте сообщение с настройкой. Вам будет предложено ввести код настройки. Введите следующие цифры:</string>
     <string name="autocrypt_prefer_e2ee">Предпочитать сквозное шифрование</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Сообщение с параметрами Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">\"Сообщение с параметрами Autocrypt\" служит для передачи параметров сквозного шифрования между клиентами.\n\nЧтобы расшифровать и использовать параметры откройте это сообщение в приложении, поддерживающем Autocrypt и введите код настройки, показанный на исходном устройстве.</string>
 
 
diff --git a/src/main/res/values-sc/strings.xml b/src/main/res/values-sc/strings.xml
index aa24abe9e..84c3a0e86 100644
--- a/src/main/res/values-sc/strings.xml
+++ b/src/main/res/values-sc/strings.xml
@@ -466,6 +466,7 @@
     <string name="autocrypt_send_asm_button">Imbia unu messàgiu de impostatzione de Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Ti ses imbiadu sa configuratzione tua. Cola a s\'àteru dispositivu e aberi su messàgiu de configuratzione. Ti diat dèpere èssere pedidu unu còdighe de configuratzione. Inserta custas tzifras:</string>
     <string name="autocrypt_prefer_e2ee">Preferi sa tzifradura a nodu terminale (end-to-end)</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Messàgiu de configuratzione de Autocrypt</string>
     <string name="write_message_desktop">Iscrie unu messàgiu</string>
     <string name="encryption_info_title_desktop">Informatziones de tzifradura</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 6028096ad..c979e0fe1 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -684,7 +684,9 @@
     <string name="autocrypt_send_asm_button">Pošlite správu s nastavením autokryptovania</string>
     <string name="autocrypt_send_asm_explain_after">Vaše nastavenie bolo odoslané vám. Prepnite na druhé zariadenie a otvorte správu o nastavení. Mali by ste byť požiadaní o nastavovací kód. Zadajte nasledujúce číslice:</string>
     <string name="autocrypt_prefer_e2ee">Preferovať šifrovanie typu end-to-end</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Správa o nastavení automatického šifrovania</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Toto je správa o nastavení automatického šifrovania, ktorá sa používa na prenos komplexného nastavenia medzi klientmi.\n\nAk chcete dešifrovať a použiť svoje nastavenie, otvorte správu v klientovi kompatibilnom s automatickým šifrovaním a zadajte inštalačný kód uvedený na generujúcom zariadení.</string>
 
 
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index e1fab82d5..1da2499e6 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -526,7 +526,7 @@
     <string name="send_message">Dërgo Mesazh</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s ndryshoi adresën e vet nga %2$s në %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Ndryshuat adresën tuaj nga %1$s në %2$s.\n\nNëse dërgoni tani një mesazh te një grup i verifikuar, kontaktet atje do të zëvendësojnë automatikisht adresën tuaj të vjetër me të renë.\n\nËshtë tejet e këshillueshme të ujdisni shërbimin tuaj të vjetër të email-it të përcjellë krejt email-et te adresa juaj e re email. Përndryshe, mund të humbni mesazhe të kontakteve që s’e kanë marrë ende adresën tuaj të re.</string>
 
 
@@ -857,7 +857,9 @@
     <string name="autocrypt_send_asm_button">Dërgo Mesazh Rregullimi Autocrypt-i</string>
     <string name="autocrypt_send_asm_explain_after">Rregullimi juaj u dërgua te ju. Kaloni te pajisja tjetër dhe hapni mesazhin e rregullimit. Do t\’ju kërkohet një kod rregullimi. Shtypni atje shifrat vijuese.\n\nPasi të keni mbaruar, pajisja juaj tjetër do të jetë gati të përdorë Autocrypt-in.</string>
     <string name="autocrypt_prefer_e2ee">Parapëlqe Fshehtëzim Skaj-Më-Skaj</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Mesazh Rregullimi Autocrypt-i</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Ky është Mesazhi i Rregullimit të Autocrypt-it i përdorur për të shpërngulur rregullimin tuaj skaj-më-skaj në klientë të tjerë.\n\nQë ta shfshehtëzoni rregullimin tuaj, hapeni mesazhin te një klient që mund të përdorë Autocrypt-in dhe jepni kodin e rregullimit të treguar te pajisja që e prodhoi.</string>
 
 
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index bc9932d21..644a6c24b 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -454,7 +454,7 @@
     <string name="send_message">Пошаљи поруку</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$sје променио њихову адресу %2$sу %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Ви сте променили вашу имејл адресу %1$sу %2$s.\n\nАко сада пошаљете поруку провереној групи, тамошњи контакти ће аутоматски заменити стару адресу новом.\n\nПрепоручљиво је да подесите свог предходног имејл провајдера да прослеђује све имејл поруке на вашу нову имејл адресу. У супротном бисте могли да пропустите поруке од контаката који још нису добили вашу нову адресу.</string>
 
 
@@ -687,7 +687,9 @@
     <string name="autocrypt_send_asm_button">Пошаљите поруку поставки за аутошифровање</string>
     <string name="autocrypt_send_asm_explain_after">Ваше подешавање вам је послато. Пређите на други уређај и отворите поруку за подешавање. На другом уређају од се вас очекује да унесете код за подешавање. Унесите следеће цифре:</string>
     <string name="autocrypt_prefer_e2ee">Преферирај с-краја-на-крај шифровање</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Порука поставки за аутошфровање</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Ово је порука подешавања аутоматског шифровања која се користи за пренос вашег с-краја-на-крај подешавања између клијената.\n\nДа бисте дешифровали и користили своје подешавање, отворите поруку на клијенту који је компатибилан са аутоматским шифровањем и унесите кôд за подешавање приказан на уређају који га је генерисао.</string>
 
 
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index b0c5f747d..964645892 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -479,7 +479,7 @@
     <string name="send_message">Skicka meddelande</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s ändrade sin adress från %2$s till %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Du har ändrat din e-postadress från %1$s till %2$s.\n\nOm du nu skickar ett meddelande till en verifierad grupp kommer kontakterna där automatiskt att ersätta den gamla med din nya adress. Vi rekommenderar starkt att du ställer in din gamla e-postleverantör så att den vidarebefordrar alla e-postmeddelanden till din nya e-postadress. Annars kan du missa meddelanden från kontakter som inte har fått din nya adress ännu.</string>
 
 
@@ -786,7 +786,9 @@
     <string name="autocrypt_send_asm_button">Skicka Autocrypt inställningsmeddelande</string>
     <string name="autocrypt_send_asm_explain_after">Dina inställningar har skickats till dig själv. Byt till den andra enheten och öppna inställningsmeddelandet. Du kommer att tillfrågas om en inställningskod. Ange följande siffror:</string>
     <string name="autocrypt_prefer_e2ee">Föredra slutpunkt-till-slutpunkt-kryptering</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Inställningsmeddelande för Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Detta är inställningsmeddelandet för Autocrypt som används för att skicka nycklar mellan klienter.\n\nFör att kunna avkryptera och använda din nyckel, öppnar du meddelandet i en Autocrypt-kompatibel klient och skriver in inställningskoden som visats på den genererande enheten.</string>
 
 
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 5882e88b8..2de27d763 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -531,7 +531,7 @@
     <string name="send_message">İleti Gönder</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s, %2$s adresini %3$s olarak değiştirdi</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">%1$s e-posta adresinizi %2$s olarak değiştirdiniz.\n\nŞimdi bir doğrulanan öbeğe ileti gönderirseniz, oradaki kişiler yeni adresinizle eskisini otomatik olarak değiştirecek.\n\nTüm e-postaları yeni e-posta adresinize iletmek için eski e-posta sağlayıcınızı ayarlamanız önemle önerilir. Yoksa henüz yeni adresinizi almamış olan kişilerin iletilerini kaçırabilirsiniz.</string>
 
 
@@ -865,7 +865,9 @@
     <string name="autocrypt_send_asm_button">Autocrypt Ayarlama İletisi Gönder</string>
     <string name="autocrypt_send_asm_explain_after">Ayarlamanız kendinize gönderildi. Diğer aygıta geçin ve ayarlama iletisini açın. Size bir ayarlama kodu sorulmalı. Aşağıdaki sayıları girin:</string>
     <string name="autocrypt_prefer_e2ee">Uçtan Uca Şifrelemeyi Yeğle</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt Ayarlama İletisi</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Bu, uçtan uca ayarlamanızı istemciler arasında aktarmak için kullanılan Autocrypt Ayarlama İletisi\'dir.\n\nŞifreyi çözmek ve ayarlamanızı kullanmak için iletiyi Autocrypt uyumlu bir istemcide açın ve oluşturan aygıtta sunulan ayarlama kodunu girin.</string>
 
 
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index b141367e2..3745a0c95 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -561,7 +561,7 @@
     <string name="send_message">Надіслати повідомлення</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s змінили їх адресу з %2$s на %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Ви змінили електронну адресу з %1$s на %2$s.\n\nЯкщо зараз Ви відправите повідомлення в підтверджену групу, контакти в ній автоматично замінять Вашу стару адресу на нову.\n\nРекомендується налаштувати старий обліковий запис електронної пошти на пересилання всіх електронних листів на Вашу нову електронну адресу. Інакше Ви можете пропустити повідомлення контактів, які ще не отримали Вашу нову адресу.</string>
 
 
@@ -891,7 +891,9 @@
     <string name="autocrypt_send_asm_button">Надіслати повідомлення з налаштуваннями Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Налаштування було Вам надіслано. Перейдіть на інший пристрій і відкрийте повідомлення про налаштування. У Вас має з\'явитися запит на введення коду налаштування. Введіть наступні цифри:</string>
     <string name="autocrypt_prefer_e2ee">Віддавати перевагу наскрізному шифруванню</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Повідомлення з налаштуваннями Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Це повідомлення з налаштуваннями Autocrypt, що слугує для передачі параметрів наскрізного шифрування між пристроями.\n\nДля розшифрування параметрів відкрийте це повідомлення в додатку, що підтримує Autocrypt і введіть інсталяційний код, показаний на початковому пристрої.</string>
 
 
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index aef55d1af..60ae1406f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -457,7 +457,7 @@
     <string name="send_message">Gửi tin nhắn</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s đã thay đổi địa chỉ của họ từ %2$s thành %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">Bạn đã thay đổi địa chỉ email của mình từ %1$s thành %2$s.\n\nNếu bây giờ bạn gửi thư đến một nhóm đã được xác minh, những người liên hệ ở đó sẽ tự động thay thế địa chỉ cũ bằng địa chỉ mới của bạn.\n\nĐiều đó thật tuyệt vời khuyên bạn nên thiết lập nhà cung cấp email cũ để chuyển tiếp tất cả email đến địa chỉ email mới của bạn. Nếu không, bạn có thể bỏ lỡ tin nhắn của những người chưa nhận được địa chỉ mới của bạn.</string>
 
 
@@ -720,7 +720,9 @@
     <string name="autocrypt_send_asm_button">Gửi tin nhắn thiết lập Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Thiết lập của bạn đã được gửi cho chính bạn. Chuyển sang thiết bị khác và mở thông báo thiết lập. Bạn sẽ được yêu cầu nhập mã thiết lập. Nhập các chữ số sau:</string>
     <string name="autocrypt_prefer_e2ee">Ưu tiên mã hóa đầu cuối</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Thông báo thiết lập Autocrypt</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">Đây là Thông báo Thiết lập Autocrypt được sử dụng để truyền thiết lập hai đầu của bạn giữa các máy khách.\n\nĐể giải mã và sử dụng thiết lập của bạn, hãy mở tin nhắn trong một ứng dụng khách tương thích với Autocrypt và nhập mã thiết lập được trình bày trên thiết bị tạo.</string>
 
 
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 77b6ca060..8970fab1a 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -515,7 +515,7 @@
     <string name="send_message">发送消息</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s 将邮箱从 %2$s 更改为 %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">你将邮箱从 %1$s 改为了 %2$s。\n\n如果你现在发送一条消息到已验证群组，那里的联系人将自动用你的新邮箱替换旧邮箱。\n\n我们建议你将旧邮箱配置为转发所有邮件到新邮箱。否则，你可能收不到还不知道你新邮箱的联系人发过来的消息。</string>
 
 
@@ -849,7 +849,9 @@
     <string name="autocrypt_send_asm_button">发送 Autocrypt 设置消息</string>
     <string name="autocrypt_send_asm_explain_after">您的设置已发送给您自己。切换到另一台设备并打开该设置消息。 您将被要求输入设置码。 输入以下数字：</string>
     <string name="autocrypt_prefer_e2ee">优先使用端到端加密</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt 设置消息</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">这是用于在客户端之间传输端到端设置的 Autocrypt 设置消息。\n\n要解密并使用您的设置，请在兼容 Autocrypt 的客户端中打开本消息，然后输入生成设备上显示的设置码。</string>
 
 
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 34790c2d6..639a733c7 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -515,7 +515,7 @@
     <string name="send_message">傳送訊息</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new addresses. -->
     <string name="aeap_addr_changed">%1$s 已將他的位址從 %2$s更改 為 %3$s</string>
-    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <!-- deprecated -->
     <string name="aeap_explanation">您已將電子郵件位址從%1$s更改為%2$s 。\n\n如果您現在向已驗證的群組發送消息，那裡的聯絡人會自動將舊位址替換為您的新位址。\n\n強烈建議您將舊電子郵件供應商設置為將所有電子郵件轉發到您的新電子郵件位址。否則，您可能會錯過尚未獲得新地址的聯絡人的消息。</string>
 
 
@@ -849,7 +849,9 @@
     <string name="autocrypt_send_asm_button">傳送AutoCrypt設定訊息</string>
     <string name="autocrypt_send_asm_explain_after">你的設定已經傳送給你自己了。請到其它支援自動加密設定的裝置，開啟設定訊息，並輸入以下的設定碼\n\n輸入完之後，你的其它裝置就可以使用AutoCrypt了。</string>
     <string name="autocrypt_prefer_e2ee">偏好端到端加密</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_subject">Autocrypt Setup Message</string>
+    <!-- deprecated -->
     <string name="autocrypt_asm_general_body">本信件包含AutoCrypt設定訊息。\n\n請使用其它裝置上支援AutoCrypt設定的應用程式開啟本訊息，並輸入設定碼，以便匯入自動加密設定。</string>
 
 

From 9106f12b77b207a1412ca98f1297ddf467936ea3 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 8 Apr 2025 00:02:22 +0200
Subject: [PATCH 12/19] remove now unused stock translations

---
 src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
index 143df3b4c..f4dec06d1 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -156,8 +156,6 @@ public class DcHelper {
     dcContext.setStockTranslation(36, context.getString(R.string.contact_not_verified));
     dcContext.setStockTranslation(37, context.getString(R.string.contact_setup_changed));
     dcContext.setStockTranslation(40, context.getString(R.string.chat_archived_label));
-    dcContext.setStockTranslation(42, context.getString(R.string.autocrypt_asm_subject));
-    dcContext.setStockTranslation(43, context.getString(R.string.autocrypt_asm_general_body));
     dcContext.setStockTranslation(60, context.getString(R.string.login_error_cannot_login));
     dcContext.setStockTranslation(66, context.getString(R.string.location));
     dcContext.setStockTranslation(67, context.getString(R.string.sticker));

From f47fff292ff13ee50764a5127ffc0f7cf5ae581a Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 8 Apr 2025 00:03:59 +0200
Subject: [PATCH 13/19] update translations

---
 src/main/res/values-nl/strings.xml | 4 ++--
 src/main/res/values-ru/strings.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 450905ac3..3fe941357 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -585,7 +585,7 @@
 
     <!-- welcome and login -->
     <!-- Primary button on the welcome screen, allows to create an instant profile -->
-    <string name="onboarding_create_instant_account">Aan de slag!</string>
+    <string name="onboarding_create_instant_account">Account aanmaken</string>
     <!-- Secondary button on the welcome screen, allows to "Add as Second Device", "Restore from Backup"  -->
     <string name="onboarding_alternative_logins">Ik heb al een account</string>
     <!-- Button, allows to log in to existing email accounts, setting ports, passwords and so on -->
@@ -861,7 +861,7 @@
 
     <!-- autocrypt -->
     <string name="autocrypt_send_asm_title">Autocrypt-instelbericht versturen</string>
-    <string name="autocrypt_send_asm_explain_before">Een ‘Autocrypt-instelbericht’ deelt je eind-tot-eindinstellingen veilig met andere 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 eind-tot-eindinstellingen veilig met andere Autocrypt-compatibele apps.\n\nAls je Delta Chat ook op het andere apparaat gebruikt, voeg het dan als tweede apparaat toe.</string>
     <string name="autocrypt_send_asm_button">Autocrypt-instelbericht versturen</string>
     <string name="autocrypt_send_asm_explain_after">Je instellingen zijn aan 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:</string>
     <string name="autocrypt_prefer_e2ee">Voorkeur voor eind-tot-eindversleuteling</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 332d21173..70ed28d7a 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -893,7 +893,7 @@
 
     <!-- autocrypt -->
     <string name="autocrypt_send_asm_title">Сообщение с параметрами Autocrypt</string>
-    <string name="autocrypt_send_asm_explain_before">\"Сообщение с параметрами Autocrypt\" служит для передачи параметров сквозного шифрования между приложениями, поддерживающими протокол Autocrypt.\n\nЭти параметры шифруются с использованием кода настройки, который показан здесь и должен быть введён в настраиваемом приложении.</string>
+    <string name="autocrypt_send_asm_explain_before">\"Сообщение с параметрами Autocrypt\" служит для передачи параметров сквозного шифрования между приложениями, поддерживающими протокол Autocrypt.\n\nЕсли вы используете Delta Chat на другом устройстве, воспользуйтесь меню \"Настройки / Добавить второе устройство\"</string>
     <string name="autocrypt_send_asm_button">Сообщение с параметрами Autocrypt</string>
     <string name="autocrypt_send_asm_explain_after">Ваши настройки были оправлены вам. Переключитесь на другое устройство и откройте сообщение с настройкой. Вам будет предложено ввести код настройки. Введите следующие цифры:</string>
     <string name="autocrypt_prefer_e2ee">Предпочитать сквозное шифрование</string>

From 4240c8b324d8600d09546e63efd5ef993e7d434d Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Thu, 10 Apr 2025 22:09:41 +0200
Subject: [PATCH 14/19] remove address from contact list and group member list

---
 CHANGELOG.md                                       |  1 +
 .../contacts/ContactSelectionListItem.java         | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd1093f9e..5e8857c6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+* display "Last Seen" information instead of email address in contact list for contacts with green-checkmark, like in other popular messengers
 * hide superfluous "Show Classic E-mails" advanced setting for chatmail
 * remove mostly non-telling transport addresses when referring to a contact;
   the contact's profile gives a much better overview
diff --git a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index 28d627254..67da79e34 100644
--- a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -109,6 +110,19 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
     this.nameView.setEnabled(true);
     this.nameView.setText(name==null? "#" : name);
 
+    if (contact != null && contact.isVerified()) {
+      if (contact.isBot()) {
+        number = getContext().getString(R.string.bot);
+      } else {
+        long timestamp = contact.getLastSeen();
+        if (timestamp != 0) {
+          number = getContext().getString(R.string.last_seen_at, DateUtils.getExtendedTimeSpanString(getContext(), timestamp));
+        } else {
+          number = null;
+        }
+      }
+    }
+
     if(number!=null) {
       this.numberView.setText(number);
       this.labelView.setText(label==null? "" : label);

From 3c0e4fd853ec65e496e86d8ea38db8256e60d75a Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Fri, 11 Apr 2025 16:22:29 +0200
Subject: [PATCH 15/19] don't display last-seen etc. just hide address

---
 .../securesms/contacts/ContactSelectionListItem.java  | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index 67da79e34..c6cc3f142 100644
--- a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -111,16 +111,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
     this.nameView.setText(name==null? "#" : name);
 
     if (contact != null && contact.isVerified()) {
-      if (contact.isBot()) {
-        number = getContext().getString(R.string.bot);
-      } else {
-        long timestamp = contact.getLastSeen();
-        if (timestamp != 0) {
-          number = getContext().getString(R.string.last_seen_at, DateUtils.getExtendedTimeSpanString(getContext(), timestamp));
-        } else {
-          number = null;
-        }
-      }
+      number = null;
     }
 
     if(number!=null) {

From 78820ec18af718dde9a96c50c6a6ea02bad953a7 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Fri, 11 Apr 2025 16:25:10 +0200
Subject: [PATCH 16/19] update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e8857c6c..7a257af93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 ## Unreleased
 
-* display "Last Seen" information instead of email address in contact list for contacts with green-checkmark, like in other popular messengers
 * hide superfluous "Show Classic E-mails" advanced setting for chatmail
 * remove mostly non-telling transport addresses when referring to a contact;
   the contact's profile gives a much better overview
 * Disable AEAP to enable us to overhaul some things - there are big changes underway in this area, which will come in a few months
+* don't display email address in contact list and member list for contacts with green-checkmark
 
 ## v1.56.1
 2025-03

From f9ac0375b97efbf7a494ec16337d73ddc8824e5d Mon Sep 17 00:00:00 2001
From: adb <adb@merlinux.eu>
Date: Fri, 11 Apr 2025 14:29:14 +0000
Subject: [PATCH 17/19] Update
 src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java

Co-authored-by: bjoern <r10s@b44t.com>
---
 .../securesms/preferences/NotificationsPreferenceFragment.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
index 80c72386c..2356e89d0 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
@@ -168,7 +168,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
             // this could happen in some phones when user selects ringtone from
             // external storage and later removes the read from external storage permission
             // and later this method is called from initializeRingtoneSummary()
-            summary = "???";
+            summary = "<no access>";
             Log.w(TAG, e);
           }
           preference.setSummary(summary);

From 92e67bd80a6438fcd2900e67a3acbcfb0ae5a953 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Fri, 11 Apr 2025 16:32:53 +0200
Subject: [PATCH 18/19] remove unused import

---
 .../securesms/contacts/ContactSelectionListItem.java             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index c6cc3f142..0c0a86424 100644
--- a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
-import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

From 389dddc9ea00effe37d235383a8d3c3c24382702 Mon Sep 17 00:00:00 2001
From: bjoern <r10s@b44t.com>
Date: Fri, 11 Apr 2025 18:15:36 +0200
Subject: [PATCH 19/19] remove address from primary settings UI (#3730)

* remove address from primary settings UI

showing the address here prominently results in bad UX
as ppl try to pass the address around,
which will not result in e2ee and will often not work.

see https://github.com/deltachat/deltachat-ios/pull/2664
for more resoning and discussion, eg. why remove it unconditionally

* show status

* update changelog

---------

Co-authored-by: adb <adb@merlinux.eu>
Co-authored-by: adbenitez <asieldbenitez@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 .../widgets/ProfilePreference.java            | 22 ++++++++++---------
 .../res/layout/profile_preference_view.xml    |  6 +++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2883aad3f..3e7853e9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 * hide superfluous "Show Classic E-mails" advanced setting for chatmail
+* show profile bio/status under name in main settings screen
 * remove mostly non-telling transport addresses when referring to a contact;
   the contact's profile gives a much better overview
 * Disable AEAP to enable us to overhaul some things - there are big changes underway in this area, which will come in a few months
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
index 34785739e..307c79a76 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
@@ -24,7 +24,7 @@ public class ProfilePreference extends Preference {
 
   private ImageView avatarView;
   private TextView  profileNameView;
-  private TextView profileAddressView;
+  private TextView  profileStatusView;
 
   public ProfilePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
@@ -55,21 +55,15 @@ public class ProfilePreference extends Preference {
     super.onBindViewHolder(viewHolder);
     avatarView        = (ImageView)viewHolder.findViewById(R.id.avatar);
     profileNameView   = (TextView)viewHolder.findViewById(R.id.profile_name);
-    profileAddressView = (TextView)viewHolder.findViewById(R.id.number);
+    profileStatusView = (TextView)viewHolder.findViewById(R.id.profile_status);
 
     refresh();
   }
 
   public void refresh() {
-    if (profileAddressView == null) return;
+    if (profileNameView == null) return;
 
     final String address = DcHelper.get(getContext(), DcHelper.CONFIG_CONFIGURED_ADDRESS);
-    String profileName  = DcHelper.get(getContext(), DcHelper.CONFIG_DISPLAY_NAME);
-
-    if(profileName==null || profileName.isEmpty()) {
-      profileName = getContext().getString(R.string.pref_profile_info_headline);
-    }
-
     final MyProfileContactPhoto profileImage = new MyProfileContactPhoto(address, String.valueOf(Prefs.getProfileAvatarId(getContext())));
 
     GlideApp.with(getContext().getApplicationContext())
@@ -79,10 +73,18 @@ public class ProfilePreference extends Preference {
             .diskCacheStrategy(DiskCacheStrategy.NONE)
             .into(avatarView);
 
+    final String profileName  = DcHelper.get(getContext(), DcHelper.CONFIG_DISPLAY_NAME);
     if (!TextUtils.isEmpty(profileName)) {
       profileNameView.setText(profileName);
+    } else {
+      profileNameView.setText(getContext().getString(R.string.pref_profile_info_headline));
     }
 
-    profileAddressView.setText(address);
+    final String status = DcHelper.get(getContext(), DcHelper.CONFIG_SELF_STATUS);
+    if (!TextUtils.isEmpty(status)) {
+      profileStatusView.setText(status);
+    } else {
+      profileStatusView.setText(getContext().getString(R.string.pref_default_status_label));
+    }
   }
 }
diff --git a/src/main/res/layout/profile_preference_view.xml b/src/main/res/layout/profile_preference_view.xml
index 2c0351c52..1662572c2 100644
--- a/src/main/res/layout/profile_preference_view.xml
+++ b/src/main/res/layout/profile_preference_view.xml
@@ -29,12 +29,14 @@
                 android:textSize="20sp"
                 tools:text="Voltarine DeClyre"/>
 
-        <TextView android:id="@+id/number"
+        <TextView android:id="@+id/profile_status"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:gravity="start"
                   android:textAlignment="viewStart"
-                  tools:text="+14151231234"/>
+                  android:singleLine="true"
+                  android:ellipsize="marquee"
+                  tools:text="I use Delta Chat :)"/>
 
     </LinearLayout>