diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 624ff4640..f0d982561 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -248,7 +248,7 @@
         <activity
             android:name=".ui.StartConversationActivity"
             android:exported="true"
-            android:label="@string/title_activity_start_conversation"
+            android:label="@string/title_activity_new_chat"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
index 755221ded..04678c3c7 100644
--- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
+++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
@@ -72,7 +72,7 @@ public final class BlockContactDialog {
 			} else {
 				boolean toastShown = false;
 				if (xmppActivity.xmppConnectionService.sendBlockRequest(blockable, binding.reportSpam.isChecked(), serverMsgId)) {
-					Toast.makeText(xmppActivity, R.string.corresponding_conversations_closed, Toast.LENGTH_SHORT).show();
+					Toast.makeText(xmppActivity, R.string.corresponding_chats_closed, Toast.LENGTH_SHORT).show();
 					toastShown = true;
 				}
 				if (xmppActivity instanceof ContactDetailsActivity) {
diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
index 17a9853b2..0a59f5348 100644
--- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
@@ -88,7 +88,7 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
 		dialog.setOnEnterJidDialogPositiveListener((accountJid, contactJid) -> {
 			Blockable blockable = new RawBlockable(account, contactJid);
 			if (xmppConnectionService.sendBlockRequest(blockable, false, null)) {
-				Toast.makeText(BlocklistActivity.this, R.string.corresponding_conversations_closed, Toast.LENGTH_SHORT).show();
+				Toast.makeText(BlocklistActivity.this, R.string.corresponding_chats_closed, Toast.LENGTH_SHORT).show();
 			}
 			return true;
 		});
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
index 51230a6be..820d3e5af 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
@@ -154,7 +154,7 @@ public class ConversationsOverviewFragment extends XmppFragment {
 					title = R.string.title_undo_swipe_out_channel;
 				}
 			} else {
-				title = R.string.title_undo_swipe_out_conversation;
+				title = R.string.title_undo_swipe_out_chat;
 			}
 
 			final Snackbar snackbar = Snackbar.make(binding.list, title, 5000)
diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
index d0f3f761e..ba069b9a5 100644
--- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
@@ -155,7 +155,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 		} else {
 			reloadFingerprints();
 			Log.d(Config.LOGTAG, "xmpp uri was: " + uri.getJid() + " has Fingerprints: " + uri.hasFingerprints());
-			Toast.makeText(this, R.string.barcode_does_not_contain_fingerprints_for_this_conversation, Toast.LENGTH_SHORT).show();
+			Toast.makeText(this, R.string.barcode_does_not_contain_fingerprints_for_this_chat, Toast.LENGTH_SHORT).show();
 		}
 		populateView();
 	}
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 9dd4bd104..393120942 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -17,6 +17,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:checked="true"
-        android:text="@string/also_end_conversation" />
+        android:text="@string/archive_this_chat" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/activity_rtp_session.xml b/src/main/res/menu/activity_rtp_session.xml
index f90117c87..a7076fa22 100644
--- a/src/main/res/menu/activity_rtp_session.xml
+++ b/src/main/res/menu/activity_rtp_session.xml
@@ -9,7 +9,7 @@
     <item
         android:id="@+id/action_goto_chat"
         android:icon="@drawable/ic_forum_24dp"
-        android:title="@string/switch_to_conversation"
+        android:title="@string/switch_to_chat"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_switch_to_video"
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 56eb366f7..cac40c389 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -113,7 +113,7 @@
     <item
         android:id="@+id/action_archive"
         android:orderInCategory="60"
-        android:title="@string/action_end_conversation"
+        android:title="@string/action_archive_chat"
         app:showAsAction="never" />
     <item
         android:orderInCategory="70"
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 54e0506eb..a87e9f13c 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/start_conversation"
-        android:title="@string/start_conversation"
+        android:title="@string/start_chat"
         android:visible="false" />
     <item
         android:id="@+id/action_contact_details"
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index b15e22f78..21c662f53 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_add_24dp"
         android:orderInCategory="10"
         app:showAsAction="always"
-        android:title="@string/action_add"/>
+        android:title="@string/start_chat"/>
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index ee93f3f9c..87ddfcbcf 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">الإعدادات</string>
-    <string name="action_add">محادثة جديدة</string>
     <string name="action_accounts">إدارة الحسابات</string>
     <string name="action_account">إدارة الحساب</string>
-    <string name="action_end_conversation">أغلق المحادثة</string>
     <string name="action_contact_details">بيانات جهة الإتصال</string>
     <string name="action_muc_details">تفاصيل مجموعة المحادثة</string>
     <string name="channel_details">تفاصيل القناة</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">إلغاء حجب المشارِك</string>
     <string name="title_activity_manage_accounts">إدارة الحسابات</string>
     <string name="title_activity_settings">إعدادات</string>
-    <string name="title_activity_start_conversation">ابدأ محادثة</string>
     <string name="title_activity_choose_contact">إختيار جهة إتصال</string>
     <string name="title_activity_choose_contacts">إختار جهات الإتصال</string>
     <string name="title_activity_share_via_account">شارك عبر حساب</string>
@@ -48,7 +45,6 @@
     <string name="register_account">تسجيل حساب جديد في سيرفر</string>
     <string name="change_password_on_server">تغيير كلمة المرور في سيرفر</string>
     <string name="share_with">مشاركة مع</string>
-    <string name="start_conversation">إبداء المحادثة</string>
     <string name="invite_contact">دعوة جهة إتصال</string>
     <string name="invite">دعوة</string>
     <string name="contacts">جهات الإتصال</string>
@@ -342,7 +338,6 @@
     <string name="send_location">إرسل موقعك</string>
     <string name="show_location">أظهر الموقع</string>
     <string name="location">الموقع</string>
-    <string name="title_undo_swipe_out_conversation">تم إغلاق المحادثة</string>
     <string name="pref_dont_trust_system_cas_title">لا تثق في سلطات شهادات النظام</string>
     <string name="pref_dont_trust_system_cas_summary">تقبل أية شهادة يدويا</string>
     <string name="pref_remove_trusted_certificates_title">حذف شهادات</string>
@@ -644,7 +639,6 @@
     <string name="please_enter_password">يرجى إدخال الكلمة السرية للحساب</string>
     <string name="rtp_state_declined_or_busy">مشغول</string>
     <string name="more_options">خيارات أخرى</string>
-    <string name="also_end_conversation">قم بإنهاء هذه المحادثة بعد ذلك</string>
     <string name="huawei_protected_apps_summary">للمواصلة في إستقبال التنبيهات، حتى والشاشة مغلقة، يجب عليك أن تضيف تطبيق Conversations إلى قائمة التطبيقات المحميّة.</string>
     <string name="account_status_regis_not_sup">إنشاء الحسابات غير مدعومة مِن طرف الخادم</string>
     <string name="error_publish_avatar_no_server_support">خادمك لا يدعم نشر الصور الرمزية</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 17f43ddf0..cc40ae577 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Настройки</string>
-    <string name="action_add">Нов разговор</string>
     <string name="action_accounts">Управление на профилите</string>
     <string name="action_account">Управление на профила</string>
-    <string name="action_end_conversation">Затваряне на разговора</string>
     <string name="action_contact_details">Подробности за контакта</string>
     <string name="action_muc_details">Подробности за груповия разговор</string>
     <string name="channel_details">Подробности за канала</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Деблокиране на участника</string>
     <string name="title_activity_manage_accounts">Управление на профилите</string>
     <string name="title_activity_settings">Настройки</string>
-    <string name="title_activity_start_conversation">Започване на разговор</string>
     <string name="title_activity_choose_contact">Изберете контакт</string>
     <string name="title_activity_choose_contacts">Изберете контакти</string>
     <string name="title_activity_share_via_account">Споделяне чрез профил</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Регистриране на нов профил на сървъра</string>
     <string name="change_password_on_server">Промяна на паролата в сървъра</string>
     <string name="share_with">Споделяне с…</string>
-    <string name="start_conversation">Започване на разговор</string>
     <string name="invite_contact">Поканете контакт</string>
     <string name="invite">Поканете</string>
     <string name="contacts">Контакти</string>
@@ -85,7 +81,6 @@
     <string name="clear_histor_msg">Наистина ли искате да изтриете всички съобщения в този разговор?\n\n<b>Внимание:</b> Това няма да изтрие съобщенията, които се съхраняват на други устройства или сървъри.</string>
     <string name="delete_file_dialog">Изтриване на файла</string>
     <string name="delete_file_dialog_msg">Наистина ли искате да изтриете този файл?\n\n<b>Внимание:</b> Това няма да изтрие копията на файла, които се съхраняват на други устройства или сървъри.</string>
-    <string name="also_end_conversation">Затваряне на този разговор след това</string>
     <string name="choose_presence">Изберете устройство</string>
     <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
     <string name="send_message">Изпращане на съобщение</string>
@@ -424,7 +419,6 @@
     <string name="show_location">Показване на местоположението</string>
     <string name="no_application_found_to_display_location">Няма намерено приложение за показване на местоположението</string>
     <string name="location">Местоположение</string>
-    <string name="title_undo_swipe_out_conversation">Conversation се затвори</string>
     <string name="title_undo_swipe_out_group_chat">Напуснахте частния групов разговор</string>
     <string name="title_undo_swipe_out_channel">Напуснахте публичния канал</string>
     <string name="pref_dont_trust_system_cas_title">Да не се вярва на системните сертификати</string>
@@ -594,7 +588,6 @@
     <string name="this_device_has_been_verified">Това устройство е потвърдено</string>
     <string name="copy_fingerprint">Копиране на отпечатъка</string>
     <string name="all_omemo_keys_have_been_verified">Потвърдили сте всички ключове OMEMO, които притежавате</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Баркодът не съдържа отпечатъци за този разговор.</string>
     <string name="verified_fingerprints">Потвърдени отпечатъци</string>
     <string name="use_camera_icon_to_scan_barcode">Използвайте камерата, за да сканирате баркода на контакт</string>
     <string name="please_wait_for_keys_to_be_fetched">Моля, изчакайте получаването на ключовете</string>
@@ -646,7 +639,6 @@
     <string name="encrypting_message">Шифроване на съобщението</string>
     <string name="not_fetching_history_retention_period">Съобщенията не се изтеглят поради местния период на задържане.</string>
     <string name="transcoding_video">Компресиране на видеото</string>
-    <string name="corresponding_conversations_closed">Съответстващите разговори са затворени.</string>
     <string name="contact_blocked_past_tense">Контактът е блокиран.</string>
     <string name="pref_notifications_from_strangers">Известия от непознати</string>
     <string name="pref_notifications_from_strangers_summary">Известяване за съобщения и обаждания от непознати.</string>
@@ -911,7 +903,6 @@
     <string name="audio_call">Гласово обаждане</string>
     <string name="video_call">Видео обаждане</string>
     <string name="help">Помо</string>
-    <string name="switch_to_conversation">Превключване към разговор</string>
     <string name="microphone_unavailable">Микрофонът не е наличен</string>
     <string name="only_one_call_at_a_time">Не може да има повече от едно обаждане едновременно.</string>
     <string name="return_to_ongoing_call">Обратно към текущия разговор</string>
diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml
index 0ce5c6600..4236cc362 100644
--- a/src/main/res/values-bn-rIN/strings.xml
+++ b/src/main/res/values-bn-rIN/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">সেটিংস</string>
-    <string name="action_add">নতুন কথোপকথন</string>
     <string name="action_accounts">অ্যকাউন্টগুলো নিয়ন্ত্রণ করা যাক</string>
     <string name="action_account">অ্যকাউন্টটি নিয়ন্ত্রণ করা যাক</string>
-    <string name="action_end_conversation">কথা বন্ধ করা যাক</string>
     <string name="action_contact_details">বিশদ বিবরণ</string>
     <string name="action_muc_details">গ্রুপ চ্যাটের বিশদ বিবরণ</string>
     <string name="channel_details">চ্যনেলের বিশদ বিবরণ</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">ব্যক্তিটিকে ব্লক্ করার আর দরকার নেই</string>
     <string name="title_activity_manage_accounts">অ্যকাউন্টগুলো নিয়ন্ত্রণ করা যাক</string>
     <string name="title_activity_settings">সেটিংস</string>
-    <string name="title_activity_start_conversation">কথোপকথন শুরু করা যাক</string>
     <string name="title_activity_choose_contact">Contact নির্বাচন করুন</string>
     <string name="title_activity_choose_contacts">Contact সমূহ নির্বাচন করুন</string>
     <string name="title_activity_share_via_account">অ্যকাউন্টের মাধ্যমে share করা যাক</string>
@@ -53,7 +50,6 @@
     <string name="register_account">সার্ভারে একটি নতুন অ্যকাউন্ট খোলা যাক</string>
     <string name="change_password_on_server">সার্ভারে পাসওয়ার্ড বদলে ফেলা যাক</string>
     <string name="share_with">শেয়ার করা হোক...</string>
-    <string name="start_conversation">কথোপকথন শুরু করা যাক</string>
     <string name="invite_contact">ব্যক্তিকে আমন্ত্রণ জানানো হোক</string>
     <string name="invite">আমন্ত্রণ</string>
     <string name="contacts">পরিচিত মানুষজন</string>
@@ -84,7 +80,6 @@
     <string name="clear_conversation_history">Conversation-এর সব প্রতিলিপি মুছে ফেলা যাক</string>
     <string name="clear_histor_msg">এই কথোপকথনের সবকটি বার্তাই কি মুছে ফেলতে চান?\n‌\n<b>সতর্ক থাকবেন:</b> সার্ভার বা অন্য যন্ত্রে থাকা বার্তা কিন্তু অপরিআর্তিতই থাকবে।</string>
     <string name="delete_file_dialog">ফাইলটি মুছে ফেলা হোক</string>
-    <string name="also_end_conversation">এই কথোপকথনটি পরে সমাপ্ত করা হোক</string>
     <string name="choose_presence">যন্ত্র নির্বাচন করা যাক</string>
     <string name="send_unencrypted_message">অসাঙ্কেতিক বার্তাই পাঠানো হোক</string>
     <string name="send_message">বার্তা পাঠানো হোক</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 10c5f925d..e055bc88a 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Preferències</string>
-    <string name="action_add">Nova conversa</string>
     <string name="action_accounts">Gestiona els comptes</string>
     <string name="action_account">Administrar compte</string>
-    <string name="action_end_conversation">Conversa pròxima</string>
     <string name="action_contact_details">Detalls del contacte</string>
     <string name="action_muc_details">Detalls del xat de grup</string>
     <string name="channel_details">Detalls del canal</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Desbloquejar participant</string>
     <string name="title_activity_manage_accounts">Gestiona els comptes</string>
     <string name="title_activity_settings">Configuració</string>
-    <string name="title_activity_start_conversation">Comença una conversa</string>
     <string name="title_activity_choose_contact">Tria el contacte</string>
     <string name="title_activity_choose_contacts">Seleccionar contactes</string>
     <string name="title_activity_share_via_account">Comparteix mitjançant compte</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Registra un compte nou al servidor</string>
     <string name="change_password_on_server">Canvia la contrasenya al servidor</string>
     <string name="share_with">Comparteix amb…</string>
-    <string name="start_conversation">Comença la conversa</string>
     <string name="invite_contact">Convida un contacte</string>
     <string name="invite">Convida</string>
     <string name="contacts">Contactes</string>
@@ -85,7 +81,6 @@
     <string name="delete_file_dialog_msg">Estàs segur que vols esborrar aquest fitxer\?
 \n
 \n<b>Advertiment:</b> Això no eliminarà les còpies d\'aquest fitxer que estiguin emmagatzemades en altres dispositius o servidors. </string>
-    <string name="also_end_conversation">Tanca aquesta conversa després</string>
     <string name="choose_presence">Tria el dispositiu</string>
     <string name="send_unencrypted_message">Envia un missatge no xifrat</string>
     <string name="send_message">Envia un missatge</string>
@@ -422,7 +417,6 @@
     <string name="show_location">Mostrar localització</string>
     <string name="no_application_found_to_display_location">No s\'ha trobat cap aplicació per a mostrar la ubicació</string>
     <string name="location">Localització</string>
-    <string name="title_undo_swipe_out_conversation">Conversa tancada</string>
     <string name="title_undo_swipe_out_group_chat">Deixar el xat de grup privat</string>
     <string name="title_undo_swipe_out_channel">Canal públic de l\'esquerra</string>
     <string name="pref_dont_trust_system_cas_title">No confiar en les CAs del sistema</string>
@@ -577,7 +571,6 @@
     <string name="error_unable_to_create_temporary_file">No s\'ha pogut crear l\'arxiu temporal</string>
     <string name="this_device_has_been_verified">S\'ha verificat aquest dispositiu</string>
     <string name="copy_fingerprint">Copieu l\'empremta digital</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">El codi de barres no conté empremtes dactilars per a aquesta conversa.</string>
     <string name="verified_fingerprints">Empremtes digitals verificades</string>
     <string name="use_camera_icon_to_scan_barcode">Utilitzeu la càmera per escanejar el codi de barres d\'un contacte</string>
     <string name="please_wait_for_keys_to_be_fetched">Espereu que es puguin obtenir les claus</string>
@@ -629,7 +622,6 @@
     <string name="encrypting_message">Xifrant el missatge</string>
     <string name="not_fetching_history_retention_period">No es recullen missatges deguts al període de retenció local.</string>
     <string name="transcoding_video">S\'està comprimint el vídeo</string>
-    <string name="corresponding_conversations_closed">S\'han tancat les converses corresponents.</string>
     <string name="contact_blocked_past_tense">Contacte bloquejat.</string>
     <string name="pref_notifications_from_strangers">Notificacions d\'estranys</string>
     <string name="pref_notifications_from_strangers_summary">Notificar per a missatges i trucades rebudes d\'estranys.</string>
@@ -891,7 +883,6 @@ que l\'administrador del servidor llegeixi els missatges, però pot ser l\'únic
     <string name="audio_call">Trucada de veu</string>
     <string name="video_call">Trucada de vídeo</string>
     <string name="help">Ajuda</string>
-    <string name="switch_to_conversation">Passar a la conversa</string>
     <string name="microphone_unavailable">El seu micròfon no està disponible</string>
     <string name="only_one_call_at_a_time">Només pots tenir una trucada alhora.</string>
     <string name="return_to_ongoing_call">Tornar a la trucada en curs</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index ce9ab8c08..329090315 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Nastavení</string>
-    <string name="action_add">Nová konverzace</string>
     <string name="action_accounts">Nastavení účtů</string>
     <string name="action_account">Nastavení účtu</string>
-    <string name="action_end_conversation">Zavřít konverzaci</string>
     <string name="action_contact_details">Detaily kontaktu</string>
     <string name="action_muc_details">Detaily skupinového chatu</string>
     <string name="channel_details">Detaily kanálu</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Odblokovat účatníka</string>
     <string name="title_activity_manage_accounts">Nastavení účtů</string>
     <string name="title_activity_settings">Nastavení</string>
-    <string name="title_activity_start_conversation">Začít konverzaci</string>
     <string name="title_activity_choose_contact">Vybrat kontakt</string>
     <string name="title_activity_choose_contacts">Vybrat kontakty</string>
     <string name="title_activity_share_via_account">Sdílet pomocí účtu</string>
@@ -54,7 +51,6 @@
     <string name="register_account">Registrovat nový účet na serveru</string>
     <string name="change_password_on_server">Změnit heslo na serveru</string>
     <string name="share_with">Sdílet s…</string>
-    <string name="start_conversation">Začít konverzaci</string>
     <string name="invite_contact">Pozvat kontakt</string>
     <string name="invite">Pozvat</string>
     <string name="contacts">Kontakty</string>
@@ -89,7 +85,6 @@
     <string name="delete_file_dialog_msg">Opravdu chcete smazat tento soubor\?
 \n
 \n<b>Varování</b>Toto neovlivní kopie uložené na jiných zařízeních či serverech. </string>
