From 8fb414068978221aaa8aed58915317c1effa91e1 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 6 Jan 2023 11:22:52 +0100
Subject: [PATCH 1/8] update deltachat-core-rust submodule to 'mark all
 archived read (#3919)'

---
 jni/deltachat-core-rust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index c5d180234..eba96eb90 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit c5d18023463460316395fdb68a910cd5b31cc1d8
+Subproject commit eba96eb9047048d30b57db59042c3c10fe386e4d

From 17039651be21146e8e3cb976a73408c9eceb1a13 Mon Sep 17 00:00:00 2001
From: bjoern <r10s@b44t.com>
Date: Fri, 6 Jan 2023 11:37:33 +0100
Subject: [PATCH 2/8] add function 'mark all as read' to archive (#2443)

* add function 'mark all as read' to archive

as we have the unread counter there now,
we should have an easy way to reset it.

* more clear strings-key
---
 res/menu/archived_list.xml                    |  9 ++++++++
 res/values/strings.xml                        |  3 +++
 .../ConversationListArchiveActivity.java      | 23 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 res/menu/archived_list.xml

diff --git a/res/menu/archived_list.xml b/res/menu/archived_list.xml
new file mode 100644
index 000000000..8b321e0d8
--- /dev/null
+++ b/res/menu/archived_list.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/mark_all_as_read"
+          android:id="@+id/mark_as_read"
+          app:showAsAction="never"/>
+
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25e83fec4..4a1094eca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -48,6 +48,9 @@
     <string name="start_chat">Start Chat</string>
     <string name="show_full_message">Show Full Message…</string>
     <string name="show_full_message_in_browser">Show Full Message in Browser…</string>
+    <string name="mark_all_as_read">Mark All as Read</string>
+    <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
+    <string name="mark_as_read_short">Read</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Loading…</string>
     <string name="hide">Hide</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
index 77de74d88..073b2da6e 100644
--- a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
@@ -2,8 +2,13 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import com.b44t.messenger.DcChat;
+
+import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
@@ -57,12 +62,28 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
     dynamicLanguage.onResume(this);
   }
 
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    MenuInflater inflater = this.getMenuInflater();
+    menu.clear();
+
+    inflater.inflate(R.menu.archived_list, menu);
+    super.onPrepareOptionsMenu(menu);
+    return true;
+  }
+
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
 
     switch (item.getItemId()) {
-      case android.R.id.home: super.onBackPressed(); return true;
+      case android.R.id.home:
+        super.onBackPressed();
+        return true;
+
+      case R.id.mark_as_read:
+        DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK);
+        return true;
     }
 
     return false;

From ef25dff3e49db7728a83b2bbae634a8afde547e2 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 6 Jan 2023 11:45:40 +0100
Subject: [PATCH 3/8] update translations

---
 res/values-de/strings.xml     | 7 ++++++-
 res/values-el/strings.xml     | 3 ++-
 res/values-es/strings.xml     | 3 ++-
 res/values-fa/strings.xml     | 3 ++-
 res/values-fi/strings.xml     | 3 ++-
 res/values-fr/strings.xml     | 3 ++-
 res/values-gl/strings.xml     | 3 ++-
 res/values-it/strings.xml     | 3 ++-
 res/values-ko/strings.xml     | 1 +
 res/values-nl/strings.xml     | 3 ++-
 res/values-pl/strings.xml     | 3 ++-
 res/values-pt-rBR/strings.xml | 3 ++-
 res/values-ru/strings.xml     | 3 ++-
 res/values-sk/strings.xml     | 3 ++-
 res/values-sq/strings.xml     | 3 ++-
 res/values-tr/strings.xml     | 3 ++-
 res/values-uk/strings.xml     | 3 ++-
 res/values-zh-rCN/strings.xml | 3 ++-
 res/values/strings.xml        | 1 +
 19 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fd0dbea36..0666aecb6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -48,6 +48,10 @@
     <string name="start_chat">Chat starten</string>
     <string name="show_full_message">Ganze Nachricht anzeigen…</string>
     <string name="show_full_message_in_browser">Ganze Nachricht im Browser anzeigen…</string>
+    <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
+    <string name="mark_all_as_read">Alles Gelesen</string>
+    <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
+    <string name="mark_as_read_short">Gelesen</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Wird geladen…</string>
     <string name="hide">Verstecken</string>
