diff --git a/CHANGELOG-upstream.md b/CHANGELOG-upstream.md
index 4ab593358..b685943d5 100644
--- a/CHANGELOG-upstream.md
+++ b/CHANGELOG-upstream.md
@@ -7,7 +7,10 @@
 * add mute option "8 hours"
 * add menu option to easily save/unsave selected message
 * improve deletion confirmation for "Device Messages"
+* remove dangerous encryption options
 * always paste as plain text in message draft area
+* some small bug fixes and updated translations
+* update to core 1.157.2
 
 ## v1.54.4
 2025-03
diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index 42deb5d94..ae0439885 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit 42deb5d94a2a154e0132f91d02d8507c262f87d7
+Subproject commit ae0439885b984a550400f4f80e7be28229b8ca1f
diff --git a/src/main/java/com/b44t/messenger/DcMsg.java b/src/main/java/com/b44t/messenger/DcMsg.java
index 7733f6204..a791cc809 100644
--- a/src/main/java/com/b44t/messenger/DcMsg.java
+++ b/src/main/java/com/b44t/messenger/DcMsg.java
@@ -151,7 +151,6 @@ public class DcMsg {
     public native String  getWebxdcHref      ();
     public native boolean isForwarded        ();
     public native boolean isInfo             ();
-    public native boolean isSetupMessage     ();
     public native boolean hasHtml            ();
     public native String  getSetupCodeBegin  ();
     public native String  getVideochatUrl    ();
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java b/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java
index 156496854..c2e805af4 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationAdapter.java
@@ -294,7 +294,7 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
     else if (type==DcMsg.DC_MSG_AUDIO || type==DcMsg.DC_MSG_VOICE) {
       return dcMsg.isOutgoing()? MESSAGE_TYPE_AUDIO_OUTGOING : MESSAGE_TYPE_AUDIO_INCOMING;
     }
-    else if (type==DcMsg.DC_MSG_FILE && !dcMsg.isSetupMessage()) {
+    else if (type==DcMsg.DC_MSG_FILE) {
       return dcMsg.isOutgoing()? MESSAGE_TYPE_DOCUMENT_OUTGOING : MESSAGE_TYPE_DOCUMENT_INCOMING;
     }
     else if (type==DcMsg.DC_MSG_IMAGE || type==DcMsg.DC_MSG_GIF || type==DcMsg.DC_MSG_VIDEO) {
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
index b1063538f..a246311c4 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
@@ -25,9 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -38,12 +36,10 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -745,80 +741,6 @@ public class ConversationFragment extends MessageSelectorFragment
         Util.runOnAnyBackgroundThread(() -> dcContext.markseenMsgs(ids));
     }
 
-
-    void querySetupCode(final DcMsg dcMsg, String[] preload)
-    {
-        if( !dcMsg.isSetupMessage()) {
-            return;
-        }
-
-        View gl = View.inflate(getActivity(), R.layout.setup_code_grid, null);
-        final EditText[] editTexts = {
-                gl.findViewById(R.id.setupCode0),  gl.findViewById(R.id.setupCode1),  gl.findViewById(R.id.setupCode2),
-                gl.findViewById(R.id.setupCode3),  gl.findViewById(R.id.setupCode4),  gl.findViewById(R.id.setupCode5),
-                gl.findViewById(R.id.setupCode6),  gl.findViewById(R.id.setupCode7),  gl.findViewById(R.id.setupCode8)
-        };
-        AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity());
-        builder1.setView(gl);
-        editTexts[0].setText(dcMsg.getSetupCodeBegin());
-        editTexts[0].setSelection(editTexts[0].getText().length());
-
-        for( int i = 0; i < 9; i++ ) {
-            if( preload != null && i < preload.length ) {
-                editTexts[i].setText(preload[i]);
-                editTexts[i].setSelection(editTexts[i].getText().length());
-            }
-            editTexts[i].addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if( s.length()==4 ) {
-                        for ( int i = 0; i < 8; i++ ) {
-                            if( editTexts[i].hasFocus() && editTexts[i+1].getText().length()<4 ) {
-                                editTexts[i+1].requestFocus();
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                }
-            });
-        }
-
-        builder1.setTitle(getActivity().getString(R.string.autocrypt_continue_transfer_title));
-        builder1.setMessage(getActivity().getString(R.string.autocrypt_continue_transfer_please_enter_code));
-        builder1.setNegativeButton(android.R.string.cancel, null);
-        builder1.setCancelable(false); // prevent the dialog from being dismissed accidentally (when the dialog is closed, the setup code is gone forever and the user has to create a new setup message)
-        builder1.setPositiveButton(android.R.string.ok, (dialog, which) -> {
-            String setup_code = "";
-            final String[] preload1 = new String[9];
-            for ( int i = 0; i < 9; i++ ) {
-                preload1[i] = editTexts[i].getText().toString();
-                setup_code += preload1[i];
-            }
-            boolean success = dcContext.continueKeyTransfer(dcMsg.getId(), setup_code);
-
-            AlertDialog.Builder builder2 = new AlertDialog.Builder(getActivity());
-            builder2.setTitle(getActivity().getString(R.string.autocrypt_continue_transfer_title));
-            builder2.setMessage(getActivity().getString(success? R.string.autocrypt_continue_transfer_succeeded : R.string.autocrypt_bad_setup_code));
-            if( success ) {
-                builder2.setPositiveButton(android.R.string.ok, null);
-            }
-            else {
-                builder2.setNegativeButton(android.R.string.cancel, null);
-                builder2.setPositiveButton(R.string.autocrypt_continue_transfer_retry, (dialog1, which1) -> querySetupCode(dcMsg, preload1));
-            }
-            builder2.show();
-        });
-        builder1.show();
-    }
-
     private class ConversationFragmentItemClickListener implements ItemClickListener {
 
         @Override
@@ -838,9 +760,6 @@ public class ConversationFragment extends MessageSelectorFragment
                     actionMode.setTitleOptionalHint(false); // the title represents important information, also indicating implicitly, more items can be selected
                 }
             }