-    <string name="also_end_conversation">Poté zavřít tuto konverzaci</string>
     <string name="choose_presence">Vybrat přístroj</string>
     <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
     <string name="send_message">Odeslat zprávu</string>
@@ -427,7 +422,6 @@
     <string name="show_location">Zobrazit pozici</string>
     <string name="no_application_found_to_display_location">Nebyla nalezena aplikace pro zobrazení pozice</string>
     <string name="location">Pozice</string>
-    <string name="title_undo_swipe_out_conversation">Conversation zavřena</string>
     <string name="title_undo_swipe_out_group_chat">Opustil(a) soukromý skupinový chat</string>
     <string name="title_undo_swipe_out_channel">Opustil(a) veřejný kanál</string>
     <string name="pref_dont_trust_system_cas_title">Nedůvěřovat systémovým CA</string>
@@ -601,7 +595,6 @@
     <string name="this_device_has_been_verified">Tento přístroj byl ověřen</string>
     <string name="copy_fingerprint">Kopírovat identifikátor</string>
     <string name="all_omemo_keys_have_been_verified">Oveřil(a) jste všechny OMEMO klíče, které vlastníte</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Kód neobsahuje otisk pro tuto konverzaci.</string>
     <string name="verified_fingerprints">Ověřené otisky</string>
     <string name="use_camera_icon_to_scan_barcode">Naskenovat kód kontaktu pomocí fotoaparátu</string>
     <string name="please_wait_for_keys_to_be_fetched">Prosím, počkejte na získání klíčů</string>
@@ -663,7 +656,6 @@
     <string name="pref_automatically_delete_messages_description">Automaticky z tohoto zařízení mazat zprávy, které jsou starší, než je nastaveno.</string>
     <string name="encrypting_message">Šifruji zprávu</string>
     <string name="transcoding_video">Komprimuji video</string>
-    <string name="corresponding_conversations_closed">Odpovídající konverzace uzavřena.</string>
     <string name="contact_blocked_past_tense">Kontakt zablokován.</string>
     <string name="pref_notifications_from_strangers">Upozornění od neznámých</string>
     <string name="pref_notifications_from_strangers_summary">Upozornit na zprávy a hovory od neznámých kontaktů.</string>
@@ -919,7 +911,6 @@
     <string name="audio_call">Hovor</string>
     <string name="video_call">Videohovor</string>
     <string name="help">Nápověda</string>
-    <string name="switch_to_conversation">Přepnout na konverzaci</string>
     <string name="microphone_unavailable">Váš mikrofon je nedostupný</string>
     <string name="only_one_call_at_a_time">V jednu chvíli může probíhat pouze jeden hovor.</string>
     <string name="return_to_ongoing_call">Návrat k probíhajícímu hovoru</string>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index 232b5a01f..973721543 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Indstillinger</string>
-    <string name="action_add">Ny samtale</string>
     <string name="action_accounts">Håndter konti</string>
     <string name="action_account">Håndter konto</string>
-    <string name="action_end_conversation">Afslut samtale</string>
     <string name="action_contact_details">Kontaktdeltaljer</string>
     <string name="action_muc_details">Gruppechat detaljer</string>
     <string name="channel_details">Kanaldetaljer  </string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Frigiv deltager</string>
     <string name="title_activity_manage_accounts">Håndter konti</string>
     <string name="title_activity_settings">Indstillinger</string>
-    <string name="title_activity_start_conversation">Start Conversation</string>
     <string name="title_activity_choose_contact">Vælg kontakt</string>
     <string name="title_activity_choose_contacts">Vælg kontakter</string>
     <string name="title_activity_share_via_account">Del via konto</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Register ny konto på server</string>
     <string name="change_password_on_server">Ændr adgangskode på server</string>
     <string name="share_with">Del med…</string>
-    <string name="start_conversation">Start samtale</string>
     <string name="invite_contact">Inviter kontakt</string>
     <string name="invite">Inviter</string>
     <string name="contacts">Kontakter</string>
@@ -87,7 +83,6 @@
     <string name="delete_file_dialog_msg">Er du sikker på, at du vil slette denne fil\?
 \n
 \n<b>Advarsel:</b> Dette sletter ikke kopier af denne fil, der er gemt på andre enheder eller servere. </string>
-    <string name="also_end_conversation">Luk efterfølgende denne samtale</string>
     <string name="choose_presence">Vælg enhed</string>
     <string name="send_unencrypted_message">Send ukrypteret besked</string>
     <string name="send_message">Send besked</string>
@@ -432,7 +427,6 @@
     <string name="show_location">Vis placering</string>
     <string name="no_application_found_to_display_location">Ingen app fundet der kan vise placering</string>
     <string name="location">Placering</string>
-    <string name="title_undo_swipe_out_conversation">Samtale afsluttet</string>
     <string name="title_undo_swipe_out_group_chat">Forlod privat gruppechat</string>
     <string name="title_undo_swipe_out_channel">Forlod offentlig kanal</string>
     <string name="pref_dont_trust_system_cas_title">Stol ikke på system-CA\'er</string>
@@ -602,7 +596,6 @@
     <string name="this_device_has_been_verified">Den enhed er blevet bekræftet</string>
     <string name="copy_fingerprint">Kopier fingeraftryk</string>
     <string name="all_omemo_keys_have_been_verified">Du har bekræftet alle OMEMO-nøglerne i din besiddelse</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Stregkoden indeholder ingen fingeraftryk for denne samtale.</string>
     <string name="verified_fingerprints">Bekræft fingeraftryk</string>
     <string name="use_camera_icon_to_scan_barcode">Brug kameraet til at skanne en kontakt’s stregkode</string>
     <string name="please_wait_for_keys_to_be_fetched">Vent til nøglerne hentes</string>
@@ -656,7 +649,6 @@
     <string name="encrypting_message">Krypter beskeden</string>
     <string name="not_fetching_history_retention_period">Henter ikke meddelelser på grund af lokal opbevaringsperiode.</string>
     <string name="transcoding_video">Komprimerer video</string>
-    <string name="corresponding_conversations_closed">Tilsvarende samtaler lukket.</string>
     <string name="contact_blocked_past_tense">Kontakt blokeret.</string>
     <string name="pref_notifications_from_strangers">Notifikationer fra fremmede</string>
     <string name="pref_notifications_from_strangers_summary">Underret ved beskeder og opkald modtaget fra fremmede.</string>
@@ -939,7 +931,6 @@
     <string name="audio_call">Lydopkald</string>
     <string name="video_call">Videoopkald</string>
     <string name="help">Hjælp</string>
-    <string name="switch_to_conversation">Skift til samtale</string>
     <string name="microphone_unavailable">Din mikrofon er utilgængelig</string>
     <string name="only_one_call_at_a_time">Du kan kun have et opkald af gangen.</string>
     <string name="return_to_ongoing_call">Returner til igangværende opkald</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 3b276e798..1b7ca375e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Einstellungen</string>
-    <string name="action_add">Neue Unterhaltung</string>
     <string name="action_accounts">Konten verwalten</string>
     <string name="action_account">Konto verwalten</string>
-    <string name="action_end_conversation">Unterhaltung beenden</string>
     <string name="action_contact_details">Kontaktdetails</string>
     <string name="action_muc_details">Gruppenchatdetails</string>
     <string name="channel_details">Channeldetails</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Teilnehmer entsperren</string>
     <string name="title_activity_manage_accounts">Konten verwalten</string>
     <string name="title_activity_settings">Einstellungen</string>
-    <string name="title_activity_start_conversation">Unterhaltung beginnen</string>
     <string name="title_activity_choose_contact">Kontakt auswählen</string>
     <string name="title_activity_choose_contacts">Kontakte auswählen</string>
     <string name="title_activity_share_via_account">Teilen über Konto</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Neues Konto auf Server erstellen</string>
     <string name="change_password_on_server">Passwort ändern</string>
     <string name="share_with">Teilen mit…</string>
-    <string name="start_conversation">Unterhaltung beginnen</string>
     <string name="invite_contact">Kontakt einladen</string>
     <string name="invite">Einladen</string>
     <string name="contacts">Kontakte</string>
@@ -87,7 +83,6 @@
     <string name="delete_file_dialog_msg">Bist du sicher, dass du diese Datei löschen möchtest\?
 \n
 \n<b>Achtung:</b> Dies löscht keine Kopien dieser Datei, die auf anderen Geräten oder Servern gespeichert sind. </string>
-    <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
     <string name="choose_presence">Gerät auswählen</string>
     <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
     <string name="send_message">Nachricht senden</string>
@@ -434,7 +429,6 @@
     <string name="show_location">Standort anzeigen</string>
     <string name="no_application_found_to_display_location">Keine App für die Standortanzeige gefunden</string>
     <string name="location">Standort</string>
-    <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
     <string name="title_undo_swipe_out_group_chat">Privaten Gruppenchat verlassen</string>
     <string name="title_undo_swipe_out_channel">Öffentlichen Channel verlassen</string>
     <string name="pref_dont_trust_system_cas_title">Zertifizierungsstellen nicht vertrauen</string>
@@ -603,7 +597,6 @@
     <string name="this_device_has_been_verified">Dieses Gerät wurde überprüft</string>
     <string name="copy_fingerprint">Fingerabdruck kopieren</string>
     <string name="all_omemo_keys_have_been_verified">Du hast alle in deinem Besitz befindlichen OMEMO-Schlüssel überprüft</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Der Barcode enthält keine Fingerabdrücke für diese Unterhaltung.</string>
     <string name="verified_fingerprints">Überprüfte Fingerabdrücke</string>
     <string name="use_camera_icon_to_scan_barcode">Nutze die Kamera, um Barcodes deiner Kontakte zu scannen</string>
     <string name="please_wait_for_keys_to_be_fetched">Bitte warten, bis die Schlüssel abgerufen werden</string>
@@ -657,7 +650,6 @@
     <string name="encrypting_message">Nachricht wird verschlüsselt</string>
     <string name="not_fetching_history_retention_period">Nachrichten werden aufgrund der eingestellten lokalen Speicherfrist nicht abgerufen. </string>
     <string name="transcoding_video">Video wird komprimiert</string>
-    <string name="corresponding_conversations_closed">Zugehörige Unterhaltung beendet.</string>
     <string name="contact_blocked_past_tense">Kontakt gesperrt.</string>
     <string name="pref_notifications_from_strangers">Benachrichtigungen von Unbekannten</string>
     <string name="pref_notifications_from_strangers_summary">Benachrichtigen bei Erhalt von Nachrichten und Anrufen von Unbekannten.</string>
@@ -940,7 +932,6 @@
     <string name="audio_call">Audioanruf</string>
     <string name="video_call">Videoanruf</string>
     <string name="help">Hilfe</string>
-    <string name="switch_to_conversation">Zur Unterhaltung wechseln</string>
     <string name="microphone_unavailable">Dein Mikrofon ist nicht verfügbar</string>
     <string name="only_one_call_at_a_time">Du kannst immer nur einen Anruf zur gleichen Zeit machen.</string>
     <string name="return_to_ongoing_call">Zurück zum laufenden Aufruf</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index ce9f937ec..14861abf9 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Ρυθμίσεις</string>
-    <string name="action_add">Νέα συζήτηση</string>
     <string name="action_accounts">Διαχείριση λογαριασμών</string>
     <string name="action_account">Διαχείριση λογαριασμού</string>
-    <string name="action_end_conversation">Τερματισμός συζήτησης</string>
     <string name="action_contact_details">Λεπτομέρειες επαφής</string>
     <string name="action_muc_details">Λεπτομέρειες ομαδικής συζήτησης</string>
     <string name="channel_details">Λεπτομέρειες καναλιού</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Άρση αποκλεισμού συμμετέχοντα</string>
     <string name="title_activity_manage_accounts">Διαχείριση Λογαριασμών</string>
     <string name="title_activity_settings">Ρυθμίσεις</string>
-    <string name="title_activity_start_conversation">Έναρξη Συζήτησης</string>
     <string name="title_activity_choose_contact">Επιλογή επαφής</string>
     <string name="title_activity_choose_contacts">Επιλογή επαφών</string>
     <string name="title_activity_share_via_account">Διαμοιρασμός μέσω λογαριασμού</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Εγγραφή νέου λογαριασμού στον διακομιστή</string>
     <string name="change_password_on_server">Αλλαγή συνθηματικού στον διακομιστή</string>
     <string name="share_with">Διαμοιρασμός με...</string>
-    <string name="start_conversation">Έναρξη συζήτησης</string>
     <string name="invite_contact">Πρόσκληση επαφής</string>
     <string name="invite">Πρόσκληση</string>
     <string name="contacts">Επαφές</string>
@@ -85,7 +81,6 @@
     <string name="clear_histor_msg">Θέλετε να διαγράψετε όλα τα μηνύματα αυτής της συζήτησης;\n\n<b>Προσοχή:</b> Αυτή η ενέργεια δεν θα επηρεάσει μηνύματα που είναι αποθηκευμένα σε άλλες συσκευές ή εξυπηρετητές.</string>
     <string name="delete_file_dialog">Διαγραφή αρχείου</string>
     <string name="delete_file_dialog_msg">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αρχείο;\n\n<b>Προσοχή:</b> Αυτή η ενέργεια δεν θα διαγράψει αντίγραφα αυτού του αρχείου που είναι αποθηκευμένα σε άλλες συσκευές ή εξυπηρετητές.</string>
-    <string name="also_end_conversation">Κλείσιμο της συζήτησης αμέσως μετά</string>
     <string name="choose_presence">Επιλογή συσκευής</string>
     <string name="send_unencrypted_message">Αποστολή μη κρυπτογραφημένου μηνύματος</string>
     <string name="send_message">Αποστολή μηνύματος</string>
@@ -425,7 +420,6 @@
     <string name="show_location">Εμφάνιση τοποθεσίας</string>
     <string name="no_application_found_to_display_location">Δεν βρέθηκε εφαρμογή για την απεικόνιση τοποθεσίας</string>
     <string name="location">Τοποθεσία</string>
-    <string name="title_undo_swipe_out_conversation">Η συζήτηση έκλεισε</string>
     <string name="title_undo_swipe_out_group_chat">Αποχώρησε από την συζήτηση ιδιωτικής ομάδας</string>
     <string name="title_undo_swipe_out_channel">Αποχώρησε από το δημόσιο κανάλι</string>
     <string name="pref_dont_trust_system_cas_title">Μη έμπιστες αρχές πιστοποίησης συστήματος</string>
@@ -593,7 +587,6 @@
     <string name="this_device_has_been_verified">Αυτή η συσκευή έχει επαληθευτεί</string>
     <string name="copy_fingerprint">Αντιγραφή αποτυπώματος</string>
     <string name="all_omemo_keys_have_been_verified">Έχετε επαληθεύσει όλα τα κλειδιά OMEMO που κατέχετε</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Ο γραμμοκώδικας δεν περιέχει αποτυπώματα για την συζήτηση αυτή.</string>
     <string name="verified_fingerprints">Επαληθευμένα αποτυπώματα</string>
     <string name="use_camera_icon_to_scan_barcode">Χρήση της φωτογραφικής μηχανής για την σάρωση του γραμμοκώδικα της επαφής</string>
     <string name="please_wait_for_keys_to_be_fetched">Παρακαλώ περιμένετε την μεταφόρτωση των κλειδιών</string>
@@ -647,7 +640,6 @@
     <string name="encrypting_message">Κρυπτογράφηση μηνύματος</string>
     <string name="not_fetching_history_retention_period">Χωρίς μεταφόρτωση μηνυμάτων λόγω τοπικού χρόνου διατήρησης.</string>
     <string name="transcoding_video">Συμπίεση βίντεο</string>
-    <string name="corresponding_conversations_closed">Οι αντίστοιχες συζητήσεις έκλεισαν.</string>
     <string name="contact_blocked_past_tense">Η επαφή αποκλείστηκε.</string>
     <string name="pref_notifications_from_strangers">Ειδοποιήσεις από άγνωστους</string>
     <string name="pref_notifications_from_strangers_summary">Ειδοποίηση για μηνύματα και κλήσεις που προέρχονται από άγνωστους.</string>
@@ -915,7 +907,6 @@
     <string name="audio_call">Κλήση ήχου</string>
     <string name="video_call">Βιντεοκλήση</string>
     <string name="help">Βοήθεια</string>
-    <string name="switch_to_conversation">Εναλλαγή στη συζήτηση</string>
     <string name="microphone_unavailable">Το μικρόφωνο δεν είναι διαθέσιμο</string>
     <string name="only_one_call_at_a_time">Μπορείτε να κάνετε μόνο μια κλήση τη φορά.</string>
     <string name="return_to_ongoing_call">Επιστροφή στην κλήση σε εξέλιξη</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index b6e4211d1..1217342a6 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Ajustes</string>
-    <string name="action_add">Nueva conversación</string>
     <string name="action_accounts">Gestionar cuentas</string>
     <string name="action_account">Gestionar cuenta</string>
-    <string name="action_end_conversation">Cerrar conversación</string>
     <string name="action_contact_details">Detalles del contacto</string>
     <string name="action_muc_details">Detalles de conversación</string>
     <string name="channel_details">Detalles del canal</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Desbloquear participante</string>
     <string name="title_activity_manage_accounts">Gestionar Cuentas</string>
     <string name="title_activity_settings">Ajustes</string>
-    <string name="title_activity_start_conversation">Nueva Conversación</string>
     <string name="title_activity_choose_contact">Seleccionar Contacto</string>
     <string name="title_activity_choose_contacts">Seleccionar Contactos</string>
     <string name="title_activity_share_via_account">Compartir via cuenta</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Registrar nueva cuenta en servidor</string>
     <string name="change_password_on_server">Cambiar contraseña en servidor</string>
     <string name="share_with">Compartir con…</string>
-    <string name="start_conversation">Comenzar conversación</string>
     <string name="invite_contact">Invitar a contacto</string>
     <string name="invite">Invitar</string>
     <string name="contacts">Contactos</string>
@@ -88,7 +84,6 @@
     <string name="delete_file_dialog_msg">¿Está seguro de que desea eliminar este archivo\?
 \n
 \n<b>Advertencia:</b> Esto no eliminará las copias de este archivo almacenadas en otros dispositivos o servidores. </string>
-    <string name="also_end_conversation">Cerrar esta conversación después</string>
     <string name="choose_presence">Seleccionar dispositivo</string>
     <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
     <string name="send_message">Enviar mensaje</string>
@@ -435,7 +430,6 @@
     <string name="show_location">Mostrar ubicación</string>
     <string name="no_application_found_to_display_location">No se ha encontrado ninguna aplicación para mostrar la ubicación</string>
     <string name="location">Ubicación</string>
-    <string name="title_undo_swipe_out_conversation">Conversación cerrada</string>
     <string name="title_undo_swipe_out_group_chat">Dejar la conversación en grupo</string>
     <string name="title_undo_swipe_out_channel">Dejar el canal público</string>
     <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string>
@@ -606,7 +600,6 @@
     <string name="this_device_has_been_verified">Este dispositivo ha sido verificado</string>
     <string name="copy_fingerprint">Copiar huella digital</string>
     <string name="all_omemo_keys_have_been_verified">Has verificado todas las huellas digitales OMEMO en tu posesión</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">El código QR no contiene huellas digitales para esta conversación. </string>
     <string name="verified_fingerprints">Huellas digitales verificadas</string>
     <string name="use_camera_icon_to_scan_barcode">Usa la cámara para escanear el código QR del contacto</string>
     <string name="please_wait_for_keys_to_be_fetched">Por favor, espera a que las claves sean recuperadas</string>
@@ -666,7 +659,6 @@
     <string name="encrypting_message">Cifrando mensaje</string>
     <string name="not_fetching_history_retention_period">No buscar mensajes más antiguos que el establecido en el marco de tiempo.</string>
     <string name="transcoding_video">Comprimiendo video</string>