@@ -738,8 +742,9 @@
     <string name="remove_member_by_you">Sie haben %1$s entfernt.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%1$s entfernt von %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Sie haben die Gruppe verlassen.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Gruppe verlassen von %1$s.</string>
     <string name="group_image_deleted_by_you">Sie haben das Gruppenbild gelöscht.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index aab7c6508..c90f3f94d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -738,8 +738,9 @@
     <string name="remove_member_by_you">Αφαίρεσες τον/την %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Ο/Η %2$s αφαίρεσε τον/την %1$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Έφυγες απ\' την ομάδα.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Ο/Η %1$s έφυγε απ\' την ομαδα.</string>
     <string name="group_image_deleted_by_you">Διαγράψατε την εικόνα της ομάδας.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3ea3ea8a2..16584e2fc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -753,8 +753,9 @@
     <string name="remove_member_by_you">Eliminaste al miembro %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Miembro %1$s eliminado por %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Abandonaste el grupo.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Grupo abandonado por %1$s.</string>
     <string name="group_image_deleted_by_you">Eliminaste la imagen del grupo.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1756b2926..7250d1809 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -751,8 +751,9 @@ https://meet.jit.si/$ROOM
     <string name="remove_member_by_you">شما عضویت %1$s را حذف کردید.  </string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">عضویت %1$s توسط %2$s حذف شد. </string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">شما گروه را ترک کردید.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">ترک گروه توسط %1$s.</string>
     <string name="group_image_deleted_by_you">شما تصویر گروه را حذف کردید.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a22ef1f04..cf6c9b3ff 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -738,8 +738,9 @@
     <string name="remove_member_by_you">Jäsen %1$s poistettu minun toimestani.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Jäsen %1$s poistettu käyttäjän %2$s toimesta.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Poistuit ryhmästä.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s poistui ryhmästä.</string>
     <string name="group_image_deleted_by_you">Ryhmän kuva poistettu minun toimestani.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3a069cf99..fe2ad3072 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -753,8 +753,9 @@
     <string name="remove_member_by_you">Membre %1$s retiré par vous.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Membre %1$s retiré par %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Vous avez quitté le groupe.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s a quitté le groupe.</string>
     <string name="group_image_deleted_by_you">Image du groupe effacée par vous.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 800298454..9c71146aa 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -738,8 +738,9 @@
     <string name="remove_member_by_you">Eliminaches a %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%1$s eliminado por %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Saíches do grupo</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s deixou o grupo.</string>
     <string name="group_image_deleted_by_you">Eliminaches a imaxe do grupo</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6bce4f0d5..2a67e7e35 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -753,8 +753,9 @@
     <string name="remove_member_by_you">Hai rimosso il membro %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Membro %1$s rimosso da %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Hai lasciato il gruppo.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Gruppo lasciato da %1$s.</string>
     <string name="group_image_deleted_by_you">Hai eliminato l\'immagine del gruppo.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 75a747f30..ffd252761 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -701,6 +701,7 @@
     <string name="remove_member_by_you">%1$s를 멤버에서 제거함.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%2$s가 %1$s를 멤버에서 제거함.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">그룹을 나갔습니다.</string>
     <string name="group_image_deleted_by_you">그룹 이미지를 지움.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7d9a0424a..73a79cc08 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -738,8 +738,9 @@
     <string name="remove_member_by_you">Je hebt ‘%1$s’ verwijderd.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">‘%1$s’ is verwijderd door %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Je hebt de groep verlaten.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">De groep is verlaten door %1$s.</string>
     <string name="group_image_deleted_by_you">Je hebt de groepsafbeelding verwijderd.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d19ce0a8b..8835d27ce 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -768,8 +768,9 @@
     <string name="remove_member_by_you">Usunięto członka %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Użytkownik %2$s usunął członka %1$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Opuszczono grupę</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Grupa opuszczona przez %1$s.</string>
     <string name="group_image_deleted_by_you">Usunięto obraz grupy.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index cf42e9034..dcc043b4e 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -753,8 +753,9 @@
     <string name="remove_member_by_you">Você removeu o membro %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Membro %1$s removido por %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Você saiu do grupo.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Grupo deixado por %1$s.</string>
     <string name="group_image_deleted_by_you">Você removeu a imagem do grupo.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cfcda0b14..dfe8c02a3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -768,8 +768,9 @@
     <string name="remove_member_by_you">Вы удалили участника %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Участник %1$s удален %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Вы вышли из группы.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s вышел из группы.</string>
     <string name="group_image_deleted_by_you">Вы удалили изображение группы.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ad2d5d28a..072c50000 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -765,8 +765,9 @@
     <string name="remove_member_by_you">Člen %1$s bol odstránený mnou.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Člen %1$s bol odstránený od %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Opustili ste skupinu</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Skupinu opustil(a) %1$s.</string>
     <string name="group_image_deleted_by_you">Odstránili ste obrázok skupiny.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 7cbaf89c0..3fe1a85b0 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -735,8 +735,9 @@
     <string name="remove_member_by_you">Hoqët anëtarin %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Anëtari %1$s u hoq nga %2$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">E braktisët grupin.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Grupi u braktis nga %1$s.</string>
     <string name="group_image_deleted_by_you">Fshitë figurën e grupit.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d6e513e94..b671f1b48 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -738,8 +738,9 @@
     <string name="remove_member_by_you">%1$s üyesini kaldırdınız.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%2$s tarafından %1$s üyesi kaldırıldı.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Gruptan ayrıldınız.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s tarafından gruptan ayrılındı.</string>
     <string name="group_image_deleted_by_you">Grup görselini sildiniz.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0a1a48912..ed0964296 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -768,8 +768,9 @@
     <string name="remove_member_by_you">Ви видалили учасника %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%2$s видалили учасника %1$s.</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Ви залишили групу.</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s залишили групу.</string>
     <string name="group_image_deleted_by_you">Ви видалили зображення групи.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4996372b0..b3992c862 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -723,8 +723,9 @@
     <string name="remove_member_by_you">你移除了成员 %1$s</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%2$s 移除了成员 %1$s</string>