-            else if(messageRecord.isSetupMessage()) {
-                querySetupCode(messageRecord,null);
-            }
             else if (messageRecord.getType()==DcMsg.DC_MSG_VIDEOCHAT_INVITATION) {
                 new VideochatUtil().join(getActivity(), messageRecord.getId());
             }
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
index 77f466428..7c4c1d9d9 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
@@ -391,7 +391,7 @@ public class ConversationItem extends BaseConversationItem
   }
 
   private boolean hasDocument(DcMsg dcMsg) {
-    return dcMsg.getType()==DcMsg.DC_MSG_FILE && !dcMsg.isSetupMessage();
+    return dcMsg.getType()==DcMsg.DC_MSG_FILE;
   }
 
   private void setBodyText(DcMsg messageRecord) {
@@ -400,11 +400,7 @@ public class ConversationItem extends BaseConversationItem
 
     String text = messageRecord.getText();
 
-    if (messageRecord.isSetupMessage()) {
-      bodyText.setText(context.getString(R.string.autocrypt_asm_click_body));
-      bodyText.setVisibility(View.VISIBLE);
-    }
-    else if (text.isEmpty()) {
+    if (text.isEmpty()) {
       bodyText.setVisibility(View.GONE);
     }
     else {
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
index 8b0be36f4..e2c8dd05d 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -65,7 +65,6 @@ public class DcHelper {
     public static final String CONFIG_DISPLAY_NAME = "displayname";
     public static final String CONFIG_SELF_STATUS = "selfstatus";
     public static final String CONFIG_SELF_AVATAR = "selfavatar";
-    public static final String CONFIG_E2EE_ENABLED = "e2ee_enabled";
     public static final String CONFIG_FORCE_ENCRYPTION = "ui.force_encryption";
     public static final String CONFIG_SENTBOX_WATCH = "sentbox_watch";
     public static final String CONFIG_MVBOX_MOVE = "mvbox_move";
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 72b1a3706..1d99a26a9 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -10,13 +10,11 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SHOW_EMAILS;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_WEBXDC_REALTIME_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.getRpc;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -30,7 +28,6 @@ import androidx.preference.CheckBoxPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
-import com.b44t.messenger.DcContext;
 import com.b44t.messenger.rpc.RpcException;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
@@ -40,12 +37,9 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.RegistrationActivity;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
-import org.thoughtcrime.securesms.mms.AttachmentManager;
-import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
-import org.thoughtcrime.securesms.util.StorageUtil;
 import org.thoughtcrime.securesms.util.StreamUtil;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -61,10 +55,9 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
                                         implements DcEventCenter.DcEventDelegate
 {
   private static final String TAG = AdvancedPreferenceFragment.class.getSimpleName();
-  public static final int PICK_SELF_KEYS = 29923;
 
   private ListPreference showEmails;
-  CheckBoxPreference preferE2eeCheckbox;
+  CheckBoxPreference forceE2eeCheckbox;
   CheckBoxPreference bccSelfCheckbox;
   CheckBoxPreference mvboxMoveCheckbox;
   CheckBoxPreference onlyFetchMvboxCheckbox;
@@ -88,9 +81,9 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
       sendAsm.setOnPreferenceClickListener(new SendAsmListener());
     }
 
-    preferE2eeCheckbox = (CheckBoxPreference) this.findPreference("pref_prefer_e2ee");
-    if (preferE2eeCheckbox != null) {
-      preferE2eeCheckbox.setOnPreferenceChangeListener(new PreferE2eeListener());
+    forceE2eeCheckbox = (CheckBoxPreference) this.findPreference("pref_prefer_e2ee");
+    if (forceE2eeCheckbox != null) {
+      forceE2eeCheckbox.setOnPreferenceChangeListener(new PreferE2eeListener());
     }
 
     bccSelfCheckbox = (CheckBoxPreference) this.findPreference("pref_bcc_self");
@@ -141,11 +134,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
       });
     }
 
-    Preference manageKeys = this.findPreference("pref_manage_keys");
-    if (manageKeys != null) {
-      manageKeys.setOnPreferenceClickListener(new ManageKeysListener());
-    }
-
     Preference submitDebugLog = this.findPreference("pref_view_log");
     if (submitDebugLog != null) {
       submitDebugLog.setOnPreferenceClickListener(new ViewLogListener());
@@ -209,8 +197,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
     }
 
     if (dcContext.isChatmail()) {
-      this.findPreference("pref_manage_keys").setVisible(false);
-      this.findPreference("pref_send_autocrypt_setup_message").setVisible(false);
+      sendAsm.setVisible(false);
       bccSelfCheckbox.setVisible(false);
       mvboxMoveCheckbox.setVisible(false);
       onlyFetchMvboxCheckbox.setVisible(false);
@@ -231,7 +218,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
     showEmails.setValue(value);
     updateListSummary(showEmails, value);
 
-    preferE2eeCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_FORCE_ENCRYPTION, 1));
+    forceE2eeCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_FORCE_ENCRYPTION, 1));
     bccSelfCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_BCC_SELF));
     mvboxMoveCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_MVBOX_MOVE));
     onlyFetchMvboxCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_ONLY_FETCH_MVBOX));
@@ -241,24 +228,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode != RESULT_OK) return;
-    if (requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS) {
-        manageKeys();
-    } else if (requestCode == PICK_SELF_KEYS) {
-        Uri uri = (data != null ? data.getData() : null);
-        if (uri == null) {
-            Log.e(TAG, " Can't import null URI");
-            return;
-        }
-      try {
-        String name = AttachmentManager.getFileName(getContext(), uri);
-        if (name == null || name.isEmpty()) name = "FILE";
-        File file = copyToCacheDir(uri);
-        showImportKeysDialog(file.getAbsolutePath(), name);
-      } catch (IOException e) {
-        Log.e(TAG, "Error calling copyToCacheDir()", e);
-      }
-    } else if (requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT) {
+    if (resultCode == RESULT_OK && requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT) {
       openRegistrationActivity();
     }
   }
@@ -418,67 +388,4 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
       }
     }
   }
-
-  /***********************************************************************************************
-   * Key Import/Export
-   **********************************************************************************************/
-  protected void showImportKeysDialog(String imexPath, String pathAsDisplayedToUser) {
-    new AlertDialog.Builder(requireActivity())
-      .setTitle(R.string.pref_managekeys_import_secret_keys)
-      .setMessage(requireActivity().getString(R.string.pref_managekeys_import_explain, pathAsDisplayedToUser))
-      .setNegativeButton(android.R.string.cancel, null)
-      .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImexOne(DcContext.DC_IMEX_IMPORT_SELF_KEYS, imexPath, pathAsDisplayedToUser))
-      .show();
-  }
-
-  private class ManageKeysListener implements Preference.OnPreferenceClickListener {
-    @Override
-    public boolean onPreferenceClick(@NonNull Preference preference) {
-      boolean result = ScreenLockUtil.applyScreenLock(requireActivity(), getString(R.string.pref_manage_keys), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS);
-      if (!result) {
-        manageKeys();
-      }
-      return true;
-    }
-  }
-
-  private void manageKeys() {
-    Activity activity = requireActivity();
-    Permissions.with(activity)
-        .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-        .alwaysGrantOnSdk30()
-        .ifNecessary()
-        .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_storage_denied))
-        .onAllGranted(() -> {
-          new AlertDialog.Builder(activity)
-              .setTitle(R.string.pref_managekeys_menu_title)
-              .setItems(new CharSequence[]{
-                      activity.getString(R.string.pref_managekeys_export_secret_keys),
-                      activity.getString(R.string.pref_managekeys_import_secret_keys)
-                  },
-                  (dialogInterface, i) -> {
-                    if (i==0) {
-                      new AlertDialog.Builder(activity)
-                          .setTitle(R.string.pref_managekeys_export_secret_keys)
-                          .setMessage(activity.getString(R.string.pref_managekeys_export_explain, DcHelper.getImexDir().getAbsolutePath()))
-                          .setNegativeButton(android.R.string.cancel, null)
-                          .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImexOne(DcContext.DC_IMEX_EXPORT_SELF_KEYS))
-                          .show();
-                    }
-                    else {
-                      if (Build.VERSION.SDK_INT >= 30) {
-                        AttachmentManager.selectMediaType(activity, "*/*", null, PICK_SELF_KEYS, StorageUtil.getDownloadUri());
-                      } else {
-                        String path = DcHelper.getImexDir().getAbsolutePath();
-                        showImportKeysDialog(path, path);
-                      }
-                    }
-                  }
-              )
-              .setNegativeButton(R.string.cancel, null)
-              .setNeutralButton(R.string.learn_more, (d, w) -> DcHelper.openHelp(activity, "#importkey"))
-              .show();
-        })
-        .execute();
-  }
 }
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index a1204c070..6a8373b7e 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -118,6 +118,7 @@
     <string name="menu_zoom_in">تقريب</string>
     <string name="menu_zoom_out">تصغير</string>
     <string name="mute_for_one_hour">أكتم لمدة ساعة</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">أكتم لمدة ساعتين</string>
     <string name="mute_for_one_day">أكتم لمدة يوم</string>
     <string name="mute_for_seven_days">أكتم لمدة أسبوع</string>