-    <string name="corresponding_conversations_closed">Conversación correspondiente cerrada.</string>
     <string name="contact_blocked_past_tense">Contacto bloqueado.</string>
     <string name="pref_notifications_from_strangers">Notificaciones de desconocidos</string>
     <string name="pref_notifications_from_strangers_summary">Notificar de nuevos mensajes y llamadas recibidas de contactos desconocidos.</string>
@@ -952,7 +944,6 @@
     <string name="audio_call">Audio llamada</string>
     <string name="video_call">Video llamada</string>
     <string name="help">Ayuda</string>
-    <string name="switch_to_conversation">Cambiar a conversación</string>
     <string name="microphone_unavailable">Tu micrófono no está disponible</string>
     <string name="only_one_call_at_a_time">Solo se puede hacer una llamada a la vez.</string>
     <string name="return_to_ongoing_call">Volver a la llamada en curso</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index b1baec333..c46c425f6 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Ezarpenak</string>
-    <string name="action_add">Elkarrizketa berria</string>
     <string name="action_accounts">Kontuak kudeatu</string>
     <string name="action_account">Kontua kudeatu</string>
     <string name="action_contact_details">Kontaktuaren xehetasunak</string>
@@ -19,7 +18,6 @@
     <string name="action_unblock_participant">Parte-hartzaileari blokeoa kendu</string>
     <string name="title_activity_manage_accounts">Kontuak kudeatu</string>
     <string name="title_activity_settings">Ezarpenak</string>
-    <string name="title_activity_start_conversation">Elkarrizketa hasi</string>
     <string name="title_activity_choose_contact">Kontaktua hautatu</string>
     <string name="title_activity_choose_contacts">Kontaktuak hautatu</string>
     <string name="title_activity_share_via_account">Kontu bidez partekatu</string>
@@ -46,7 +44,6 @@
     <string name="register_account">Kontu berria zerbitzarian erregistratu</string>
     <string name="change_password_on_server">Pasahitza zerbitzarian aldatu</string>
     <string name="share_with">Partekatu honekin...</string>
-    <string name="start_conversation">Elkarrizketa hasi</string>
     <string name="invite_contact">Kontaktua gonbidatu</string>
     <string name="invite">Gonbidatu</string>
     <string name="contacts">Kontaktuak</string>
@@ -70,7 +67,6 @@
     <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
     <string name="delete_file_dialog">Fitxategia ezabatu</string>
     <string name="delete_file_dialog_msg">Fitxategi hau ezabatu nahi al duzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako fitxategi honen kopiak ezabatuko.</string>
-    <string name="also_end_conversation">Elkarrizketa hau jarraian itxi</string>
     <string name="choose_presence">Gailua aukeratu</string>
     <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
     <string name="send_message">Mezua bidali</string>
@@ -357,7 +353,6 @@
     <string name="send_location">Kokapena partekatu</string>
     <string name="show_location">Kokapena erakutsi</string>
     <string name="location">Kokapena</string>
-    <string name="title_undo_swipe_out_conversation">Elkarrizketa itxi egin da</string>
     <string name="title_undo_swipe_out_group_chat">Talde pribatua utzi da</string>
     <string name="title_undo_swipe_out_channel">Kanal publikoa utzi da</string>
     <string name="pref_dont_trust_system_cas_title">Sistemaren CAtaz ez fidatu</string>
@@ -527,7 +522,6 @@
     <string name="encrypting_message">Mezua enkriptatzen</string>
     <string name="not_fetching_history_retention_period">Mezurik ez eskuratzen gelditze tarte lokalarengatik.</string>
     <string name="transcoding_video">Bideoa konprimatzen</string>
-    <string name="corresponding_conversations_closed">Dagokion elkarrizketa itxi egin da.</string>
     <string name="contact_blocked_past_tense">Kontaktua blokeatu da.</string>
     <string name="pref_notifications_from_strangers">Ezezagunen jakinarazpenak</string>
     <string name="received_message_from_stranger">Ezezagun baten mezu bat jaso duzu</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 2c7680756..0f1abf6d6 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">تنظیمات</string>
-    <string name="action_add">مکالمه جدید</string>
     <string name="action_accounts">مدیریت حساب های کاربری</string>
     <string name="action_contact_details">جزییات مخاطب</string>
     <string name="action_muc_details">جزئیات چت گروهی</string>
@@ -15,7 +14,6 @@
     <string name="action_unblock_domain">باز کردن دامنه</string>
     <string name="title_activity_manage_accounts">مدیریت حساب ها</string>
     <string name="title_activity_settings">تنظیمات</string>
-    <string name="title_activity_start_conversation">شروع گفتگو</string>
     <string name="title_activity_choose_contact">انتخاب مخاطب</string>
     <string name="title_activity_choose_contacts">انتخاب مخاطبین</string>
     <string name="title_activity_share_via_account">به اشتراک گذاری با حساب</string>
@@ -38,7 +36,6 @@
     <string name="register_account">ثبت نام حساب جدید بر روی سرور</string>
     <string name="change_password_on_server">تغییر رمز عبور بر روی سرور</string>
     <string name="share_with">هم‌رسانی با…</string>
-    <string name="start_conversation">شروع گفتگو</string>
     <string name="invite_contact">دعوت از مخاطب</string>
     <string name="contacts">مخاطبین</string>
     <string name="contact">مخاطب</string>
@@ -160,7 +157,6 @@
     <string name="view_conversation">دیدن گفتگو</string>
     <string name="toast_message_omemo_fingerprint">اثر انگشت OMEMO کپی شد</string>
     <string name="show_block_list">نمایش مسدودسازی‌ها</string>
-    <string name="also_end_conversation">سپس این گفتگو را ببند</string>
     <string name="pref_up_push_server_summary">سرور push دلخواه کاربر برای رساندن اعلان‌های push از راه XMPP به دستگاه شما.</string>
     <string name="connect">وصل شدن</string>
     <string name="log_in">ورود</string>
@@ -390,7 +386,6 @@
     <string name="conference_resource_constraint">محدودیت منابع</string>
     <string name="leave">ترک</string>
     <string name="skip">چشم‌پوشی</string>
-    <string name="action_end_conversation">بستن گفتگو</string>
     <string name="multimedia_file">پروندهٔ چندرسانه‌ای</string>
     <string name="preparing_image">آماده‌سازی برای فرستادن عکس</string>
     <string name="send_private_message_to">فرستادن پیام خصوصی به %s</string>
@@ -479,7 +474,6 @@
     <string name="confirm">تأیید</string>
     <string name="encrypted_with_openpgp">رمزشده با OpenPGP</string>
     <string name="audio_call">تماس صوتی</string>
-    <string name="switch_to_conversation">بازگشت به گفتگو</string>
     <string name="enable">فعال‌کردن</string>
     <string name="could_not_modify_conference_options">تغییر تنظیمات گفتگوی گروهی ممکن نبود</string>
     <string name="pref_expert_options">تنظیمات پیشرفته</string>
@@ -523,7 +517,6 @@
     <string name="title_undo_swipe_out_channel">کانال عمومی را ترک کرد</string>
     <string name="remove_from_favorites">برداشتن سنجاق از بالا</string>
     <string name="not_encrypted">رمزنشده</string>
-    <string name="title_undo_swipe_out_conversation">گفتگو بسته شد</string>
     <string name="pref_up_push_account_summary">حسابی که از راه آن اعلان‌های push دریافت می‌شوند.</string>
     <string name="pref_notification_grace_period_summary">مدت زمانی که اعلان‌های این برنامه، پس از این که شما روی دستگاه‌های دیگرتان فعالیت می‌کنید، خاموش می‌مانند.</string>
     <string name="member">عضو</string>
@@ -790,7 +783,6 @@
     <string name="location_disabled">هم‌رسانی موقعیت مکانی غیرفعال است</string>
     <string name="unable_to_fetch_mam_prefs">دریافت ترجیحات آرشیوگیری ممکن نبود</string>
     <string name="nickname">نام نمایشی</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">بارکد شامل اثر انگشت دیجیتالی این گفتگو نیست.</string>
     <string name="pref_delete_omemo_identities">حذف هویت‌های OMEMO</string>
     <string name="verifying_omemo_keys_trusted_source_account">شما قرار است کلیدهای OMEMO حساب خودتان را تأیید کنید. این کار فقط وقتی امن است که شما این پیوند را از منبع مورد اعتمادی گرفته باشید که فقط خودتان می‌توانستید منتشرش کنید.</string>
     <string name="account_already_setup">این حساب قبلاً ساخته شده است</string>
@@ -944,7 +936,6 @@
     <string name="verified_omemo_key_with_certificate">کلید OMEMO با تأییدیهٔ امنیتی تأیید شد!</string>
     <string name="pref_notifications_from_strangers">اعلان‌ها از غریبه‌ها</string>
     <string name="invalid_user_input">ورودی نامعتبر از کاربر</string>
-    <string name="corresponding_conversations_closed">گفتگوهای مربوطه بسته شده‌اند.</string>
     <string name="battery_optimizations_enabled_dialog">دستگاه شما شدیداً‌مصرف باتری را برای %1$s بهینه می‌کند که ممکن است باعث تأخیر در اعلان‌ها یا حتی ازدست‌رفتن پیام‌ها شود.
 \n
 \nهم‌اینک از شما خواسته می‌شود که آن را غیرفعال کنید.</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 4cc945d73..e61b7b086 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Asetukset</string>
-    <string name="action_add">Uusi keskustelu</string>
     <string name="action_accounts">Hallitse tilejä</string>
     <string name="action_account">Hallinnoi tiliä</string>
-    <string name="action_end_conversation">Päätä keskustelu</string>
     <string name="action_contact_details">Yhteystiedot</string>
     <string name="action_muc_details">Ryhmäkeskustelun tiedot</string>
     <string name="channel_details">Kanavan tiedot</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Peru osallistujan esto</string>
     <string name="title_activity_manage_accounts">Hallitse tilejä</string>
     <string name="title_activity_settings">Asetukset</string>
-    <string name="title_activity_start_conversation">Aloita keskustelu</string>
     <string name="title_activity_choose_contact">Valitse yhteystieto</string>
     <string name="title_activity_choose_contacts">Valitse yhteystiedot</string>
     <string name="title_activity_share_via_account">Jaa tilillä</string>
@@ -51,7 +48,6 @@
     <string name="blocked">Estetty</string>
     <string name="register_account">Rekisteröi uusi tili palvelimella</string>
     <string name="change_password_on_server">Vaihda salasanaa palvelimelle</string>
-    <string name="start_conversation">Aloita keskustelu</string>
     <string name="invite_contact">Kutsu yhteystieto</string>
     <string name="invite">Kutsu</string>
     <string name="contacts">Yhteystiedot</string>
@@ -86,7 +82,6 @@
     <string name="delete_file_dialog_msg">Haluatko varmasti poistaa tämän tiedoston\?
 \n
 \n<b>Varoitus:</b> Muilla laitteilla tai palvelimilla olevia kopioita ei poisteta. </string>
-    <string name="also_end_conversation">Päätä keskustelu myös</string>
     <string name="choose_presence">Valitse laite</string>
     <string name="send_unencrypted_message">Lähetä salaamaton viesti</string>
     <string name="send_message">Lähetä viesti</string>
@@ -418,7 +413,6 @@
     <string name="show_location">Näytä sijainti</string>
     <string name="no_application_found_to_display_location">Sijainnin näyttämiseen sopivaa sovellusta ei löytynyt</string>
     <string name="location">Sijainti</string>
-    <string name="title_undo_swipe_out_conversation">Keskustelu suljettu</string>
     <string name="title_undo_swipe_out_group_chat">Poistuit yksityisestä ryhmäkeskustelusta</string>
     <string name="title_undo_swipe_out_channel">Poistuit julkisesta kanavasta</string>
     <string name="pref_dont_trust_system_cas_title">Älä luota varmenteiden myöntäjiin</string>
@@ -576,7 +570,6 @@
     <string name="this_device_has_been_verified">Laite on varmennettu</string>
     <string name="copy_fingerprint">Kopioi sormenjälki</string>
     <string name="all_omemo_keys_have_been_verified">Olet varmentanut kaikki hallussasi olevat OMEMO-avaimet</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Viivakoodi ei sisällä tähän keskusteluun liittyviä sormenjälkiä.</string>
     <string name="verified_fingerprints">Varmennetut sormenjäljet</string>
     <string name="use_camera_icon_to_scan_barcode">Käytä kameraa yhteystietosi viivakoodin lukemiseen</string>
     <string name="please_wait_for_keys_to_be_fetched">Odota hetki, avaimia ladataan</string>
@@ -863,7 +856,6 @@
     <string name="audio_call">Äänipuhelu</string>
     <string name="video_call">Videopuhelu</string>
     <string name="help">Apua</string>
-    <string name="switch_to_conversation">Vaihda keskusteluun</string>
     <string name="microphone_unavailable">Mikrofoni ei käytettävissä</string>
     <string name="only_one_call_at_a_time">Voit osallistua vain yhteen puheluun kerrallaan.</string>
     <string name="return_to_ongoing_call">Takaisin keskeneräiseen puheluun</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 2fb53ad59..aff2aaee1 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Paramètres</string>
-    <string name="action_add">Nouvelle conversation</string>
     <string name="action_accounts">Gérer les comptes</string>
     <string name="action_account">Gérer le compte</string>
-    <string name="action_end_conversation">Fermer la conversation</string>
     <string name="action_contact_details">Détails du contact</string>
     <string name="action_muc_details">Détails du groupe</string>
     <string name="channel_details">Détails du canal</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Débloquer le participant</string>
     <string name="title_activity_manage_accounts">Gestion des comptes</string>
     <string name="title_activity_settings">Paramètres</string>
-    <string name="title_activity_start_conversation">Démarrer une conversation</string>
     <string name="title_activity_choose_contact">Choisir un contact</string>
     <string name="title_activity_choose_contacts">Choisir les contacts</string>
     <string name="title_activity_share_via_account">Partager via le compte</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Créer un nouveau compte sur le serveur</string>
     <string name="change_password_on_server">Changer de mot de passe sur le serveur</string>
     <string name="share_with">Partager avec…</string>
-    <string name="start_conversation">Démarrer une conversation</string>
     <string name="invite_contact">Inviter un contact</string>
     <string name="invite">Inviter</string>
     <string name="contacts">Contacts</string>
@@ -88,7 +84,6 @@
     <string name="delete_file_dialog_msg">Êtes-vous sûr de vouloir supprimer ce fichier \?
 \n
 \n<b>Avertissement :</b> Cela ne supprimera pas les copies de ce fichier qui sont stockées sur d\'autres appareils ou serveurs. </string>
-    <string name="also_end_conversation">Fermez cette conversation après</string>
     <string name="choose_presence">Choisir l\'appareil</string>
     <string name="send_unencrypted_message">Envoyer un message en clair</string>
     <string name="send_message">Envoyer le message</string>
@@ -431,7 +426,6 @@
     <string name="show_location">Afficher la position</string>
     <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher le lieu</string>
     <string name="location">Position</string>
-    <string name="title_undo_swipe_out_conversation">Conversation fermée</string>
     <string name="title_undo_swipe_out_group_chat">Quitter le groupe privé</string>
     <string name="title_undo_swipe_out_channel">Quitte le canal public</string>
     <string name="pref_dont_trust_system_cas_title">Ne pas utiliser les CAs système</string>
@@ -600,7 +594,6 @@
     <string name="this_device_has_been_verified">Cet appareil a été vérifié</string>
     <string name="copy_fingerprint">Copier l\'empreinte</string>
     <string name="all_omemo_keys_have_been_verified">Vous avez vérifié toutes les clés OMEMO en votre possession</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Le code-barres ne contient pas d\'empreintes pour cette conversation.</string>
     <string name="verified_fingerprints">Empreintes vérifiées</string>
     <string name="use_camera_icon_to_scan_barcode">Utilisez l\'appareil photo pour scanner le code-barres d\'un contact</string>
     <string name="please_wait_for_keys_to_be_fetched">Veuillez attendre que les clés soient récupérées</string>
@@ -659,7 +652,6 @@
     <string name="encrypting_message">Chiffrement du message en cours</string>
     <string name="not_fetching_history_retention_period">Aucun message récupéré, en raison de la configuration de rétention de l\'appareil.</string>
     <string name="transcoding_video">Compression de la vidéo en cours</string>
-    <string name="corresponding_conversations_closed">Conversations correspondantes fermées.</string>
     <string name="contact_blocked_past_tense">Contact bloqué.</string>
     <string name="pref_notifications_from_strangers">Notifications d\'inconnus</string>
     <string name="pref_notifications_from_strangers_summary">Notifier les messages et appels reçus d\'inconnus.</string>
@@ -927,7 +919,6 @@
     <string name="audio_call">Appel audio</string>
     <string name="video_call">Appel vidéo</string>
     <string name="help">Aide</string>
-    <string name="switch_to_conversation">Basculer vers la conversation</string>
     <string name="microphone_unavailable">Votre micro n\'est pas disponible</string>
     <string name="only_one_call_at_a_time">Vous ne pouvez prendre qu\'un appel à la fois.</string>
     <string name="return_to_ongoing_call">Reprendre l\'appel en cours</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 1a4a402ac..d33baffee 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Axustes</string>
-    <string name="action_add">Nova conversa</string>
     <string name="action_accounts">Xestionar contas</string>
     <string name="action_account">Xestionar conta</string>
-    <string name="action_end_conversation">Pechar conversa</string>
     <string name="action_contact_details">Detalles do contacto</string>
     <string name="action_muc_details">Detalles da conversa de grupo</string>
     <string name="channel_details">Detalles da canle</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Desbloquear persoa</string>
     <string name="title_activity_manage_accounts">Xestionar Contas</string>
     <string name="title_activity_settings">Axustes</string>
-    <string name="title_activity_start_conversation">Iniciar conversa</string>
     <string name="title_activity_choose_contact">Escoller Contacto</string>
     <string name="title_activity_choose_contacts">Seleccionar contactos</string>
     <string name="title_activity_share_via_account">Compartir coa conta</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Rexistrar nova conta no servidor</string>
     <string name="change_password_on_server">Cambiar o contrasinal no servidor</string>
     <string name="share_with">Compartir con…</string>
-    <string name="start_conversation">Comezar conversa</string>
     <string name="invite_contact">Convidar contacto</string>
     <string name="invite">Convidar</string>
     <string name="contacts">Contactos</string>
@@ -89,7 +85,6 @@
     <string name="delete_file_dialog_msg">Tes a certeza de querer eliminar este ficheiro\?
 \n
 \n<b>Aviso:</b> Esto non eliminará as copias de este ficheiro que están gardadas noutros dispositivos ou servidores. </string>
-    <string name="also_end_conversation">Pechar a conversa tras baleirar</string>
     <string name="choose_presence">Escoller dispositivo</string>
     <string name="send_unencrypted_message">Enviar mensaxe non cifrada</string>
     <string name="send_message">Enviar mensaxe</string>
@@ -436,7 +431,6 @@
     <string name="show_location">Mostrar localización</string>
     <string name="no_application_found_to_display_location">Non se atopou unha app para mostrar a localización</string>
     <string name="location">Localización</string>
-    <string name="title_undo_swipe_out_conversation">Pechouse a conversa</string>
     <string name="title_undo_swipe_out_group_chat">Deixar o grupo de conversa privada</string>
     <string name="title_undo_swipe_out_channel">Deixar a canle pública</string>
     <string name="pref_dont_trust_system_cas_title">Non confiar nas CAs do sistema</string>
@@ -605,7 +599,6 @@
     <string name="this_device_has_been_verified">Este dispositivo foi verificado</string>
     <string name="copy_fingerprint">Copiar impresión dixital</string>
     <string name="all_omemo_keys_have_been_verified">Verificaches tódalas chaves OMEMO da túa propiedade</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">O código de barras non contén impresións dixitais para esta conversa.</string>
     <string name="verified_fingerprints">Impresións dixitais verificadas</string>
     <string name="use_camera_icon_to_scan_barcode">Utilice a cámara para escanear o código de barras do contacto</string>
     <string name="please_wait_for_keys_to_be_fetched">Por favor agarde mentras se obteñen as chaves</string>