+    <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">你退出了群组</string>
-    <!-- %1$s will be replaced by name and address of the contact -->
+    <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s 退出了群组</string>
     <string name="group_image_deleted_by_you">你删除了群组图像</string>
     <!-- %1$s will be replaced by name and address of the contact -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a1094eca..03dd071a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -48,6 +48,7 @@
     <string name="start_chat">Start Chat</string>
     <string name="show_full_message">Show Full Message…</string>
     <string name="show_full_message_in_browser">Show Full Message in Browser…</string>
+    <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
     <string name="mark_all_as_read">Mark All as Read</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
     <string name="mark_as_read_short">Read</string>

From 598089655a8647bfac8b7963c05ecae679f1b646 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 8 Jan 2023 17:50:39 +0100
Subject: [PATCH 4/8] update deltachat-core-rust submodule to 'Prepare 1.105.0
 release'

---
 jni/deltachat-core-rust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index eba96eb90..120a7a309 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit eba96eb9047048d30b57db59042c3c10fe386e4d
+Subproject commit 120a7a3090e46727b21c518ffb618cc643ffff82

From a7e624f4a7f20abd7daed8654dcd5e1f020c24de Mon Sep 17 00:00:00 2001
From: bjoern <r10s@b44t.com>
Date: Sun, 8 Jan 2023 23:26:16 +0100
Subject: [PATCH 5/8] fade left/right animation when opening the archive
 (#2446)

this is similar to opening a chat and feels more natural.
settings/connectivity/help etc. still appear from the bottom as being
"something little different".
---
 .../thoughtcrime/securesms/ConversationListActivity.java    | 1 +
 .../securesms/ConversationListArchiveActivity.java          | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 1e161a184..a7fe90d78 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -406,6 +406,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     } else {
       startActivity(intent);
     }
+    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
index 073b2da6e..939a34458 100644
--- a/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
@@ -55,6 +55,12 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
     setIntent(intent);
   }
 