diff --git a/src/main/res/values-az/strings.xml b/src/main/res/values-az/strings.xml
index 7fa6d3efd..d231e18ad 100644
--- a/src/main/res/values-az/strings.xml
+++ b/src/main/res/values-az/strings.xml
@@ -159,6 +159,7 @@
     <string name="title_share_location">Qrup üzvlərinə yerləşdiyin yerini göndər</string>
     <string name="edit_contact">Kontakta dəyişiklik</string>
     <string name="mute_for_one_hour">1 saatlıq söndür</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2 saatlıq söndür</string>
     <string name="mute_for_one_day">1 günlük söndür</string>
     <string name="mute_for_seven_days">7 günlük söndür</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 06deedbdd..a8dbc45da 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -294,6 +294,7 @@
     <string name="donate">Дарение</string>
 
     <string name="mute_for_one_hour">Спиране на звука за 1 час</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Спиране на звука за 2 часа</string>
     <string name="mute_for_one_day">Спиране на звука за 1 ден</string>
     <string name="mute_for_seven_days">Спиране на звука за 7 дни</string>
@@ -329,7 +330,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Сигурни ли сте, че искате да напуснете тази група?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Да бъде ли изтрито %d съобщение?</item>
         <item quantity="other">Да бъдат ли изтрити %d съобщения?</item>
diff --git a/src/main/res/values-bqi/strings.xml b/src/main/res/values-bqi/strings.xml
index 7f1e51e2a..40bb7c79b 100644
--- a/src/main/res/values-bqi/strings.xml
+++ b/src/main/res/values-bqi/strings.xml
@@ -228,6 +228,7 @@
     <string name="pin">دیسنیڌن</string>
     <string name="source_code">کود بونچک</string>
     <string name="mute_for_one_hour">بؽ دونگ کردن سی 1 ساعت</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">بؽ دونگ کردن سی 2 ساعت</string>
     <string name="mute_for_one_day">بؽ دونگ کردن سی 1 رۊ</string>
     <string name="mute_for_seven_days">بؽ دونگ کردن سی 7 رۊ</string>
@@ -243,7 +244,7 @@
 
     <string name="videochat">گوفت ۉ لوفت ویدیویی</string>
     <string name="videochat_invitation">موکش و گوفت ۉ لوفت ویدیویی</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">êxuy %d payom pāk bu?</item>
         <item quantity="other">اخۊی %d پیوم پاک بۊ؟</item>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index b84ee4bc5..810821fe3 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -332,6 +332,7 @@
     <string name="donate">Feu un donatiu</string>
 
     <string name="mute_for_one_hour">Silencia 1 hora</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Silencia 2 hores</string>
     <string name="mute_for_one_day">Silencia 1 dia</string>
     <string name="mute_for_seven_days">Silencia 7 dies</string>
@@ -377,7 +378,7 @@
         <item quantity="one">¿Esborra %d missatge de tots els teus dispositius?</item>
         <item quantity="other">¿Esborra %d missatges de tots els teus dispositius?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Vols esborrar %d missatge?</item>
         <item quantity="other">Voleu esborrar %d missatges?</item>
diff --git a/src/main/res/values-ckb/strings.xml b/src/main/res/values-ckb/strings.xml
index 96d382e6c..8155e9114 100644
--- a/src/main/res/values-ckb/strings.xml
+++ b/src/main/res/values-ckb/strings.xml
@@ -205,6 +205,7 @@
     <string name="ConversationFragment_quoted_message_not_found">پەیامە ڕەسەنەکە نەدۆزرایەوە</string>
     <string name="reply_privately">وەڵامدانەوەی نهێنی</string>
     <string name="mute_for_one_hour">بێدەنگ کردن بۆ ماوەی 1 کاتژمێر</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">بێدەنگ کردن بۆ ماوەی 2 کاتژمێر</string>
     <string name="mute_for_one_day">بێدەنگ کردن بۆ ماوەی 1 ڕۆژ</string>
     <string name="mute_for_seven_days">بێدەنگ کردن بۆ ماوەی 7 ڕۆژ</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index f28cea822..b98b1b9f4 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -327,7 +327,7 @@
     <string name="jump_to_message">Přejít na zprávu</string>
     <string name="jump_to_original_message">Přejít na původní zprávu</string>
     <string name="copy_json">Kopírovat JSON</string>
-    <string name="replace_draft">Přepsat rozepsané</string>
+    <string name="replace_draft">Nahradit rozepsanou zprávu</string>
     <string name="title_share_location">Sdílet polohu se všemi členy skupiny</string>
     <string name="device_talk">Zprávy v zařízení</string>
     <string name="device_talk_subtitle">Lokálně vygenerované zprávy</string>
@@ -350,6 +350,7 @@
     <string name="donate">Darovat</string>
 
     <string name="mute_for_one_hour">Ztlumit na 1 hodinu</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Ztlumit na 2 hodiny</string>
     <string name="mute_for_one_day">Ztlumit na 1 den</string>
     <string name="mute_for_seven_days">Ztlumit na 7 dní</string>
@@ -401,7 +402,7 @@
         <item quantity="many">Smazat %d zpráv ze všech Vašich zařízení?</item>
         <item quantity="other">Smazat %d zpráv ze všech vašich zařízení?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Smazat %d zprávu?</item>
         <item quantity="few">Smazat %d zprávy?</item>
@@ -410,7 +411,7 @@
     </plurals>
     <string name="ask_forward">Přejete si přeposlat zprávy do chatu %1$s?</string>
     <string name="ask_forward_multiple">Přejete si přeposlat zprávy do %1$d chatů?</string>
