diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
index 4c19bfd9c..894ab277b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
@@ -302,7 +302,7 @@ public class ConversationsOverviewFragment extends XmppFragment {
 		this.binding.list.setAdapter(this.conversationsAdapter);
 		if (activity.getPreferences().getBoolean("show_nav_bar", true)) {
 			binding.list.setClipToPadding(false);
-			binding.list.setPadding(0,0,0,(int) dpToPx(72, activity));
+			binding.list.setPadding(0,0,0,(int) dpToPx(66, activity));
 		} else {
 			binding.list.setClipToPadding(true);
 			binding.list.setPadding(0,0,0,0);
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 133ea5e0a..0bad62373 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -506,7 +506,7 @@ public class StartConversationActivity extends XmppActivity
         speedDialView.clearActionItems();
         if (getPreferences().getBoolean("show_nav_bar", true)) {
             speedDialView.setClipToPadding(false);
-            speedDialView.setPadding(0, 0, 0, (int) dpToPx(72, this));
+            speedDialView.setPadding(0, 0, 0, (int) dpToPx(66, this));
         } else {
             speedDialView.setClipToPadding(true);
             speedDialView.setPadding(0, 0, 0, 0);
@@ -1716,7 +1716,7 @@ public class StartConversationActivity extends XmppActivity
             }
             if (activity.getPreferences().getBoolean("show_nav_bar", true)) {
                 getListView().setClipToPadding(false);
-                getListView().setPadding(0, 0, 0, (int) dpToPx(72, activity));
+                getListView().setPadding(0, 0, 0, (int) dpToPx(66, activity));
             } else {
                 getListView().setClipToPadding(true);
                 getListView().setPadding(0, 0, 0, 0);
diff --git a/src/main/res/layout-w945dp/activity_conversations.xml b/src/main/res/layout-w945dp/activity_conversations.xml
index 46ca90b66..631d049ff 100644
--- a/src/main/res/layout-w945dp/activity_conversations.xml
+++ b/src/main/res/layout-w945dp/activity_conversations.xml
@@ -91,12 +91,13 @@
             android:layout_alignParentBottom="true"
             android:background="@drawable/background_nav_bar"
             android:alpha="0.96"
-            app:labelVisibilityMode="labeled"
+            app:labelVisibilityMode="selected"
             app:menu="@menu/bottom_navigation_menu_chat"
             app:itemPaddingBottom="0dp"
             app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator"
             android:state_checked="true"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:animateLayoutChanges="true" />
 
 </RelativeLayout>
 
diff --git a/src/main/res/layout/activity_conversations.xml b/src/main/res/layout/activity_conversations.xml
index 6b1ac2eaf..51c336c55 100644
--- a/src/main/res/layout/activity_conversations.xml
+++ b/src/main/res/layout/activity_conversations.xml
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+
     <androidx.drawerlayout.widget.DrawerLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.google.android.material.appbar.AppBarLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
+            android:layout_height="match_parent">
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?attr/actionBarSize" >
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-                <eu.siacs.conversations.ui.widget.AvatarView
-                    android:id="@+id/toolbar_avatar"
-                    android:layout_width="38dp"
-                    android:layout_height="38dp"
-                    android:layout_marginEnd="8dp"
-                    android:scaleType="centerCrop"
-                    android:visibility="gone" />
+                <com.google.android.material.appbar.AppBarLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/toolbar_title"
-                        android:layout_width="wrap_content"
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/toolbar"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:textSize="@dimen/actionbar_text_size" />
+                        android:minHeight="?attr/actionBarSize" >
 
-                    <TextView
-                        android:id="@+id/toolbar_subtitle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="12sp"
-                        android:maxLines="1"
-                        android:visibility="gone" />
+                        <eu.siacs.conversations.ui.widget.AvatarView
+                            android:id="@+id/toolbar_avatar"
+                            android:layout_width="38dp"
+                            android:layout_height="38dp"
+                            android:layout_marginEnd="8dp"
+                            android:scaleType="centerCrop"
+                            android:visibility="gone" />
 
-                </LinearLayout>
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
 
-            </com.google.android.material.appbar.MaterialToolbar>
+                            <TextView
+                                android:id="@+id/toolbar_title"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:maxLines="1"
+                                android:textSize="@dimen/actionbar_text_size" />
 
-        </com.google.android.material.appbar.AppBarLayout>
+                            <TextView
+                                android:id="@+id/toolbar_subtitle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textSize="12sp"
+                                android:maxLines="1"
+                                android:visibility="gone" />
 
-        <FrameLayout
-            android:id="@+id/main_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+                        </LinearLayout>
 
-    </LinearLayout>
+                    </com.google.android.material.appbar.MaterialToolbar>
 
-    <com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-        android:id="@+id/drawer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:translationZ="90dp"
-        android:fitsSystemWindows="true" />
+                </com.google.android.material.appbar.AppBarLayout>
+
+                <FrameLayout
+                    android:id="@+id/main_fragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </LinearLayout>
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottom_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nav_bar_height"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="4dp"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/background_nav_bar"
+                android:alpha="0.96"
+                app:labelVisibilityMode="selected"
+                app:menu="@menu/bottom_navigation_menu_chat"
+                app:itemPaddingBottom="0dp"
+                app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator"
+                android:state_checked="true"
+                android:visibility="gone"
+                android:animateLayoutChanges="true" />
+        </RelativeLayout>
+
+        <com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
+            android:id="@+id/drawer"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:fitsSystemWindows="true" />
 
     </androidx.drawerlayout.widget.DrawerLayout>
-
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bottom_navigation"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/nav_bar_height"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp"
-            android:layout_alignParentBottom="true"
-            android:background="@drawable/background_nav_bar"
-            android:alpha="0.96"
-            app:labelVisibilityMode="labeled"
-            app:menu="@menu/bottom_navigation_menu_chat"
-            app:itemPaddingBottom="0dp"
-            app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator"
-            android:state_checked="true"
-            android:visibility="gone" />
-</RelativeLayout>
-    </layout>
+</layout>
diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml
index e634d3f01..3100dc9b8 100644
--- a/src/main/res/layout/activity_manage_accounts.xml
+++ b/src/main/res/layout/activity_manage_accounts.xml
@@ -96,11 +96,12 @@
         android:layout_alignParentBottom="true"
         android:background="@drawable/background_nav_bar"
         android:alpha="0.96"
-        app:labelVisibilityMode="labeled"
+        app:labelVisibilityMode="selected"
         app:menu="@menu/bottom_navigation_menu_accounts"
         app:itemPaddingBottom="0dp"
         app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator"
         android:state_checked="true"
-        android:visibility="gone" />
+        android:visibility="gone"
+        android:animateLayoutChanges="true" />
 </RelativeLayout>
 </layout>
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 93e2618a1..cba87c8ce 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -73,14 +73,16 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:layout_alignParentBottom="true"
+            android:layout_gravity="bottom"
             android:background="@drawable/background_nav_bar"
             android:alpha="0.96"
-            app:labelVisibilityMode="labeled"
+            app:labelVisibilityMode="selected"
             app:menu="@menu/bottom_navigation_menu_contacts"
             app:itemPaddingBottom="0dp"
             app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator"
             android:state_checked="true"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:animateLayoutChanges="true" />
 
     </RelativeLayout>
     </layout>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e2783e47b..5260c65c6 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1060,7 +1060,7 @@
     <string name="pref_category_interaction">Interaktion</string>
     <string name="pref_up_long_summary">Beim Einsatz als UnifiedPush-Verteiler wird die dauerhafte, zuverlässige und akkuschonende XMPP-Verbindung genutzt, um andere UnifiedPush-kompatible Apps wie Tusky, Ltt.rs, FluffyChat und andere aufzuwecken.</string>
     <string name="send_encrypted_message">Verschlüsselt schreiben…</string>
-    <string name="pref_large_font_summary">Schriftgröße der Nachrichten erhöhen</string>
+    <string name="pref_large_font_summary">Schriftgröße der Nachrichten, Reactions und des Eingabefelds erhöhen</string>
     <string name="pref_large_font">Große Schrift</string>
     <string name="pref_accept_invites_from_strangers">Einladungen von Unbekannten</string>
     <string name="pref_accept_invites_from_strangers_summary">Einladungen zu Gruppenchats von Unbekannten annehmen</string>
@@ -1425,6 +1425,6 @@
     <string name="select_settings_dat">Wählen Sie eine settings.dat</string>
     <string name="pref_use_colored_muc_names_summary">Farbige Benutzernamen in Gruppenchats anzeigen</string>
     <string name="delete_avatar_message">Möchten Sie Ihren Avatar löschen? Einige Clients zeigen möglicherweise weiterhin eine zwischengespeicherte Kopie Ihres Avatars an.</string>
-    <string name="pref_secure_tls_summary">Verwenden Sie nur die sichersten TLS-Chiffren, einschließlich Post-Quantum-Schlüsselvereinbarung, falls auf dem Server verfügbar</string>
+    <string name="pref_secure_tls_summary">Verwenden Sie nur die sichersten TLS-Chiffren, falls auf dem Server verfügbar</string>
     <string name="pref_secure_tls">Nur sichere TLS-Verschlüsselungen verwenden</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index b3710136c..4393b26fb 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -9,7 +9,7 @@
     <string name="action_add_account">アカウントを追加</string>
     <string name="action_edit_contact">名前を編集</string>
     <string name="action_add_phone_book">アドレス帳に追加</string>
-    <string name="action_delete_contact">名簿から削除</string>
+    <string name="action_delete_contact">連絡先から削除</string>
     <string name="action_block_contact">連絡先をブロック</string>
     <string name="action_unblock_contact">連絡先のブロックを解除</string>
     <string name="action_block_domain">ドメインをブロック</string>
@@ -1052,8 +1052,8 @@
     <string name="pref_dialler_integration_incoming_summary">電話番号からの着信通話は、このアプリの通知設定の代わりに、システムのダイヤラーで鳴るかもしれません</string>
     <string name="delete_background_success">背景画像が削除されました</string>
     <string name="pref_show_mappreview_inside">地図のプレビューを表示</string>
-    <string name="pref_set_text_collapsable">長文を折りたたむ</string>
-    <string name="pref_set_text_collapsable_summary">230字以上で折りたたむ</string>
+    <string name="pref_set_text_collapsable">ベータ: 長文を折りたたむ</string>
+    <string name="pref_set_text_collapsable_summary">8行以上で折りたたむ</string>
     <string name="update_default_stickers">規定のステッカーを更新</string>
     <string name="pref_jump_to_commands_tab_summary">利用可能なとき、コマンドページに自動的に飛ぶ</string>
     <string name="block_avatar">アバターをブロック</string>
@@ -1189,4 +1189,7 @@
     <string name="failed">失敗</string>
     <string name="encrypted_with_otr">OTR で暗号化済</string>
     <string name="gifs">GIF</string>
+    <string name="action_dialpad">ダイヤルパッド</string>
+    <string name="pref_accept_invites_from_strangers">見知らぬ人からの招待を受諾</string>
+    <string name="pref_accept_invites_from_strangers_summary">諸MUCへの見知らぬ人からの招待を受諾</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index de84e77e3..78163ffef 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -929,8 +929,8 @@ OpenKeychain is beschikbaar onder de GPLv3-licentie en beschikbaar op F-Droid en
     <string name="unverified_devices">Je gebruikt apparaten die nog niet geverifieerd zijn. Scan de QR-code op je andere apparaten en voltooi de verificatie om man-in-the-middle-aanvallen te voorkomen.</string>
     <string name="pref_show_less_avatars_summary">Herhaal de avatar van een gebruiker zo min mogelijk</string>
     <string name="pref_show_thread_feature_summary">Activeer de threadmarkering in het invoerveld en sta het maken en volgen van threads toe</string>
-    <string name="pref_set_text_collapsable_summary">Teksten van meer dan 230 tekens worden samengevouwen</string>
-    <string name="pref_set_text_collapsable">Langere tekstblokken samenvouwen</string>
+    <string name="pref_set_text_collapsable_summary">Berichten van meer dan 8 regels worden samengevouwen</string>
+    <string name="pref_set_text_collapsable">Beta: Lange berichten samenvouwen</string>
     <string name="rtp_state_contact_offline">Contact is offline</string>
     <string name="allow_private_messages">Privéberichten toestaan</string>
     <string name="pref_jump_to_commands_tab">Naar tab Opdrachten springen</string>
@@ -1165,7 +1165,7 @@ OpenKeychain is beschikbaar onder de GPLv3-licentie en beschikbaar op F-Droid en
     <string name="pref_title_trust_system_ca_store">Certificaatautoriteiten</string>
     <string name="pref_title_trust_system_ca_store_summary">Vertrouw de CA-certificaten van het systeem</string>
     <string name="detect_mim">Kanaalbinding vereisen</string>
-    <string name="pref_large_font_summary">Vergoot het lettergrootte in berichtenbubbels</string>
+    <string name="pref_large_font_summary">Vergoot de letters in berichtenbubbels, reacties en invoervelden</string>
     <string name="pref_backup_summary">Eenmalig maken, terugkerend plannen</string>
     <string name="pref_create_backup_one_off_summary">Eenmalige back-up maken</string>
     <string name="pref_backup_recurring">Periodieke back-up</string>
@@ -1405,4 +1405,15 @@ OpenKeychain is beschikbaar onder de GPLv3-licentie en beschikbaar op F-Droid en
     <string name="pref_secure_tls">Alleen veilige TLS-methodes gebruiken</string>
     <string name="pref_secure_tls_summary">Gebruik alleen de veiligste TLS-ciphers met een post-quantum protocol voor sleuteluitwisseling indien beschikbaar op de server.</string>
     <string name="simple_commons">Simple commons</string>
+    <string name="pref_prefer_ipv6">IPv6 prefereren</string>
+    <string name="pref_use_colored_muc_names">Gekleurde gebruikersnamen</string>
+    <string name="delete_avatar_message">Wil je deze avatar verwijderen? Sommige clients zullen toch nog een kopie van de avatar blijven weergeven.</string>
+    <string name="show_to_contacts_only">Alleen aan contacten tonen</string>
+    <string name="error_export_settings">Fout bij het exporteren van de instellingen</string>
+    <string name="pref_export_plain_text_logs">Als platte tekst exporteren</string>
+    <string name="pref_export_plain_text_logs_summary">Exporteer de gesprekken onversleuteld in platte tekst</string>
+    <string name="pref_prefer_ipv6_summary">Geef de voorkeur aan IPv6-verbindingen</string>
+    <string name="select_settings_dat">Kies het bestand settings.dat</string>
+    <string name="pref_use_colored_muc_names_summary">Gebruik gekleurde gebruikersnamen in groepsgesprekken</string>
+    <string name="success_export_settings">De instellingen zijn geëxporteerd</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 7c960602d..99a449be7 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1092,7 +1092,7 @@
     <string name="pref_category_application">Aplikacja</string>
     <string name="pref_category_interaction">Interakcja</string>
     <string name="pref_category_on_this_device">Na urządzeniu</string>
-    <string name="pref_large_font_summary">Zwiększ rozmiar czcionki w dymkach wiadomości</string>
+    <string name="pref_large_font_summary">Zwiększ rozmiar czcionki w dymkach wiadomości</string>
     <string name="pref_use_colorful_bubbles_summary">Różne kolory tła dla wysłanych i odebranych wiadomości</string>
     <string name="send_encrypted_message">Wyślij zaszyfrowaną wiadomość</string>
     <string name="welcome_header">Dołącz do rozmowy</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index ca7cca7d0..77493d7ea 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1079,7 +1079,7 @@
     <string name="pref_category_interaction">Взаимодействие</string>
     <string name="pref_category_on_this_device">На устройстве</string>
     <string name="pref_large_font">Крупный шрифт</string>
-    <string name="pref_large_font_summary">Увеличить размер шрифта сообещний</string>
+    <string name="pref_large_font_summary">Увеличьте размер шрифта в сообщениях, реакциях и поле ввода</string>
     <string name="pref_summary_security">Сквозное шифрование, слепое доверие до подтверждения, обнаружение атаки посредника</string>
     <string name="send_encrypted_message">Зашифрованное сообщение</string>
     <string name="corresponding_chats_closed">Соответствующие беседы архивированы.</string>
@@ -1442,7 +1442,7 @@
     <string name="pref_hide_media_title">Скрыть медиа в галерее</string>
     <string name="pref_hide_media_summary">Скрыть полученные и отправленные медиа файлы в системной галерее</string>
     <string name="pref_secure_tls">Используйте только безопасные шифры TLS</string>
-    <string name="pref_secure_tls_summary">Используйте только самые надежные шифры TLS, включая соглашение о постквантовом ключе, если оно доступно на сервере</string>
+    <string name="pref_secure_tls_summary">Используйте только самые надежные шифры TLS, если они доступны на сервере</string>
     <string name="pref_prefer_ipv6">Предпочитаю IPv6</string>
     <string name="pref_use_colored_muc_names_summary">Используйте цветные имена пользователей в групповых чатах</string>
     <string name="show_to_contacts_only">Показать только контактам</string>
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 6983d7d06..1b329b960 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -1074,7 +1074,7 @@
     <string name="pref_accept_invites_from_strangers">Ftesa nga të panjohur</string>
     <string name="pref_accept_invites_from_strangers_summary">Prano ftesa për fjalosje në grup nga të panjohur</string>
     <string name="pref_large_font">Shkronja të mëdha</string>
-    <string name="pref_large_font_summary">Rrit madhësi shkronja në flluska mesazhesh</string>
+    <string name="pref_large_font_summary">Rrit madhësi shkronja në flluska mesazhesh, reagime dhe fusha dhëniesh teksti</string>
     <string name="pref_fullscreen_notification">Njoftime sa krejt ekrani</string>
     <string name="pref_fullscreen_notification_summary">Lejojeni këtë aplikacion të shfaqë njoftime për thirrje ardhëse që zënë krejt ekranin, kur pajisja është e kyçur.</string>
     <string name="unsupported_operation">Veprim i pambuluar</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index a64d80ea5..08e33d19f 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -672,7 +672,7 @@
     <string name="mtm_accept_cert">Прийняти незнайомий сертифікат?</string>
     <string name="mtm_trust_anchor">Сертифікат сервера не підписано відомим центром сертифікації.</string>
     <string name="mtm_accept_servername">Прийняти сервер з невідповідним ім\'ям?</string>
-    <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як %s. Сертифікат чинний лише для:</string>
+    <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як «%s». Сертифікат чинний лише для:</string>
     <string name="mtm_connect_anyway">Усе одно бажаєте підключитися?</string>
     <string name="mtm_cert_details">Деталі сертифіката:</string>
     <string name="once">Один раз</string>
@@ -1109,7 +1109,7 @@
     <string name="pref_privacy_summary">Сповіщення про набір, остання активність, доступність</string>
     <string name="send_encrypted_message">Зашифроване повідомлення</string>
     <string name="pref_large_font">Великий шрифт</string>
-    <string name="pref_large_font_summary">Збільшити розмір шрифту повідомлень</string>
+    <string name="pref_large_font_summary">Збільшити розмір шрифту в повідомленнях, реакціях і полі введення</string>
     <string name="pref_fullscreen_notification">Повноекранні сповіщення</string>
     <string name="pref_backup_recurring">Регулярне резервне копіювання</string>
     <string name="unsupported_operation">Операція не підтримується</string>
@@ -1200,7 +1200,7 @@
     <string name="manage_permission_with_nick">Керувати правами для %s</string>
     <string name="server_info_bind2">XEP-0386: Bind 2</string>
     <string name="server_info_login_mechanism">Механізм авторизації</string>
-    <string name="pref_set_text_collapsable_summary">Згортати дописи обсягом понад 230 знаків</string>
+    <string name="pref_set_text_collapsable_summary">Згортати текст довший за 8 рядків</string>
     <string name="pref_send_link_previews_summary">Додавати метадані про посилання під час надсилання повідомлення</string>
     <string name="schedule_message">Надіслати пізніше</string>
     <string name="pref_show_thread_feature">Значок тем</string>
@@ -1221,7 +1221,7 @@
     <string name="flip_camera">Розвернути камеру</string>
     <string name="video_is_disabled_tap_to_enable">Відео вимкнено. Торкніться, щоб увімкнути.</string>
     <string name="do_you_really_want_to_retract_this_message">Ви справді хочете відкликати це повідомлення?</string>
-    <string name="pref_set_text_collapsable">Згортати довгий текст</string>
+    <string name="pref_set_text_collapsable">Бета: Згортати довгий текст</string>
     <string name="pref_show_show_nav_drawer_summary">Увімкнути навігаційну панель для кращого сортування розмов</string>
     <string name="pref_show_show_nav_drawer">Навігаційна панель</string>
     <string name="show_link_previews">Попередній перегляд посилань</string>
@@ -1346,7 +1346,7 @@
     <string name="compose_using_rich_text_summary">Редактор повідомлень показуватиме форматування під час введення тексту</string>
     <string name="example_jid">username@monocles.eu</string>
     <string name="stay_true_to_my_color_inputs">Дотримуватися вказаних кольорів</string>
-    <string name="xmpp_network_description">Мережа XMPP працює на основі протоколу під назвою XMPP. Це децентралізована мережа, що означає, що нею ніхто не володіє і не контролює її. Це федеративна мережа, тобто будь-хто може запустити службу XMPP. Повідомлення іншим користувачам XMPP за замовчуванням наскрізь зашифровані за допомогою OMEMO.\\n\\nАдреси XMPP схожі на адреси електронної пошти:</string>
+    <string name="xmpp_network_description">Мережа XMPP працює на основі протоколу під назвою XMPP. Це децентралізована мережа, що означає, що нею ніхто не володіє і не контролює її. Це федеративна мережа, тобто будь-хто може запустити службу XMPP. Повідомлення іншим користувачам XMPP за замовчуванням наскрізь зашифровані за допомогою OMEMO. Адреси XMPP схожі на адреси електронної пошти:</string>
     <string name="request_to_speak">Запит на розмову</string>
     <string name="invite_to_start_chat">Запросити почати розмову</string>
     <string name="saving">збереження</string>
@@ -1461,5 +1461,16 @@
     <string name="pref_hide_media_summary">Приховати отримані та надіслані файли в перегляді системної галереї</string>
     <string name="pref_hide_media_title">Приховати медіа в галереї</string>
     <string name="pref_secure_tls">Тільки безпечні TLS-шифри</string>
-    <string name="pref_secure_tls_summary">Використовувати тільки безпечні TLS-шифри, включаючи постквантове узгодження ключів, якщо доступно на сервері</string>
+    <string name="pref_secure_tls_summary">Використовувати тільки безпечні TLS-шифри, якщо доступно на сервері</string>
+    <string name="pref_prefer_ipv6_summary">Віддавати перевагу IPv6 під час з\'єднання</string>
+    <string name="pref_use_colored_muc_names_summary">Використовувати кольорові імена користувачів у групових чатах</string>
+    <string name="error_export_settings">Помилка під час експорту налаштувань</string>
+    <string name="pref_export_plain_text_logs">Експорт звичайного тексту</string>
+    <string name="pref_prefer_ipv6">Віддавати перевагу IPv6</string>
+    <string name="show_to_contacts_only">Показувати лише контактам</string>
+    <string name="pref_export_plain_text_logs_summary">Експорт повідомлень у незашифрованому вигляді звичайним текстом, придатним для читання людиною</string>
+    <string name="select_settings_dat">Виберіть файл settings.dat</string>
+    <string name="pref_use_colored_muc_names">Кольорові імена користувачів</string>
+    <string name="delete_avatar_message">Бажаєте видалити свій аватар? Деякі клієнти можуть продовжувати відображати копію Вашого аватара з кешу.</string>
+    <string name="success_export_settings">Налаштування успішно експортовано</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a601b32ec..b6e652c26 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -22,23 +22,23 @@
     <string name="title_activity_choose_contacts">选择联系人</string>
     <string name="title_activity_share_via_account">通过账号分享</string>
     <string name="title_activity_block_list">屏蔽列表</string>
-    <string name="just_now">刚才</string>
+    <string name="just_now">刚刚</string>
     <string name="minute_ago">1 分钟前</string>
     <string name="minutes_ago">%d 分钟前</string>
     <plurals name="x_unread_conversations">
         <item quantity="other">%d 个未读聊天</item>
     </plurals>
     <string name="sending">正在发送…</string>
-    <string name="message_decrypting">解密消息中。请稍候…</string>
+    <string name="message_decrypting">正在解密消息。请稍候…</string>
     <string name="pgp_message">OpenPGP 加密消息</string>
-    <string name="nick_in_use">此昵称已在使用中</string>
+    <string name="nick_in_use">昵称已被使用</string>
     <string name="invalid_muc_nick">昵称无效</string>
     <string name="admin">管理员</string>
     <string name="owner">所有者</string>
     <string name="moderator">主持人</string>
     <string name="participant">参与者</string>
-    <string name="visitor">访客</string>
-    <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的聊天。</string>
+    <string name="visitor">参观者</string>
+    <string name="remove_contact_text">是否从联系人列表移除 %s？将不会移除与对方的聊天。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
     <string name="unblock_contact_text">是否取消屏蔽 %s 并允许对方向您发送消息？</string>
     <string name="block_domain_text">屏蔽来自 %s 的所有联系人？</string>
@@ -74,9 +74,9 @@
     <string name="send_failed">发送失败</string>
     <string name="preparing_image">正在准备发送图片</string>
     <string name="preparing_images">正在准备发送图片</string>
-    <string name="sharing_files_please_wait">分享文件中。请稍候…</string>
-    <string name="action_clear_history">清空聊天记录</string>
-    <string name="clear_conversation_history">清空聊天记录</string>
+    <string name="sharing_files_please_wait">正在分享文件。请稍候…</string>
+    <string name="action_clear_history">清除历史记录</string>
+    <string name="clear_conversation_history">清除聊天记录</string>
     <string name="clear_histor_msg">是否要删除此聊天中的所有消息？
 \n
 \n<b>警告：</b>存储在其他设备或服务器上的消息将不受影响。</string>
@@ -91,7 +91,7 @@
     <string name="send_omemo_x509_message">发送 v\\OMEMO 加密消息</string>
     <string name="your_nick_has_been_changed">正在使用新昵称</string>
     <string name="send_unencrypted">发送未加密</string>
-    <string name="decryption_failed">解密失败。也许您没有正确的私钥。</string>
+    <string name="decryption_failed">解密失败。也许您没有合适的私钥。</string>
     <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long"><![CDATA[%1$s 使用 <b>OpenKeychain</b> 来加密和解密消息并管理公钥。<br><br>它在 GPLv3+ 许可证下授权并可在 F-Droid 和 Google Play 上获取。<br><br><small>（请之后重启 %1$s。）</small>]]></string>
     <string name="restart">重启</string>
@@ -143,7 +143,7 @@
     <string name="preemptively_grant">预先同意订阅请求</string>
     <string name="error_not_an_image_file">所选文件不是图片</string>
     <string name="error_compressing_image">无法转换图片文件</string>
-    <string name="error_file_not_found">文件未找到</string>
+    <string name="error_file_not_found">未找到文件</string>
     <string name="error_io_exception">常规 I/O 错误。也许存储空间已用完？</string>
     <string name="error_security_exception_during_image_copy">用来选择图片的应用未提供读取文件的足够权限。
 \n
@@ -154,12 +154,12 @@
     <string name="account_status_online">在线</string>
     <string name="account_status_connecting">正在连接…</string>
     <string name="account_status_offline">离线</string>
-    <string name="account_status_unauthorized">未授权</string>
-    <string name="account_status_not_found">服务器未找到</string>
+    <string name="account_status_unauthorized">未经授权</string>
+    <string name="account_status_not_found">未找到服务器</string>
     <string name="account_status_no_internet">未连接</string>
     <string name="account_status_regis_fail">注册失败</string>
-    <string name="account_status_regis_conflict">此用户名已在使用中</string>
-    <string name="account_status_regis_success">注册已完成</string>
+    <string name="account_status_regis_conflict">用户名已被使用</string>
+    <string name="account_status_regis_success">注册完成</string>
     <string name="account_status_regis_not_sup">服务器不支持注册</string>
     <string name="account_status_regis_invalid_token">注册令牌无效</string>
     <string name="account_status_tls_error">TLS 协商失败</string>
@@ -182,7 +182,7 @@
 \n您的联系人将无法再向您发送 OpenPGP 加密消息。</string>
     <string name="openpgp_has_been_published">OpenPGP 公钥已发布。</string>
     <string name="mgmt_account_enable">启用账号</string>
-    <string name="mgmt_account_delete_confirm_text">是否确定要删除账号？删除账号会擦除全部聊天记录</string>
+    <string name="mgmt_account_delete_confirm_text">是否确定要删除账号？删除账号会清除全部聊天记录</string>
     <string name="attach_record_voice">录制语音</string>
     <string name="account_settings_jabber_id">XMPP 地址</string>
     <string name="block_jabber_id">屏蔽 XMPP 地址</string>
@@ -190,9 +190,9 @@
     <string name="password">密码</string>
     <string name="invalid_jid">此 XMPP 地址无效</string>
     <string name="error_out_of_memory">空间不足。图片太大</string>
-    <string name="add_phone_book_text">是否要添加 %s 到您的通讯录中？</string>
+    <string name="add_phone_book_text">是否要添加 %s 到您的通讯录？</string>
     <string name="server_info_show_more">服务器信息</string>
-    <string name="server_info_mam">XEP-0313：消息存档管理</string>
+    <string name="server_info_mam">XEP-0313：消息归档管理</string>
     <string name="server_info_carbon_messages">XEP-0280：消息抄送</string>
     <string name="server_info_csi">XEP-0352：客户端状态指示</string>
     <string name="server_info_blocking">XEP-0191：屏蔽命令</string>
@@ -205,7 +205,7 @@
     <string name="server_info_available">有效</string>
     <string name="server_info_unavailable">无效</string>
     <string name="missing_public_keys">缺少公钥公布</string>
-    <string name="last_seen_now">最后上线于刚才</string>
+    <string name="last_seen_now">最后上线于刚刚</string>
     <string name="last_seen_min">最后上线于 1 分钟前</string>
     <string name="last_seen_mins">最后上线于 %d 分钟前</string>
     <string name="last_seen_hour">最后上线于 1 小时前</string>
@@ -302,12 +302,12 @@
     <string name="pref_autojoin_summary">在进入或离开群聊时设置“自动加入”标志，并回应其他客户端所做的改变。</string>
     <string name="toast_message_omemo_fingerprint">OMEMO 指纹已复制到剪贴板</string>
     <string name="conference_banned">禁止您进入此群聊</string>
-    <string name="conference_members_only">此群聊仅成员进入</string>
+    <string name="conference_members_only">只有成员才能进入此群聊</string>
     <string name="conference_resource_constraint">资源限制</string>
-    <string name="conference_kicked">已从群聊中踢出了您</string>
+    <string name="conference_kicked">您已被踢出此群聊</string>
     <string name="conference_shutdown">此群聊已关闭</string>
-    <string name="conference_unknown_error">您已不在此群聊中</string>
-    <string name="conference_technical_problems">由于技术原因，您离开了群聊</string>
+    <string name="conference_unknown_error">您已不在此群聊</string>
+    <string name="conference_technical_problems">由于技术原因，您离开了此群聊</string>
     <string name="using_account">使用账号 %s</string>
     <string name="hosted_on">托管在 %s</string>
     <string name="checking_x">正在 HTTP 主机上检查 %s</string>
@@ -335,10 +335,10 @@
     <string name="pref_create_backup">创建备份</string>
     <string name="pref_create_backup_summary">备份文件将存储在 %s</string>
     <string name="notification_create_backup_title">正在创建备份文件</string>
-    <string name="notification_backup_created_title">已创建备份</string>
+    <string name="notification_backup_created_title">备份已创建</string>
     <string name="notification_backup_created_subtitle">此备份文件已存储在 %s</string>
     <string name="restoring_backup">正在恢复备份</string>
-    <string name="notification_restored_backup_title">已恢复备份</string>
+    <string name="notification_restored_backup_title">备份已恢复</string>
     <string name="notification_restored_backup_subtitle">请勿忘记启用账号。</string>
     <string name="choose_file">选择文件</string>
     <string name="receiving_x_file">正在接收 %1$s（%2$d%% 已完成）</string>
@@ -359,20 +359,18 @@
     <string name="pref_show_dynamic_tags">动态标签</string>
     <string name="pref_show_dynamic_tags_summary">允许使用标签进行整理</string>
     <string name="enable_notifications">启用通知</string>
-    <string name="no_conference_server_found">群聊服务器未找到</string>
+    <string name="no_conference_server_found">未找到群聊服务器</string>
     <string name="conference_creation_failed">无法创建群聊</string>
     <string name="account_image_description">账号头像</string>
     <string name="copy_omemo_clipboard_description">复制 OMEMO 指纹到剪贴板</string>
     <string name="regenerate_omemo_key">重新生成 OMEMO 密钥</string>
     <string name="clear_other_devices">清除设备</string>
     <string name="clear_other_devices_desc">是否确定要从 OMEMO 公布中清除所有其他设备？下次连接时，设备将会重新公布，但可能不会收到在此期间发送的消息。</string>
-    <string name="error_no_keys_to_trust_server_error">此联系人没有可用的密钥。
-\n无法从服务器获取新密钥。也许是对方的服务器出了问题？</string>
-    <string name="error_no_keys_to_trust_presence">此联系人没有可用的密钥。
-\n请确保双方都有在线状态订阅。</string>
+    <string name="error_no_keys_to_trust_server_error">此联系人没有可用密钥。 \n无法从服务器获取新密钥。也许是对方的服务器有问题？</string>
+    <string name="error_no_keys_to_trust_presence">此联系人没有可用密钥。 \n请确保双方都有在线状态订阅。</string>
     <string name="error_trustkeys_title">出了点问题</string>
-    <string name="fetching_history_from_server">正在从服务器获取聊天记录</string>
-    <string name="no_more_history_on_server">服务器上没有更多聊天记录</string>
+    <string name="fetching_history_from_server">正在从服务器获取历史记录</string>
+    <string name="no_more_history_on_server">服务器上没有更多历史记录</string>
     <string name="updating">正在更新…</string>
     <string name="password_changed">密码已更改！</string>
     <string name="could_not_change_password">无法更改密码</string>
@@ -383,7 +381,7 @@
     <string name="enable_all_accounts">启用所有账号</string>
     <string name="disable_all_accounts">禁用所有账号</string>
     <string name="perform_action_with">执行操作</string>
-    <string name="no_affiliation">无从属关系</string>
+    <string name="no_affiliation">无</string>
     <string name="no_role">离线</string>
     <string name="outcast">被驱逐者</string>
     <string name="member">成员</string>
@@ -394,25 +392,25 @@
     <string name="remove_admin_privileges">撤销管理员权限</string>
     <string name="grant_owner_privileges">授予所有者权限</string>
     <string name="remove_owner_privileges">撤销所有者权限</string>
-    <string name="remove_from_room">从群聊中移除</string>
-    <string name="remove_from_channel">从频道中移除</string>
+    <string name="remove_from_room">从群聊移除</string>
+    <string name="remove_from_channel">从频道移除</string>
     <string name="could_not_change_affiliation">无法更改 %s 的从属关系</string>
-    <string name="ban_from_conference">从群聊中封禁</string>
-    <string name="ban_from_channel">从频道中封禁</string>
-    <string name="removing_from_public_conference">您正试图从公开频道中移除 %s。唯一的办法就是永远封禁此用户。</string>
+    <string name="ban_from_conference">从群聊封禁</string>
+    <string name="ban_from_channel">从频道封禁</string>
+    <string name="removing_from_public_conference">您正尝试从公开频道移除 %s。唯一办法是永久封禁该用户。</string>
     <string name="ban_now">立即封禁</string>
     <string name="could_not_change_role">无法更改 %s 的角色</string>
     <string name="conference_options">私人群聊配置</string>
     <string name="channel_options">公开频道配置</string>
-    <string name="members_only">私人，仅成员进入</string>
-    <string name="non_anonymous">公开用户的 XMPP 地址</string>
+    <string name="members_only">私人，仅成员</string>
+    <string name="non_anonymous">对任何参与者显示用户 XMPP 地址</string>
     <string name="moderated">开启频道发言审核</string>
     <string name="you_are_not_participating">您没有发言权</string>
     <string name="modified_conference_options">群聊配置修改成功！</string>
     <string name="could_not_modify_conference_options">无法修改群聊配置</string>
     <string name="never">从不</string>
     <string name="until_further_notice">直至另行通知</string>
-    <string name="snooze">稍后提醒</string>
+    <string name="snooze">暂停</string>
     <string name="reply">回复</string>
     <string name="mark_as_read">标记为已读</string>
     <string name="pref_input_options">输入</string>
@@ -428,7 +426,7 @@
     <string name="pdf_document">PDF 文档</string>
     <string name="apk">Android 应用</string>
     <string name="vcard">联系人</string>
-    <string name="avatar_has_been_published">已发布头像！</string>
+    <string name="avatar_has_been_published">头像已发布！</string>
     <string name="sending_x_file">正在发送 %s</string>
     <string name="offering_x_file">正在提供 %s</string>
     <string name="hide_offline">隐藏离线</string>
@@ -465,12 +463,12 @@
     <string name="username">用户名</string>
     <string name="username_hint">用户名</string>
     <string name="invalid_username">此用户名无效</string>
-    <string name="download_failed_server_not_found">下载失败：服务器未找到</string>
-    <string name="download_failed_file_not_found">下载失败：文件未找到</string>
+    <string name="download_failed_server_not_found">下载失败：未找到服务器</string>
+    <string name="download_failed_file_not_found">下载失败：未找到文件</string>
     <string name="download_failed_could_not_connect">下载失败：无法连接到主机</string>
     <string name="download_failed_could_not_write_file">下载失败：无法写入文件</string>
     <string name="download_failed_invalid_file">下载失败：文件无效</string>
-    <string name="account_status_tor_unavailable">Tor 网络不可用</string>
+    <string name="account_status_tor_unavailable">无法连接到 Tor 网络</string>
     <string name="account_status_bind_failure">绑定失败</string>
     <string name="account_status_host_unknown">服务器不能为此域名做出响应</string>
     <string name="server_info_broken">损坏</string>
@@ -486,17 +484,17 @@
     <string name="hostname_example">xmpp.example.com</string>
     <string name="action_add_account_with_certificate">用证书登录</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
-    <string name="mam_prefs">存档首选项</string>
-    <string name="server_side_mam_prefs">服务器端存档首选项</string>
-    <string name="fetching_mam_prefs">获取存档首选项中。请稍候…</string>
-    <string name="unable_to_fetch_mam_prefs">无法获取存档首选项</string>
+    <string name="mam_prefs">归档首选项</string>
+    <string name="server_side_mam_prefs">服务器端归档首选项</string>
+    <string name="fetching_mam_prefs">正在获取归档首选项。请稍候…</string>
+    <string name="unable_to_fetch_mam_prefs">无法获取归档首选项</string>
     <string name="captcha_required">需要验证码</string>
     <string name="captcha_hint">请按上图输入文本</string>
     <string name="certificate_chain_is_not_trusted">未受信任的证书链</string>
     <string name="jid_does_not_match_certificate">XMPP 地址与证书不匹配</string>
     <string name="action_renew_certificate">续订证书</string>
     <string name="error_fetching_omemo_key">获取 OMEMO 密钥时出错！</string>
-    <string name="verified_omemo_key_with_certificate">已通过证书验证 OMEMO 密钥！</string>
+    <string name="verified_omemo_key_with_certificate">OMEMO 密钥已通过证书验证！</string>
     <string name="device_does_not_support_certificates">设备不支持客户端证书选择！</string>
     <string name="pref_connection_options">连接</string>
     <string name="pref_use_tor">通过 Tor 连接</string>
@@ -506,7 +504,7 @@
     <string name="hostname_or_onion">服务器或 .onion 地址</string>
     <string name="not_a_valid_port">此端口号无效</string>
     <string name="not_valid_hostname">此主机名无效</string>
-    <string name="connected_accounts">已连接 %2$d 个账号中的 %1$d 个</string>
+    <string name="connected_accounts">已连接 %1$d 个账号（共 %2$d 个）</string>
     <plurals name="x_messages">
         <item quantity="other">%d 条消息</item>
     </plurals>
@@ -536,7 +534,7 @@
     <string name="this_field_is_required">必填字段</string>
     <string name="correct_message">更正消息</string>
     <string name="send_corrected_message">发送更正后的消息</string>
-    <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的一员。</string>
+    <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的成员。</string>
     <string name="this_account_is_disabled">您禁用了此账号</string>
     <string name="security_error_invalid_file_access">安全错误：文件访问无效！</string>
     <string name="no_application_to_share_uri">未找到可以分享 URI 的应用</string>
@@ -555,7 +553,7 @@
     <string name="presence_away">离开</string>
     <string name="presence_xa">没空</string>
     <string name="presence_dnd">忙碌</string>
-    <string name="secure_password_generated">已生成安全密码</string>
+    <string name="secure_password_generated">安全密码已生成</string>
     <string name="device_does_not_support_battery_op">您的设备不支持选择退出电池优化</string>
     <string name="registration_please_wait">注册失败：请稍后重试</string>
     <string name="registration_password_too_weak">注册失败：密码太弱</string>
@@ -575,7 +573,7 @@
     <string name="pref_theme_light">浅色</string>
     <string name="pref_theme_dark">深色</string>
     <string name="unable_to_connect_to_keychain">无法连接到 OpenKeychain</string>
-    <string name="this_device_is_no_longer_in_use">此设备已不再使用</string>
+    <string name="this_device_is_no_longer_in_use">此设备不再使用</string>
     <string name="type_pc">电脑</string>
     <string name="type_phone">手机</string>
     <string name="type_tablet">平板</string>
@@ -586,21 +584,20 @@
     <string name="me">我</string>
     <string name="contact_asks_for_presence_subscription">对方请求在线状态订阅</string>
     <string name="allow">允许</string>
-    <string name="no_permission_to_access_x">没有权限访问 %s</string>
-    <string name="remote_server_not_found">远程服务器未找到</string>
+    <string name="no_permission_to_access_x">没有访问 %s 的权限</string>
+    <string name="remote_server_not_found">未找到远程服务器</string>
     <string name="remote_server_timeout">远程服务器超时</string>
     <string name="unable_to_update_account">无法更新账号</string>
     <string name="report_jid_as_spammer">举报此 XMPP 地址发送垃圾信息。</string>
     <string name="pref_delete_omemo_identities">删除 OMEMO 身份</string>
     <string name="pref_delete_omemo_identities_summary">重新生成 OMEMO 密钥。您的所有联系人将必须再次验证您。仅将此作为最后的方法。</string>
     <string name="delete_selected_keys">删除所选密钥</string>
-    <string name="error_publish_avatar_offline">需要连接到网络才能发布头像。</string>
+    <string name="error_publish_avatar_offline">连接后才能发布头像。</string>
     <string name="show_error_message">显示出错信息</string>
     <string name="error_message">出错信息</string>
-    <string name="data_saver_enabled">省流量模式已启用</string>
-    <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“省流量模式”开启时允许 %1$s 无限制访问。
-\n%1$s 仍将在可能的情况下努力节省数据。</string>
-    <string name="device_does_not_support_data_saver">设备不支持对 %1$s 禁用省流量模式。</string>
+    <string name="data_saver_enabled">流量节省程序已启用</string>
+    <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“流量节省程序”开启时允许 %1$s 无限制访问。 \n在可能的情况下，%1$s 仍会尽可能节省数据。</string>
+    <string name="device_does_not_support_data_saver">设备不支持为 %1$s 禁用流量节省程序。</string>
     <string name="error_unable_to_create_temporary_file">无法创建临时文件</string>
     <string name="this_device_has_been_verified">此设备已经过验证</string>
     <string name="copy_fingerprint">复制指纹</string>
@@ -612,8 +609,8 @@
     <string name="share_as_uri">以 XMPP URI 形式分享</string>
     <string name="share_as_http">以 HTTP 链接形式分享</string>
     <string name="pref_blind_trust_before_verification">验证前盲目信任</string>
-    <string name="pref_blind_trust_before_verification_summary">信任来自未经验证的联系人的新设备，但对于已验证的联系人，提示手动确认新设备。</string>
-    <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，表示它们可能是其他人或者某人可能冒充别人发送消息。</string>
+    <string name="pref_blind_trust_before_verification_summary">信任未经验证的联系人的新设备，但提示手动确认已验证的联系人的新设备。</string>
+    <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，这意味着它们可能是别人的，可能会有人窃听。</string>
     <string name="not_trusted">未受信任</string>
     <string name="invalid_barcode">二维码无效</string>
     <string name="pref_clean_cache_summary">清理缓存文件夹（由相机使用）</string>
@@ -650,7 +647,7 @@
     <string name="pref_automatically_delete_messages">自动删除消息</string>
     <string name="pref_automatically_delete_messages_description">自动删除此设备上超过配置时限的消息。</string>
     <string name="encrypting_message">正在加密消息</string>
-    <string name="not_fetching_history_retention_period">由于本地保留期限设置，无法获取消息。</string>
+    <string name="not_fetching_history_retention_period">由于本地保留期，无法获取消息。</string>
     <string name="transcoding_video">正在压缩视频</string>
     <string name="contact_blocked_past_tense">联系人已屏蔽。</string>
     <string name="pref_notifications_from_strangers">陌生人的通知</string>
@@ -665,12 +662,12 @@
     <string name="account_status_regis_web">服务器要求在网站上注册</string>
     <string name="open_website">打开网站</string>
     <string name="application_found_to_open_website">未找到可以打开网站的应用</string>
-    <string name="pref_headsup_notifications">顶部通知</string>
-    <string name="pref_headsup_notifications_summary">显示顶部通知</string>
+    <string name="pref_headsup_notifications">提醒式通知</string>
+    <string name="pref_headsup_notifications_summary">显示提醒式通知</string>
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
     <string name="pref_validate_hostname">用 DNSSEC 验证主机名</string>
-    <string name="pref_validate_hostname_summary">将包含主机名的服务器证书视为是已验证的</string>
+    <string name="pref_validate_hostname_summary">将包含已验证主机名的服务器证书视为已验证</string>
     <string name="certificate_does_not_contain_jid">证书不包含 XMPP 地址</string>
     <string name="server_info_partial">部分</string>
     <string name="attach_record_video">录制视频</string>
@@ -693,7 +690,7 @@
     <string name="edit_status_message_title">编辑状态信息</string>
     <string name="edit_status_message">编辑状态信息</string>
     <string name="disable_encryption">禁用加密</string>
-    <string name="error_trustkey_general">%1$s 无法发送加密消息到 %2$s。可能是由于您的联系人使用了过时的服务器或者无法处理 OMEMO 的客户端。</string>
+    <string name="error_trustkey_general">%1$s 无法向 %2$s 发送加密消息。可能是由于您的联系人使用了无法处理 OMEMO 的过时服务器或客户端。</string>
     <string name="error_trustkey_device_list">无法获取设备列表</string>
     <string name="error_trustkey_bundle">无法获取密钥</string>
     <string name="error_trustkey_hint_mutual">提示：某些情况下，双方可以添加到联系人列表解决此问题。</string>
@@ -709,9 +706,9 @@
     <string name="default_on">默认开启</string>
     <string name="default_off">默认关闭</string>
     <string name="not_encrypted_for_this_device">消息未对此设备加密。</string>
-    <string name="omemo_decryption_failed">解密 OMEMO 消息失败。</string>
+    <string name="omemo_decryption_failed">无法解密 OMEMO 消息。</string>
     <string name="undo">撤销</string>
-    <string name="location_disabled">已禁用位置共享</string>
+    <string name="location_disabled">已禁用位置分享</string>
     <string name="action_fix_to_location">固定位置</string>
     <string name="action_unfix_from_location">取消固定位置</string>
     <string name="action_copy_location">复制位置</string>
@@ -726,13 +723,13 @@
     <string name="search_messages">搜索消息</string>
     <string name="gif">GIF</string>
     <string name="view_conversation">查看聊天</string>
-    <string name="pref_use_share_location_plugin">位置共享插件</string>
-    <string name="pref_use_share_location_plugin_summary">使用位置共享插件代替内置地图</string>
+    <string name="pref_use_share_location_plugin">分享位置插件</string>
+    <string name="pref_use_share_location_plugin_summary">使用分享位置插件代替内置地图</string>
     <string name="copy_link">复制网址</string>
     <string name="copy_jabber_id">复制 XMPP 地址</string>
-    <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
+    <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件分享</string>
     <string name="pref_start_search">直接搜索</string>
-    <string name="pref_start_search_summary">在“新聊天”屏幕上打开键盘并将光标放在搜索栏中</string>
+    <string name="pref_start_search_summary">在“新聊天”屏幕上打开键盘并将光标放入搜索栏</string>
     <string name="group_chat_avatar">群聊头像</string>
     <string name="host_does_not_support_group_chat_avatars">主机不支持群聊头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改群聊头像</string>
@@ -765,8 +762,8 @@
     <string name="group_chat_members">参与者</string>
     <string name="media_browser">媒体浏览器</string>
     <string name="security_violation_not_attaching_file">由于违反安全规定，文件已删除。</string>
-    <string name="pref_video_compression">视频质量</string>
-    <string name="pref_video_compression_summary">质量越低，文件越小</string>
+    <string name="pref_video_compression">视频画质</string>
+    <string name="pref_video_compression_summary">画质越低，文件越小</string>
     <string name="video_360p">360p（中）</string>
     <string name="video_720p">720p（高）</string>
     <string name="cancelled">已取消</string>
@@ -783,7 +780,7 @@
     <string name="search_countries">搜索国家/地区</string>
     <string name="verify_x">验证 %s</string>
     <string name="we_have_sent_you_an_sms_to_x"><![CDATA[我们已向您发送短信至 <b>%s</b>。]]></string>
-    <string name="we_have_sent_you_another_sms">我们已经向您发送了另一条带有 6 位数验证码的短信。</string>
+    <string name="we_have_sent_you_another_sms">我们已向您发送了另一条带有六位数验证码的短信。</string>
     <string name="please_enter_pin_below">请在下方输入 6 位 PIN 码。</string>
     <string name="resend_sms">重新发送短信</string>
     <string name="resend_sms_in">重新发送短信 (%s)</string>
@@ -848,15 +845,15 @@
     <string name="channel_already_exists">此频道已存在</string>
     <string name="joined_an_existing_channel">您已加入现有的频道</string>
     <string name="unable_to_set_channel_configuration">无法保存频道配置</string>
-    <string name="allow_participants_to_edit_subject">允许参与者（非访客）编辑话题</string>
-    <string name="allow_participants_to_invite_others">允许任何参与者邀请别人</string>
-    <string name="anyone_can_edit_subject">参与者（非访客）可以编辑话题。</string>
+    <string name="allow_participants_to_edit_subject">允许参与者编辑话题</string>
+    <string name="allow_participants_to_invite_others">允许参与者邀请他人</string>
+    <string name="anyone_can_edit_subject">参与者可以编辑话题。</string>
     <string name="owners_can_edit_subject">所有者可以编辑话题。</string>
     <string name="admins_can_edit_subject">管理员可以编辑话题。</string>
-    <string name="owners_can_invite_others">所有者可以邀请别人。</string>
-    <string name="anyone_can_invite_others">任何参与者可以邀请别人。</string>
-    <string name="jabber_ids_are_visible_to_admins">XMPP 地址对管理员可见。</string>
-    <string name="jabber_ids_are_visible_to_anyone">XMPP 地址对任何人可见。</string>
+    <string name="owners_can_invite_others">所有者可以邀请他人。</string>
+    <string name="anyone_can_invite_others">参与者可以邀请他人。</string>
+    <string name="jabber_ids_are_visible_to_admins">管理员可以看到用户 XMPP 地址。</string>
+    <string name="jabber_ids_are_visible_to_anyone">任何参与者可以看到用户 XMPP 地址。</string>
     <string name="no_users_hint_channel">此公开频道无参与者。邀请联系人或使用分享按钮分发其 XMPP 地址。</string>
     <string name="no_users_hint_group_chat">此私人群聊无参与者。</string>
     <string name="manage_permission">管理权限</string>
@@ -881,7 +878,7 @@
     <string name="please_enter_password">请输入此账号的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="open_join_dialog">加入公开频道…</string>
-    <string name="sharing_application_not_grant_permission">共享应用未授予访问此文件的权限。</string>
+    <string name="sharing_application_not_grant_permission">分享应用未授予访问此文件的权限。</string>
     <string name="group_chats_and_channels"><![CDATA[群聊和频道]]></string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
@@ -906,13 +903,13 @@
     <string name="rtp_state_ringing">正在响铃</string>
     <string name="rtp_state_declined_or_busy">占线</string>
     <string name="rtp_state_connectivity_error">无法连接通话</string>
-    <string name="rtp_state_connectivity_lost_error">连接已中断</string>
+    <string name="rtp_state_connectivity_lost_error">连接中断</string>
     <string name="rtp_state_retracted">已取消通话</string>
     <string name="rtp_state_application_failure">应用错误</string>
     <string name="rtp_state_security_error">验证问题</string>
     <string name="hang_up">挂断</string>
-    <string name="ongoing_call">正在进行的通话</string>
-    <string name="ongoing_video_call">正在进行的视频通话</string>
+    <string name="ongoing_call">正在通话</string>
+    <string name="ongoing_video_call">正在进行视频通话</string>
     <string name="reconnecting_call">正在重新连接通话</string>
     <string name="reconnecting_video_call">正在重新连接视频通话</string>
     <string name="disable_tor_to_make_call">禁用 Tor 以进行通话</string>
@@ -933,8 +930,8 @@
     <string name="video_call">视频通话</string>
     <string name="help">帮助</string>
     <string name="microphone_unavailable">麦克风无法使用</string>
-    <string name="only_one_call_at_a_time">一次只能打一通电话。</string>
-    <string name="return_to_ongoing_call">返回到正在进行的通话</string>
+    <string name="only_one_call_at_a_time">每次只能有一个通话。</string>
+    <string name="return_to_ongoing_call">返回当前通话</string>
     <string name="could_not_switch_camera">无法切换摄像头</string>
     <string name="add_to_favorites">置顶</string>
     <string name="remove_from_favorites">取消置顶</string>
@@ -964,13 +961,13 @@
     <string name="invite_to_app">邀请至 monocles chat</string>
     <string name="unable_to_parse_invite">无法解析邀请</string>
     <string name="server_does_not_support_easy_onboarding_invites">服务器不支持生成邀请</string>
-    <string name="no_active_accounts_support_this">没有已启用的账号支持此功能</string>
+    <string name="no_active_accounts_support_this">没有活动账号支持此功能</string>
     <string name="backup_started_message">备份已开始。一旦完成，将会收到通知。</string>
     <string name="unable_to_enable_video">无法启用视频。</string>
     <string name="plain_text_document">纯文本文档</string>
     <string name="account_registrations_are_not_supported">不支持账号注册</string>
     <string name="no_xmpp_adddress_found">未找到 XMPP 地址</string>
-    <string name="account_status_temporary_auth_failure">验证暂时失败</string>
+    <string name="account_status_temporary_auth_failure">临时身份验证失败</string>
     <string name="delete_avatar">删除头像</string>
     <string name="audio_video_disabled_tor">使用 Tor 时会禁用通话</string>
     <string name="switch_to_video">切换到视频</string>
@@ -1004,13 +1001,13 @@
     <string name="welcome_header_quicksy">欢迎使用 Quicksy！</string>
     <string name="quicksy_wants_your_consent">Quicksy 请求您同意使用您的数据</string>
     <string name="privacy_policy">隐私政策</string>
-    <string name="contact_list_integration_not_available">联系人列表集成不可用</string>
-    <string name="rtp_state_contact_offline">联系人不可用</string>
-    <string name="no_permission_to_place_call">没有拨打电话的权限</string>
-    <string name="call_integration_not_available">通话集成不可用！</string>
-    <string name="remove_bookmark_and_close">是否移除 %s 的书签并存档聊天？</string>
+    <string name="contact_list_integration_not_available">无法使用联系人列表集成功能</string>
+    <string name="rtp_state_contact_offline">联系人已离线</string>
+    <string name="no_permission_to_place_call">没有发起通话的权限</string>
+    <string name="call_integration_not_available">无法使用通话集成功能！</string>
+    <string name="remove_bookmark_and_close">是否移除 %s 的书签并归档聊天？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</string>
-    <string name="delete_and_close">删除并存档聊天</string>
+    <string name="delete_and_close">删除并归档聊天</string>
     <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="start_chat">开始聊天</string>
     <string name="title_activity_share_with">分享至…</string>
@@ -1021,16 +1018,16 @@
     <string name="pref_dynamic_colors_summary">系统配色 (Material You)</string>
     <string name="title_activity_new_chat">新聊天</string>
     <string name="archive_this_chat">之后删除聊天</string>
-    <string name="title_undo_swipe_out_chat">聊天已存档</string>
+    <string name="title_undo_swipe_out_chat">聊天已归档</string>
     <string name="switch_to_chat">切换到聊天</string>
-    <string name="action_archive_chat">存档聊天</string>
+    <string name="action_archive_chat">归档聊天</string>
     <string name="barcode_does_not_contain_fingerprints_for_this_chat">二维码不包含此聊天的指纹。</string>
     <string name="welcome_header">加入对话</string>
-    <string name="corresponding_chats_closed">相应的聊天已存档。</string>
+    <string name="corresponding_chats_closed">相应的聊天已归档。</string>
     <string name="pref_send_crash_reports">发送崩溃报告</string>
     <string name="pref_title_security">安全</string>
     <string name="notifications">通知</string>
-    <string name="pref_attachments_summary">文件大小、图片压缩、视频质量</string>
+    <string name="pref_attachments_summary">文件大小、图片压缩、视频画质</string>
     <string name="pref_notifications_summary">静默期、铃声、振动、陌生人</string>
     <string name="pref_automatic_download">自动下载</string>
     <string name="appearance">外观</string>
@@ -1061,13 +1058,13 @@
     <string name="unified_push_summary">兼容 UnifiedPush 的第三方应用的通知转发器</string>
     <string name="send_encrypted_message">发送加密消息</string>
     <string name="pref_large_font">大字体</string>
-    <string name="pref_large_font_summary">增加消息气泡中的字体大小</string>
+    <string name="pref_large_font_summary">增大消息气泡、回应和输入栏中的字体大小</string>
     <string name="pref_create_backup_one_off_summary">创建一次性备份</string>
     <string name="pref_backup_recurring">定期备份</string>
     <string name="pref_fullscreen_notification">全屏通知</string>
     <string name="pref_fullscreen_notification_summary">当设备锁定时，允许此应用显示占据全屏的来电通知。</string>
     <string name="unsupported_operation">不支持的操作</string>
-    <string name="pref_backup_summary">创建一次性备份、计划定期备份</string>
+    <string name="pref_backup_summary">创建一次性备份、设置定期备份</string>
     <string name="action_dialpad">拨号键盘</string>
     <string name="pref_send_link_previews">发送链接预览</string>
     <string name="pref_send_link_previews_summary">发送消息时附加有关链接的元数据</string>
@@ -1079,9 +1076,9 @@
     <string name="note_to_self">自我备注</string>
     <string name="microphone_permission_for_call">需要麦克风权限才能完成通话</string>
     <string name="pref_show_less_avatars_summary">在聊天中仅显示所需的头像</string>
-    <string name="allow_private_messages">允许频道内私信</string>
+    <string name="allow_private_messages">允许私信</string>
     <string name="update_default_stickers">更新默认贴纸</string>
-    <string name="failed_to_delete_gif">删除 GIF 失败</string>
+    <string name="failed_to_delete_gif">无法删除 GIF</string>
     <string name="secrets_do_not_match">秘密不匹配</string>
     <string name="in_progress">正在进行</string>
     <string name="respond">答复</string>
@@ -1116,7 +1113,7 @@
     <string name="flip_camera">翻转摄像头</string>
     <string name="video_is_enabled_tap_to_disable">已启用视频，点按即可禁用。</string>
     <string name="pref_show_mappreview_inside">显示地图预览</string>
-    <string name="pref_show_mappreview_inside_summary">在聊天中加载共享位置的地图预览</string>
+    <string name="pref_show_mappreview_inside_summary">在聊天中加载分享位置的地图预览</string>
     <string name="unknown_otr_fingerprint">未知的 OTR 指纹</string>
     <string name="otr_fingerprint">OTR 指纹</string>
     <string name="otr_fingerprint_selected_message">消息的 OTR 指纹</string>
@@ -1178,10 +1175,10 @@
     <string name="gifs">GIF</string>
     <string name="pref_show_less_avatars">显示较少的头像</string>
     <string name="pref_set_text_collapsable_summary">折叠超过 8 行的文本</string>
-    <string name="pref_set_text_collapsable">测试：折叠长文本</string>
+    <string name="pref_set_text_collapsable">折叠长文本（测试）</string>
     <string name="server_info_bind2">XEP-0386：绑定 2</string>
     <string name="pref_jump_to_commands_tab">跳转到命令</string>
-    <string name="pref_jump_to_commands_tab_summary">可用时自动跳转到命令页面</string>
+    <string name="pref_jump_to_commands_tab_summary">有命令可用时自动跳转到命令页</string>
     <string name="emojis">表情符号</string>
     <string name="stickers">贴纸</string>
     <string name="gif_deleted">GIF 已删除</string>
@@ -1264,7 +1261,7 @@
     <string name="thumbnails">缩略图</string>
     <string name="saving">正在保存</string>
     <string name="file_saved">文件已保存</string>
-    <string name="simple_commons">简单共享资源</string>
+    <string name="simple_commons">Simple commons</string>
     <string name="default_color">默认颜色</string>
     <string name="unknown_error_occurred">发生未知错误</string>
     <string name="change_color">更改颜色</string>
@@ -1273,7 +1270,7 @@
     <string name="could_not_create_file">无法创建文件</string>
     <string name="save_to_downloads">保存到下载</string>
     <string name="pref_delete_background_summary">移除聊天中的自定义背景图片</string>
-    <string name="create_background_failed">创建背景失败</string>
+    <string name="create_background_failed">无法创建背景</string>
     <string name="custom_background_set">自定义背景设置</string>
     <string name="delete_background_failed">无法移除背景图片</string>
     <string name="delete_background_success">背景图片已移除</string>
@@ -1338,11 +1335,11 @@
     <string name="error_import_settings">导入设置时出错</string>
     <string name="pref_import_settings_summary">从备份文件夹导入 settings.dat</string>
     <string name="could_not_modify_call">无法修改通话</string>
-    <string name="pref_accept_invites_from_strangers">接受来自陌生人的邀请</string>
+    <string name="pref_accept_invites_from_strangers">陌生人的邀请</string>
     <string name="pref_accept_invites_from_strangers_summary">接受来自陌生人的群聊邀请</string>
     <string name="clear_blocked_media">清除屏蔽的媒体</string>
-    <string name="unban_from_group_chat">从群聊中取消封禁</string>
-    <string name="unban_from_channel">从频道中取消封禁</string>
+    <string name="unban_from_group_chat">从群聊取消封禁</string>
+    <string name="unban_from_channel">从频道取消封禁</string>
     <string name="voice_message_codec">语音消息编解码器</string>
     <string name="change_stickers_location">更改贴纸位置</string>
     <string name="always_accept_when_unmetered">不按流量计费时始终接收</string>
@@ -1351,7 +1348,7 @@
     <string name="pref_auto_accept_unmetered_summary">不要在不按流量计费的网络上使用上述大小限制</string>
     <string name="pref_custom_tab">集成浏览器 UI</string>
     <string name="pref_export_summary">导出可用于导入其他应用的数据。不是完全备份。</string>
-    <string name="request_to_speak_send">已将您的请求发送给主持人</string>
+    <string name="request_to_speak_send">您的请求已发送给主持人</string>
     <string name="pref_create_backup_warning">完全备份用于在设备丢失后恢复，或用于迁移到新设备。您无法在仍与此应用连接的情况下将备份恢复到其他应用！</string>
     <string name="pref_ring_from_strangers">陌生人来电</string>
     <string name="pref_ring_from_strangers_summary">陌生人是指不在您的联系人中且您从未向其发送过消息的人</string>
@@ -1365,7 +1362,7 @@
     <string name="incorrect_password_txt">密码错误</string>
     <string name="password_disabled_txt">密码已禁用</string>
     <string name="enter_your_password_txt">请输入您的密码</string>
-    <string name="clear_txt">清空</string>
+    <string name="clear_txt">清除</string>
     <string name="forgot_password_txt">忘记密码？</string>
     <string name="pref_app_lock_enable_title">启用应用锁</string>
     <string name="pref_app_lock_enable_summary">启用应用锁。请注意，如果您忘记了 PIN，您将无法再打开此应用。</string>
@@ -1386,7 +1383,7 @@
     <string name="pref_show_avatars">显示头像</string>
     <string name="pref_show_avatars_summary">在群聊和一对一聊天中为您的消息显示头像。</string>
     <string name="download_stickers_text">是否下载一些默认的贴纸包？</string>
-    <string name="archiving_not_enabled_text">未完全启用存档功能。如果您使用多个设备或应用，这可能会导致错过消息。</string>
+    <string name="archiving_not_enabled_text">未完全启用归档功能。如果您使用多个设备或应用可能会导致错过消息。</string>
     <string name="block_avatar_question">是否确定要屏蔽此头像？</string>
     <string name="block_media_question">是否确定要在所有消息中屏蔽此媒体？</string>
     <string name="account_color">账号颜色</string>
@@ -1412,7 +1409,7 @@
     <string name="show_media_summary">是否在系统图库中显示接收和发送的媒体？</string>
     <string name="pref_hide_media_title">在图库中隐藏媒体</string>
     <string name="pref_hide_media_summary">在系统图库视图中隐藏接收和发送的媒体</string>
-    <string name="pref_secure_tls_summary">如果服务器上可用，仅使用最安全的 TLS 密码，包括后量子密钥协议</string>
+    <string name="pref_secure_tls_summary">如果服务器上支持，仅使用最安全的 TLS 密码</string>
     <string name="pref_secure_tls">仅安全 TLS 密码</string>
     <string name="pref_export_plain_text_logs_summary">以人类可读的纯文本导出未加密消息</string>
     <string name="delete_avatar_message">是否删除头像？某些客户端可能会继续显示您头像的缓存副本。</string>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 81587fa18..f5a033896 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -57,7 +57,7 @@
 
 
     <dimen name="avatar_corners_radius">8dp</dimen>
-    <dimen name="nav_bar_height">68dp</dimen>
+    <dimen name="nav_bar_height">62dp</dimen>
     <dimen name="muc_avatar_actionbar">24dp</dimen>
     <dimen name="avatar_big">640dp</dimen>
 
diff --git a/src/monocleschat/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/monocleschat/java/eu/siacs/conversations/ui/ManageAccountActivity.java
index dc1de4c20..4014363f6 100644
--- a/src/monocleschat/java/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/monocleschat/java/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -179,7 +179,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         if (getBooleanPreference("show_nav_bar", R.bool.show_nav_bar) && getIntent().getBooleanExtra("show_nav_bar", false)) {
             bottomNavigationView.setVisibility(VISIBLE);
             accountListView.setClipToPadding(false);
-            accountListView.setPadding(0,0,0,(int) dpToPx(72, this));
+            accountListView.setPadding(0,0,0,(int) dpToPx(66, this));
         } else {
             bottomNavigationView.setVisibility(View.GONE);
             accountListView.setClipToPadding(true);