@@ -659,7 +652,6 @@
     <string name="encrypting_message">Cifrando mensaxe</string>
     <string name="not_fetching_history_retention_period">Sen obtención de mensaxes debido ao período de retención local.</string>
     <string name="transcoding_video">Comprimindo vídeo</string>
-    <string name="corresponding_conversations_closed">Conversas correpondentes pechadas.</string>
     <string name="contact_blocked_past_tense">Contacto bloqueado.</string>
     <string name="pref_notifications_from_strangers">Notificacións de estraños</string>
     <string name="pref_notifications_from_strangers_summary">Notificar as mensaxes e chamadas recibidas por parte de extraños.</string>
@@ -943,7 +935,6 @@
     <string name="audio_call">Chamada de audio</string>
     <string name="video_call">Chamada de vídeo</string>
     <string name="help">Axuda</string>
-    <string name="switch_to_conversation">Ir á conversa</string>
     <string name="microphone_unavailable">O micrófono non está dispoñible</string>
     <string name="only_one_call_at_a_time">Só podes manter unha chamada en cada momento.</string>
     <string name="return_to_ongoing_call">Volver á chamada activa</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index 91f64c173..5306db979 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Postavke</string>
-    <string name="action_add">Novi razgovor</string>
     <string name="action_accounts">Upravljanje računima</string>
     <string name="action_account">Upravljaj računom</string>
-    <string name="action_end_conversation">Zatvori razgovor</string>
     <string name="action_contact_details">Kontakt podaci</string>
     <string name="action_muc_details">Pojedinosti grupnog razgovora</string>
     <string name="channel_details">Detalji kanala</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Deblokiraj sudionika</string>
     <string name="title_activity_manage_accounts">Upravljanje računima</string>
     <string name="title_activity_settings">Postavke</string>
-    <string name="title_activity_start_conversation">Započni razgovor</string>
     <string name="title_activity_choose_contact">Odaberite Kontakt</string>
     <string name="title_activity_choose_contacts">Odaberite kontakte</string>
     <string name="title_activity_share_via_account">Dijeli putem računa</string>
@@ -58,7 +55,6 @@
     <string name="register_account">Registrirajte novi račun na poslužitelju</string>
     <string name="change_password_on_server">Promjena lozinke na poslužitelju</string>
     <string name="share_with">Podijeli s…</string>
-    <string name="start_conversation">Započni razgovor</string>
     <string name="invite_contact">Pozovi kontakt</string>
     <string name="invite">Pozovi</string>
     <string name="contacts">Kontakti</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 4df39a16c..1cd5a6b61 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Beállítások</string>
-    <string name="action_add">Új beszélgetés</string>
     <string name="action_accounts">Fiókok kezelése</string>
     <string name="action_account">Fiók kezelése</string>
-    <string name="action_end_conversation">Beszélgetés bezárása</string>
     <string name="action_contact_details">Partner részletei</string>
     <string name="action_muc_details">Csoportos csevegés részletei</string>
     <string name="channel_details">Csatorna részletei</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Résztvevő tiltásának feloldása</string>
     <string name="title_activity_manage_accounts">Fiókok kezelése</string>
     <string name="title_activity_settings">Beállítások</string>
-    <string name="title_activity_start_conversation">Beszélgetés indítása</string>
     <string name="title_activity_choose_contact">Partner kiválasztása</string>
     <string name="title_activity_choose_contacts">Partnerek kiválasztása</string>
     <string name="title_activity_share_via_account">Megosztás fiókon keresztül</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Új fiók regisztrálása a kiszolgálón</string>
     <string name="change_password_on_server">Jelszó megváltoztatása a kiszolgálón</string>
     <string name="share_with">Megosztás ezzel…</string>
-    <string name="start_conversation">Beszélgetés indítása</string>
     <string name="invite_contact">Partner meghívása</string>
     <string name="invite">Meghívás</string>
     <string name="contacts">Partnerek</string>
@@ -85,7 +81,6 @@
     <string name="clear_histor_msg">Biztosan törölni szeretné az összes üzenetet a beszélgetésen belül?\n\n<b>Figyelmeztetés:</b> Ez nem fogja érinteni a más eszközökön vagy kiszolgálókon tárolt üzeneteket.</string>
     <string name="delete_file_dialog">Fájl törlése</string>
     <string name="delete_file_dialog_msg">Biztosan törölni szeretné ezt a fájlt?\n\n<b>Figyelmeztetés:</b> Ez nem fogja törölni a fájlnak azon másolatait, amelyek más eszközökön vagy kiszolgálókon vannak tárolva.</string>
-    <string name="also_end_conversation">A beszélgetés bezárása azután</string>
     <string name="choose_presence">Eszköz kiválasztása</string>
     <string name="send_unencrypted_message">Titkosítatlan üzenet küldése</string>
     <string name="send_message">Üzenet küldése</string>
@@ -416,7 +411,6 @@
     <string name="show_location">Hely megjelenítése</string>
     <string name="no_application_found_to_display_location">Nem található alkalmazás a hely megjelenítéséhez</string>
     <string name="location">Hely</string>
-    <string name="title_undo_swipe_out_conversation">A beszélgetés bezárva</string>
     <string name="title_undo_swipe_out_group_chat">Kilépett a személyes csoportos csevegésből</string>
     <string name="title_undo_swipe_out_channel">Kilépett a nyilvános csatornából</string>
     <string name="pref_dont_trust_system_cas_title">Ne bízzon meg a rendszer hitelesítésszolgáltatóiban</string>
@@ -613,7 +607,6 @@
     <string name="encrypting_message">Üzenet titkosítása</string>
     <string name="not_fetching_history_retention_period">Nincs üzenetletöltés a helyi megőrzési időszak miatt.</string>
     <string name="transcoding_video">Videó tömörítése</string>
-    <string name="corresponding_conversations_closed">A megfelelő beszélgetések lezárultak.</string>
     <string name="contact_blocked_past_tense">Partner tiltva.</string>
     <string name="pref_notifications_from_strangers">Értesítések idegenektől</string>
     <string name="pref_notifications_from_strangers_summary">Értesítés az idegenektől fogadott üzenetekről és hívásokról.</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 038eb074c..f561dbec9 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Pengaturan</string>
-    <string name="action_add">Percakapan Baru</string>
     <string name="action_accounts">Pengaturan Akun</string>
     <string name="action_account">Pengaturan akun</string>
-    <string name="action_end_conversation">Tutup percakapan</string>
     <string name="action_contact_details">Detil Kontak</string>
     <string name="action_muc_details">Detil percakapan grup</string>
     <string name="channel_details">Detil channel </string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Buka blok partisipan</string>
     <string name="title_activity_manage_accounts">Pengaturan Akun</string>
     <string name="title_activity_settings">Pengaturan</string>
-    <string name="title_activity_start_conversation">Mulai Percakapan</string>
     <string name="title_activity_choose_contact">Pilih kontak</string>
     <string name="title_activity_choose_contacts">Pilih beberapa kontak</string>
     <string name="title_activity_share_via_account">Bagikan melalui akun</string>
@@ -51,7 +48,6 @@
     <string name="register_account">Daftarkan akun baru di server</string>
     <string name="change_password_on_server">Ganti password di server</string>
     <string name="share_with">Bagikan dengan...</string>
-    <string name="start_conversation">Mulai percakapan</string>
     <string name="invite_contact">Undang kontak</string>
     <string name="invite">Undang</string>
     <string name="contacts">Kontak</string>
@@ -82,7 +78,6 @@
     <string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam percakapan ini?\n\n<b>Peringatan:</b> Ini tidak akan mempengaruhi pesan yang tersimpan di perangkat atau server lain.</string>
     <string name="delete_file_dialog">Hapus file</string>
     <string name="delete_file_dialog_msg">Anda yakin ingin menghapus file ini?\n\n<b>Peringatan:</b> Ini tidak akan menghapus salinan dari file ini yang disimpan di perangkat atau server lain.</string>
-    <string name="also_end_conversation">Lanjutkan dengan menutup percakapan</string>
     <string name="choose_presence">Pilih perangkat</string>
     <string name="send_unencrypted_message">Kirim pesan tak-terenkripsi</string>
     <string name="send_message">Kirim pesan</string>
@@ -353,7 +348,6 @@
     <string name="send_location">Kirim lokasi</string>
     <string name="show_location">Tampilkan lokasi</string>
     <string name="location">Lokasi</string>
-    <string name="title_undo_swipe_out_conversation">Percakapan tertutup</string>
     <string name="pref_dont_trust_system_cas_title">Jangan percaya sistem CA</string>
     <string name="pref_dont_trust_system_cas_summary">Semua sertifikat harus disetujui secara manual</string>
     <string name="pref_remove_trusted_certificates_title">Hapus sertifikat</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 48e57fd97..f154a199b 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Impostazioni</string>
-    <string name="action_add">Nuova conversazione</string>
     <string name="action_accounts">Gestisci profili</string>
     <string name="action_account">Gestisci profilo</string>
-    <string name="action_end_conversation">Chiudi conversazione</string>
     <string name="action_contact_details">Dettagli del contatto</string>
     <string name="action_muc_details">Dettagli chat di gruppo</string>
     <string name="channel_details">Dettagli canale</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Sblocca partecipante</string>
     <string name="title_activity_manage_accounts">Gestisci profili</string>
     <string name="title_activity_settings">Impostazioni</string>
-    <string name="title_activity_start_conversation">Inizia una conversazione</string>
     <string name="title_activity_choose_contact">Scegli un contatto</string>
     <string name="title_activity_choose_contacts">Scegli i contatti</string>
     <string name="title_activity_share_via_account">Condividi via account</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Registra un nuovo profilo sul server</string>
     <string name="change_password_on_server">Cambia la password sul server</string>
     <string name="share_with">Condividi con…</string>
-    <string name="start_conversation">Inizia conversazione</string>
     <string name="invite_contact">Invita contatto</string>
     <string name="invite">Invita</string>
     <string name="contacts">Contatti</string>
@@ -86,7 +82,6 @@
     <string name="clear_histor_msg">Vuoi eliminare tutti i messaggi in questa conversazione?\n\n<b>Attenzione:</b> ciò non influenzerà i messaggi salvati su altri dispositivi o server.</string>
     <string name="delete_file_dialog">Elimina file</string>
     <string name="delete_file_dialog_msg">Sei sicuro di voler eliminare questo file?\n\n<b>Attenzione:</b> non verranno eliminate copie di questo file memorizzate in altri dispositivi o server. </string>
-    <string name="also_end_conversation">Chiudi questa conversazione successivamente</string>
     <string name="choose_presence">Scegli un dispositivo</string>
     <string name="send_unencrypted_message">Invia messaggio non cifrato</string>
     <string name="send_message">Invia messaggio</string>
@@ -435,7 +430,6 @@
     <string name="show_location">Mostra la posizione</string>
     <string name="no_application_found_to_display_location">Nessuna app trovata per mostrare la posizione</string>
     <string name="location">Posizione</string>
-    <string name="title_undo_swipe_out_conversation">Conversazione interrotta</string>
     <string name="title_undo_swipe_out_group_chat">Chat di gruppo privata abbandonata</string>
     <string name="title_undo_swipe_out_channel">Canale pubblico abbandonato</string>
     <string name="pref_dont_trust_system_cas_title">Non ti fidare delle CA di sistema</string>
@@ -607,7 +601,6 @@
     <string name="this_device_has_been_verified">Questo dispositivo è stato verificato</string>
     <string name="copy_fingerprint">Copia impronta</string>
     <string name="all_omemo_keys_have_been_verified">Hai verificato tutte le chiavi OMEMO in tuo possesso</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Il codice a barre non contiene impronte per questa conversazione.</string>
     <string name="verified_fingerprints">Impronte verificate</string>
     <string name="use_camera_icon_to_scan_barcode">Usa la fotocamera per scansionare il codice a barre di un contatto</string>
     <string name="please_wait_for_keys_to_be_fetched">Attendi la ricezione delle chiavi</string>
@@ -667,7 +660,6 @@
     <string name="encrypting_message">Cifratura del messaggio</string>
     <string name="not_fetching_history_retention_period">Nessun recupero di messaggi a causa del periodo di conservazione locale.</string>
     <string name="transcoding_video">Compressione video in corso</string>
-    <string name="corresponding_conversations_closed">Chiuse le relative conversazioni.</string>
     <string name="contact_blocked_past_tense">Contatto bloccato.</string>
     <string name="pref_notifications_from_strangers">Notifiche da sconosciuti</string>
     <string name="pref_notifications_from_strangers_summary">Notifica messaggi e chiamate ricevuti da sconosciuti.</string>
@@ -953,7 +945,6 @@
     <string name="audio_call">Chiamata vocale</string>
     <string name="video_call">Chiamata video</string>
     <string name="help">Aiuto</string>
-    <string name="switch_to_conversation">Passa alla conversazione</string>
     <string name="microphone_unavailable">Il tuo microfono non è disponibile</string>
     <string name="only_one_call_at_a_time">Puoi fare solo una chiamata alla volta.</string>
     <string name="return_to_ongoing_call">Torna alla chiamata in corso</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index aff2d6b64..15aa6fb83 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">הגדרות</string>
-    <string name="action_add">שיחה חדשה</string>
     <string name="action_accounts">נהל חשבונות</string>
     <string name="action_contact_details">פרטי איש קשר</string>
     <string name="action_add_account">הוסף חשבון</string>
@@ -13,7 +12,6 @@
     <string name="action_unblock_domain">בטל חסימת דומיין</string>
     <string name="title_activity_manage_accounts">נהל חשבונות</string>
     <string name="title_activity_settings">הגדרות</string>
-    <string name="title_activity_start_conversation">התחל דיון</string>
     <string name="title_activity_block_list">רשימת חסימה</string>
     <string name="just_now">ממש עכשיו</string>
     <string name="minute_ago">לפני דקה</string>
@@ -235,7 +233,6 @@
     <string name="send_location">שלח מיקום</string>
     <string name="show_location">הראה מיקום</string>
     <string name="location">מיקום</string>
-    <string name="title_undo_swipe_out_conversation">השיחה נסגרה</string>
     <string name="pref_dont_trust_system_cas_title">אל תסמוך על ה- CAs של המערכת</string>
     <string name="pref_dont_trust_system_cas_summary">כל החתימות הדיגטליות יצטרכו לעבור אימות ידני</string>
     <string name="pref_remove_trusted_certificates_title">מחק חתימות דיגטליות</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 5bbc9cf92..07f366e1b 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">設定</string>
-    <string name="action_add">新しい会話</string>
     <string name="action_accounts">アカウントを管理</string>
     <string name="action_account">アカウントを管理</string>
-    <string name="action_end_conversation">会話を閉じる</string>
     <string name="action_contact_details">連絡先の詳細</string>
     <string name="action_muc_details">グループチャットの詳細</string>
     <string name="channel_details">談話室の詳細</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">参加者のブロックを解除</string>
     <string name="title_activity_manage_accounts">アカウントを管理</string>
     <string name="title_activity_settings">設定</string>
-    <string name="title_activity_start_conversation">会話を開始</string>
     <string name="title_activity_choose_contact">連絡先を選択</string>
     <string name="title_activity_choose_contacts">連絡先を選択</string>
     <string name="title_activity_share_via_account">アカウントで共有</string>
@@ -51,7 +48,6 @@
     <string name="register_account">サーバーに新規アカウントを登録</string>
     <string name="change_password_on_server">サーバーのパスワードを変更</string>
     <string name="share_with">…で共有</string>
-    <string name="start_conversation">会話を始める</string>
     <string name="invite_contact">連絡先を招待</string>
     <string name="invite">招待</string>
     <string name="contacts">連絡先</string>
@@ -84,7 +80,6 @@
     <string name="clear_histor_msg">この会話のすべてのメッセージを削除してもよろしいですか?\n\n<b>警告:</b> 他のデバイスやサーバーに保存されているメッセージのコピーには影響しません。</string>
     <string name="delete_file_dialog">ファイルを削除</string>
     <string name="delete_file_dialog_msg">このファイルを削除してもよろしいですか?\n\n<b>警告:</b> これは、他のデバイスやサーバーに保存されているファイルのコピーは削除しません。</string>
-    <string name="also_end_conversation">この後、この会話を閉じる</string>
     <string name="choose_presence">デバイスを選択</string>
     <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
     <string name="send_message">メッセージを送信</string>
@@ -430,7 +425,6 @@
     <string name="show_location">位置を表示</string>
     <string name="no_application_found_to_display_location">位置を表示するアプリケーションが見つかりません</string>
     <string name="location">位置</string>
-    <string name="title_undo_swipe_out_conversation">会話が閉じられました</string>
     <string name="title_undo_swipe_out_group_chat">非公開グループチャットを退出しました</string>
     <string name="title_undo_swipe_out_channel">公開談話室を退出しました</string>
     <string name="pref_dont_trust_system_cas_title">システムの CA を信頼しない</string>
@@ -597,7 +591,6 @@
     <string name="this_device_has_been_verified">このデバイスは検証済です</string>
     <string name="copy_fingerprint">指紋をコピー</string>
     <string name="all_omemo_keys_have_been_verified">所有するすべての OMEMO 鍵を検証しました</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">バーコードに、この会話の指紋が含まれていません。</string>
     <string name="verified_fingerprints">指紋を検証しました</string>
     <string name="use_camera_icon_to_scan_barcode">カメラを使用して連絡先のバーコードをスキャンします</string>
     <string name="please_wait_for_keys_to_be_fetched">鍵が取得されるのをお待ちください</string>
@@ -646,7 +639,6 @@
     <string name="encrypting_message">メッセージの暗号化中</string>
     <string name="not_fetching_history_retention_period">ローカル保存期間のためにメッセージを取得しません。</string>
     <string name="transcoding_video">ビデオを圧縮中</string>
-    <string name="corresponding_conversations_closed">対応する会話が閉じられました。</string>
     <string name="contact_blocked_past_tense">連絡先をブロックしました</string>
     <string name="pref_notifications_from_strangers">見知らぬ人からの通知</string>
     <string name="pref_notifications_from_strangers_summary">見知らぬ人から受信したメッセージと通話を通知します。</string>
@@ -923,7 +915,6 @@
     <string name="audio_call">音声通話</string>
     <string name="video_call">映像通話</string>
     <string name="help">ヘルプ</string>
-    <string name="switch_to_conversation">会話に切り替え</string>
     <string name="microphone_unavailable">マイクが利用できません</string>
     <string name="only_one_call_at_a_time">1度に1回線の通話のみ。</string>
     <string name="return_to_ongoing_call">継続中の通話に戻る</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index aea66786f..40809dfef 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">설정</string>
-    <string name="action_add">새 대화</string>
     <string name="action_accounts">계정 </string>
     <string name="action_contact_details">연락처 정보</string>
     <string name="action_add_account">계정 추가 </string>
@@ -14,7 +13,6 @@
     <string name="action_unblock_domain">도메인 차단 해제 </string>
     <string name="title_activity_manage_accounts">계정 관리 </string>
     <string name="title_activity_settings">설정 </string>
-    <string name="title_activity_start_conversation">대화 시작 </string>
     <string name="title_activity_block_list">목록 차단 </string>
     <string name="just_now">방금 </string>
     <string name="minute_ago">1분 전 </string>
@@ -274,7 +272,6 @@
     <string name="send_location">위치 전송 </string>
     <string name="show_location">위치 표시 </string>
     <string name="location">위치 </string>
-    <string name="title_undo_swipe_out_conversation">대화 끝남 </string>
     <string name="pref_dont_trust_system_cas_title">시스템 CA를 신뢰하지 않음 </string>
     <string name="pref_dont_trust_system_cas_summary">모든 인증서는 수동으로 승인되어야 함 </string>
     <string name="pref_remove_trusted_certificates_title">인증서 삭제 </string>
diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml
index ccee3e16b..b4df2be72 100644
--- a/src/main/res/values-ml/strings.xml
+++ b/src/main/res/values-ml/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">ക്രമീകരണങ്ങൾ</string>
-    <string name="action_add">പുതിയ സംഭാഷണം</string>
     <string name="action_accounts">അക്കൗണ്ടുകൾ നിയന്ത്രിക്കൂ</string>
     <string name="action_account">അക്കൗണ്ട് നിയന്ത്രിക്കൂ</string>
-    <string name="action_end_conversation">സംഭാഷണം അടയ്ക്കൂ</string>
     <string name="action_contact_details">കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ</string>
     <string name="action_muc_details">ഗ്രൂപ്പ് ചാറ്റ് വിശദാംശങ്ങൾ</string>
     <string name="channel_details">ചാനൽ വിവരങ്ങൾ</string>
@@ -15,7 +13,6 @@
     <string name="action_block_domain">മേഖല തടയുക</string>
     <string name="action_block_participant">പങ്കാളിയെ തടയുക</string>
     <string name="title_activity_settings">ക്രമീകരണങ്ങൾ</string>
-    <string name="title_activity_start_conversation">സംഭാഷണം ആരംഭിക്കൂ</string>
     <string name="title_activity_choose_contact">കോൺ‌ടാക്റ്റ് തിരഞ്ഞെടുക്കുക</string>
     <string name="title_activity_choose_contacts">കോൺ‌ടാക്റ്റുകൾ തിരഞ്ഞെടുക്കുക</string>
     <string name="title_activity_share_via_account">അക്കൗണ്ട് വഴി പങ്കിടുക</string>
@@ -44,7 +41,6 @@
     <string name="blocked">തടഞ്ഞു</string>
     <string name="change_password_on_server">സെർവറിൽ രഹസ്യവാക്ക് മാറ്റുക</string>
     <string name="share_with">ഇതുമായി പങ്കിടുക…</string>
-    <string name="start_conversation">സംഭാഷണം ആരംഭിക്കുക</string>
     <string name="invite_contact">കോൺ‌ടാക്റ്റിനെ ക്ഷണിക്കുക</string>
     <string name="invite">ക്ഷണിക്കൂ</string>
     <string name="contacts">കോൺ‌ടാക്റ്റുകൾ</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 1b16da338..7427815e7 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Innstillinger</string>
-    <string name="action_add">Ny samtale</string>
     <string name="action_accounts">Kontobehandling</string>
     <string name="action_contact_details">Kontaktdetaljer</string>
     <string name="action_muc_details">Gruppesludringsdetaljer</string>
@@ -15,7 +14,6 @@
     <string name="action_unblock_domain">Avblokker domene</string>
     <string name="title_activity_manage_accounts">Kontobehandling</string>
     <string name="title_activity_settings">Innstillinger</string>
-    <string name="title_activity_start_conversation">Start samtale</string>
     <string name="title_activity_choose_contact">Velg kontakt</string>
     <string name="title_activity_share_via_account">Del via konto</string>
     <string name="title_activity_block_list">Blokkeringsliste</string>
@@ -40,7 +38,6 @@
     <string name="register_account">Registrer ny konto på tjeneren</string>
     <string name="change_password_on_server">Endre passord på tjeneren</string>
     <string name="share_with">Del med...</string>
-    <string name="start_conversation">Start samtale</string>
     <string name="invite_contact">Inviter kontakt</string>
     <string name="contacts">Kontakter</string>
     <string name="contact">Kontakt</string>
@@ -302,7 +299,6 @@
     <string name="send_location">Send plasseringsdata</string>
     <string name="show_location">Vis plasseringsdata</string>
     <string name="location">Plasseringsdata</string>
-    <string name="title_undo_swipe_out_conversation">Samtale lukket</string>
     <string name="pref_dont_trust_system_cas_title">Ikke stol på systemets CA-er</string>
     <string name="pref_dont_trust_system_cas_summary">Alle sertifikat må godkjennes manuelt</string>
     <string name="pref_remove_trusted_certificates_title">Fjern sertifikater</string>
@@ -434,7 +430,6 @@
     <string name="encrypting_message">Krypterer melding</string>
     <string name="not_fetching_history_retention_period">Henter ikke inn meldinger på grunn av lokal oppbevaringsperiode.</string>
     <string name="transcoding_video">Komprimerer video</string>
-    <string name="corresponding_conversations_closed">Samsvarende samtaler lukket.</string>
     <string name="contact_blocked_past_tense">Kontakt blokkert.</string>
     <string name="pref_notifications_from_strangers">Varslinger fra fremmede</string>
     <string name="received_message_from_stranger">Mottok melding fra fremmed</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f4509f357..c0e8ca4a9 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Instellingen</string>
-    <string name="action_add">Nieuw gesprek</string>
     <string name="action_accounts">Accounts beheren</string>
     <string name="action_account">Account beheren</string>
-    <string name="action_end_conversation">Gesprek sluiten</string>
     <string name="action_contact_details">Contactgegevens</string>
     <string name="action_muc_details">Gespreksgegevens</string>
     <string name="channel_details">Kanaalinformatie</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Deelnemer deblokkeren</string>
     <string name="title_activity_manage_accounts">Accounts beheren</string>
     <string name="title_activity_settings">Instellingen</string>
-    <string name="title_activity_start_conversation">Gesprek starten</string>
     <string name="title_activity_choose_contact">Contact kiezen</string>
     <string name="title_activity_choose_contacts">Contacten kiezen</string>
     <string name="title_activity_share_via_account">Delen via account</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Nieuwe account op server registreren</string>
     <string name="change_password_on_server">Wachtwoord op server veranderen</string>
     <string name="share_with">Delen met…</string>
-    <string name="start_conversation">Gesprek beginnen</string>
     <string name="invite_contact">Contact uitnodigen</string>
     <string name="invite">Uitnodigen</string>
     <string name="contacts">Contacten</string>
@@ -84,7 +80,6 @@
     <string name="clear_conversation_history">Gespreksgeschiedenis wissen</string>
     <string name="delete_file_dialog">Bestand verwijderen</string>
     <string name="delete_file_dialog_msg">Weet je zeker dat je dit bestand wil verwijderen?\n\n<b>Waarschuwing:</b> Dit zal kopieën van dit bericht die opgeslagen zijn op andere apparaten of servers niet verwijderen.</string>
-    <string name="also_end_conversation">Dit gesprek nadien sluiten</string>
     <string name="choose_presence">Apparaat kiezen</string>
     <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
     <string name="send_message">Verstuur bericht</string>
@@ -395,7 +390,6 @@
     <string name="show_location">Locatie weergeven</string>
     <string name="no_application_found_to_display_location">Geen app om locatie weer te geven</string>
     <string name="location">Locatie</string>
-    <string name="title_undo_swipe_out_conversation">Gesprek gesloten</string>
     <string name="title_undo_swipe_out_group_chat">Privégroep verlaten</string>
     <string name="title_undo_swipe_out_channel">Openbaar kanaal verlaten</string>
     <string name="pref_dont_trust_system_cas_title">Systeem-CA\'s niet vertrouwen</string>
@@ -565,7 +559,6 @@
     <string name="encrypting_message">Bericht wordt versleuteld</string>
     <string name="not_fetching_history_retention_period">Berichten worden niet opgehaald wegens lokale bewaarperiode.</string>
     <string name="transcoding_video">Video wordt gecomprimeerd</string>
-    <string name="corresponding_conversations_closed">Bijbehorende gesprekken gesloten.</string>
     <string name="contact_blocked_past_tense">Contact geblokkeerd.</string>
     <string name="pref_notifications_from_strangers">Meldingen van onbekenden</string>
     <string name="received_message_from_stranger">Bericht ontvangen van onbekende</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index f9bc62f1d..f829530e7 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Ustawienia</string>
-    <string name="action_add">Nowa konwersacja</string>
     <string name="action_accounts">Zarządzaj kontami</string>
     <string name="action_account">Zarządzaj kontem</string>
-    <string name="action_end_conversation">Zamknij rozmowę</string>
     <string name="action_contact_details">Szczegóły kontaktu</string>
     <string name="action_muc_details">Szczegóły konferencji</string>
     <string name="channel_details">Szczegóły kanału</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Odblokuj użytkownika</string>
     <string name="title_activity_manage_accounts">Zarządzaj kontami</string>
     <string name="title_activity_settings">Ustawienia</string>
-    <string name="title_activity_start_conversation">Rozpocznij konwersację</string>
     <string name="title_activity_choose_contact">Wybierz kontakt</string>
     <string name="title_activity_choose_contacts">Wybierz kontakty</string>
     <string name="title_activity_share_via_account">Udostępnij za pomocą</string>
@@ -54,7 +51,6 @@
     <string name="register_account">Zarejestruj nowe konto na serwerze</string>
     <string name="change_password_on_server">Zmień hasło na serwerze</string>
     <string name="share_with">Udostępnij…</string>
-    <string name="start_conversation">Rozpocznij rozmowę</string>
     <string name="invite_contact">Zaproś kontakt</string>
     <string name="invite">Zaproś</string>
     <string name="contacts">Kontakty</string>
@@ -89,7 +85,6 @@
     <string name="delete_file_dialog_msg">Czy na pewno usunąć ten plik\?
 \n
 \n<b>Uwaga:</b> Działanie nie wpływa na kopie pliku przechowywane na innych urządzeniach lub serwerach. </string>
-    <string name="also_end_conversation">Zamknij konwersację po zakończeniu</string>
     <string name="choose_presence">Wybierz urządzenie</string>
     <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
     <string name="send_message">Wyślij wiadomość</string>
@@ -438,7 +433,6 @@
     <string name="show_location">Pokaż lokalizację</string>
     <string name="no_application_found_to_display_location">Nie odnaleziono aplikacji do wyświetlenia lokalizacji</string>
     <string name="location">Lokalizacja</string>
-    <string name="title_undo_swipe_out_conversation">Zamknięto konwersację</string>
     <string name="title_undo_swipe_out_group_chat">Opuszczono prywatną rozmowę grupową</string>
     <string name="title_undo_swipe_out_channel">Opuszczono publiczny kanał</string>
     <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
@@ -613,7 +607,6 @@
     <string name="this_device_has_been_verified">To urządzenie zostało zweryfikowane</string>
     <string name="copy_fingerprint">Skopiuj odcisk</string>
     <string name="all_omemo_keys_have_been_verified">Zweryfikowałeś wszystkie klucze OMEMO które posiadasz</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Kod kreskowy nie zawiera odcisków dla tej rozmowy.</string>
     <string name="verified_fingerprints">Zaufane odciski</string>
     <string name="use_camera_icon_to_scan_barcode">Użyj aparatu, aby zeskanować kod kreskowy kontaktu</string>
     <string name="please_wait_for_keys_to_be_fetched">Proszę czekać na ściągnięcie kluczy</string>
@@ -679,7 +672,6 @@
     <string name="encrypting_message">Szyfrowanie wiadomości</string>
     <string name="not_fetching_history_retention_period">Nie pobieram wiadomości przez lokalny okres retencji.</string>
     <string name="transcoding_video">Kompresuję film</string>
-    <string name="corresponding_conversations_closed">Odpowiadające rozmowy zostały zamknięte.</string>
     <string name="contact_blocked_past_tense">Kontakt zablokowany.</string>
     <string name="pref_notifications_from_strangers">Powiadomienia od nieznajomych</string>
     <string name="pref_notifications_from_strangers_summary">Powiadamiaj przy wiadomościach i połączeniach od nieznajomych.</string>
@@ -969,7 +961,6 @@
     <string name="audio_call">Połączenie audio</string>
     <string name="video_call">Połączenie wideo</string>
     <string name="help">Pomoc</string>
-    <string name="switch_to_conversation">Przełącz do rozmowy</string>
     <string name="microphone_unavailable">Twój mikrofon jest niedostępny</string>
     <string name="only_one_call_at_a_time">Możesz mieć tylko jedno połączenie na raz.</string>
     <string name="return_to_ongoing_call">Powróć do trwającego połączenia</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index a131195fe..a56d83b20 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Configurações</string>
-    <string name="action_add">Nova conversa</string>
     <string name="action_accounts">Gerenciar contas</string>
     <string name="action_account">Gerenciar conta</string>
-    <string name="action_end_conversation">Encerrar a conversa</string>
     <string name="action_contact_details">Detalhes do contato</string>
     <string name="action_muc_details">Detalhes da conversa em grupo</string>
     <string name="channel_details">Detalhes do canal</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Desbloquear participante</string>
     <string name="title_activity_manage_accounts">Gerenciar contas</string>
     <string name="title_activity_settings">Configurações</string>
-    <string name="title_activity_start_conversation">Conversar</string>
     <string name="title_activity_choose_contact">Selecione o contato</string>
     <string name="title_activity_choose_contacts">Selecionar Contatos</string>
     <string name="title_activity_share_via_account">Compartilhar via conta</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Registrar uma nova conta no servidor</string>
     <string name="change_password_on_server">Alterar a senha no servidor</string>
     <string name="share_with">Compartilhar com...</string>
-    <string name="start_conversation">Iniciar conversa</string>
     <string name="invite_contact">Convidar contato</string>
     <string name="invite">Convidar</string>
     <string name="contacts">Contatos</string>
@@ -86,7 +82,6 @@
     <string name="clear_histor_msg">Deseja excluir todas as mensagens dessa conversa?\n\n<b>Atenção:</b> Isso não afetará mensagens armazenadas em outros dispositivos ou servidores.</string>
     <string name="delete_file_dialog">Excluir arquivo</string>
     <string name="delete_file_dialog_msg">Deseja realmente excluir este arquivo?\n\n<b>Atenção:</b> Isso não excluirá cópias deste arquivo armazenadas em outros dispositivos ou servidores.</string>
-    <string name="also_end_conversation">Encerrar essa conversa após isso</string>
     <string name="choose_presence">Selecione o dispositivo</string>
     <string name="send_unencrypted_message">Enviar mensagem não criptografada</string>
     <string name="send_message">Enviar mensagem</string>
@@ -431,7 +426,6 @@
     <string name="show_location">Exibir localização</string>
     <string name="no_application_found_to_display_location">Não foi encontrado nenhum aplicativo para exibir a localização</string>
     <string name="location">Localização</string>
-    <string name="title_undo_swipe_out_conversation">A conversa foi fechada</string>
     <string name="title_undo_swipe_out_group_chat">Deixar a conversa em grupo privada</string>
     <string name="title_undo_swipe_out_channel">Deixar o canal público</string>
     <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
@@ -601,7 +595,6 @@
     <string name="this_device_has_been_verified">Este dispositivo foi verificado</string>
     <string name="copy_fingerprint">Copiar impressão digital</string>
     <string name="all_omemo_keys_have_been_verified">Você verificou todas as chaves OMEMO em sua posse</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">O código de barras não contém impressões digitais para essa conversa.</string>
     <string name="verified_fingerprints">Impressões digitais verificadas</string>
     <string name="use_camera_icon_to_scan_barcode">Use a câmera para capturar o código de barras de um contato</string>
     <string name="please_wait_for_keys_to_be_fetched">Por favor, aguarde a obtenção das chaves</string>
@@ -661,7 +654,6 @@
     <string name="encrypting_message">Criptografar a mensagem</string>
     <string name="not_fetching_history_retention_period">As mensagens não estão sendo obtidas devido ao período de retenção local.</string>
     <string name="transcoding_video">Comprimindo vídeo</string>
-    <string name="corresponding_conversations_closed">As conversas correspondentes foram encerradas.</string>
     <string name="contact_blocked_past_tense">O contato foi bloqueado.</string>
     <string name="pref_notifications_from_strangers">Notificações de desconhecidos</string>
     <string name="pref_notifications_from_strangers_summary">Notificar ao receber mensagens e chamadas de desconhecidos.</string>
@@ -947,7 +939,6 @@
     <string name="audio_call">Chamada de áudio</string>
     <string name="video_call">Chamada de vídeo</string>
     <string name="help">Ajuda</string>
-    <string name="switch_to_conversation">Alternar para a conversa</string>
     <string name="microphone_unavailable">Seu microfone não está disponível</string>
     <string name="only_one_call_at_a_time">Você só pode ter uma chamada de cada vez</string>
     <string name="return_to_ongoing_call">Retornar para a chamada em andamento</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index aad1a637d..4f76633e1 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Definições</string>
-    <string name="action_add">Nova conversa</string>
     <string name="action_accounts">Gerir contas</string>
     <string name="action_contact_details">Detalhes do contacto</string>
     <string name="action_add_account">Adicionar conta</string>
@@ -14,7 +13,6 @@
     <string name="action_unblock_domain">Desbloquear domínio</string>
     <string name="title_activity_manage_accounts">Gerir contas</string>
     <string name="title_activity_settings">Definições</string>
-    <string name="title_activity_start_conversation">Iniciar conversa</string>
     <string name="title_activity_choose_contact">Escolher contacto</string>
     <string name="title_activity_choose_contacts">Escolher contactos</string>
     <string name="title_activity_block_list">Bloquear lista</string>
@@ -40,7 +38,6 @@
     <string name="register_account">Registe uma nova conta no servidor</string>
     <string name="change_password_on_server">Altere a senha no servidor</string>
     <string name="share_with">Compartilhar com...</string>
-    <string name="start_conversation">Iniciar conversa</string>
     <string name="invite_contact">Convidar contacto</string>
     <string name="contacts">Contactos</string>
     <string name="contact">Contacto</string>
@@ -295,7 +292,6 @@
     <string name="send_location">Enviar localização</string>
     <string name="show_location">Exibir localização</string>
     <string name="location">Localização</string>
-    <string name="title_undo_swipe_out_conversation">Conversa fechada</string>
     <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
     <string name="pref_dont_trust_system_cas_summary">Todos os certificados têm que ser aprovados manualmente</string>
     <string name="pref_remove_trusted_certificates_title">Remover certificados</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index c4b3f2a57..2da3788b4 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Setări</string>
-    <string name="action_add">Conversație nouă</string>
     <string name="action_accounts">Configurează conturile</string>
     <string name="action_account">Configurează contul</string>
-    <string name="action_end_conversation">Închide conversația</string>
     <string name="action_contact_details">Detalii contact</string>
     <string name="action_muc_details">Detalii discuție de grup</string>
     <string name="channel_details">Detalii canal</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Deblochează participant</string>
     <string name="title_activity_manage_accounts">Configurează conturile</string>
     <string name="title_activity_settings">Setări</string>
-    <string name="title_activity_start_conversation">Pornește o conversație</string>
     <string name="title_activity_choose_contact">Alegeți contactul</string>
     <string name="title_activity_choose_contacts">Alegeți contactele</string>
     <string name="title_activity_share_via_account">Partajează cu cont</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Înregistrează un cont nou pe server</string>
     <string name="change_password_on_server">Schimbă parola pe server</string>
     <string name="share_with">Partajează cu…</string>
-    <string name="start_conversation">Pornește o conversație</string>
     <string name="invite_contact">Invită contact</string>
     <string name="invite">Invită</string>
     <string name="contacts">Contacte</string>
@@ -88,7 +84,6 @@
     <string name="delete_file_dialog_msg">Sigur doriți să ștergeți acest fișier\?
 \n
 \n<b>Atenție:</b> Această acțiune nu va șterge copiile acestui fișier care sunt stocate pe alte dispozitive sau servere. </string>
-    <string name="also_end_conversation">Închide conversația după ștergere</string>
     <string name="choose_presence">Alege dispozitiv</string>
     <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
     <string name="send_message">Trimite mesaj</string>
@@ -437,7 +432,6 @@
     <string name="show_location">Arată locația</string>
     <string name="no_application_found_to_display_location">Nu s-a găsit nici o aplicație care să afișeze locația</string>
     <string name="location">Locatie</string>
-    <string name="title_undo_swipe_out_conversation">Conversație închisă</string>
     <string name="title_undo_swipe_out_group_chat">A părăsit discuția de grup privată</string>
     <string name="title_undo_swipe_out_channel">A părăsit canalul public</string>
     <string name="pref_dont_trust_system_cas_title">Nu ai încredere în CA din sistem</string>