-    <string name="ask_export_attachment">Uložením příloh je zpřístupníte ostatním aplikacím na tomto přístroji.\n\nPřejete si pokračovat?</string>
+    <string name="ask_export_attachment">Uložením příloh je zpřístupníte ostatním aplikacím na tomto zařízení.\n\nPřejete si pokračovat?</string>
     <string name="ask_block_contact">Přejete si zablokovat tento kontakt?\n\nSoukromé zprávy a skupiny vytvořené zablokovanými kontakty budou skryty.\n\nV ostatních skupinách, ve kterých se zablokované kontakty nacházejí, se jejich zprávy budou zobrazovat i nadále.</string>
     <string name="ask_unblock_contact">Přejete si odblokovat tento kontakt?</string>
     <string name="ask_delete_contacts">Přejete si smazat kontakty?\n\nKontakty s probíhajícími chaty a kontakty ze systémového adresáře nelze smazat permanentně.</string>
@@ -462,7 +463,7 @@
     <string name="chat_new_broadcast_hint">Seznam vysílání slouží k posílání zpráv příjemcům v chatu, který je pro ně pouze pro čtení.</string>
     <string name="chat_new_group_hint">Ostatní tuto skupinu uvidí až poté, co odešlete první zprávu.</string>
     <string name="chat_record_slide_to_cancel">Zrušit tahem</string>
-    <string name="chat_record_explain">K nahrání hlasové zprávy stiskněte a držte mikrofon, uvolněte pro odeslání.</string>
+    <string name="chat_record_explain">Pro nahrání hlasové zprávy stiskněte a držte ikonu mikrofonu; uvolněte pro odeslání.</string>
     <string name="chat_no_chats_yet_title">Žádné chaty.\nStiskem \"+\" založte nový chat.</string>
     <string name="chat_all_archived">Všechny chaty jsou archivovány.\nStiskem \"+\" založte nový chat.</string>
     <string name="chat_share_with_title">Sdílet s</string>
@@ -473,7 +474,7 @@
     <string name="chat_self_talk_subtitle">Zprávy poslané sobě</string>
     <string name="archive_empty_hint">Zde se zobrazí archivované chaty.</string>
     <string name="saved_messages">Uložené zprávy</string>
-    <string name="saved_messages_explain">• Přepošlete si sem zprávy pro rychlý přístup\n\n• Tvořte si poznámky textové i hlasové\n\n• Uložte si sem multimédia</string>
+    <string name="saved_messages_explain">Sem si můžete:\n\n• přeposílat zprávy pro rychlý přístup,\n\n• zapisovat textové i hlasové poznámky,\n\n• ukládat multimédia</string>
     <!-- Should match "Saved" from "Saved messages" -->
     <string name="saved">Uložené</string>
     <string name="save_as">Uložit jako</string>
@@ -657,7 +658,7 @@
     <!-- for classic email, we use the classical term "Account" -->
     <string name="login_explain">Přihlásit se se stávajícím účtem pro e-mail.</string>
     <string name="login_subheader">Pro standardní poskytovatele jsou nastavení dopněna automaticky. Někdy je potřeba povolit IMAP ve webovém rozhraní. Potřebujete-li pomoc, obraťte se na svého poskytovatele e-mailu nebo přátele.</string>
-    <string name="login_no_servers_hint">Delta Chat nemá žádné vlastní servery, všechna data zůstávají na vašem přístroji.</string>
+    <string name="login_no_servers_hint">Delta Chat nesbírá uživatelská data, vše zůstává na vašem zařízení.</string>
     <string name="login_inbox">Příchozí</string>
     <string name="login_imap_login">IMAP uživatelské jméno</string>
     <string name="login_imap_server">IMAP server</string>
@@ -685,7 +686,7 @@
     <string name="proxy_share_link">Sdílet odkaz</string>
 
     <string name="login_info_oauth2_title">Pokračovat se zjednodušeným nastavením?</string>
-    <string name="login_info_oauth2_text">Zadaný e-mail podporuje zjednodušené nastavení (OAuth 2.0).\n\nV příštím kroku dej prosím Delta Chatu povolení chovat se jako chat přes e-mail. \n\nŽádné servery Delta Chat nemá, tvá data zůstávají na tvém přístroji.</string>
+    <string name="login_info_oauth2_text">Zadaný e-mail podporuje zjednodušené nastavení (OAuth 2.0).\n\nV následujícím kroku, prosíme, povolte Delta Chatu chovat se jako aplikace typu Chat přes e-mail.\n\nDelta Chat nesbírá uživatelská data, vše zůstává na vašem zařízení.</string>
     <string name="login_certificate_checks">Kontroly certifikátu</string>
     <string name="login_error_mail">Prosím, zadejte platnou e-mailovou adresu</string>
     <string name="login_error_server">Prosím, zadejte platný server / IP adresu</string>
@@ -878,7 +879,7 @@
 
     <!-- automatically delete message -->
     <string name="delete_old_messages">Mazat staré zprávy</string>
-    <string name="autodel_device_title">Mazat zprávy z přístroje</string>
+    <string name="autodel_device_title">Mazat zprávy ze zařízení</string>
     <string name="autodel_server_title">Mazat zprávy ze serveru</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_device_ask">Skutečně smazat %1$d zpráv a všechny v budoucnu stažené zprávy \"%2$s\"?\n\n• Toto zahrnuje všechna multimédia\n\n• Zprávy budou smazány bez ohledu na jejich přečtení\n\n• \"Uložené zprávy\" budou ponechány</string>
@@ -928,7 +929,7 @@
     <string name="group_name_changed_by_other">Uživatel %3$s změnil název skupiny z \"%1$s\" na \"%2$s\".</string>
     <string name="group_image_changed_by_you">Změnili jste obrázek skupiny.</string>
     <!-- %1$s will be replaced by name and address of the contact who did the action -->
-    <string name="group_image_changed_by_other">Uživatel %1$s změnil název skupiny.</string>
+    <string name="group_image_changed_by_other">Uživatel %1$s změnil obrázek skupiny.</string>
     <!-- %1$s will be replaced by name and address of the contact added to the group -->
     <string name="member_x_added">Člen %1$s byl přidán.</string>
     <!-- %1$s will be replaced by name and address of the contact added to the group -->
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 1c44f262f..c54f7efde 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -224,6 +224,7 @@
     <string name="ConversationFragment_quoted_message_not_found">Oprindelig besked ikke fundet</string>
     <string name="reply_privately">Svar privat</string>
     <string name="mute_for_one_hour">Dæmp i 1 time</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Dæmp i 2 timer</string>
     <string name="mute_for_one_day">Dæmp i 1 dag</string>
     <string name="mute_for_seven_days">Dæmp i 7 dage</string>
@@ -256,7 +257,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Forlad denne gruppe?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Slet %d besked?</item>
         <item quantity="other">Slet %d beskeder?</item>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6880e07b3..7a92a1c67 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -332,7 +332,9 @@
     <string name="donate">Spenden</string>
 
     <string name="mute_for_one_hour">Stumm für 1 Stunde</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Stumm für 2 Stunden</string>