+  @Override
+  protected void onPause() {
+    super.onPause();
+    if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
+  }
+
   @Override
   public void onResume() {
     super.onResume();

From 826cea5d82b2c03cd1a55e7e77f0a668b725068b Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Mon, 9 Jan 2023 18:17:31 +0100
Subject: [PATCH 6/8] update translations

---
 res/values-it/strings.xml     | 4 ++++
 res/values-pl/strings.xml     | 4 ++++
 res/values-zh-rCN/strings.xml | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a67e7e35..ccdb196c0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -48,6 +48,10 @@
     <string name="start_chat">Inizia una Chat</string>
     <string name="show_full_message">Mostra Messaggio Completo…</string>
     <string name="show_full_message_in_browser">Mostra Messaggio Completo nel Browser…</string>
+    <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
+    <string name="mark_all_as_read">Segna Tutti come Letti</string>
+    <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
+    <string name="mark_as_read_short">Leggi</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Caricamento in Corso…</string>
     <string name="hide">Nascondi</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8835d27ce..a4b9c969b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -48,6 +48,10 @@
     <string name="start_chat">Rozpocznij czat</string>
     <string name="show_full_message">Pokaż całą wiadomość…</string>
     <string name="show_full_message_in_browser">Pokaż całą wiadomość w przeglądarce…</string>
+    <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
+    <string name="mark_all_as_read">Wszys. przeczyt.</string>
+    <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
+    <string name="mark_as_read_short">Przeczytane</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Ładowanie…</string>
     <string name="hide">Ukryj</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b3992c862..7670c6c07 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -48,6 +48,10 @@
     <string name="start_chat">开始聊天</string>
     <string name="show_full_message">显示完整消息… </string>
     <string name="show_full_message_in_browser">在浏览器中显示完整消息…</string>
+    <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
+    <string name="mark_all_as_read">将所有标记为已读</string>
+    <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
+    <string name="mark_as_read_short">已读</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">加载中…</string>
     <string name="hide">隐藏</string>

From fffff6abe527037de798ac72eddcb897116ca059 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 10 Jan 2023 23:32:26 +0100
Subject: [PATCH 7/8] update deltachat-core-rust submodule to 'Clippy fix'

---
 jni/deltachat-core-rust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index 120a7a309..6642083f5 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit 120a7a3090e46727b21c518ffb618cc643ffff82
+Subproject commit 6642083f52120ca1130753bef2ad17789a648f60

From 90c4399d2a5ff92b9236d09f7b5b6358dce9c7cb Mon Sep 17 00:00:00 2001
From: bjoern <r10s@b44t.com>
Date: Wed, 11 Jan 2023 10:54:02 +0100
Subject: [PATCH 8/8] prepare 1.34.10 (#2447)

* update CHANGELOG for 1.34.9

* bump version to 1.34.9

* add a little device message for the 1.34.9 update

* add f-droid changelog

* make device message more clear and add it only for existing installations

* bump to 1.34.10
---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 build.gradle                                  |  4 ++--
 metadata/en-US/changelogs/6464.txt            | 13 +++++++++++++
 .../securesms/ConversationListActivity.java   |  6 ++++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 metadata/en-US/changelogs/6464.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2116334d..4bd419c7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Delta Chat Android Changelog
 
+## v1.34.10
+2023-01
+
+* fix: make archived chats visible that don't get unarchived automatically (muted chats):
+  add an unread counter and move the archive to the top
+* fix: send AVIF, HEIC, TXT, PPT, XLS, XML files as such
+* fix: trigger reconnection when failing to fetch existing messages
+* fix: do not retry fetching existing messages after failure, prevents infinite reconnection loop
+* fix: do not add an error if the message is encrypted but not signed
+* fix: do not strip leading spaces from message lines
+* fix corner cases on sending quoted texts
+* fix STARTTLS connection
+* fix: do not treat invalid email addresses as an exception
+* fix: flush relative database paths introduced in 1.34.8 in time
+* faster updates of chat lists and contact list
+* update translations
+* update to core106
+
+
 ## v1.34.8
 2022-12
 
diff --git a/build.gradle b/build.gradle
index d801cb35f..0e979d353 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,8 +96,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 644
-        versionName "1.34.8"
+        versionCode 646
+        versionName "1.34.10"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true
diff --git a/metadata/en-US/changelogs/6464.txt b/metadata/en-US/changelogs/6464.txt
new file mode 100644
index 000000000..ee894e8fa
--- /dev/null
+++ b/metadata/en-US/changelogs/6464.txt
@@ -0,0 +1,13 @@
+fix: make archived chats visible that don't get unarchived automatically (muted chats): add an unread counter and move the archive to the top
+fix: send AVIF, HEIC, TXT, PPT, XLS, XML files as such
+fix: trigger reconnection when failing to fetch existing messages
+fix: do not retry fetching existing messages after failure, prevents infinite reconnection loop
+fix: do not add an error if the message is encrypted but not signed
+fix: do not strip leading spaces from message lines
+fix corner cases on sending quoted texts
+fix STARTTLS connection
+fix: do not treat invalid email addresses as an exception
+fix: flush relative database paths introduced in 1.34.8 in time
+faster updates of chat lists and contact list
+update translations
+update to core106
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index a7fe90d78..630422b87 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -99,6 +99,12 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     // update messages - for new messages, do not reuse or modify strings but create new ones.
     // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
     DcContext dcContext = DcHelper.getContext(this);
+    if (dcContext.wasDeviceMsgEverAdded("update_1_34d_android")) {
+      // no need to explain the new archive position on new installations; it should just feel natural and overall more intuitive.
+      DcMsg msg2 = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+      msg2.setText("\uD83D\uDDC4️ More handy and common \"Archive\" in 1.34.10: \"Unread counters\" and moving things into view fixes issues with chats that stay in archive.\n\nFor other recent bugfixes, see https://get.delta.chat/#changelogs");
+      dcContext.addDeviceMsg("update_1_34_10_android", msg2);
+    }
     DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
     msg.setText(getString(R.string.update_1_34_android));
     dcContext.addDeviceMsg("update_1_34d_android", msg);