@@ -611,7 +605,6 @@
     <string name="this_device_has_been_verified">Acest dispozitiv a fost verificat</string>
     <string name="copy_fingerprint">Copiază amprenta</string>
     <string name="all_omemo_keys_have_been_verified">Ați verificat toate cheile OMEMO pe care le aveți</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Codul de bare nu conține amprente pentru această conversație.</string>
     <string name="verified_fingerprints">Amprente verificate</string>
     <string name="use_camera_icon_to_scan_barcode">Folosește camera pentru a scana codul de bare al contactului</string>
     <string name="please_wait_for_keys_to_be_fetched">Vă rugăm să așteptați până se preiau cheile</string>
@@ -671,7 +664,6 @@
     <string name="encrypting_message">Mesajul se criptează</string>
     <string name="not_fetching_history_retention_period">Politica de retenție locală împiedică descărcarea altor mesaje.</string>
     <string name="transcoding_video">Se comprimă clipul video</string>
-    <string name="corresponding_conversations_closed">Conversațiile corespunzătoare au fost închise.</string>
     <string name="contact_blocked_past_tense">Contact blocat.</string>
     <string name="pref_notifications_from_strangers">Notificări de la persoane necunoscute</string>
     <string name="pref_notifications_from_strangers_summary">Permite notificări pentru mesaje și apeluri de la persoane care nu sunt în lista de contacte.</string>
@@ -957,7 +949,6 @@
     <string name="audio_call">Apel audio</string>
     <string name="video_call">Apel video</string>
     <string name="help">Ajutor</string>
-    <string name="switch_to_conversation">Comutare la discuție</string>
     <string name="microphone_unavailable">Microfonul nu este disponibil</string>
     <string name="only_one_call_at_a_time">Puteți avea un singur apel simultan.</string>
     <string name="return_to_ongoing_call">Reveniți la apelul în curs</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e0acc3ca2..b47bdc300 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Настройки</string>
-    <string name="action_add">Новая беседа</string>
     <string name="action_accounts">Управление аккаунтами</string>
     <string name="action_account">Управление аккаунтом</string>
-    <string name="action_end_conversation">Закрыть беседу</string>
     <string name="action_contact_details">Сведения о контакте</string>
     <string name="action_muc_details">Подробности конференции</string>
     <string name="channel_details">Сведения о канале</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Разблокировать участника</string>
     <string name="title_activity_manage_accounts">Управление аккаунтами</string>
     <string name="title_activity_settings">Настройки</string>
-    <string name="title_activity_start_conversation">Начать беседу</string>
     <string name="title_activity_choose_contact">Выберите контакт</string>
     <string name="title_activity_choose_contacts">Выберите контакты</string>
     <string name="title_activity_share_via_account">Поделиться через аккаунт</string>
@@ -54,7 +51,6 @@
     <string name="register_account">Создать новую учётную запись на сервере</string>
     <string name="change_password_on_server">Изменить пароль на сервере</string>
     <string name="share_with">Поделиться с…</string>
-    <string name="start_conversation">Начать беседу</string>
     <string name="invite_contact">Пригласить контакт</string>
     <string name="invite">Пригласить</string>
     <string name="contacts">Контакты</string>
@@ -89,7 +85,6 @@
     <string name="delete_file_dialog_msg">Вы уверены, что хотите удалить этот файл?
 \n
 \n<b>Предупреждение:</b> Данная операция не удалит копии этого файла, хранящиеся на других устройствах или серверах. </string>
-    <string name="also_end_conversation">Закрыть эту беседу</string>
     <string name="choose_presence">Выберите устройство</string>
     <string name="send_unencrypted_message">Нешифрованное сообщение</string>
     <string name="send_message">Сообщение</string>
@@ -429,7 +424,6 @@
     <string name="show_location">Показать местоположение</string>
     <string name="no_application_found_to_display_location">Не найдено приложения для отображения местоположения</string>
     <string name="location">Местоположение</string>
-    <string name="title_undo_swipe_out_conversation">Беседа окончена</string>
     <string name="title_undo_swipe_out_group_chat">Покинул приватную конференцию</string>
     <string name="title_undo_swipe_out_channel">Покинул публичный канал</string>
     <string name="pref_dont_trust_system_cas_title">Не доверять системным УЦ</string>
@@ -603,7 +597,6 @@
     <string name="this_device_has_been_verified">Это устройство было подтверждено</string>
     <string name="copy_fingerprint">Копировать отпечаток</string>
     <string name="all_omemo_keys_have_been_verified">Все имеющиеся у вас OMEMO-ключи были подтверждены</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Штрих-код не содержит цифрового отпечатка для этой беседы.</string>
     <string name="verified_fingerprints">Подтверждённые отпечатки</string>
     <string name="use_camera_icon_to_scan_barcode">Используйте камеру для сканирования штрихкода контакта</string>
     <string name="please_wait_for_keys_to_be_fetched">Подождите получения ключей</string>
@@ -668,7 +661,6 @@
     <string name="encrypting_message">Зашифровать сообщение</string>
     <string name="not_fetching_history_retention_period">Не загружаем сообщения, в соответствии с локальным сроком хранения.</string>
     <string name="transcoding_video">Сжимание видео</string>
-    <string name="corresponding_conversations_closed">Соответствующие беседы закрыты.</string>
     <string name="contact_blocked_past_tense">Контакт заблокирован.</string>
     <string name="pref_notifications_from_strangers">Уведомления от неизвестных контактов</string>
     <string name="pref_notifications_from_strangers_summary">Уведомлять о сообщениях и звонках от незнакомых контактов.</string>
@@ -932,7 +924,6 @@
     <string name="audio_call">Аудиовызов</string>
     <string name="video_call">Видеовызов</string>
     <string name="help">Помощь</string>
-    <string name="switch_to_conversation">Переключиться на беседу</string>
     <string name="microphone_unavailable">Микрофон недоступен</string>
     <string name="only_one_call_at_a_time">Нельзя одновременно совершать больше одного вызова.</string>
     <string name="return_to_ongoing_call">Вернуться к текущему вызову</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 27e5da601..96f0d8d85 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Nastavenia</string>
-    <string name="action_add">Nová konverzácia</string>
     <string name="action_accounts">Nastavenie účtov</string>
     <string name="action_account">Nastaviť účet</string>
-    <string name="action_end_conversation">Zavrieť rozhovor</string>
     <string name="action_contact_details">Detaily kontaktu</string>
     <string name="action_muc_details">Detaily skupinového rozhovoru</string>
     <string name="channel_details">Detaily kanála</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Odblokovať účastníka</string>
     <string name="title_activity_manage_accounts">Nastavenie účtov</string>
     <string name="title_activity_settings">Nastavenia</string>
-    <string name="title_activity_start_conversation">Začať konverzáciu</string>
     <string name="title_activity_choose_contact">Vybrať Kontakt</string>
     <string name="title_activity_choose_contacts">Vyberte Kontakty</string>
     <string name="title_activity_share_via_account">Zdieľať cez účet</string>
@@ -61,7 +58,6 @@
     <string name="register_account">Registrovať nový účet na serveri</string>
     <string name="change_password_on_server">Zmeniť heslo na serveri</string>
     <string name="share_with">Zdieľať s</string>
-    <string name="start_conversation">Začať rozhovor</string>
     <string name="invite_contact">Pozvať kontakt</string>
     <string name="invite">Pozvať</string>
     <string name="contacts">Kontakty</string>
@@ -94,7 +90,6 @@
     <string name="clear_histor_msg">Chcete vymazať všetky správy v tomto rozhovore?\n\n<b>Upozornenie:</b>Nebude to mať vplyv na správy uložené na ostatných zariadeniach alebo serveroch.</string>
     <string name="delete_file_dialog">Zmazať súbor</string>
     <string name="delete_file_dialog_msg">Ste si istý, že chcete tento súbor zmazať?\n\n<b>Upozornenie:</b>Nevymažú sa kópie súborov, ktoré sú uložené na ostatných zariadeniach alebo serveroch.</string>
-    <string name="also_end_conversation">Potom zavrieť tento rozhovor</string>
     <string name="choose_presence">Zvoliť zariadenie</string>
     <string name="send_unencrypted_message">Poslať nezašifrovanú správu</string>
     <string name="send_message">Poslať správu</string>
@@ -391,7 +386,6 @@
     <string name="send_location">Poslať polohu</string>
     <string name="show_location">Zobraziť polohu</string>
     <string name="location">Poloha</string>
-    <string name="title_undo_swipe_out_conversation">Konverzácia zatvorená</string>
     <string name="pref_dont_trust_system_cas_title">Nedôverovať systému CAs</string>
     <string name="pref_dont_trust_system_cas_summary">Všetky certifikáty musia byť ručne schválené</string>
     <string name="pref_remove_trusted_certificates_title">Odstrániť certifikáty</string>
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index bc4974ce7..7c590f996 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="action_add">Bisedë e re</string>
     <string name="action_accounts">Administroni llogari</string>
     <string name="action_account">Administroni llogari</string>
-    <string name="action_end_conversation">Mbylle bisedën</string>
     <string name="action_contact_details">Hollësi kontakti</string>
     <string name="action_muc_details">Hollësi fjalosjeje grupi</string>
     <string name="channel_details">Hollësi kanali</string>
@@ -18,7 +16,6 @@
     <string name="action_unblock_participant">Zhbllokoje pjesëmarrësin</string>
     <string name="title_activity_manage_accounts">Administroni Llogari</string>
     <string name="title_activity_settings">Formësime</string>
-    <string name="title_activity_start_conversation">Nisni Bisedë</string>
     <string name="title_activity_choose_contact">Zgjidhni Kontakt</string>
     <string name="title_activity_choose_contacts">Zgjidhni Kontakte</string>
     <string name="title_activity_share_via_account">Jepe përmes llogarie</string>
@@ -42,7 +39,6 @@
     <string name="register_account">Regjistroni llogari të re në shërbyes</string>
     <string name="change_password_on_server">Ndryshoni fjalëkalim te shërbyesi</string>
     <string name="share_with">Ndajeni me…</string>
-    <string name="start_conversation">Nisni bisedë</string>
     <string name="invite_contact">Ftoni kontakt</string>
     <string name="invite">Ftoni</string>
     <string name="contacts">Kontakte</string>
@@ -71,7 +67,6 @@
     <string name="action_clear_history">Spastro historikun</string>
     <string name="clear_conversation_history">Spastoni Historik Bisedash</string>
     <string name="delete_file_dialog">Fshije kartelën</string>
-    <string name="also_end_conversation">Mbylle këtë bisedë më pas</string>
     <string name="choose_presence">Zgjidhni pajisje</string>
     <string name="send_unencrypted_message">Dërgoni mesazh të pafshehtëzuar</string>
     <string name="send_message">Dërgoni mesazh</string>
@@ -351,7 +346,6 @@
     <string name="show_location">Shfaq vendndodhje</string>
     <string name="no_application_found_to_display_location">S’u gjet aplikacion për shfaqje të vendndodhjes</string>
     <string name="location">Vendndodhje</string>
-    <string name="title_undo_swipe_out_conversation">Biseda u mbyll</string>
     <string name="title_undo_swipe_out_group_chat">Braktisi fjalosje private në grup</string>
     <string name="title_undo_swipe_out_channel">Braktisi kanal majtas</string>
     <string name="pref_dont_trust_system_cas_summary">Krejt dëshmitë duhet të miratohen dorazi</string>
@@ -469,7 +463,6 @@
     <string name="pref_delete_omemo_identities">Fshini identitete OMEMO</string>
     <string name="delete_selected_keys">Fshi kyçet e përzgjedhur</string>
     <string name="copy_fingerprint">Kopjo shenja gishtash</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Kodi me vija nuk përmban shenja gishtash për këtë bisedë.</string>
     <string name="verified_fingerprints">Shenja gishtash të verifikuar</string>
     <string name="use_camera_icon_to_scan_barcode">Përdorni kamerën e telefonit tuaj që të skanoni një kod me vija</string>
     <string name="please_wait_for_keys_to_be_fetched">Ju lutemi, pritni të sillen kyçet</string>
@@ -504,7 +497,6 @@
     <string name="pref_automatically_delete_messages">Fshirje e automatizuar mesazhesh</string>
     <string name="encrypting_message">Po fshehtëzohet meszhi</string>
     <string name="transcoding_video">Po ngjishet video</string>
-    <string name="corresponding_conversations_closed">Biseda përkatëse u mbyll.</string>
     <string name="contact_blocked_past_tense">Kontakti u bllokua.</string>
     <string name="pref_notifications_from_strangers">Njoftime prej të panjohurish</string>
     <string name="received_message_from_stranger">U mor mesazh prej të panjohuri</string>
@@ -802,7 +794,6 @@
     <string name="audio_call">Thirrje audio</string>
     <string name="video_call">Thirrje video</string>
     <string name="help">Ndihmë</string>
-    <string name="switch_to_conversation">Kalo te bisedë</string>
     <string name="return_to_ongoing_call">Rikthehu te thirrja që po bëhej</string>
     <plurals name="x_messages">
         <item quantity="one">%d mesazh</item>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 81b24b378..d599c8618 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Поставке</string>
-    <string name="action_add">Нова преписка</string>
     <string name="action_accounts">Управљај налозима</string>
     <string name="action_account">Управљај налогом</string>
-    <string name="action_end_conversation">Затвори преписку</string>
     <string name="action_contact_details">Детаљи контакта</string>
     <string name="action_muc_details">Детаљи групног ћаскања</string>
     <string name="channel_details">Детаљи канала</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Одблокирај учесника</string>
     <string name="title_activity_manage_accounts">Управљање налозима</string>
     <string name="title_activity_settings">Поставке</string>
-    <string name="title_activity_start_conversation">Почни преписку</string>
     <string name="title_activity_choose_contact">Изабери контакт</string>
     <string name="title_activity_choose_contacts">Изабери контакте</string>
     <string name="title_activity_share_via_account">Подели преко налога</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Региструј нови налог на серверу</string>
     <string name="change_password_on_server">Промени лозинку на серверу</string>
     <string name="share_with">Подели помоћу…</string>
-    <string name="start_conversation">Почни преписку</string>
     <string name="invite_contact">Позови контакт</string>
     <string name="invite">Позови</string>
     <string name="contacts">Контакти</string>
@@ -86,7 +82,6 @@
     <string name="clear_histor_msg">Желите ли да обришете све поруке из ове преписке?\n\n<b>Упозорење:</b> Ово неће утицати на поруке складиштене на осталим уређајима или серверима.</string>
     <string name="delete_file_dialog">Обриши датотеку</string>
     <string name="delete_file_dialog_msg">Желите ли да обришете ову датотеку?\n\n<b>Упозорење:</b> Ово неће утицати на копије ове датотеке складиштене на осталим уређајима или серверима.</string>
-    <string name="also_end_conversation">Затвори ову преписку након тога</string>
     <string name="choose_presence">Изаберите уређај</string>
     <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
     <string name="send_message">Пошаљи поруку</string>
@@ -418,7 +413,6 @@
     <string name="show_location">Прикажи локацију</string>
     <string name="no_application_found_to_display_location">Нема апликације за приказ локације</string>
     <string name="location">Локација</string>
-    <string name="title_undo_swipe_out_conversation">Преписка затворена</string>
     <string name="title_undo_swipe_out_group_chat">Напустили сте групно ћаскање</string>
     <string name="title_undo_swipe_out_channel">Напустили сте јавни канал</string>
     <string name="pref_dont_trust_system_cas_title">Не поуздај се у системска сертификациона тела</string>
@@ -624,7 +618,6 @@
     <string name="pref_automatically_delete_messages_description">Аутоматско брисање порука са овог уређаја које су старије од постављеног времена.</string>
     <string name="encrypting_message">Шифрујем поруку</string>
     <string name="transcoding_video">Компресујем видео</string>
-    <string name="corresponding_conversations_closed">Одговарајуће преписке затворене.</string>
     <string name="contact_blocked_past_tense">Контакт блокиран.</string>
     <string name="pref_notifications_from_strangers">Обавештења од непознатих</string>
     <string name="received_message_from_stranger">Примљена порука од незнанца</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 9c511ba95..68013137c 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Inställningar</string>
-    <string name="action_add">Ny konversation</string>
     <string name="action_accounts">Hantera konton</string>
     <string name="action_account">Hantera konto</string>
-    <string name="action_end_conversation">Stäng konversation</string>
     <string name="action_contact_details">Kontaktdetaljer</string>
     <string name="action_muc_details">Gruppchattdetaljer</string>
     <string name="channel_details">Gruppdetaljer</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Avblockera deltagare</string>
     <string name="title_activity_manage_accounts">Hantera konton</string>
     <string name="title_activity_settings">Inställningar</string>
-    <string name="title_activity_start_conversation">Starta konversation</string>
     <string name="title_activity_choose_contact">Välj kontakt</string>
     <string name="title_activity_choose_contacts">Välj kontakter</string>
     <string name="title_activity_share_via_account">Dela via konto</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Registrera ett nytt konto på servern</string>
     <string name="change_password_on_server">Byt lösenord på servern</string>
     <string name="share_with">Dela med…</string>
-    <string name="start_conversation">Börja konversation</string>
     <string name="invite_contact">Bjud in kontakt</string>
     <string name="invite">Bjud in</string>
     <string name="contacts">Kontakter</string>
@@ -89,7 +85,6 @@
     <string name="delete_file_dialog_msg">Är du säker på att du vill ta bort den här filen\?
 \n
 \n<b>Varning:</b> Den här åtgärden kommer inte att ta bort kopior av den här filen som finns lagrad på andra enheter eller servrar. </string>
-    <string name="also_end_conversation">Stäng den här konversation efteråt</string>
     <string name="choose_presence">Välj enhet</string>
     <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
     <string name="send_message">Skicka meddelande</string>
@@ -443,7 +438,6 @@
     <string name="show_location">Visa position</string>
     <string name="no_application_found_to_display_location">Ingen app hittades för att kunna visa platsen</string>
     <string name="location">Position</string>
-    <string name="title_undo_swipe_out_conversation">Konversation stängd</string>
     <string name="title_undo_swipe_out_group_chat">Lämnade privat gruppchatt</string>
     <string name="title_undo_swipe_out_channel">Lämnade publik kanal</string>
     <string name="pref_dont_trust_system_cas_title">Lita inte på systemets certifikatutfärdare</string>
@@ -617,7 +611,6 @@
     <string name="this_device_has_been_verified">Den här enheten har verifierats</string>
     <string name="copy_fingerprint">Kopiera fingeravtryck</string>
     <string name="all_omemo_keys_have_been_verified">Du har verifierat alla OMEMO-nycklar i din ägo</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Streckkoden innehåller inga fingeravtryck för den här konversationen.</string>
     <string name="verified_fingerprints">Verifierade fingeravtryck</string>
     <string name="use_camera_icon_to_scan_barcode">Använd kameran för att skanna en kontakts streckkod</string>
     <string name="please_wait_for_keys_to_be_fetched">Var god vänta på att nycklarna ska hämtas</string>
@@ -672,7 +665,6 @@
     <string name="encrypting_message">Krypterar meddelande</string>
     <string name="not_fetching_history_retention_period">Hämtar inte meddelanden på grund av lokal lagringsperiod.</string>
     <string name="transcoding_video">Komprimerar video</string>
-    <string name="corresponding_conversations_closed">Motsvarande konversationer avslutades.</string>
     <string name="contact_blocked_past_tense">Kontakt blockerad.</string>
     <string name="pref_notifications_from_strangers">Aviseringar från främlingar</string>
     <string name="pref_notifications_from_strangers_summary">Motta aviseringar för meddelanden och samtal från främlingar.</string>
@@ -892,7 +884,6 @@
     <string name="audio_call">Röstsamtal</string>
     <string name="video_call">Videosamtal</string>
     <string name="help">Hjälp</string>