+    <string name="mute_for_eight_hours">Stumm für 8 Stunden</string>
     <string name="mute_for_one_day">Stumm für 1 Tag</string>
     <string name="mute_for_seven_days">Stumm für 7 Tage</string>
     <string name="mute_forever">Stumm für immer</string>
@@ -378,7 +380,7 @@
         <item quantity="one">%d Nachricht von allen Geräten löschen?</item>
         <item quantity="other">%d Nachrichten von allen Geräten löschen?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">%d Nachricht löschen?</item>
         <item quantity="other">%d Nachrichten löschen?</item>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 77a792633..08e5e15ff 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -264,6 +264,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Προσθήκη στην κεντρική οθόνη</string>
     <string name="mute_for_one_hour">Σίγαση για 1 ώρα</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Σίγαση για 2 ώρες</string>
     <string name="mute_for_one_day">Σίγαση για 1 ημέρα</string>
     <string name="mute_for_seven_days">Σίγαση για 7 ημέρες</string>
@@ -299,7 +300,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Είστε σίγουρος/-η ότι θέλετε να βγείτε από αυτή την ομάδα;</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Διαγραφή %d μηνύματος;</item>
         <item quantity="other">Διαγραφή %d μηνυμάτων;</item>
diff --git a/src/main/res/values-eo/strings.xml b/src/main/res/values-eo/strings.xml
index f0015ef42..f5e7d8e97 100644
--- a/src/main/res/values-eo/strings.xml
+++ b/src/main/res/values-eo/strings.xml
@@ -267,6 +267,7 @@
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
     <string name="unpin">Depingli</string>
     <string name="mute_for_one_hour">Silentigi por 1 horo</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Silentigi por 2 horoj</string>
     <string name="mute_for_one_day">Silentigi por 1 tago</string>
     <string name="mute_for_seven_days">Silentigi por 7 tagoj</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 00fa8919d..65d16ce6b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -358,6 +358,7 @@
     <string name="donate">Donar</string>
 
     <string name="mute_for_one_hour">Silenciar por 1 hora</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Silenciar por 2 horas</string>
     <string name="mute_for_one_day">Silenciar por 1 día</string>
     <string name="mute_for_seven_days">Silenciar por 7 días</string>
@@ -406,7 +407,7 @@
         <item quantity="many">¿Eliminar %d mensajes de todos tus dispositivos?</item>
         <item quantity="other">¿Eliminar %d mensajes de todos tus dispositivos?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">¿Eliminar %d mensaje?</item>
         <item quantity="many">¿Eliminar %d mensajes?</item>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index d0b62432e..4f64c5510 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -177,6 +177,7 @@
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
     <string name="unpin">Desfinkatu</string>
     <string name="mute_for_one_hour">Mututu ordubete</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Mututu 2 ordu</string>
     <string name="mute_for_one_day">Mututu egun bat</string>
     <string name="mute_for_seven_days">Mututu 7 egun</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 4d520ba59..0fcb363d7 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -316,6 +316,7 @@
     <string name="donate">حمایت مالی</string>
 
     <string name="mute_for_one_hour">ساکت کردن به مدت۱ ساعت</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">ساکت کردن به مدت ۲ ساعت</string>
     <string name="mute_for_one_day">ساکت کردن به مدت ۱ روز</string>
     <string name="mute_for_seven_days">ساکت کردن به مدت۷ روز</string>
@@ -354,7 +355,7 @@ https://meet.jit.si/$ROOM
 
     <!-- get confirmations -->
     <string name="ask_leave_group">مطمئن هستید می‌خواهید این گروه را ترک کنید؟</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">می‌خواهید %dپیام پاک شود؟</item>
         <item quantity="other">می‌خواهید %d پیام پاک شود؟</item>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 061f43feb..9205e0a96 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -294,6 +294,7 @@
     <string name="donate">Lahjoita</string>
 
     <string name="mute_for_one_hour">Mykistä 1 tunniksi</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Mykistä 2 tunniksi</string>
     <string name="mute_for_one_day">Mykistä 1 päiväksi</string>
     <string name="mute_for_seven_days">Mykistä 7 päiväksi</string>
@@ -329,7 +330,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Haluatko varmasti poistua tästä ryhmästä?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Poista %d viesti?</item>
         <item quantity="other">Poista %d viestiä?</item>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 1e0a2648b..3a5f54915 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -337,6 +337,7 @@
     <string name="donate">Faire un don</string>
 
     <string name="mute_for_one_hour">Désactiver pour 1 heure</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Désactiver pour 2 heures</string>
     <string name="mute_for_one_day">Désactiver pour 1 jour</string>
     <string name="mute_for_seven_days">Désactiver pour 7 jours</string>
@@ -379,7 +380,7 @@
         <item quantity="many">Effacer %d messages ici et sur le serveur ?</item>
         <item quantity="other">Effacer %d messages ici et sur le serveur  ?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Supprimer %d message ?</item>
         <item quantity="many">Supprimer %d messages ?</item>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 98ab9852e..f94d207e0 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -270,6 +270,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Engadir á pantalla de Inicio</string>
     <string name="mute_for_one_hour">Acalar durante 1 h.</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Acalar durante 2 h.</string>
     <string name="mute_for_one_day">Acalar durante 1 día</string>
     <string name="mute_for_seven_days">Acalar durante 7 días</string>
@@ -305,7 +306,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Seguro que desexa abandonar o grupo?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Borrar %d mensaxe?</item>
         <item quantity="other">Borrar %d mensaxes?</item>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index f010eb7b5..8068f9f47 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -133,6 +133,7 @@
     <string name="menu_settings">Postavke</string>
     <string name="menu_advanced">Napredno</string>
     <string name="mute_for_one_hour">Utišaj na 1 sat</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Utišaj na 2 sata</string>
     <string name="mute_for_one_day">Utišaj na 1 dan</string>
     <string name="mute_for_seven_days">Utišaj na 7 dana</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index f3c926a11..237080376 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -30,7 +30,7 @@
     <string name="delete">Törlés</string>
     <string name="delete_for_me">Törlés számomra</string>
     <string name="delete_for_everyone">Törlés mindenki számára</string>
-    <string name="info">Infó</string>
+    <string name="info">Információk</string>
     <string name="update">Frissítés</string>
     <string name="emoji">Emodzsi</string>
     <string name="attachment">Csatolmány</string>
@@ -312,8 +312,8 @@
     <string name="replace_draft">Piszkozat cseréje</string>
     <string name="title_share_location">Helyszín megosztása a csoport összes tagjával</string>
     <string name="device_talk">Eszközüzenetek</string>
-    <string name="device_talk_subtitle">Helyileg előállított üzenetek</string>
-    <string name="device_talk_explain">Az üzenetek ebben a csevegésben az Ön készülékén kerülnek előállításra, hogy tájoékoztassák Önt az alkalmazás frissítéseiről és a használat közben felmerülő problémákról.</string>
+    <string name="device_talk_subtitle">Helyben előállított üzenetek</string>
+    <string name="device_talk_explain">Az üzenetek ebben a csevegésben az Ön készülékén kerülnek előállításra, hogy tájékoztassák Önt az alkalmazás frissítéseiről és a használat közben felmerülő problémákról.</string>
     <string name="device_talk_welcome_message2">Lépjen kapcsolatba a partnereivel!\n\n🙌 Koppintson a „QR-kódra” mind a két eszköz főképernyőjén. Válassza a „QR-kód beolvasása” lehetőséget az egyik eszközön, és irányítsa a másik eszközre\n\n🌍 Ha nem ugyanabban a szobában tartózkodnak a partnerével, akkor olvassa be a QR-kódját egy videohíváson keresztül, vagy ossza meg a meghívó-hivatkozást a „QR-kód bolvasása”-ból.\n\nMajd: Élvezze az üzenetküldés-élményt a valaha létezett legnagyobb decentralizált hálózaton keresztül, ami az e-mail és - más népszerű alkalmazásokkal ellentétben - központi kiszolgáló vagy nyomon követés nélkül, illetve anélkül, hogy önt, partnereit, kollégáit vagy családját nagy szervezeteknek adná el.</string>
     <string name="edit_contact">Névjegy szerkesztése</string>
     <!-- Verb "to pin", making something sticky, not a noun or abbreviation for "pin number". -->
@@ -332,6 +332,7 @@
     <string name="donate">Adományozás</string>
 
     <string name="mute_for_one_hour">Némítás 1 órára</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Némítás 2 órára</string>
     <string name="mute_for_one_day">Némítás 1 napra</string>
     <string name="mute_for_seven_days">Némítás 7 napra</string>
@@ -377,7 +378,7 @@
         <item quantity="one">Töröl %d üzenetet az összes eszközén?</item>
         <item quantity="other">Töröl %d üzenetet az összes eszközén?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">%d üzenet törlése?</item>
         <item quantity="other">%d üzenet törlése?</item>
@@ -887,7 +888,7 @@
 
     <!-- system messages -->
     <string name="systemmsg_cannot_decrypt">Ez az üzenet nem dekódolható.\n\n• Már az is segíthet, ha egyszerűen válaszol erre az üzenetre, és megkéri a feladóját, hogy küldje el újra az üzenetet.\n\n• Ha most telepítette újra a Delta Chatet, akkor a legjobb, ha most újraindítja a Delta Chatet, és kiválasztja a „Második eszközként való hozzáadás” lehetőséget, vagy importál egy biztonsági mentést.</string>
-    <string name="systemmsg_unknown_sender_for_chat">Az üzenet küldője ismeretlen ebben a csevegésben. További részletekért nézze meg az \'Infót\'.</string>
+    <string name="systemmsg_unknown_sender_for_chat">Az üzenet feladója ismeretlen ebben a csevegésben. További részletekért tekintse meg az „Információkat”.</string>
     <string name="systemmsg_subject_for_new_contact">Üzenet tőle: %1$s</string>
     <string name="systemmsg_failed_sending_to">Nem sikerült elküldeni az üzenetet „%1$s” számára.</string>
     <!-- %1$s will be replaced by the old group name, %2$s will be replaced by the new group name -->
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 0da84d10a..bd4bdac09 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -257,6 +257,7 @@
     <string name="ConversationFragment_quoted_message_not_found">Pesan orisinil tidak ditemukan</string>
     <string name="reply_privately">Balas secara privat</string>
     <string name="mute_for_one_hour">Diamkan untuk 1 jam</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Diamkan untuk 2 jam</string>
     <string name="mute_for_one_day">Diamkan untuk 1 hari</string>
     <string name="mute_for_seven_days">Diamkan untuk 7 hari</string>
@@ -287,7 +288,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Apakah anda yakin untuk keluar dari grup ini?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="other">Menghapus pesan %d?</item>
     </plurals>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 04142550f..0633e5bbb 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -341,6 +341,7 @@
     <string name="donate">Dona</string>
 
     <string name="mute_for_one_hour">Silenzia per 1 ora</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Silenzia per 2 ore</string>
     <string name="mute_for_one_day">Silenzia per 1 giorno</string>
     <string name="mute_for_seven_days">Silenzia per 7 giorni</string>
@@ -390,7 +391,7 @@
         <item quantity="many">Cancella %d messaggi su tutti i tuoi dispositivi?</item>
         <item quantity="other">Cancella %d messaggi su tutti i tuoi dispositivi?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Eliminare %d messaggio?</item>
         <item quantity="many">Eliminare %d messaggi?</item>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 751963670..d0259b5e5 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -221,6 +221,7 @@
     <string name="ConversationFragment_quoted_message_not_found">メッセージが見つかりません</string>
     <string name="reply_privately">個別に返信する</string>
     <string name="mute_for_one_hour">1時間停止する</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2時間停止する</string>
     <string name="mute_for_one_day">24時間停止する</string>
     <string name="mute_for_seven_days">7日間停止する</string>
diff --git a/src/main/res/values-km/strings.xml b/src/main/res/values-km/strings.xml
index 1111fc4e8..5b146c83f 100644
--- a/src/main/res/values-km/strings.xml
+++ b/src/main/res/values-km/strings.xml
@@ -238,6 +238,7 @@
     <string name="ConversationFragment_quoted_message_not_found">រកមិនឃើញសារដើម</string>
     <string name="reply_privately">ឆ្លើយតបដោយឯកជន</string>
     <string name="mute_for_one_hour">ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល១ម៉ោង</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល២ម៉ោង</string>
     <string name="mute_for_one_day">ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល១ថ្ងៃ</string>
     <string name="mute_for_seven_days">ធ្វើឲ្យមិនឃើញមិនលឺរយៈពេល៧ថ្ងៃ</string>
@@ -269,7 +270,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">តើអ្នកប្រាកដហើយថាចង់ចាកចេញពីក្រុមនេះ?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="other">លុបសារ %d</item>
     </plurals>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index dbfaae3d1..f079c647b 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -256,6 +256,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">홈 스크린에 추가</string>
     <string name="mute_for_one_hour">1시간 동안 알림 끄기</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2시간 동안 알림 끄기</string>
     <string name="mute_for_one_day">1일 동안 알림 끄기</string>
     <string name="mute_for_seven_days">7일 동안 알림 끄기</string>
@@ -289,7 +290,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">이 그룹에서 나가시겠습니까?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="other">%d개의 메시지를 삭제하시겠습니까?</item>
     </plurals>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index 6d6f0c6b5..792b4a908 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -279,6 +279,7 @@
     <string name="donate">Paaukoti</string>
 
     <string name="mute_for_one_hour">Išjungti 1 valandai</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Išjungti 2 valandoms</string>
     <string name="mute_for_one_day">Išjungti 1 dienai</string>
     <string name="mute_for_seven_days">Išjungti 7 dienoms</string>