-    <string name="switch_to_conversation">Växla till konversation</string>
     <string name="microphone_unavailable">Din mikrofon är inte tillgänglig</string>
     <string name="only_one_call_at_a_time">Du kan bara ha ett samtal åt gången.</string>
     <string name="return_to_ongoing_call">Återgå till pågående samtal</string>
diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml
index 9967bebf1..4ad0ecd66 100644
--- a/src/main/res/values-szl/strings.xml
+++ b/src/main/res/values-szl/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Sztelōnki</string>
-    <string name="action_add">Nowo godka</string>
     <string name="action_accounts">Sztelōnki kōnt</string>
     <string name="action_account">Sztelōnki kōnta</string>
-    <string name="action_end_conversation">Zawrzij godka</string>
     <string name="action_contact_details">Informacyje kōntaktu</string>
     <string name="action_muc_details">Informacyje kōnferyncyje</string>
     <string name="channel_details">Informacyje kanału</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Ôdblokuj kōntakt</string>
     <string name="title_activity_manage_accounts">Sztelōnki kōnt</string>
     <string name="title_activity_settings">Sztelōnki</string>
-    <string name="title_activity_start_conversation">Zacznij godka</string>
     <string name="title_activity_choose_contact">Ôbier kōntakt</string>
     <string name="title_activity_choose_contacts">Ôbier kōntakty</string>
     <string name="title_activity_share_via_account">Udostympnij bez</string>
@@ -53,7 +50,6 @@
     <string name="register_account">Zaregistruj nowe kōnto na serwerze</string>
     <string name="change_password_on_server">Umiyń hasło na serwerze</string>
     <string name="share_with">Udostympnij…</string>
-    <string name="start_conversation">Zacznij godka</string>
     <string name="invite_contact">Zaproś kōntakt</string>
     <string name="invite">Zaproś</string>
     <string name="contacts">Kōntakty</string>
@@ -90,7 +86,6 @@
     <string name="delete_file_dialog_msg">Na zicher wymazać tyn zbiōr\?
 \n
 \n<b>Pozōr:</b> To niy wpływo na kopije zbioru trzimane na inkszych maszinach abo serwerach. </string>
-    <string name="also_end_conversation">Zawrzij potym tyż kōnwersacyjo</string>
     <string name="choose_presence">Ôbier maszina</string>
     <string name="send_unencrypted_message">Wyślij wiadōmość bez szyfrowanio</string>
     <string name="send_message">Wyślij wiadōmość</string>
@@ -447,7 +442,6 @@
     <string name="show_location">Pokoż lokalizacyjo</string>
     <string name="no_application_found_to_display_location">Niy szło znojś aplikacyje do pokazowanio lokalizacyje</string>
     <string name="location">Lokalizacyjo</string>
-    <string name="title_undo_swipe_out_conversation">Kōnwersacyjo zawarto</string>
     <string name="title_undo_swipe_out_group_chat">Ôpuś prywatno kōnferyncyjo</string>
     <string name="title_undo_swipe_out_channel">Ôpuś publiczny kanał</string>
     <string name="pref_dont_trust_system_cas_title">Niy dufej certyfikatōm systymowym</string>
@@ -623,7 +617,6 @@
     <string name="this_device_has_been_verified">Maszina je zweryfikowano</string>
     <string name="copy_fingerprint">Skopiyruj ôdcisk</string>
     <string name="all_omemo_keys_have_been_verified">Wszyske twoje klucze OMEMO sōm zweryfikowane</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Kod kryskowy niy zawiyro ôdciskōw dlo tyj godki.</string>
     <string name="verified_fingerprints">Zaufane ôdciski</string>
     <string name="use_camera_icon_to_scan_barcode">Użyj fotoaparatu, coby zeskanować kod kryskowy kōntaktu</string>
     <string name="please_wait_for_keys_to_be_fetched">Czekej na ściōngniyńcie kluczy</string>
@@ -684,7 +677,6 @@
     <string name="encrypting_message">Szyfrowanie wiadōmości</string>
     <string name="not_fetching_history_retention_period">Bez pobiyranio wiadōmości bez lokalny ôkres retyncyje.</string>
     <string name="transcoding_video">Kōmpresowanie filmu</string>
-    <string name="corresponding_conversations_closed">Powiōnzane godki zawarte.</string>
     <string name="contact_blocked_past_tense">Kōntakt zablokowany.</string>
     <string name="pref_notifications_from_strangers">Powiadōmiynia ôd cudzych ludzi</string>
     <string name="pref_notifications_from_strangers_summary">Powiadōmiej przi wiadōmościach i połōnczyniach ôd cudzych ludzi.</string>
@@ -953,7 +945,6 @@
     <string name="audio_call">Połōnczynie audio</string>
     <string name="video_call">Połōnczynie wideo</string>
     <string name="help">Pōmoc</string>
-    <string name="switch_to_conversation">Przejdź do kōnwersacyje</string>
     <string name="microphone_unavailable">Twōj mikrofōn je niydostympny</string>
     <string name="only_one_call_at_a_time">Możesz mieć ino jedno połōnczynie w jednyj chwili.</string>
     <string name="return_to_ongoing_call">Wrōć do trwajōncego połōnczynio</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 11f5dd781..118f39da2 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Ayarlar</string>
-    <string name="action_add">Yeni konuşma</string>
     <string name="action_accounts">Hesapları yönet</string>
     <string name="action_account">Hesabı yönet</string>
-    <string name="action_end_conversation">Konuşmayı kapat</string>
     <string name="action_contact_details">Kişi bilgileri</string>
     <string name="action_muc_details">Küme konuşması ayrıntıları</string>
     <string name="channel_details">Kanal ayrıntıları</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Katılımcının engelini kaldır</string>
     <string name="title_activity_manage_accounts">Hesapları yönet</string>
     <string name="title_activity_settings">Ayarlar</string>
-    <string name="title_activity_start_conversation">Konuşma Başlat</string>
     <string name="title_activity_choose_contact">Kişi Seç</string>
     <string name="title_activity_choose_contacts">Kişi Seç</string>
     <string name="title_activity_share_via_account">Hesap aracılığıyla paylaş</string>
@@ -52,7 +49,6 @@
     <string name="register_account">Sunucuda yeni bir hesap oluştur</string>
     <string name="change_password_on_server">Sunucudaki şifreni değiştir</string>
     <string name="share_with">Paylaş…</string>
-    <string name="start_conversation">Konuşma başlat</string>
     <string name="invite_contact">Kişi davet et</string>
     <string name="invite">Davet et </string>
     <string name="contacts">Kişiler</string>
@@ -87,7 +83,6 @@
 \n<b>Uyarı:</b> Bu eylem, diğer aygıt ve sunucularda kayıtlı mesajları etkilemeyecektir.</string>
     <string name="delete_file_dialog">Dosyayı sil</string>
     <string name="delete_file_dialog_msg">Bu dosyayı silmek istediğinizden emin misiniz? \n\n<b>Uyarı:</b> Bu eylem, bu dosyanın diğer aygıt ve sunucularda kayıtlı kopyalarını silmeyecektir.</string>
-    <string name="also_end_conversation">Devamında bu konuşmayı kapat</string>
     <string name="choose_presence">Aygıt seç</string>
     <string name="send_unencrypted_message">Şifrelenmemiş ileti gönder</string>
     <string name="send_message">Mesajı gönder</string>
@@ -438,7 +433,6 @@
     <string name="show_location">Yer bildirimi göster</string>
     <string name="no_application_found_to_display_location">Konum göstermek için uygulama bulunamadı</string>
     <string name="location">Yer</string>
-    <string name="title_undo_swipe_out_conversation">Konuşma sonlandı</string>
     <string name="title_undo_swipe_out_group_chat">Özel grup konuşmasından ayrıldı</string>
     <string name="title_undo_swipe_out_channel">Ortak kanaldan ayrıldı</string>
     <string name="pref_dont_trust_system_cas_title">Sistem sertifikalarına güvenmeyin</string>
@@ -607,7 +601,6 @@
     <string name="this_device_has_been_verified">Bu aygıt doğrulandı</string>
     <string name="copy_fingerprint">Parmak izini kopyala</string>
     <string name="all_omemo_keys_have_been_verified">Sahip olduğunuz bütün OMEMO anahtarlarını doğruladınız</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barkod bu konuşmanın parmak izlerlerini içermiyor</string>
     <string name="verified_fingerprints">Doğrulanmış parmak izleri</string>
     <string name="use_camera_icon_to_scan_barcode">Bir kişinin barkodunu taramak için kamerayı kullan</string>
     <string name="please_wait_for_keys_to_be_fetched">Anahtarların alınması için lütfen bekle</string>
@@ -662,7 +655,6 @@
     <string name="encrypting_message">İletiyi şifrelemek</string>
     <string name="not_fetching_history_retention_period">Yerel saklama süresi nedeniyle ileti getirilmiyor.</string>
     <string name="transcoding_video">Video sıkıştırılıyor</string>
-    <string name="corresponding_conversations_closed">Konuşma sonlandı.</string>
     <string name="contact_blocked_past_tense">Kişi engellendi.</string>
     <string name="pref_notifications_from_strangers">Yabancılardan bildirimler</string>
     <string name="pref_notifications_from_strangers_summary">Yabancılardan alınan ileti ve aramaları bildir.</string>
@@ -943,7 +935,6 @@
     <string name="audio_call">Sesli arama</string>
     <string name="video_call">Görüntülü arama</string>
     <string name="help">Yardım</string>
-    <string name="switch_to_conversation">Konuşmaya geç</string>
     <string name="microphone_unavailable">Mikrofonunuza erişilemiyor</string>
     <string name="only_one_call_at_a_time">Bir seferde yalnızca tek bir aramanız olabilir.</string>
     <string name="return_to_ongoing_call">Devam eden aramaya dön</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index c008db5a0..2ab185ffe 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Налаштування</string>
-    <string name="action_add">Нова розмова</string>
     <string name="action_accounts">Мої облікові записи</string>
     <string name="action_account">Мій обліковий запис</string>
     <string name="action_contact_details">Деталі контакту</string>
@@ -19,7 +18,6 @@
     <string name="action_unblock_participant">Розблокувати учасника</string>
     <string name="title_activity_manage_accounts">Мої облікові записи</string>
     <string name="title_activity_settings">Налаштування</string>
-    <string name="title_activity_start_conversation">Почати розмову</string>
     <string name="title_activity_choose_contact">Вибрати контакт</string>
     <string name="title_activity_choose_contacts">Вибрати контакти</string>
     <string name="title_activity_share_via_account">Поділитися через обліковий запис</string>
@@ -47,7 +45,6 @@
     <string name="register_account">Зареєструвати новий обліковий запис на сервері</string>
     <string name="change_password_on_server">Змінити пароль</string>
     <string name="share_with">Поділитися…</string>
-    <string name="start_conversation">Почати розмову</string>
     <string name="invite_contact">Запросити до групи</string>
     <string name="invite">Запросити</string>
     <string name="contacts">Контакти</string>
@@ -82,7 +79,6 @@
     <string name="delete_file_dialog_msg">Ви впевнені, що хочете вилучити цей файл\?
 \n
 \n<b>Увага:</b> Це не вилучить копії цього файлу, які зберігаються на інших пристроях чи серверах. </string>
-    <string name="also_end_conversation">Завершити цю розмову пізніше</string>
     <string name="choose_presence">Вибрати пристрій</string>
     <string name="send_unencrypted_message">Незашифроване повідомлення</string>
     <string name="send_message">Надіслати повідомлення</string>
@@ -430,7 +426,6 @@
     <string name="show_location">Показати місцезнаходження</string>
     <string name="no_application_found_to_display_location">Не знайдено застосунку, щоб показати місцезнаходження</string>
     <string name="location">Місцезнаходження</string>
-    <string name="title_undo_swipe_out_conversation">Розмову закрито</string>
     <string name="title_undo_swipe_out_group_chat">Залишити приватну групу</string>
     <string name="title_undo_swipe_out_channel">Залишити публічний канал</string>
     <string name="pref_dont_trust_system_cas_title">Не довіряти системним центрам сертифікації</string>
@@ -587,7 +582,6 @@
     <string name="error_unable_to_create_temporary_file">Не вдалося створити тимчасовий файл</string>
     <string name="this_device_has_been_verified">Цей пристрій перевірено</string>
     <string name="copy_fingerprint">Копіювати цифровий підпис</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">QR-код не містить цифрових підписів для цієї розмови.</string>
     <string name="verified_fingerprints">Перевірені цифрові підписи</string>
     <string name="use_camera_icon_to_scan_barcode">Використайте камеру для сканування QR-коду контакту</string>
     <string name="please_wait_for_keys_to_be_fetched">Зачекайте поки ключі отримуються</string>
@@ -652,7 +646,6 @@
     <string name="encrypting_message">Зашифровую повідомлення</string>
     <string name="not_fetching_history_retention_period">Повідомлення не завантажуються з огляду на локально встановлений строк зберігання.</string>
     <string name="transcoding_video">Стиснення відео</string>
-    <string name="corresponding_conversations_closed">Відповідні розмови завершено.</string>
     <string name="contact_blocked_past_tense">Контакт заблоковано.</string>
     <string name="pref_notifications_from_strangers">Сповіщення від незнайомців</string>
     <string name="pref_notifications_from_strangers_summary">Сповіщати про повідомлення і виклики від незнайомців.</string>
@@ -912,7 +905,6 @@
     <string name="audio_call">Голосовий виклик</string>
     <string name="video_call">Відеовиклик</string>
     <string name="help">Допомога</string>
-    <string name="switch_to_conversation">Перейти до розмови</string>
     <string name="microphone_unavailable">Недоступний мікрофон</string>
     <string name="only_one_call_at_a_time">Водночас можливо здійснювати лише один виклик.</string>
     <string name="return_to_ongoing_call">Назад до активного виклику</string>
@@ -929,7 +921,6 @@
         <item quantity="many">%1$d пропущених викликів від %2$d контактів</item>
         <item quantity="other">%1$d пропущених викликів від %2$d контактів</item>
     </plurals>
-    <string name="action_end_conversation">Закрити розмову</string>
     <string name="crash_report_title">Збій %1$s</string>
     <string name="crash_report_message">Надсилаючи зі свого облікового запису XMPP звіти про збої, Ви допомагаєте розвивати %1$s.</string>
     <string name="pref_call_ringtone_summary">Мелодія для вхідних викликів</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 325cec1d8..2824b3d97 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Cài đặt</string>
-    <string name="action_add">Cuộc hội thoại mới</string>
     <string name="action_accounts">Quản lý tài khoản</string>
     <string name="action_account">Quản lý tài khoản</string>
-    <string name="action_end_conversation">Đóng cuộc hội thoại</string>
     <string name="action_contact_details">Thông tin liên hệ</string>
     <string name="action_muc_details">Chi tiết cuộc trò chuyện nhóm</string>
     <string name="channel_details">Chi tiết kênh</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">Bỏ chặn thành viên</string>
     <string name="title_activity_manage_accounts">Quản lý tài khoản</string>
     <string name="title_activity_settings">Cài đặt</string>
-    <string name="title_activity_start_conversation">Khởi chạy Conversation</string>
     <string name="title_activity_choose_contact">Chọn liên hệ</string>
     <string name="title_activity_choose_contacts">Chọn liên hệ</string>
     <string name="title_activity_share_via_account">Chia sẻ qua tài khoản</string>
@@ -51,7 +48,6 @@
     <string name="register_account">Đăng ký tài khoản mới trên máy chủ</string>
     <string name="change_password_on_server">Đổi mật k trên máy chủ</string>
     <string name="share_with">Chia sẻ với…</string>
-    <string name="start_conversation">Bắt đầu cuộc hội thoại</string>
     <string name="invite_contact">Mời liên hệ</string>
     <string name="invite">Mời</string>
     <string name="contacts">Danh bạ</string>
@@ -86,7 +82,6 @@
     <string name="delete_file_dialog_msg">Bạn có chắc bạn muốn xoá tệp này không\?
 \n
 \n<b>Cảnh báo:</b> Việc này sẽ không xoá các bản sao được lưu trữ trên các thiết bị hoặc máy chủ khác của tệp này. </string>
-    <string name="also_end_conversation">Đóng cuộc hội thoại này sau đó</string>
     <string name="choose_presence">Chọn thiết bị</string>
     <string name="send_unencrypted_message">Gửi tin nhắn không mã hoá</string>
     <string name="send_message">Gửi tin nhắn</string>
@@ -428,7 +423,6 @@
     <string name="show_location">Hiện vị trí</string>
     <string name="no_application_found_to_display_location">Không tìm thấy ứng dụng nào để hiển thị vị trí</string>
     <string name="location">Vị trí</string>
-    <string name="title_undo_swipe_out_conversation">Đã đóng cuộc hội thoại</string>
     <string name="title_undo_swipe_out_group_chat">Đã rời khỏi cuộc trò chuyện nhóm riêng tư</string>
     <string name="title_undo_swipe_out_channel">Đã rời khỏi kênh công khai</string>
     <string name="pref_dont_trust_system_cas_title">Đừng tin các CA hệ thống</string>
@@ -597,7 +591,6 @@
     <string name="this_device_has_been_verified">Thiết bị này đã được xác thực</string>
     <string name="copy_fingerprint">Sao chép mã vân tay</string>
     <string name="all_omemo_keys_have_been_verified">Bạn đã xác minh tất cả mã khoá OMEMO mà bạn đang sở hữu</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Mã vạch không chứa mã vân tay cho cuộc trò chuyện này.</string>
     <string name="verified_fingerprints">Mã vân tay đã xác minh</string>
     <string name="use_camera_icon_to_scan_barcode">Sử dụng máy ảnh để quét mã vạch của liên hệ</string>
     <string name="please_wait_for_keys_to_be_fetched">Vui lòng đợi để lấy các mã khoá</string>
@@ -643,7 +636,6 @@
     <string name="encrypting_message">Đang mã hoá tin nhắn</string>
     <string name="not_fetching_history_retention_period">Không lấy tin nhắn do khoảng thời gian giữ lại cục bộ.</string>
     <string name="transcoding_video">Đang nén video</string>
-    <string name="corresponding_conversations_closed">Đã đóng các cuộc hội thoại tương ứng.</string>
     <string name="contact_blocked_past_tense">Đã chặn liên hệ.</string>
     <string name="pref_notifications_from_strangers">Thông báo từ người lạ</string>
     <string name="pref_notifications_from_strangers_summary">Thông báo về các tin nhắn và cuộc gọi được nhận từ những người lạ.</string>
@@ -908,7 +900,6 @@
     <string name="audio_call">Cuộc gọi âm thanh</string>
     <string name="video_call">Cuộc gọi video</string>
     <string name="help">Trợ giúp</string>
-    <string name="switch_to_conversation">Chuyển sang cuộc hội thoại</string>
     <string name="microphone_unavailable">Micro của bạn không có sẵn</string>
     <string name="only_one_call_at_a_time">Bạn chỉ có thể có một cuộc gọi trong một lúc.</string>
     <string name="return_to_ongoing_call">Quay lại cuộc gọi đang diễn ra</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a1668ec97..5c04a1cc0 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">设置</string>
-    <string name="action_add">新对话</string>
     <string name="action_accounts">管理账号</string>
     <string name="action_account">管理账号</string>
-    <string name="action_end_conversation">关闭对话</string>
     <string name="action_contact_details">联系人详情</string>
     <string name="action_muc_details">群聊详情</string>
     <string name="channel_details">频道详情</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">解除屏蔽参与者</string>
     <string name="title_activity_manage_accounts">管理账号</string>
     <string name="title_activity_settings">设置</string>
-    <string name="title_activity_start_conversation">开始对话</string>
     <string name="title_activity_choose_contact">选择联系人</string>
     <string name="title_activity_choose_contacts">选择联系人</string>
     <string name="title_activity_share_via_account">通过账号分享</string>