@@ -308,7 +309,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Ar tikrai norite išeiti iš šios grupės?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Ištrinti %d žinutę?</item>
         <item quantity="few">Ištrinti %d žinutes?</item>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 38aa3335d..5d4bb68b0 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -183,6 +183,7 @@
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
     <string name="unpin">Løsn</string>
     <string name="mute_for_one_hour">Demp i 1 time</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Demp i 2 timer</string>
     <string name="mute_for_one_day">Demp i 1 dag</string>
     <string name="mute_for_seven_days">Demp i 7 dager</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 8aaa049d8..1f9e68430 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -332,7 +332,9 @@
     <string name="donate">Doneren</string>
 
     <string name="mute_for_one_hour">1 uur lang uitschakelen</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2 uur lang uitschakelen</string>
+    <string name="mute_for_eight_hours">8 uur lang uitschakelen</string>
     <string name="mute_for_one_day">1 dag lang uitschakelen</string>
     <string name="mute_for_seven_days">7 dagen lang uitschakelen</string>
     <string name="mute_forever">Permanent uitschakelen</string>
@@ -377,7 +379,7 @@
         <item quantity="one">Wil je %d bericht verwijderen van al je apparaten?</item>
         <item quantity="other">Wil je %d berichten verwijderen van al je apparaten?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Wil je %d bericht verwijderen?</item>
         <item quantity="other">Wil je %d berichten verwijderen?</item>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 4f7b5c220..d3cd72fa5 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -350,6 +350,7 @@
     <string name="donate">Wspomóż</string>
 
     <string name="mute_for_one_hour">Wyłącz na 1 godzinę</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Wyłącz na 2 godziny</string>
     <string name="mute_for_one_day">Wyłącz na 1 dzień</string>
     <string name="mute_for_seven_days">Wyłącz na 7 dni</string>
@@ -401,7 +402,7 @@
         <item quantity="many">Usunąć %d wiadomości ze wszystkich urządzeń?</item>
         <item quantity="other">Usunąć %d wiadomości ze wszystkich urządzeń?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Usunąć %d wiadomość?</item>
         <item quantity="few">Usunąć %d wiadomości?</item>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 152082c88..6d4dbdf6b 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -290,6 +290,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Adicionar à Tela Inicial</string>
     <string name="mute_for_one_hour">Silenciar por 1 hora</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Silenciar por 2 horas</string>
     <string name="mute_for_one_day">Silenciar por 1 dia</string>
     <string name="mute_for_seven_days">Silenciar por 7 dias</string>
@@ -326,7 +327,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Quer mesmo sair do grupo?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Apagar %d mensagem?</item>
         <item quantity="many">Apagar %d mensagens?</item>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 3c8606bb3..af0b1bc92 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -132,6 +132,7 @@
     <string name="menu_advanced">Avançado</string>
     <string name="menu_view_profile">Ver perfil</string>
     <string name="mute_for_one_hour">Calado por 1 hora</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Calado por 2 horas</string>
     <string name="mute_for_one_day">Calado por 1 dia</string>
     <string name="mute_for_seven_days">Calado por 7 dias</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 08a3df305..4ebe990af 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -280,6 +280,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Adăugați la ecranul principal</string>
     <string name="mute_for_one_hour">Silențios timp de 1 oră</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Silențios timp de 2 ore</string>
     <string name="mute_for_one_day">Silențios pentru 1 zi</string>
     <string name="mute_for_seven_days">Silențios timp de 7 zile</string>
@@ -316,7 +317,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Ești sigur că vrei să părăsești acest grup?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Ștergeți %d mesaj?</item>
         <item quantity="few">Ștergeți %d mesaje?</item>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 5a7f423e6..335b893fd 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -350,7 +350,9 @@
     <string name="donate">Пожертвовать</string>
 
     <string name="mute_for_one_hour">На 1 час</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">На 2 часа</string>
+    <string name="mute_for_eight_hours">На 8 часов</string>
     <string name="mute_for_one_day">На 1 день</string>
     <string name="mute_for_seven_days">На 7 дней</string>
     <string name="mute_forever">Постоянно</string>
@@ -401,7 +403,7 @@
         <item quantity="many">Удалить %d сообщений на всех ваших устройствах?</item>
         <item quantity="other">Удалить %d сообщений на всех ваших устройствах?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Удалить %d сообщение?</item>
         <item quantity="few">Удалить %d сообщения?</item>
diff --git a/src/main/res/values-sc/strings.xml b/src/main/res/values-sc/strings.xml
index bf91c6a46..0093c26e2 100644
--- a/src/main/res/values-sc/strings.xml
+++ b/src/main/res/values-sc/strings.xml
@@ -191,6 +191,7 @@
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
     <string name="unpin">Isbloca</string>
     <string name="mute_for_one_hour">A sa muda pro 1 ora</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">A sa muda pro 2 oras</string>
     <string name="mute_for_one_day">A sa muda pro 1 die</string>
     <string name="mute_for_seven_days">A sa muda pro 7 dies</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index ba2231e89..efad4cc77 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -280,6 +280,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Pridať na domovskú obrazovku</string>
     <string name="mute_for_one_hour">Stíšiť na 1 hodinu</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Stíšiť na 2 hodiny</string>
     <string name="mute_for_one_day">Stíšiť na 1 deň</string>
     <string name="mute_for_seven_days">Stíšiť na 7 dní</string>
@@ -317,7 +318,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Naozaj chcete opustiť túto skupinu?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Odstrániť %d správu?</item>
         <item quantity="few">Odstrániť %d správy?</item>
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index e6f89b746..443a4df06 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -328,7 +328,9 @@
     <string name="donate">Dhuroni</string>
 
     <string name="mute_for_one_hour">Heshtoji për 1 orë</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Heshtoji për 2 orë</string>
+    <string name="mute_for_eight_hours">Heshtoje për 8 orë</string>
     <string name="mute_for_one_day">Heshtoji për 1 ditë</string>
     <string name="mute_for_seven_days">Heshtoji për 7 ditë</string>
     <string name="mute_forever">Heshtoje përgjithmonë</string>
@@ -373,7 +375,7 @@
         <item quantity="one">Të fshihet %d mesazh në krejt pajisjet tuaja?</item>
         <item quantity="other">Të fshihen %d mesazhe në krejt pajisjet tuaja?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Të fshihet %d mesazh?</item>
         <item quantity="other">Të fshihen %d mesazhe?</item>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 11c979a96..f5a0ad897 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -283,6 +283,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Додај на главни екран</string>
     <string name="mute_for_one_hour">Утишај на 1 сат</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Утишај на 2 сата</string>
     <string name="mute_for_one_day">Утишај на 1 дан</string>
     <string name="mute_for_seven_days">Утишај на 7 дана</string>
@@ -319,7 +320,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Да ли заиста желите да напустите ову групу?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Да ли желите да избришите %d поруку?</item>
         <item quantity="few">Да ли желите да избришите %d поруке?</item>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 8d9638658..8da5dafbf 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -300,6 +300,7 @@
     <string name="donate">Donera</string>
 
     <string name="mute_for_one_hour">Tysta 1 timma</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Tysta 2 timmar</string>
     <string name="mute_for_one_day">Tysta 1 dag</string>
     <string name="mute_for_seven_days">Tysta 7 dagar</string>
@@ -335,7 +336,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Är du säker på att du vill lämna den här gruppen?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Vill du ta bort %d meddelande?</item>
         <item quantity="other">Vill du ta bort %d meddelanden?</item>
diff --git a/src/main/res/values-ta/strings.xml b/src/main/res/values-ta/strings.xml
index 75c661f68..074e7af7c 100644
--- a/src/main/res/values-ta/strings.xml
+++ b/src/main/res/values-ta/strings.xml
@@ -133,6 +133,7 @@
     <string name="menu_advanced">மேம்பட்ட அமைப்புகள்</string>
     <string name="menu_view_profile">சுயவிவரத்தை காண்பி</string>
     <string name="mute_for_one_hour">1 மணி இதற்காக ஊமையாக்கு</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2 மணிகள் இதற்காக ஊமையாக்கு</string>
     <string name="mute_for_one_day">1 நாள் இதற்காக ஊமையாக்கு</string>
     <string name="mute_for_seven_days">7 நாட்கள் இதற்காக ஊமையாக்கு</string>
diff --git a/src/main/res/values-te/strings.xml b/src/main/res/values-te/strings.xml
index 10217a834..14ff26c1b 100644
--- a/src/main/res/values-te/strings.xml
+++ b/src/main/res/values-te/strings.xml
@@ -117,6 +117,7 @@
     <string name="menu_zoom_in">పెద్దదిగా చూపు</string>
     <string name="menu_zoom_out">పెద్దది చెయ్యి</string>
     <string name="mute_for_one_hour">1 గంట నిశబ్దంగా ఉంచు</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2 గంటలు నిశబ్దంగా ఉంచు</string>
     <string name="mute_for_one_day">1 రోజు నిశబ్దంగా ఉంచు</string>
     <string name="mute_for_seven_days">7 రోజులు నిశబ్దంగా ఉంచు</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 40034f183..d377f6e22 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -332,6 +332,7 @@
     <string name="donate">Bağış</string>
 
     <string name="mute_for_one_hour">1 saatliğine sessize al</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">2 saatliğine sessize al</string>
     <string name="mute_for_one_day">1 günlüğüne sessize al</string>
     <string name="mute_for_seven_days">7 günlüğüne sessize al</string>
@@ -377,7 +378,7 @@
         <item quantity="one">Tüm aygıtlarınızdaki %d ileti silinsin mi?</item>
         <item quantity="other">Tüm aygıtlarınızdaki %d ileti silinsin mi?</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">%d ileti silinsin mi?</item>
         <item quantity="other">%d ileti silinsin mi?</item>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index eb981ed17..e357dde4d 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -347,6 +347,7 @@
     <string name="donate">Пожертвувати</string>
 
     <string name="mute_for_one_hour">Відключити сповіщення на 1 годину</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Відключити сповіщення на 2 години</string>
     <string name="mute_for_one_day">Відключити сповіщення на 1 день</string>
     <string name="mute_for_seven_days">Відключити сповіщення на 7 днів</string>
@@ -384,7 +385,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Ви впевнені, що хочете залишити цю групу?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="one">Видалити %d повідомлення?</item>
         <item quantity="few">Видалити %d повідомлення?</item>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index e6d939adb..89bd6f25d 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -283,6 +283,7 @@
     <string name="donate">Quyên tặng</string>
 
     <string name="mute_for_one_hour">Tắt tiếng trong 1 giờ</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">Tắt tiếng trong 2 giờ</string>
     <string name="mute_for_one_day">Tắt tiếng trong 1 ngày</string>
     <string name="mute_for_seven_days">Tắt tiếng trong 7 ngày</string>
@@ -317,7 +318,7 @@
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Bạn có chắc chắn muốn rời khỏi nhóm này không?</string>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="other">Xóa %d tin nhắn?</item>
     </plurals>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index d92713158..47522c3bd 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- common strings without special context -->
-    <string name="app_name">德尔塔聊</string>
+    <string name="app_name">Delta Chat</string>
     <string name="ok">确定</string>
     <string name="cancel">取消</string>
     <string name="clear_search">清除搜索</string>
@@ -323,7 +323,9 @@
     <string name="donate">捐赠</string>
 
     <string name="mute_for_one_hour">静音 1 小时</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">静音 2 小时</string>
+    <string name="mute_for_eight_hours">静音 8 小时</string>
     <string name="mute_for_one_day">静音 1 天</string>
     <string name="mute_for_seven_days">静音 7 天</string>
     <string name="mute_forever">永久静音</string>
@@ -365,7 +367,7 @@
     <plurals name="ask_delete_messages">
         <item quantity="other">是否删除所有设备上的 %d 条消息？</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="other">删除 %d 条消息吗？</item>
     </plurals>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 2d761d724..4ee92fbcd 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -323,6 +323,7 @@
     <string name="donate">捐贈</string>
 
     <string name="mute_for_one_hour">靜音1小時</string>
+    <!-- deprecated -->
     <string name="mute_for_two_hours">靜音2小時</string>
     <string name="mute_for_one_day">靜音1天</string>
     <string name="mute_for_seven_days">靜音7天</string>
@@ -365,7 +366,7 @@
     <plurals name="ask_delete_messages">
         <item quantity="other">是否刪除所有裝置上的%d條訊息？</item>
     </plurals>
-    <!-- deprecated, use ask_delete_messages -->
+    <!-- Used for the deletion of Device messages -->
     <plurals name="ask_delete_messages_simple">
         <item quantity="other">刪除%d則訊息？</item>
     </plurals>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f56b4cc1e..abea0088f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -899,6 +899,7 @@
     <string name="autocrypt_prefer_e2ee">Prefer End-To-End Encryption</string>
     <string name="autocrypt_asm_subject">Autocrypt Setup Message</string>
     <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>
+    <!-- deprecated -->
     <string name="autocrypt_asm_click_body">This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, tap or click on this message.</string>
     <string name="autocrypt_continue_transfer_title">Autocrypt Setup Message</string>
     <string name="autocrypt_continue_transfer_please_enter_code">Please enter the setup code displayed on the other device.</string>
diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml
index dfefd06c7..15e10145e 100644
--- a/src/main/res/xml/preferences_advanced.xml
+++ b/src/main/res/xml/preferences_advanced.xml
@@ -47,10 +47,6 @@
             android:key="pref_prefer_e2ee"
             android:title="@string/force_e2ee"/>
 
-
-        <Preference android:key="pref_manage_keys"
-            android:title="@string/pref_manage_keys"/>
-
         <Preference android:key="pref_send_autocrypt_setup_message"
             android:title="@string/autocrypt_send_asm_title"/>