@@ -51,7 +48,6 @@
     <string name="register_account">在服务器上注册新账号</string>
     <string name="change_password_on_server">在服务器上修改密码</string>
     <string name="share_with">分享至…</string>
-    <string name="start_conversation">开始对话</string>
     <string name="invite_contact">邀请联系人</string>
     <string name="invite">邀请</string>
     <string name="contacts">联系人</string>
@@ -88,7 +84,6 @@
     <string name="delete_file_dialog_msg">是否确定要删除此文件？
 \n
 \n<b>警告：</b>存储在其他设备或服务器上此文件的副本将不会删除。 </string>
-    <string name="also_end_conversation">之后关闭此对话</string>
     <string name="choose_presence">选择设备</string>
     <string name="send_unencrypted_message">发送未加密消息</string>
     <string name="send_message">发送消息</string>
@@ -450,7 +445,6 @@
     <string name="show_location">显示位置</string>
     <string name="no_application_found_to_display_location">未找到可以显示位置的应用</string>
     <string name="location">位置</string>
-    <string name="title_undo_swipe_out_conversation">对话已关闭</string>
     <string name="title_undo_swipe_out_group_chat">离开私人群聊</string>
     <string name="title_undo_swipe_out_channel">离开公开频道</string>
     <string name="pref_dont_trust_system_cas_title">不信任系统证书颁发机构</string>
@@ -621,7 +615,6 @@
     <string name="this_device_has_been_verified">此设备已经过验证</string>
     <string name="copy_fingerprint">复制指纹</string>
     <string name="all_omemo_keys_have_been_verified">您已验证您拥有的所有 OMEMO 密钥</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">二维码中不包含此对话的指纹。</string>
     <string name="verified_fingerprints">已验证的指纹</string>
     <string name="use_camera_icon_to_scan_barcode">使用相机扫描对方二维码</string>
     <string name="please_wait_for_keys_to_be_fetched">正在获取密钥，请稍候</string>
@@ -670,7 +663,6 @@
     <string name="encrypting_message">正在加密消息</string>
     <string name="not_fetching_history_retention_period">由于本地保留期限设置，无法获取消息。</string>
     <string name="transcoding_video">正在压缩视频</string>
-    <string name="corresponding_conversations_closed">相应的对话已关闭。</string>
     <string name="contact_blocked_past_tense">联系人已屏蔽。</string>
     <string name="pref_notifications_from_strangers">陌生人的通知</string>
     <string name="pref_notifications_from_strangers_summary">收到陌生人的消息和来电时通知。</string>
@@ -951,7 +943,6 @@
     <string name="audio_call">音频通话</string>
     <string name="video_call">视频通话</string>
     <string name="help">帮助</string>
-    <string name="switch_to_conversation">切换到对话</string>
     <string name="microphone_unavailable">麦克风无法使用</string>
     <string name="only_one_call_at_a_time">一次只能打一通电话。</string>
     <string name="return_to_ongoing_call">返回到正在进行的通话</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 22d245f45..b511b4b49 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">設定</string>
-    <string name="action_add">新會話</string>
     <string name="action_accounts">管理帳戶</string>
     <string name="action_account">管理帳戶</string>
-    <string name="action_end_conversation">關閉會話</string>
     <string name="action_contact_details">聯絡人詳細資料</string>
     <string name="action_muc_details">群組聊天詳細資料</string>
     <string name="channel_details">頻道詳細資料</string>
@@ -20,7 +18,6 @@
     <string name="action_unblock_participant">解除封鎖參與者</string>
     <string name="title_activity_manage_accounts">管理帳戶</string>
     <string name="title_activity_settings">設定</string>
-    <string name="title_activity_start_conversation">開始會話</string>
     <string name="title_activity_choose_contact">選擇聯絡人</string>
     <string name="title_activity_choose_contacts">選擇聯絡人</string>
     <string name="title_activity_share_via_account">透過帳戶分享</string>
@@ -51,7 +48,6 @@
     <string name="register_account">在伺服器上註冊新帳戶</string>
     <string name="change_password_on_server">在伺服器上變更密碼</string>
     <string name="share_with">分享至…</string>
-    <string name="start_conversation">開始會話</string>
     <string name="invite_contact">邀請聯絡人</string>
     <string name="invite">邀請</string>
     <string name="contacts">聯絡人</string>
@@ -81,7 +77,6 @@
     <string name="action_clear_history">清除歷史記錄</string>
     <string name="clear_conversation_history">清除會話記錄</string>
     <string name="delete_file_dialog">刪除檔案</string>
-    <string name="also_end_conversation">之後關閉此會話</string>
     <string name="choose_presence">選擇裝置</string>
     <string name="send_unencrypted_message">傳送未加密的訊息</string>
     <string name="send_message">傳送訊息</string>
@@ -410,7 +405,6 @@
     <string name="show_location">顯示位置</string>
     <string name="no_application_found_to_display_location">找不到可以顯示位置的應用程式</string>
     <string name="location">位置</string>
-    <string name="title_undo_swipe_out_conversation">會話已關閉</string>
     <string name="title_undo_swipe_out_group_chat">離開私人群組聊天</string>
     <string name="title_undo_swipe_out_channel">離開了公用頻道</string>
     <string name="pref_dont_trust_system_cas_title">不要信任系統 CA</string>
@@ -566,7 +560,6 @@
     <string name="this_device_has_been_verified">此裝置已驗證</string>
     <string name="copy_fingerprint">複製指紋</string>
     <string name="all_omemo_keys_have_been_verified">您已驗證您持有的所有 OMEMO 金鑰</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">條碼中沒有此會話的指紋。</string>
     <string name="verified_fingerprints">已驗證的指紋</string>
     <string name="use_camera_icon_to_scan_barcode">使用相機掃描聯絡人的條碼</string>
     <string name="please_wait_for_keys_to_be_fetched">請等候金鑰擷取</string>
@@ -607,7 +600,6 @@
     <string name="encrypting_message">正在加密訊息</string>
     <string name="not_fetching_history_retention_period">因本機保留期間設定，未擷取訊息。</string>
     <string name="transcoding_video">正在壓縮影片</string>
-    <string name="corresponding_conversations_closed">對應會話已關閉。</string>
     <string name="contact_blocked_past_tense">聯絡人已封鎖。</string>
     <string name="pref_notifications_from_strangers">陌生人訊息通知</string>
     <string name="received_message_from_stranger">已接收來自陌生人的訊息</string>
@@ -876,7 +868,6 @@
     <string name="audio_call">語音通話</string>
     <string name="video_call">視訊通話</string>
     <string name="help">說明</string>
-    <string name="switch_to_conversation">切換至會話</string>
     <string name="microphone_unavailable">您的麥克風無法使用</string>
     <string name="only_one_call_at_a_time">同時間只能進行一通電話。</string>
     <string name="return_to_ongoing_call">返回正在進行的通話</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b9a106bd4..58450634e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_settings">Settings</string>
-    <string name="action_add">New conversation</string>
     <string name="action_accounts">Manage accounts</string>
     <string name="action_account">Manage account</string>
-    <string name="action_end_conversation">Close conversation</string>
+    <string name="action_archive_chat">Archive chat</string>
     <string name="action_contact_details">Contact details</string>
     <string name="action_muc_details">Group chat details</string>
     <string name="channel_details">Channel details</string>
@@ -21,17 +20,17 @@
     <string name="title_activity_manage_accounts">Manage Accounts</string>
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_share_with">Share with…</string>
-    <string name="title_activity_start_conversation">Start Conversation</string>
     <string name="title_activity_choose_contact">Choose Contact</string>
     <string name="title_activity_choose_contacts">Choose Contacts</string>
     <string name="title_activity_share_via_account">Share via account</string>
     <string name="title_activity_block_list">Block list</string>
+    <string name="title_activity_new_chat">New chat</string>
     <string name="just_now">just now</string>
     <string name="minute_ago">1 min ago</string>
     <string name="minutes_ago">%d mins ago</string>
     <plurals name="x_unread_conversations">
-        <item quantity="one">%d unread conversation</item>
-        <item quantity="other">%d unread conversations</item>
+        <item quantity="one">%d unread chat</item>
+        <item quantity="other">%d unread chats</item>
 
     </plurals>
     <string name="sending">sending…</string>
@@ -44,7 +43,7 @@
     <string name="moderator">Moderator</string>
     <string name="participant">Participant</string>
     <string name="visitor">Visitor</string>
-    <string name="remove_contact_text">Would you like to remove %s from your contact list? Conversations with this contact will not be removed.</string>
+    <string name="remove_contact_text">Would you like to remove %s from your contact list? The chat with this contact will not be removed.</string>
     <string name="block_contact_text">Would you like to block %s from sending you messages?</string>
     <string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string>
     <string name="block_domain_text">Block all contacts from %s?</string>
@@ -52,11 +51,10 @@
     <string name="contact_blocked">Contact blocked</string>
     <string name="blocked">Blocked</string>
     <string name="remove_bookmark">Would you like to remove the bookmark for %s?</string>
-    <string name="remove_bookmark_and_close">Would you like to remove the bookmark for %s and close the conversation?</string>
+    <string name="remove_bookmark_and_close">Would you like to remove the bookmark for %s and archive the chat?</string>
     <string name="register_account">Register new account on server</string>
     <string name="change_password_on_server">Change password on server</string>
     <string name="share_with">Share with…</string>
-    <string name="start_conversation">Start conversation</string>
     <string name="invite_contact">Invite contact</string>
     <string name="invite">Invite</string>
     <string name="contacts">Contacts</string>
@@ -85,11 +83,11 @@
     <string name="preparing_images">Getting ready to send images</string>
     <string name="sharing_files_please_wait">Sharing files. Please wait…</string>
     <string name="action_clear_history">Clear history</string>
-    <string name="clear_conversation_history">Clear Conversation History</string>
-    <string name="clear_histor_msg">Do you want to delete all messages in this conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
+    <string name="clear_conversation_history">Clear chat history</string>
+    <string name="clear_histor_msg">Do you want to delete all messages in this chat?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
     <string name="delete_file_dialog">Delete file</string>
     <string name="delete_file_dialog_msg">Are you sure you want to delete this file?\n\n<b>Warning:</b> This will not delete copies of this file that are stored on other devices or servers. </string>
-    <string name="also_end_conversation">Close this conversation afterwards</string>
+    <string name="archive_this_chat">Archive this chat</string>
     <string name="choose_presence">Choose device</string>
     <string name="send_unencrypted_message">Send unencrypted message</string>
     <string name="send_message">Send message</string>
@@ -185,7 +183,7 @@
     <string name="unpublish_pgp_message">Are you sure you want to remove your OpenPGP public key from your presence announcement?\nYour contacts will no longer be able to send you OpenPGP encrypted messages.</string>
     <string name="openpgp_has_been_published">OpenPGP public key published.</string>
     <string name="mgmt_account_enable">Enable account</string>
-    <string name="mgmt_account_delete_confirm_text">Are you sure you want to delete your account? Deleting your account erases your entire conversation history</string>
+    <string name="mgmt_account_delete_confirm_text">Are you sure you want to delete your account? Deleting your account erases your entire chat history</string>
     <string name="attach_record_voice">Record voice</string>
     <string name="account_settings_jabber_id">XMPP address</string>
     <string name="block_jabber_id">Block XMPP address</string>
@@ -438,7 +436,7 @@
     <string name="show_location">Show location</string>
     <string name="no_application_found_to_display_location">No app found to display location</string>
     <string name="location">Location</string>
-    <string name="title_undo_swipe_out_conversation">Conversation closed</string>
+    <string name="title_undo_swipe_out_chat">Chat archived!</string>
     <string name="title_undo_swipe_out_group_chat">Left private group chat</string>
     <string name="title_undo_swipe_out_channel">Left public channel</string>
     <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
@@ -545,7 +543,7 @@
     <string name="security_error_invalid_file_access">Security error: Invalid file access!</string>
     <string name="no_application_to_share_uri">No app found to share URI</string>
     <string name="share_uri_with">Share URI with…</string>
-    <string name="welcome_header" translatable="false">Join the Conversation</string>
+    <string name="welcome_header">Join the Conversation</string>
     <string name="welcome_header_quicksy">Welcome to Quicksy!</string>
     <string name="welcome_text_quicksy_static" translatable="false"><![CDATA[· Quicksy syncs your contact list in regular intervals to make suggestions about possible contacts who are already on Quicksy even when the app is closed or not in use.<br>· Quicksy shares and stores images, audio recordings, videos and other media to deliver them to the intended recipients. Files will be stored for up to 30 days.<br><br>Find more information in our <a href="https://quicksy.im/privacy.htm">Privacy Policy</a>.]]></string>
     <string name="agree_and_continue">Agree and continue</string>
@@ -582,7 +580,7 @@
     <string name="pref_theme_light">Light</string>
     <string name="pref_theme_dark">Dark</string>
     <string name="pref_use_colorful_bubbles">Colorful chat bubbles</string>
-    <string name="pref_use_colorful_bubbles_summary">Colorful chat bubbles help to distinguish send and received messages</string>
+    <string name="pref_use_colorful_bubbles_summary">Colorful chat bubbles help to distinguish sent and received messages</string>
     <string name="unable_to_connect_to_keychain">Could not connect to OpenKeychain</string>
     <string name="this_device_is_no_longer_in_use">This device is no longer in use</string>
     <string name="type_pc">Computer</string>
@@ -615,7 +613,7 @@
     <string name="this_device_has_been_verified">This device has been verified</string>
     <string name="copy_fingerprint">Copy fingerprint</string>
     <string name="all_omemo_keys_have_been_verified">You have verified all the OMEMO keys in your possession</string>
-    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">The barcode does not contain fingerprints for this conversation.</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">The barcode does not contain fingerprints for this chat.</string>
     <string name="verified_fingerprints">Verified fingerprints</string>
     <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contact’s barcode</string>
     <string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string>
@@ -669,7 +667,7 @@
     <string name="encrypting_message">Encrypting message</string>
     <string name="not_fetching_history_retention_period">Not fetching messages due to local retention period.</string>
     <string name="transcoding_video">Compressing video</string>
-    <string name="corresponding_conversations_closed">Corresponding conversations closed.</string>
+    <string name="corresponding_chats_closed">Corresponding chats archived.</string>
     <string name="contact_blocked_past_tense">Contact blocked.</string>
     <string name="pref_notifications_from_strangers">Notifications from strangers</string>
     <string name="pref_notifications_from_strangers_summary">Notify for messages and calls received from strangers.</string>
@@ -715,13 +713,13 @@
     <string name="error_trustkey_device_list">Could not fetch device list</string>
     <string name="error_trustkey_bundle">Could not fetch encryption keys</string>
     <string name="error_trustkey_hint_mutual">Hint: In some cases this can be fixed by adding each other your contact lists.</string>
-    <string name="disable_encryption_message">Are you sure you want to disable OMEMO encryption for this conversation?\nThis will allow your server administrator to read your messages, but it might be the only way to communicate with people using outdated clients.</string>
+    <string name="disable_encryption_message">Are you sure you want to disable OMEMO encryption for this chat?\nThis will allow your server administrator to read your messages, but it might be the only way to communicate with people using outdated clients.</string>
     <string name="disable_now">Disable now</string>
     <string name="draft">Draft:</string>
     <string name="pref_omemo_setting">OMEMO Encryption</string>
     <string name="pref_omemo_setting_summary_always">OMEMO will always be used for one-on-one and private group chats.</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO will be used by default for new conversations.</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO will have to be turned on explicitly for new conversations.</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO will be used by default for new chats.</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO will have to be turned on explicitly for new chats.</string>
     <string name="create_shortcut">Create Shortcut</string>
     <string name="default_on">On by default</string>
     <string name="default_off">Off by default</string>
@@ -744,14 +742,14 @@
     <string name="no_microphone_permission">Grant %1$s access to the microphone</string>
     <string name="search_messages">Search messages</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">View conversation</string>
+    <string name="view_conversation">View chat</string>
     <string name="pref_use_share_location_plugin">Share Location Plugin</string>
     <string name="pref_use_share_location_plugin_summary">Use the Share Location Plugin instead of the built-in map</string>
     <string name="copy_link">Copy web address</string>
     <string name="copy_jabber_id">Copy XMPP address</string>
     <string name="p1_s3_filetransfer">HTTP File Sharing for S3</string>
     <string name="pref_start_search">Direct Search</string>
-    <string name="pref_start_search_summary">At ‘Start Conversation’ screen open keyboard and place cursor in search field</string>
+    <string name="pref_start_search_summary">At ‘Start chat’ screen open keyboard and place cursor in search field</string>
     <string name="group_chat_avatar">Group chat avatar</string>
     <string name="host_does_not_support_group_chat_avatars">Host does not support group chat avatars</string>
     <string name="only_the_owner_can_change_group_chat_avatar">Only the owner can change group chat avatar</string>
@@ -803,20 +801,20 @@
     <string name="verify_x">Verify %s</string>
     <string name="we_have_sent_you_an_sms_to_x"><![CDATA[We have sent you an SMS to <b>%s</b>.]]></string>
     <string name="we_have_sent_you_another_sms">We have sent you another SMS with a 6 digit code.</string>
-    <string name="please_enter_pin_below">Please enter the 6 digit pin below.</string>
+    <string name="please_enter_pin_below">Please enter the 6 digit PIN below.</string>
     <string name="resend_sms">Resend SMS</string>
     <string name="resend_sms_in">Resend SMS (%s)</string>
     <string name="wait_x">Please wait (%s)</string>
     <string name="back">Back</string>
-    <string name="possible_pin">Automatically pasted possible pin from clipboard.</string>
-    <string name="please_enter_pin">Please enter your 6 digit pin.</string>
     <string name="abort_registration_procedure">Are you sure you want to abort the registration procedure?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="possible_pin">Automatically pasted possible PIN from clipboard.</string>
+    <string name="please_enter_pin">Please enter your 6 digit PIN.</string>
     <string name="verifying">Verifying…</string>
     <string name="requesting_sms">Requesting SMS…</string>
-    <string name="incorrect_pin">The pin you have entered is incorrect.</string>
-    <string name="pin_expired">The pin we have sent you has expired.</string>
+    <string name="incorrect_pin">The PIN you have entered is incorrect.</string>
+    <string name="pin_expired">The PIN we have sent you has expired.</string>
     <string name="unknown_api_error_network">Unknown network error.</string>
     <string name="unknown_api_error_response">Unknown response from server.</string>
     <string name="unable_to_connect_to_server">Could not connect to server.</string>
@@ -961,7 +959,7 @@
     <string name="audio_call">Audio call</string>
     <string name="video_call">Video call</string>
     <string name="help">Help</string>
-    <string name="switch_to_conversation">Switch to conversation</string>
+    <string name="switch_to_chat">Switch to chat</string>
     <string name="microphone_unavailable">Your microphone is unavailable</string>
     <string name="only_one_call_at_a_time">You can only have one call at a time.</string>
     <string name="return_to_ongoing_call">Return to ongoing call</string>
@@ -970,8 +968,8 @@
     <string name="remove_from_favorites">Unpin from top</string>
     <string name="gpx_track">GPX track</string>
     <string name="could_not_correct_message">Could not correct message</string>
-    <string name="search_all_conversations">All conversations</string>
-    <string name="search_this_conversation">This conversation</string>
+    <string name="search_all_conversations">All chats</string>
+    <string name="search_this_conversation">This chat</string>
     <string name="your_avatar">Your avatar</string>
     <string name="avatar_for_x">Avatar for %s</string>
     <string name="encrypted_with_omemo">Encrypted with OMEMO</string>
@@ -1026,7 +1024,7 @@
     <string name="privacy_policy">Privacy policy</string>
     <string name="contact_list_integration_not_available">Contact list integration is not available</string>
     <string name="call_integration_not_available">Call integration not available!</string>
-    <string name="delete_and_close">Delete &amp; Close</string>
+    <string name="delete_and_close">Delete &amp; Archive chat</string>
     <string name="start_chat">Start chat</string>
     <string name="no_certificate_selected">No client certificate selected!</string>
 </resources>