diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index ccac3382a8..f05e078208 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -318,7 +318,7 @@ fun PreviewMessageDetails(
         MessageDetails(
             state = MessageDetailsState(
                 nonImageAttachmentFileDetails = listOf(
-                    TitledText(R.string.message_details_header__file_id, "Screen Shot 2023-07-06 at 11.35.50 am.png"),
+                    TitledText(R.string.attachmentsFileId, "Screen Shot 2023-07-06 at 11.35.50 am.png"),
                     TitledText(R.string.attachmentsFileType, "image/png"),
                     TitledText(R.string.attachmentsFileSize, "195.6kB"),
                     TitledText(R.string.attachmentsResolution, "342x312"),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
index 7c4b01f601..fcaca71c6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
@@ -90,7 +90,7 @@ class MessageDetailsViewModel @Inject constructor(
 
     private val Slide.details: List<TitledText>
         get() = listOfNotNull(
-            fileName.orNull()?.let { TitledText(R.string.message_details_header__file_id, it) },
+            fileName.orNull()?.let { TitledText(R.string.attachmentsFileId, it) },
             TitledText(R.string.attachmentsFileType, asAttachment().contentType),
             TitledText(R.string.attachmentsFileSize, Util.getPrettyFileSize(fileSize)),
             takeIf { it is ImageSlide }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
index d6df71176a..639e0b4c2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
@@ -149,10 +149,8 @@ object DateUtils : android.text.format.DateUtils() {
     ): String {
         return if (isToday(timestamp)) {
             getLocalisedRelativeDayString(RelativeDay.TODAY)
-            //context.getString(R.string.DateUtils_today) // ACL REMOVE WHEN HAPPY
         } else if (isYesterday(timestamp)) {
             getLocalisedRelativeDayString(RelativeDay.YESTERDAY)
-            //context.getString(R.string.DateUtils_yesterday) // ACL REMOVE WHEN HAPPY
         } else {
             getFormattedDateTime(timestamp, "EEE, MMM d, yyyy", locale)
         }
diff --git a/app/src/main/res/menu/menu_apply.xml b/app/src/main/res/menu/menu_apply.xml
index 0a73b83e3b..1ebf0f280c 100644
--- a/app/src/main/res/menu/menu_apply.xml
+++ b/app/src/main/res/menu/menu_apply.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="@string/menu_apply_button"
+        android:title="@string/set"
         android:id="@+id/applyButton"
         android:icon="?menu_accept_icon"
         app:showAsAction="always|withText"/>
diff --git a/app/src/main/res/menu/menu_edit_closed_group.xml b/app/src/main/res/menu/menu_edit_closed_group.xml
index bcf5c784ec..bcf12aefe2 100644
--- a/app/src/main/res/menu/menu_edit_closed_group.xml
+++ b/app/src/main/res/menu/menu_edit_closed_group.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_apply"
-        android:title="@string/menu_apply_button"
+        android:title="@string/set"
         android:contentDescription="@string/AccessibilityId_apply_changes"
         app:showAsAction="always|withText" />
 
diff --git a/libsession/src/main/res/values-ar-rSA/strings.xml b/libsession/src/main/res/values-ar-rSA/strings.xml
index 6408b371ff..5289cab69b 100644
--- a/libsession/src/main/res/values-ar-rSA/strings.xml
+++ b/libsession/src/main/res/values-ar-rSA/strings.xml
@@ -38,7 +38,6 @@
     <string name="none">لا شيء </string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">الآن</string>
-    <string name="DateUtils_yesterday">البارحة</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -74,7 +73,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session غير مقفول</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">أنت</string>
     <string name="draft">مسودة:</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">اعتبرها مقروءة</string>
@@ -133,7 +131,6 @@
     <string name="notificationsMute2Hours">كتم لمدة ساعتين</string>
     <string name="notificationsMute1Day">كتم لمدة يوم</string>
     <string name="notificationsContentShowNameOnly">الاسم فقط</string>
-    <string name="arrays__images">صور</string>
     <string name="audio">صوت</string>
     <string name="video">فيديو</string>
     <string name="max">الأقصى</string>
@@ -219,7 +216,6 @@
     <string name="qrCode">رمز QR</string>
     <string name="contactsContacts">متصلين</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">طبِق</string>
     <string name="done">تم</string>
     <string name="groupEdit">عَدِل المجموعة</string>
     <string name="contactSelect">اِختر متصلين</string>
diff --git a/libsession/src/main/res/values-ar/strings.xml b/libsession/src/main/res/values-ar/strings.xml
index 6408b371ff..5289cab69b 100644
--- a/libsession/src/main/res/values-ar/strings.xml
+++ b/libsession/src/main/res/values-ar/strings.xml
@@ -38,7 +38,6 @@
     <string name="none">لا شيء </string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">الآن</string>
-    <string name="DateUtils_yesterday">البارحة</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -74,7 +73,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session غير مقفول</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">أنت</string>
     <string name="draft">مسودة:</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">اعتبرها مقروءة</string>
@@ -133,7 +131,6 @@
     <string name="notificationsMute2Hours">كتم لمدة ساعتين</string>
     <string name="notificationsMute1Day">كتم لمدة يوم</string>
     <string name="notificationsContentShowNameOnly">الاسم فقط</string>
-    <string name="arrays__images">صور</string>
     <string name="audio">صوت</string>
     <string name="video">فيديو</string>
     <string name="max">الأقصى</string>
@@ -219,7 +216,6 @@
     <string name="qrCode">رمز QR</string>
     <string name="contactsContacts">متصلين</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">طبِق</string>
     <string name="done">تم</string>
     <string name="groupEdit">عَدِل المجموعة</string>
     <string name="contactSelect">اِختر متصلين</string>
diff --git a/libsession/src/main/res/values-az-rAZ/strings.xml b/libsession/src/main/res/values-az-rAZ/strings.xml
index ab7bf1fbf7..9b3f40f716 100644
--- a/libsession/src/main/res/values-az-rAZ/strings.xml
+++ b/libsession/src/main/res/values-az-rAZ/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Heç biri</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">İndi</string>
-    <string name="DateUtils_yesterday">Dünən</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session-ın kilidi açıldı</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Siz</string>
     <string name="draft">Qaralama</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Oxundu olaraq işarələ</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 saatlıq səssizə al</string>
     <string name="notificationsMute1Day">1 günlük səssizə al</string>
     <string name="notificationsContentShowNameOnly">Yalnız ad</string>
-    <string name="arrays__images">Təsvirlər</string>
     <string name="audio">Səs</string>
     <string name="video">Video</string>
     <string name="max">Maksimum</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR Kod</string>
     <string name="contactsContacts">Əlaqələr</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Tətbiq et</string>
     <string name="done">Bitdi</string>
     <string name="groupEdit">Qrupa düzəliş et</string>
     <string name="contactSelect">Əlaqələri seç</string>
diff --git a/libsession/src/main/res/values-az/strings.xml b/libsession/src/main/res/values-az/strings.xml
index ab7bf1fbf7..9b3f40f716 100644
--- a/libsession/src/main/res/values-az/strings.xml
+++ b/libsession/src/main/res/values-az/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Heç biri</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">İndi</string>
-    <string name="DateUtils_yesterday">Dünən</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session-ın kilidi açıldı</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Siz</string>
     <string name="draft">Qaralama</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Oxundu olaraq işarələ</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 saatlıq səssizə al</string>
     <string name="notificationsMute1Day">1 günlük səssizə al</string>
     <string name="notificationsContentShowNameOnly">Yalnız ad</string>
-    <string name="arrays__images">Təsvirlər</string>
     <string name="audio">Səs</string>
     <string name="video">Video</string>
     <string name="max">Maksimum</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR Kod</string>
     <string name="contactsContacts">Əlaqələr</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Tətbiq et</string>
     <string name="done">Bitdi</string>
     <string name="groupEdit">Qrupa düzəliş et</string>
     <string name="contactSelect">Əlaqələri seç</string>
diff --git a/libsession/src/main/res/values-bal-rBA/strings.xml b/libsession/src/main/res/values-bal-rBA/strings.xml
index 05ddff9452..6fe181c22a 100644
--- a/libsession/src/main/res/values-bal-rBA/strings.xml
+++ b/libsession/src/main/res/values-bal-rBA/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Kosong</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sekarang</string>
-    <string name="DateUtils_yesterday">Kemarin</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -63,7 +62,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session tidak terkunci</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Anda</string>
     <string name="draft">Draf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Tandai sudah dibaca</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">Bisukan selama 2 jam</string>
     <string name="notificationsMute1Day">Bisukan selama 1 hari</string>
     <string name="notificationsContentShowNameOnly">Nama saja</string>
-    <string name="arrays__images">Gambar</string>
     <string name="max">Maks</string>
     <!-- plurals.xml -->
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-bal/strings.xml b/libsession/src/main/res/values-bal/strings.xml
index 05ddff9452..6fe181c22a 100644
--- a/libsession/src/main/res/values-bal/strings.xml
+++ b/libsession/src/main/res/values-bal/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Kosong</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sekarang</string>
-    <string name="DateUtils_yesterday">Kemarin</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -63,7 +62,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session tidak terkunci</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Anda</string>
     <string name="draft">Draf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Tandai sudah dibaca</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">Bisukan selama 2 jam</string>
     <string name="notificationsMute1Day">Bisukan selama 1 hari</string>
     <string name="notificationsContentShowNameOnly">Nama saja</string>
-    <string name="arrays__images">Gambar</string>
     <string name="max">Maks</string>
     <!-- plurals.xml -->
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-bg-rBG/strings.xml b/libsession/src/main/res/values-bg-rBG/strings.xml
index a5a074b81a..67941a0daf 100644
--- a/libsession/src/main/res/values-bg-rBG/strings.xml
+++ b/libsession/src/main/res/values-bg-rBG/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Нищо</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Току що</string>
-    <string name="DateUtils_yesterday">Вчера</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session е отключен</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ти</string>
     <string name="draft">Чернова</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Прочетено</string>
@@ -125,7 +123,6 @@
     <string name="notificationsMute2Hours">Тих режим за 2 часа</string>
     <string name="notificationsMute1Day">Тих режим за 1 ден</string>
     <string name="notificationsContentShowNameOnly">Само име</string>
-    <string name="arrays__images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="video">Видео</string>
     <string name="max">Максимално</string>
diff --git a/libsession/src/main/res/values-bg/strings.xml b/libsession/src/main/res/values-bg/strings.xml
index a5a074b81a..67941a0daf 100644
--- a/libsession/src/main/res/values-bg/strings.xml
+++ b/libsession/src/main/res/values-bg/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Нищо</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Току що</string>
-    <string name="DateUtils_yesterday">Вчера</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session е отключен</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ти</string>
     <string name="draft">Чернова</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Прочетено</string>
@@ -125,7 +123,6 @@
     <string name="notificationsMute2Hours">Тих режим за 2 часа</string>
     <string name="notificationsMute1Day">Тих режим за 1 ден</string>
     <string name="notificationsContentShowNameOnly">Само име</string>
-    <string name="arrays__images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="video">Видео</string>
     <string name="max">Максимално</string>
diff --git a/libsession/src/main/res/values-ca-rES/strings.xml b/libsession/src/main/res/values-ca-rES/strings.xml
index 42e70aa48e..2cfcd2f6b9 100644
--- a/libsession/src/main/res/values-ca-rES/strings.xml
+++ b/libsession/src/main/res/values-ca-rES/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Cap</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ara</string>
-    <string name="DateUtils_yesterday">Ahir</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">S\'ha desblocat el Session</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jo</string>
     <string name="draft">Esborrany</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marca\'l com a llegit</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Silencia-ho durant 2 hores</string>
     <string name="notificationsMute1Day">Silencia-ho durant 1 dia</string>
     <string name="notificationsContentShowNameOnly">Només el nom</string>
-    <string name="arrays__images">Imatges</string>
     <string name="audio">Àudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Màxima</string>
@@ -210,7 +207,6 @@
     <string name="qrCode">Codi QR</string>
     <string name="contactsContacts">Contactes</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplica</string>
     <string name="done">Fet</string>
     <string name="groupEdit">Edita el Grup</string>
     <string name="contactSelect">Selecciona contactes</string>
diff --git a/libsession/src/main/res/values-ca/strings.xml b/libsession/src/main/res/values-ca/strings.xml
index 42e70aa48e..2cfcd2f6b9 100644
--- a/libsession/src/main/res/values-ca/strings.xml
+++ b/libsession/src/main/res/values-ca/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Cap</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ara</string>
-    <string name="DateUtils_yesterday">Ahir</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">S\'ha desblocat el Session</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jo</string>
     <string name="draft">Esborrany</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marca\'l com a llegit</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Silencia-ho durant 2 hores</string>
     <string name="notificationsMute1Day">Silencia-ho durant 1 dia</string>
     <string name="notificationsContentShowNameOnly">Només el nom</string>
-    <string name="arrays__images">Imatges</string>
     <string name="audio">Àudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Màxima</string>
@@ -210,7 +207,6 @@
     <string name="qrCode">Codi QR</string>
     <string name="contactsContacts">Contactes</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplica</string>
     <string name="done">Fet</string>
     <string name="groupEdit">Edita el Grup</string>
     <string name="contactSelect">Selecciona contactes</string>
diff --git a/libsession/src/main/res/values-cs-rCZ/strings.xml b/libsession/src/main/res/values-cs-rCZ/strings.xml
index c356e48324..5ae18b79bc 100644
--- a/libsession/src/main/res/values-cs-rCZ/strings.xml
+++ b/libsession/src/main/res/values-cs-rCZ/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Nic</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teď</string>
-    <string name="DateUtils_yesterday">Včera</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session je odemčen</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vy</string>
     <string name="draft">Koncept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Označit jako přečtené</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Ztišit na 2 hodiny</string>
     <string name="notificationsMute1Day">Ztišit na 1 den</string>
     <string name="notificationsContentShowNameOnly">Pouze jméno</string>
-    <string name="arrays__images">Obrázky</string>
     <string name="audio">Zvuk</string>
     <string name="video">Video</string>
     <string name="max">Maximum</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kontakty</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Použít</string>
     <string name="done">Hotovo</string>
     <string name="groupEdit">Upravit skupinu</string>
     <string name="contactSelect">Vyber kontakty</string>
diff --git a/libsession/src/main/res/values-cs/strings.xml b/libsession/src/main/res/values-cs/strings.xml
index c356e48324..5ae18b79bc 100644
--- a/libsession/src/main/res/values-cs/strings.xml
+++ b/libsession/src/main/res/values-cs/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Nic</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teď</string>
-    <string name="DateUtils_yesterday">Včera</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session je odemčen</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vy</string>
     <string name="draft">Koncept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Označit jako přečtené</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Ztišit na 2 hodiny</string>
     <string name="notificationsMute1Day">Ztišit na 1 den</string>
     <string name="notificationsContentShowNameOnly">Pouze jméno</string>
-    <string name="arrays__images">Obrázky</string>
     <string name="audio">Zvuk</string>
     <string name="video">Video</string>
     <string name="max">Maximum</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kontakty</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Použít</string>
     <string name="done">Hotovo</string>
     <string name="groupEdit">Upravit skupinu</string>
     <string name="contactSelect">Vyber kontakty</string>
diff --git a/libsession/src/main/res/values-cy-rGB/strings.xml b/libsession/src/main/res/values-cy-rGB/strings.xml
index 9fa1d4b9dd..0e298753ed 100644
--- a/libsession/src/main/res/values-cy-rGB/strings.xml
+++ b/libsession/src/main/res/values-cy-rGB/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">Dim</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nawr</string>
-    <string name="DateUtils_yesterday">Ddoe</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Mae Session wedi\'i ddatgloi</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Chi</string>
     <string name="draft">Drafft</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcio wedi\'i ddarllen</string>
@@ -126,7 +124,6 @@
     <string name="notificationsMute2Hours">Tewi am 2 awr</string>
     <string name="notificationsMute1Day">Tewi am 1 diwrnod</string>
     <string name="notificationsContentShowNameOnly">Enw yn unig</string>
-    <string name="arrays__images">Lluniau</string>
     <string name="audio">Sain</string>
     <string name="video">Fideo</string>
     <string name="max">Mwyaf</string>
diff --git a/libsession/src/main/res/values-cy/strings.xml b/libsession/src/main/res/values-cy/strings.xml
index 9fa1d4b9dd..0e298753ed 100644
--- a/libsession/src/main/res/values-cy/strings.xml
+++ b/libsession/src/main/res/values-cy/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">Dim</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nawr</string>
-    <string name="DateUtils_yesterday">Ddoe</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Mae Session wedi\'i ddatgloi</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Chi</string>
     <string name="draft">Drafft</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcio wedi\'i ddarllen</string>
@@ -126,7 +124,6 @@
     <string name="notificationsMute2Hours">Tewi am 2 awr</string>
     <string name="notificationsMute1Day">Tewi am 1 diwrnod</string>
     <string name="notificationsContentShowNameOnly">Enw yn unig</string>
-    <string name="arrays__images">Lluniau</string>
     <string name="audio">Sain</string>
     <string name="video">Fideo</string>
     <string name="max">Mwyaf</string>
diff --git a/libsession/src/main/res/values-da-rDK/strings.xml b/libsession/src/main/res/values-da-rDK/strings.xml
index 3291c1ed87..a748168d95 100644
--- a/libsession/src/main/res/values-da-rDK/strings.xml
+++ b/libsession/src/main/res/values-da-rDK/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ingen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
-    <string name="DateUtils_yesterday">I går</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session er låst op</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Dig</string>
     <string name="draft">Kladde</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Markér som læst</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Udsæt 2 timer</string>
     <string name="notificationsMute1Day">Udsæt 1 dag</string>
     <string name="notificationsContentShowNameOnly">Kun navn</string>
-    <string name="arrays__images">Billeder</string>
     <string name="audio">Lyd</string>
     <string name="video">Video</string>
     <string name="max">Max.</string>
@@ -209,7 +206,6 @@
     <string name="qrCode">QR-kode</string>
     <string name="contactsContacts">Kontakter</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Anvend</string>
     <string name="done">Færdig</string>
     <string name="groupEdit">Rediger Gruppe</string>
     <string name="contactSelect">Vælg Kontakter</string>
diff --git a/libsession/src/main/res/values-da/strings.xml b/libsession/src/main/res/values-da/strings.xml
index 3291c1ed87..a748168d95 100644
--- a/libsession/src/main/res/values-da/strings.xml
+++ b/libsession/src/main/res/values-da/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ingen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
-    <string name="DateUtils_yesterday">I går</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session er låst op</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Dig</string>
     <string name="draft">Kladde</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Markér som læst</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Udsæt 2 timer</string>
     <string name="notificationsMute1Day">Udsæt 1 dag</string>
     <string name="notificationsContentShowNameOnly">Kun navn</string>
-    <string name="arrays__images">Billeder</string>
     <string name="audio">Lyd</string>
     <string name="video">Video</string>
     <string name="max">Max.</string>
@@ -209,7 +206,6 @@
     <string name="qrCode">QR-kode</string>
     <string name="contactsContacts">Kontakter</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Anvend</string>
     <string name="done">Færdig</string>
     <string name="groupEdit">Rediger Gruppe</string>
     <string name="contactSelect">Vælg Kontakter</string>
diff --git a/libsession/src/main/res/values-de-rDE/strings.xml b/libsession/src/main/res/values-de-rDE/strings.xml
index 3066d20c07..6f6aec83de 100644
--- a/libsession/src/main/res/values-de-rDE/strings.xml
+++ b/libsession/src/main/res/values-de-rDE/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Kein Eintrag</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Jetzt</string>
-    <string name="DateUtils_yesterday">Gestern</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session ist entsperrt</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Du</string>
     <string name="draft">Entwurf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Gelesen</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Für 2 Stunden</string>
     <string name="notificationsMute1Day">Für 1 Tag</string>
     <string name="notificationsContentShowNameOnly">Nur Name</string>
-    <string name="arrays__images">Bilder</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Maximal</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-Code</string>
     <string name="contactsContacts">Kontakte</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Anwenden</string>
     <string name="done">Fertig</string>
     <string name="groupEdit">Gruppe bearbeiten</string>
     <string name="contactSelect">Kontakte auswählen</string>
diff --git a/libsession/src/main/res/values-de/strings.xml b/libsession/src/main/res/values-de/strings.xml
index 3066d20c07..6f6aec83de 100644
--- a/libsession/src/main/res/values-de/strings.xml
+++ b/libsession/src/main/res/values-de/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Kein Eintrag</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Jetzt</string>
-    <string name="DateUtils_yesterday">Gestern</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session ist entsperrt</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Du</string>
     <string name="draft">Entwurf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Gelesen</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Für 2 Stunden</string>
     <string name="notificationsMute1Day">Für 1 Tag</string>
     <string name="notificationsContentShowNameOnly">Nur Name</string>
-    <string name="arrays__images">Bilder</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Maximal</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-Code</string>
     <string name="contactsContacts">Kontakte</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Anwenden</string>
     <string name="done">Fertig</string>
     <string name="groupEdit">Gruppe bearbeiten</string>
     <string name="contactSelect">Kontakte auswählen</string>
diff --git a/libsession/src/main/res/values-el-rGR/strings.xml b/libsession/src/main/res/values-el-rGR/strings.xml
index 44d2415134..53baf7c5cc 100644
--- a/libsession/src/main/res/values-el-rGR/strings.xml
+++ b/libsession/src/main/res/values-el-rGR/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Κανένα</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Τώρα</string>
-    <string name="DateUtils_yesterday">Χθες</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Το Session ξεκλειδώθηκε</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Εσείς</string>
     <string name="draft">Πρόχειρο</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Σημείωση ως αναγνωσμένο</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Σίγαση για 2 ώρες</string>
     <string name="notificationsMute1Day">Σίγαση για 1 ημέρα</string>
     <string name="notificationsContentShowNameOnly">Μόνο όνομα</string>
-    <string name="arrays__images">Εικόνες</string>
     <string name="audio">Ήχοι</string>
     <string name="video">Βίντεο</string>
     <string name="max">Μέγιστο</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR κωδικός</string>
     <string name="contactsContacts">Επαφές</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Εφαρμογή</string>
     <string name="done">Τέλος</string>
     <string name="groupEdit">Επεξεργασία Ομάδας</string>
     <string name="contactSelect">Επιλογή Επαφών</string>
diff --git a/libsession/src/main/res/values-el/strings.xml b/libsession/src/main/res/values-el/strings.xml
index 44d2415134..53baf7c5cc 100644
--- a/libsession/src/main/res/values-el/strings.xml
+++ b/libsession/src/main/res/values-el/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Κανένα</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Τώρα</string>
-    <string name="DateUtils_yesterday">Χθες</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Το Session ξεκλειδώθηκε</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Εσείς</string>
     <string name="draft">Πρόχειρο</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Σημείωση ως αναγνωσμένο</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Σίγαση για 2 ώρες</string>
     <string name="notificationsMute1Day">Σίγαση για 1 ημέρα</string>
     <string name="notificationsContentShowNameOnly">Μόνο όνομα</string>
-    <string name="arrays__images">Εικόνες</string>
     <string name="audio">Ήχοι</string>
     <string name="video">Βίντεο</string>
     <string name="max">Μέγιστο</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR κωδικός</string>
     <string name="contactsContacts">Επαφές</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Εφαρμογή</string>
     <string name="done">Τέλος</string>
     <string name="groupEdit">Επεξεργασία Ομάδας</string>
     <string name="contactSelect">Επιλογή Επαφών</string>
diff --git a/libsession/src/main/res/values-eo-rUY/strings.xml b/libsession/src/main/res/values-eo-rUY/strings.xml
index 58bcaca5d8..25647b40fb 100644
--- a/libsession/src/main/res/values-eo-rUY/strings.xml
+++ b/libsession/src/main/res/values-eo-rUY/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Neniu</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nun</string>
-    <string name="DateUtils_yesterday">Hieraŭ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session estas malŝlosita</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vi</string>
     <string name="draft">Malneto</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marki legita</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Silentigi dum 2 horoj</string>
     <string name="notificationsMute1Day">Silentigi dum 1 tago</string>
     <string name="notificationsContentShowNameOnly">Nur nomon</string>
-    <string name="arrays__images">Bildoj</string>
     <string name="audio">Sonaĵo</string>
     <string name="video">Videaĵo</string>
     <string name="max">Maksimuma</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-Kodo</string>
     <string name="contactsContacts">Kontaktoj</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Apliki</string>
     <string name="done">Farite</string>
     <string name="groupEdit">Redakti Grupon</string>
     <string name="contactSelect">Elekti Kontaktojn</string>
diff --git a/libsession/src/main/res/values-eo/strings.xml b/libsession/src/main/res/values-eo/strings.xml
index 58bcaca5d8..25647b40fb 100644
--- a/libsession/src/main/res/values-eo/strings.xml
+++ b/libsession/src/main/res/values-eo/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Neniu</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nun</string>
-    <string name="DateUtils_yesterday">Hieraŭ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session estas malŝlosita</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vi</string>
     <string name="draft">Malneto</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marki legita</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Silentigi dum 2 horoj</string>
     <string name="notificationsMute1Day">Silentigi dum 1 tago</string>
     <string name="notificationsContentShowNameOnly">Nur nomon</string>
-    <string name="arrays__images">Bildoj</string>
     <string name="audio">Sonaĵo</string>
     <string name="video">Videaĵo</string>
     <string name="max">Maksimuma</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-Kodo</string>
     <string name="contactsContacts">Kontaktoj</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Apliki</string>
     <string name="done">Farite</string>
     <string name="groupEdit">Redakti Grupon</string>
     <string name="contactSelect">Elekti Kontaktojn</string>
diff --git a/libsession/src/main/res/values-es-rES/strings.xml b/libsession/src/main/res/values-es-rES/strings.xml
index f4518a1d37..8e51e7c7c8 100644
--- a/libsession/src/main/res/values-es-rES/strings.xml
+++ b/libsession/src/main/res/values-es-rES/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ninguno</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ahora</string>
-    <string name="DateUtils_yesterday">Ayer</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session está desbloqueado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tú</string>
     <string name="draft">Borrador</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como leído</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Silenciar durante 2 horas</string>
     <string name="notificationsMute1Day">Silenciar durante 1 día</string>
     <string name="notificationsContentShowNameOnly">Sólo nombre</string>
-    <string name="arrays__images">Imágenes</string>
     <string name="audio">Audio</string>
     <string name="video">Vídeo</string>
     <string name="max">Máximo</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">Código QR</string>
     <string name="contactsContacts">Contactos</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplicar</string>
     <string name="done">Hecho</string>
     <string name="groupEdit">Editar grupo</string>
     <string name="contactSelect">Elegir contactos</string>
diff --git a/libsession/src/main/res/values-es/strings.xml b/libsession/src/main/res/values-es/strings.xml
index f4518a1d37..8e51e7c7c8 100644
--- a/libsession/src/main/res/values-es/strings.xml
+++ b/libsession/src/main/res/values-es/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ninguno</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ahora</string>
-    <string name="DateUtils_yesterday">Ayer</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session está desbloqueado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tú</string>
     <string name="draft">Borrador</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como leído</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Silenciar durante 2 horas</string>
     <string name="notificationsMute1Day">Silenciar durante 1 día</string>
     <string name="notificationsContentShowNameOnly">Sólo nombre</string>
-    <string name="arrays__images">Imágenes</string>
     <string name="audio">Audio</string>
     <string name="video">Vídeo</string>
     <string name="max">Máximo</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">Código QR</string>
     <string name="contactsContacts">Contactos</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplicar</string>
     <string name="done">Hecho</string>
     <string name="groupEdit">Editar grupo</string>
     <string name="contactSelect">Elegir contactos</string>
diff --git a/libsession/src/main/res/values-et-rEE/strings.xml b/libsession/src/main/res/values-et-rEE/strings.xml
index d7703927d0..25e5060645 100644
--- a/libsession/src/main/res/values-et-rEE/strings.xml
+++ b/libsession/src/main/res/values-et-rEE/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">Puudub</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nüüd</string>
-    <string name="DateUtils_yesterday">Eile</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -67,7 +66,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session on avatud</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Sina</string>
     <string name="draft">Mustand</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Märgi loetuks</string>
@@ -123,7 +121,6 @@
     <string name="notificationsMute2Hours">Vaigista 2 tunniks</string>
     <string name="notificationsMute1Day">Vaigista 1 päevaks</string>
     <string name="notificationsContentShowNameOnly">Ainult nimi</string>
-    <string name="arrays__images">Pildid</string>
     <string name="audio">Heli</string>
     <string name="max">Maksimaalne</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-et/strings.xml b/libsession/src/main/res/values-et/strings.xml
index d7703927d0..25e5060645 100644
--- a/libsession/src/main/res/values-et/strings.xml
+++ b/libsession/src/main/res/values-et/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">Puudub</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nüüd</string>
-    <string name="DateUtils_yesterday">Eile</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -67,7 +66,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session on avatud</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Sina</string>
     <string name="draft">Mustand</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Märgi loetuks</string>
@@ -123,7 +121,6 @@
     <string name="notificationsMute2Hours">Vaigista 2 tunniks</string>
     <string name="notificationsMute1Day">Vaigista 1 päevaks</string>
     <string name="notificationsContentShowNameOnly">Ainult nimi</string>
-    <string name="arrays__images">Pildid</string>
     <string name="audio">Heli</string>
     <string name="max">Maksimaalne</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-fa-rIR/strings.xml b/libsession/src/main/res/values-fa-rIR/strings.xml
index 2cbcb55fb9..c50e3a6f75 100644
--- a/libsession/src/main/res/values-fa-rIR/strings.xml
+++ b/libsession/src/main/res/values-fa-rIR/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">هیچ کدام</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">اکنون</string>
-    <string name="DateUtils_yesterday">دیروز</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session قفل شده است</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">شما</string>
     <string name="draft">پیش نویس</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">علامت گذاری به عنوان خوانده شده</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">بی صدا به مدت 2 ساعت</string>
     <string name="notificationsMute1Day">بی صدا برای 1 روز</string>
     <string name="notificationsContentShowNameOnly">فقط نام</string>
-    <string name="arrays__images">تصویر</string>
     <string name="audio">صدا</string>
     <string name="video">ویدئو</string>
     <string name="max">حداکثر</string>
@@ -216,7 +213,6 @@
     <string name="qrCode">کد QR</string>
     <string name="contactsContacts">مخاطبین</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">اعمال</string>
     <string name="done">انجام شد</string>
     <string name="groupEdit">ویرایش گروه</string>
     <string name="contactSelect">انتخاب مخاطب‌ها</string>
diff --git a/libsession/src/main/res/values-fa/strings.xml b/libsession/src/main/res/values-fa/strings.xml
index ed39dbb878..0eee1c4684 100644
--- a/libsession/src/main/res/values-fa/strings.xml
+++ b/libsession/src/main/res/values-fa/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">هیچ کدام</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">اکنون</string>
-    <string name="DateUtils_yesterday">دیروز</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session قفل شده است</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">شما</string>
     <string name="draft">پیش نویس</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">علامت گذاری به عنوان خوانده شده</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">بی صدا به مدت 2 ساعت</string>
     <string name="notificationsMute1Day">بی صدا برای 1 روز</string>
     <string name="notificationsContentShowNameOnly">تنها نام</string>
-    <string name="arrays__images">تصویر</string>
     <string name="audio">صدا</string>
     <string name="video">ویدئو</string>
     <string name="max">حداکثر</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">کد QR</string>
     <string name="contactsContacts">مخاطبین</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">اعمال</string>
     <string name="done">انجام شد</string>
     <string name="groupEdit">ویرایش گروه</string>
     <string name="contactSelect">انتخاب مخاطب‌ها</string>
diff --git a/libsession/src/main/res/values-fi-rFI/strings.xml b/libsession/src/main/res/values-fi-rFI/strings.xml
index 801b16e404..4efcb33632 100644
--- a/libsession/src/main/res/values-fi-rFI/strings.xml
+++ b/libsession/src/main/res/values-fi-rFI/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ei asetettu</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nyt</string>
-    <string name="DateUtils_yesterday">eilen</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Sessionin lukitus on auki</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Sinä</string>
     <string name="draft">Luonnos</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Luettu</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 tunniksi</string>
     <string name="notificationsMute1Day">1 vuorokaudeksi</string>
     <string name="notificationsContentShowNameOnly">Vain nimi</string>
-    <string name="arrays__images">Kuvat</string>
     <string name="audio">Äänitallenteet</string>
     <string name="video">Videot</string>
     <string name="max">Maksimi</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-koodi</string>
     <string name="contactsContacts">Yhteystiedot</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Käytä</string>
     <string name="done">Valmis</string>
     <string name="groupEdit">Muokkaa ryhmää</string>
     <string name="contactSelect">Valitse Yhteystiedot</string>
diff --git a/libsession/src/main/res/values-fi/strings.xml b/libsession/src/main/res/values-fi/strings.xml
index 801b16e404..4efcb33632 100644
--- a/libsession/src/main/res/values-fi/strings.xml
+++ b/libsession/src/main/res/values-fi/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ei asetettu</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nyt</string>
-    <string name="DateUtils_yesterday">eilen</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Sessionin lukitus on auki</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Sinä</string>
     <string name="draft">Luonnos</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Luettu</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 tunniksi</string>
     <string name="notificationsMute1Day">1 vuorokaudeksi</string>
     <string name="notificationsContentShowNameOnly">Vain nimi</string>
-    <string name="arrays__images">Kuvat</string>
     <string name="audio">Äänitallenteet</string>
     <string name="video">Videot</string>
     <string name="max">Maksimi</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-koodi</string>
     <string name="contactsContacts">Yhteystiedot</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Käytä</string>
     <string name="done">Valmis</string>
     <string name="groupEdit">Muokkaa ryhmää</string>
     <string name="contactSelect">Valitse Yhteystiedot</string>
diff --git a/libsession/src/main/res/values-fr-rFR/strings.xml b/libsession/src/main/res/values-fr-rFR/strings.xml
index 4cd025e477..956f8ff198 100644
--- a/libsession/src/main/res/values-fr-rFR/strings.xml
+++ b/libsession/src/main/res/values-fr-rFR/strings.xml
@@ -45,7 +45,6 @@
     <string name="none">Aucun</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">À l’instant</string>
-    <string name="DateUtils_yesterday">Hier</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -81,7 +80,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session est déverrouillé</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vous</string>
     <string name="draft">Brouillon</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marquer comme lu</string>
@@ -140,7 +138,6 @@
     <string name="notificationsMute2Hours">Sourdine pendant 2 heures</string>
     <string name="notificationsMute1Day">Sourdine pendant 1 jour</string>
     <string name="notificationsContentShowNameOnly">Nom uniquement</string>
-    <string name="arrays__images">Images</string>
     <string name="audio">Son</string>
     <string name="video">Vidéo</string>
     <string name="max">Maximale</string>
@@ -156,7 +153,6 @@
     <string name="readReceipts">Accusés de lecture</string>
     <string name="typingIndicators">Indicateurs de saisie</string>
     <string name="conversationsMessageTrimming">Élagage des messages</string>
-    <string name="preferences_notifications__content_message">Afficher :</string>
     <!-- **************************************** -->
     <!-- menus -->
     <!-- **************************************** -->
@@ -229,7 +225,6 @@
     <string name="qrCode">QR Code</string>
     <string name="contactsContacts">Contacts</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Appliquer</string>
     <string name="done">Terminé</string>
     <string name="groupEdit">Modifier le groupe</string>
     <string name="contactSelect">Sélectionner des contacts</string>
diff --git a/libsession/src/main/res/values-fr/strings.xml b/libsession/src/main/res/values-fr/strings.xml
index 0d21c721f5..cdc2c20ec9 100644
--- a/libsession/src/main/res/values-fr/strings.xml
+++ b/libsession/src/main/res/values-fr/strings.xml
@@ -45,7 +45,6 @@
     <string name="none">Aucun</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">À l’instant</string>
-    <string name="DateUtils_yesterday">Hier</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -81,7 +80,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session est déverrouillé</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vous</string>
     <string name="draft">Brouillon</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marquer comme lu</string>
@@ -140,7 +138,6 @@
     <string name="notificationsMute2Hours">Sourdine pendant 2 heures</string>
     <string name="notificationsMute1Day">Sourdine pendant 1 jour</string>
     <string name="notificationsContentShowNameOnly">Nom uniquement</string>
-    <string name="arrays__images">Images</string>
     <string name="audio">Son</string>
     <string name="video">Vidéo</string>
     <string name="max">Maximale</string>
@@ -158,7 +155,6 @@
     <string name="readReceipts">Accusés de lecture</string>
     <string name="typingIndicators">Indicateurs de saisie</string>
     <string name="conversationsMessageTrimming">Élagage des messages</string>
-    <string name="preferences_notifications__content_message">Afficher :</string>
     <!-- **************************************** -->
     <!-- menus -->
     <!-- **************************************** -->
@@ -231,7 +227,6 @@
     <string name="qrCode">QR Code</string>
     <string name="contactsContacts">Contacts</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Appliquer</string>
     <string name="done">Terminé</string>
     <string name="groupEdit">Modifier le groupe</string>
     <string name="contactSelect">Sélectionner des contacts</string>
diff --git a/libsession/src/main/res/values-gl-rES/strings.xml b/libsession/src/main/res/values-gl-rES/strings.xml
index 58205266df..9f6c38df66 100644
--- a/libsession/src/main/res/values-gl-rES/strings.xml
+++ b/libsession/src/main/res/values-gl-rES/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Ningunha</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Agora</string>
-    <string name="DateUtils_yesterday">Onte</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session está desbloqueado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ti</string>
     <string name="draft">Borrador</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como lida</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Silenciar durante 2 horas</string>
     <string name="notificationsMute1Day">Silenciar durante 1 día</string>
     <string name="notificationsContentShowNameOnly">Só o nome</string>
-    <string name="arrays__images">Imaxes</string>
     <string name="audio">Audio</string>
     <string name="video">Vídeo</string>
     <string name="max">Máxima</string>
diff --git a/libsession/src/main/res/values-gl/strings.xml b/libsession/src/main/res/values-gl/strings.xml
index 58205266df..9f6c38df66 100644
--- a/libsession/src/main/res/values-gl/strings.xml
+++ b/libsession/src/main/res/values-gl/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Ningunha</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Agora</string>
-    <string name="DateUtils_yesterday">Onte</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session está desbloqueado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ti</string>
     <string name="draft">Borrador</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como lida</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Silenciar durante 2 horas</string>
     <string name="notificationsMute1Day">Silenciar durante 1 día</string>
     <string name="notificationsContentShowNameOnly">Só o nome</string>
-    <string name="arrays__images">Imaxes</string>
     <string name="audio">Audio</string>
     <string name="video">Vídeo</string>
     <string name="max">Máxima</string>
diff --git a/libsession/src/main/res/values-ha-rHG/strings.xml b/libsession/src/main/res/values-ha-rHG/strings.xml
index 923126e29e..8264573971 100644
--- a/libsession/src/main/res/values-ha-rHG/strings.xml
+++ b/libsession/src/main/res/values-ha-rHG/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">Hîç</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Niha</string>
-    <string name="DateUtils_yesterday">Doh</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -65,7 +64,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session vekirî ye</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tu</string>
     <string name="draft">Reşnivîs</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Xwendî nîşan bike</string>
@@ -120,7 +118,6 @@
     <string name="notificationsMute2Hours">Heta 2 demjimêran bêdeng bike</string>
     <string name="notificationsMute1Day">Heta 1 rojê bêdeng bike</string>
     <string name="notificationsContentShowNameOnly">Tenê nav</string>
-    <string name="arrays__images">Wêne</string>
     <string name="audio">Deng</string>
     <string name="video">Vîdyo</string>
     <string name="max">Herî bilind</string>
diff --git a/libsession/src/main/res/values-ha/strings.xml b/libsession/src/main/res/values-ha/strings.xml
index 923126e29e..8264573971 100644
--- a/libsession/src/main/res/values-ha/strings.xml
+++ b/libsession/src/main/res/values-ha/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">Hîç</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Niha</string>
-    <string name="DateUtils_yesterday">Doh</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -65,7 +64,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session vekirî ye</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tu</string>
     <string name="draft">Reşnivîs</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Xwendî nîşan bike</string>
@@ -120,7 +118,6 @@
     <string name="notificationsMute2Hours">Heta 2 demjimêran bêdeng bike</string>
     <string name="notificationsMute1Day">Heta 1 rojê bêdeng bike</string>
     <string name="notificationsContentShowNameOnly">Tenê nav</string>
-    <string name="arrays__images">Wêne</string>
     <string name="audio">Deng</string>
     <string name="video">Vîdyo</string>
     <string name="max">Herî bilind</string>
diff --git a/libsession/src/main/res/values-hi-rIN/strings.xml b/libsession/src/main/res/values-hi-rIN/strings.xml
index 5d8f27fa8c..feb998a32d 100644
--- a/libsession/src/main/res/values-hi-rIN/strings.xml
+++ b/libsession/src/main/res/values-hi-rIN/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">कुछ नहीं</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">अभी</string>
-    <string name="DateUtils_yesterday">कल</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session खुला है </string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">आप</string>
     <string name="draft">प्रारूप</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">पढ़ा हुआ चिह्नित करें</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 घंटे के लिए म्यूट करें</string>
     <string name="notificationsMute1Day">1 दिन के लिए म्यूट करें</string>
     <string name="notificationsContentShowNameOnly">केवल नाम</string>
-    <string name="arrays__images">तसवीरें </string>
     <string name="audio">ऑडियो </string>
     <string name="video">वीडियो </string>
     <string name="max">अधिकतम</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR कोड</string>
     <string name="contactsContacts">संपर्क</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">लागू करें</string>
     <string name="done">पूरा हुआ</string>
     <string name="groupEdit">ग्रुप बदलें</string>
     <string name="contactSelect">कांटेक्ट चुनें</string>
diff --git a/libsession/src/main/res/values-hi/strings.xml b/libsession/src/main/res/values-hi/strings.xml
index 5d8f27fa8c..feb998a32d 100644
--- a/libsession/src/main/res/values-hi/strings.xml
+++ b/libsession/src/main/res/values-hi/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">कुछ नहीं</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">अभी</string>
-    <string name="DateUtils_yesterday">कल</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session खुला है </string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">आप</string>
     <string name="draft">प्रारूप</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">पढ़ा हुआ चिह्नित करें</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 घंटे के लिए म्यूट करें</string>
     <string name="notificationsMute1Day">1 दिन के लिए म्यूट करें</string>
     <string name="notificationsContentShowNameOnly">केवल नाम</string>
-    <string name="arrays__images">तसवीरें </string>
     <string name="audio">ऑडियो </string>
     <string name="video">वीडियो </string>
     <string name="max">अधिकतम</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR कोड</string>
     <string name="contactsContacts">संपर्क</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">लागू करें</string>
     <string name="done">पूरा हुआ</string>
     <string name="groupEdit">ग्रुप बदलें</string>
     <string name="contactSelect">कांटेक्ट चुनें</string>
diff --git a/libsession/src/main/res/values-hu-rHU/strings.xml b/libsession/src/main/res/values-hu-rHU/strings.xml
index cea2bc0ae3..499bde2388 100644
--- a/libsession/src/main/res/values-hu-rHU/strings.xml
+++ b/libsession/src/main/res/values-hu-rHU/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">Egyik sem</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Most</string>
-    <string name="DateUtils_yesterday">Tegnap</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session feloldva</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Te</string>
     <string name="draft">Piszkozat</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Olvasottnak jelöl</string>
@@ -130,7 +128,6 @@
     <string name="notificationsMute2Hours">Némítás 2 órára</string>
     <string name="notificationsMute1Day">Némítás 1 napra</string>
     <string name="notificationsContentShowNameOnly">Csak név</string>
-    <string name="arrays__images">Képek</string>
     <string name="audio">Hang</string>
     <string name="video">Videó</string>
     <string name="max">Legmagasabb</string>
@@ -216,7 +213,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kapcsolatok</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Alkalmaz</string>
     <string name="done">Kész</string>
     <string name="groupEdit">Csoport szerkesztése</string>
     <string name="contactSelect">Névjegyek kiválasztása</string>
diff --git a/libsession/src/main/res/values-hu/strings.xml b/libsession/src/main/res/values-hu/strings.xml
index cea2bc0ae3..499bde2388 100644
--- a/libsession/src/main/res/values-hu/strings.xml
+++ b/libsession/src/main/res/values-hu/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">Egyik sem</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Most</string>
-    <string name="DateUtils_yesterday">Tegnap</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session feloldva</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Te</string>
     <string name="draft">Piszkozat</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Olvasottnak jelöl</string>
@@ -130,7 +128,6 @@
     <string name="notificationsMute2Hours">Némítás 2 órára</string>
     <string name="notificationsMute1Day">Némítás 1 napra</string>
     <string name="notificationsContentShowNameOnly">Csak név</string>
-    <string name="arrays__images">Képek</string>
     <string name="audio">Hang</string>
     <string name="video">Videó</string>
     <string name="max">Legmagasabb</string>
@@ -216,7 +213,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kapcsolatok</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Alkalmaz</string>
     <string name="done">Kész</string>
     <string name="groupEdit">Csoport szerkesztése</string>
     <string name="contactSelect">Névjegyek kiválasztása</string>
diff --git a/libsession/src/main/res/values-hy-rAM/strings.xml b/libsession/src/main/res/values-hy-rAM/strings.xml
index 702acfe239..71cdb94d98 100644
--- a/libsession/src/main/res/values-hy-rAM/strings.xml
+++ b/libsession/src/main/res/values-hy-rAM/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Չկա</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Հիմա</string>
-    <string name="DateUtils_yesterday">Երեկ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session֊ը ապակողպված է</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Դուք</string>
     <string name="draft">Սևագիր</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Նշել որպես ընթերցված</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Խլացնել 2 ժամով</string>
     <string name="notificationsMute1Day">Անջատել 1 օր</string>
     <string name="notificationsContentShowNameOnly">Միայն անունը</string>
-    <string name="arrays__images">Նկարներ</string>
     <string name="audio">Աուդիո</string>
     <string name="video">Վիդեո</string>
     <string name="max">Մաքսիմում</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR կոդ</string>
     <string name="contactsContacts">Կոնտակտներ</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Հաստատել</string>
     <string name="done">Վերջ</string>
     <string name="groupEdit">Խմբագրել խումբը</string>
     <string name="contactSelect">Ընտրել Կոնտակտներ</string>
diff --git a/libsession/src/main/res/values-hy/strings.xml b/libsession/src/main/res/values-hy/strings.xml
index 702acfe239..71cdb94d98 100644
--- a/libsession/src/main/res/values-hy/strings.xml
+++ b/libsession/src/main/res/values-hy/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Չկա</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Հիմա</string>
-    <string name="DateUtils_yesterday">Երեկ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session֊ը ապակողպված է</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Դուք</string>
     <string name="draft">Սևագիր</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Նշել որպես ընթերցված</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Խլացնել 2 ժամով</string>
     <string name="notificationsMute1Day">Անջատել 1 օր</string>
     <string name="notificationsContentShowNameOnly">Միայն անունը</string>
-    <string name="arrays__images">Նկարներ</string>
     <string name="audio">Աուդիո</string>
     <string name="video">Վիդեո</string>
     <string name="max">Մաքսիմում</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR կոդ</string>
     <string name="contactsContacts">Կոնտակտներ</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Հաստատել</string>
     <string name="done">Վերջ</string>
     <string name="groupEdit">Խմբագրել խումբը</string>
     <string name="contactSelect">Ընտրել Կոնտակտներ</string>
diff --git a/libsession/src/main/res/values-in-rID/strings.xml b/libsession/src/main/res/values-in-rID/strings.xml
index 463ddaed0a..59d591bf9a 100644
--- a/libsession/src/main/res/values-in-rID/strings.xml
+++ b/libsession/src/main/res/values-in-rID/strings.xml
@@ -30,7 +30,6 @@
     <string name="none">Tidak ada</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sekarang</string>
-    <string name="DateUtils_yesterday">Kemarin</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -66,7 +65,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session terbuka</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Anda</string>
     <string name="draft">Draf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Tandai dibaca</string>
@@ -120,7 +118,6 @@
     <string name="notificationsMute2Hours">Senyapkan selama 2 jam</string>
     <string name="notificationsMute1Day">Senyapkan selama 1 hari</string>
     <string name="notificationsContentShowNameOnly">Hanya nama</string>
-    <string name="arrays__images">Gambar</string>
     <string name="audio">Suara</string>
     <string name="video">Video</string>
     <string name="max">Maksimal</string>
@@ -180,7 +177,6 @@
     <string name="qrCode">Kode QR</string>
     <string name="contactsContacts">Kontak</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Terapkan</string>
     <string name="done">Selesai</string>
     <string name="groupEdit">Ubah Grup</string>
     <string name="appearanceThemes">Tema</string>
diff --git a/libsession/src/main/res/values-in/strings.xml b/libsession/src/main/res/values-in/strings.xml
index 463ddaed0a..59d591bf9a 100644
--- a/libsession/src/main/res/values-in/strings.xml
+++ b/libsession/src/main/res/values-in/strings.xml
@@ -30,7 +30,6 @@
     <string name="none">Tidak ada</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sekarang</string>
-    <string name="DateUtils_yesterday">Kemarin</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -66,7 +65,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session terbuka</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Anda</string>
     <string name="draft">Draf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Tandai dibaca</string>
@@ -120,7 +118,6 @@
     <string name="notificationsMute2Hours">Senyapkan selama 2 jam</string>
     <string name="notificationsMute1Day">Senyapkan selama 1 hari</string>
     <string name="notificationsContentShowNameOnly">Hanya nama</string>
-    <string name="arrays__images">Gambar</string>
     <string name="audio">Suara</string>
     <string name="video">Video</string>
     <string name="max">Maksimal</string>
@@ -180,7 +177,6 @@
     <string name="qrCode">Kode QR</string>
     <string name="contactsContacts">Kontak</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Terapkan</string>
     <string name="done">Selesai</string>
     <string name="groupEdit">Ubah Grup</string>
     <string name="appearanceThemes">Tema</string>
diff --git a/libsession/src/main/res/values-it-rIT/strings.xml b/libsession/src/main/res/values-it-rIT/strings.xml
index eb26da1f47..67786240fa 100644
--- a/libsession/src/main/res/values-it-rIT/strings.xml
+++ b/libsession/src/main/res/values-it-rIT/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Nessuna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ora</string>
-    <string name="DateUtils_yesterday">Ieri</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session è sbloccato</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tu</string>
     <string name="draft">Bozza</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Segna come già letto</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Silenzia per 2 ore</string>
     <string name="notificationsMute1Day">Silenzia per 1 giorno</string>
     <string name="notificationsContentShowNameOnly">Solo nome</string>
-    <string name="arrays__images">Immagini</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Massima</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">Codice QR</string>
     <string name="contactsContacts">Contatti</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Applica</string>
     <string name="done">Fatto</string>
     <string name="groupEdit">Modifica Gruppo</string>
     <string name="contactSelect">Seleziona Contatti</string>
diff --git a/libsession/src/main/res/values-it/strings.xml b/libsession/src/main/res/values-it/strings.xml
index eb26da1f47..67786240fa 100644
--- a/libsession/src/main/res/values-it/strings.xml
+++ b/libsession/src/main/res/values-it/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Nessuna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ora</string>
-    <string name="DateUtils_yesterday">Ieri</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session è sbloccato</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tu</string>
     <string name="draft">Bozza</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Segna come già letto</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Silenzia per 2 ore</string>
     <string name="notificationsMute1Day">Silenzia per 1 giorno</string>
     <string name="notificationsContentShowNameOnly">Solo nome</string>
-    <string name="arrays__images">Immagini</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Massima</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">Codice QR</string>
     <string name="contactsContacts">Contatti</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Applica</string>
     <string name="done">Fatto</string>
     <string name="groupEdit">Modifica Gruppo</string>
     <string name="contactSelect">Seleziona Contatti</string>
diff --git a/libsession/src/main/res/values-iw-rIL/strings.xml b/libsession/src/main/res/values-iw-rIL/strings.xml
index 5931754b34..c0d6783d72 100644
--- a/libsession/src/main/res/values-iw-rIL/strings.xml
+++ b/libsession/src/main/res/values-iw-rIL/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">אין</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">עכשיו</string>
-    <string name="DateUtils_yesterday">אתמול</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session אינו נעול</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">אתה</string>
     <string name="draft">טיוטה</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">סמן כנקרא</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">השתק למשך שעתיים</string>
     <string name="notificationsMute1Day">השתק למשך יום 1</string>
     <string name="notificationsContentShowNameOnly">שם בלבד</string>
-    <string name="arrays__images">תמונות</string>
     <string name="audio">שמע</string>
     <string name="video">וידיאו</string>
     <string name="max">מרבי</string>
diff --git a/libsession/src/main/res/values-iw/strings.xml b/libsession/src/main/res/values-iw/strings.xml
index 5931754b34..c0d6783d72 100644
--- a/libsession/src/main/res/values-iw/strings.xml
+++ b/libsession/src/main/res/values-iw/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">אין</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">עכשיו</string>
-    <string name="DateUtils_yesterday">אתמול</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session אינו נעול</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">אתה</string>
     <string name="draft">טיוטה</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">סמן כנקרא</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">השתק למשך שעתיים</string>
     <string name="notificationsMute1Day">השתק למשך יום 1</string>
     <string name="notificationsContentShowNameOnly">שם בלבד</string>
-    <string name="arrays__images">תמונות</string>
     <string name="audio">שמע</string>
     <string name="video">וידיאו</string>
     <string name="max">מרבי</string>
diff --git a/libsession/src/main/res/values-ja-rJP/strings.xml b/libsession/src/main/res/values-ja-rJP/strings.xml
index 4de98ac520..3f3b38c7f5 100644
--- a/libsession/src/main/res/values-ja-rJP/strings.xml
+++ b/libsession/src/main/res/values-ja-rJP/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">なし</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">今</string>
-    <string name="DateUtils_yesterday">昨日</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Sessionのロック解除</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">あなた</string>
     <string name="draft">下書き</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">既読にする</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">2時間ミュート</string>
     <string name="notificationsMute1Day">1日間ミュート</string>
     <string name="notificationsContentShowNameOnly">名前のみ</string>
-    <string name="arrays__images">画像</string>
     <string name="audio">音声</string>
     <string name="video">動画</string>
     <string name="max">最大</string>
@@ -214,7 +211,6 @@
     <string name="qrCode">QR コード</string>
     <string name="contactsContacts">連絡先</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">適用する</string>
     <string name="done">完了</string>
     <string name="groupEdit">グループを編集</string>
     <string name="contactSelect">連絡先を選択</string>
diff --git a/libsession/src/main/res/values-ja/strings.xml b/libsession/src/main/res/values-ja/strings.xml
index 4de98ac520..3f3b38c7f5 100644
--- a/libsession/src/main/res/values-ja/strings.xml
+++ b/libsession/src/main/res/values-ja/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">なし</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">今</string>
-    <string name="DateUtils_yesterday">昨日</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Sessionのロック解除</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">あなた</string>
     <string name="draft">下書き</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">既読にする</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">2時間ミュート</string>
     <string name="notificationsMute1Day">1日間ミュート</string>
     <string name="notificationsContentShowNameOnly">名前のみ</string>
-    <string name="arrays__images">画像</string>
     <string name="audio">音声</string>
     <string name="video">動画</string>
     <string name="max">最大</string>
@@ -214,7 +211,6 @@
     <string name="qrCode">QR コード</string>
     <string name="contactsContacts">連絡先</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">適用する</string>
     <string name="done">完了</string>
     <string name="groupEdit">グループを編集</string>
     <string name="contactSelect">連絡先を選択</string>
diff --git a/libsession/src/main/res/values-km-rKH/strings.xml b/libsession/src/main/res/values-km-rKH/strings.xml
index 3a1d534a5a..91c2ef5d9f 100644
--- a/libsession/src/main/res/values-km-rKH/strings.xml
+++ b/libsession/src/main/res/values-km-rKH/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">គ្មាន</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">ឥឡូវនេះ</string>
-    <string name="DateUtils_yesterday">ម្សិលមិញ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -67,7 +66,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked"> Session បានដោះសោ</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">អ្នក</string>
     <string name="draft">ព្រាង</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">សម្គាល់ថាបានអាន</string>
@@ -123,7 +121,6 @@
     <string name="notificationsMute2Hours">បិទសំឡេង 2 ម៉ោង</string>
     <string name="notificationsMute1Day">បិទសំឡេង 1 ថ្ងៃ</string>
     <string name="notificationsContentShowNameOnly">ឈ្មោះតែប៉ុណ្ណោះ</string>
-    <string name="arrays__images">រូបភាព</string>
     <string name="audio">សំឡេង</string>
     <string name="video">វីដេអូ</string>
     <string name="max">អតិបរិមា</string>
diff --git a/libsession/src/main/res/values-km/strings.xml b/libsession/src/main/res/values-km/strings.xml
index 3a1d534a5a..91c2ef5d9f 100644
--- a/libsession/src/main/res/values-km/strings.xml
+++ b/libsession/src/main/res/values-km/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">គ្មាន</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">ឥឡូវនេះ</string>
-    <string name="DateUtils_yesterday">ម្សិលមិញ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -67,7 +66,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked"> Session បានដោះសោ</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">អ្នក</string>
     <string name="draft">ព្រាង</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">សម្គាល់ថាបានអាន</string>
@@ -123,7 +121,6 @@
     <string name="notificationsMute2Hours">បិទសំឡេង 2 ម៉ោង</string>
     <string name="notificationsMute1Day">បិទសំឡេង 1 ថ្ងៃ</string>
     <string name="notificationsContentShowNameOnly">ឈ្មោះតែប៉ុណ្ណោះ</string>
-    <string name="arrays__images">រូបភាព</string>
     <string name="audio">សំឡេង</string>
     <string name="video">វីដេអូ</string>
     <string name="max">អតិបរិមា</string>
diff --git a/libsession/src/main/res/values-kn-rIN/strings.xml b/libsession/src/main/res/values-kn-rIN/strings.xml
index 2e44d4ee33..fc40cd2d7c 100644
--- a/libsession/src/main/res/values-kn-rIN/strings.xml
+++ b/libsession/src/main/res/values-kn-rIN/strings.xml
@@ -28,7 +28,6 @@
     <string name="none">ಯಾವುದೂ ಇಲ್ಲ</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">ಈಗ</string>
-    <string name="DateUtils_yesterday">ನಿನ್ನೆ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -98,7 +97,6 @@
     <!-- AndroidManifest.xml -->
     <!-- arrays.xml -->
     <string name="notificationsContentShowNameOnly">ಹೆಸರು ಮಾತ್ರ</string>
-    <string name="arrays__images">ಚಿತ್ರಗಳು</string>
     <string name="audio">ಆಡಿಯೋ</string>
     <string name="video">ವೀಡಿಯೊ</string>
     <!-- plurals.xml -->
diff --git a/libsession/src/main/res/values-kn/strings.xml b/libsession/src/main/res/values-kn/strings.xml
index 2e44d4ee33..fc40cd2d7c 100644
--- a/libsession/src/main/res/values-kn/strings.xml
+++ b/libsession/src/main/res/values-kn/strings.xml
@@ -28,7 +28,6 @@
     <string name="none">ಯಾವುದೂ ಇಲ್ಲ</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">ಈಗ</string>
-    <string name="DateUtils_yesterday">ನಿನ್ನೆ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -98,7 +97,6 @@
     <!-- AndroidManifest.xml -->
     <!-- arrays.xml -->
     <string name="notificationsContentShowNameOnly">ಹೆಸರು ಮಾತ್ರ</string>
-    <string name="arrays__images">ಚಿತ್ರಗಳು</string>
     <string name="audio">ಆಡಿಯೋ</string>
     <string name="video">ವೀಡಿಯೊ</string>
     <!-- plurals.xml -->
diff --git a/libsession/src/main/res/values-ko-rKR/strings.xml b/libsession/src/main/res/values-ko-rKR/strings.xml
index 2899ed48c6..bb318c9c3f 100644
--- a/libsession/src/main/res/values-ko-rKR/strings.xml
+++ b/libsession/src/main/res/values-ko-rKR/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">없음</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">방금 전</string>
-    <string name="DateUtils_yesterday">어제</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -68,7 +67,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session 잠금 해제 됨</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">나</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">읽음으로 표시</string>
     <!-- Notification Channels -->
@@ -113,7 +111,6 @@
     <string name="notificationsMute2Hours">2시간 동안 알림 끄기</string>
     <string name="notificationsMute1Day">하루 동안 알림 끄기</string>
     <string name="notificationsContentShowNameOnly">이름</string>
-    <string name="arrays__images">이미지</string>
     <string name="audio">오디오</string>
     <string name="video">동영상</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-ko/strings.xml b/libsession/src/main/res/values-ko/strings.xml
index 2899ed48c6..bb318c9c3f 100644
--- a/libsession/src/main/res/values-ko/strings.xml
+++ b/libsession/src/main/res/values-ko/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">없음</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">방금 전</string>
-    <string name="DateUtils_yesterday">어제</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -68,7 +67,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session 잠금 해제 됨</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">나</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">읽음으로 표시</string>
     <!-- Notification Channels -->
@@ -113,7 +111,6 @@
     <string name="notificationsMute2Hours">2시간 동안 알림 끄기</string>
     <string name="notificationsMute1Day">하루 동안 알림 끄기</string>
     <string name="notificationsContentShowNameOnly">이름</string>
-    <string name="arrays__images">이미지</string>
     <string name="audio">오디오</string>
     <string name="video">동영상</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-lt-rLT/strings.xml b/libsession/src/main/res/values-lt-rLT/strings.xml
index 83c5023f0c..2f551ce75a 100644
--- a/libsession/src/main/res/values-lt-rLT/strings.xml
+++ b/libsession/src/main/res/values-lt-rLT/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Nėra</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Dabar</string>
-    <string name="DateUtils_yesterday">Vakar</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session yra atrakinta</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jūs</string>
     <string name="draft">Juodraštis</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Žymėti kaip skaitytą</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Nutildyti 2 valandoms</string>
     <string name="notificationsMute1Day">Nutildyti 1 dienai</string>
     <string name="notificationsContentShowNameOnly">Tik vardą</string>
-    <string name="arrays__images">Paveikslai</string>
     <string name="audio">Garso įrašai</string>
     <string name="video">Vaizdo įrašai</string>
     <string name="max">Maksimali</string>
@@ -209,7 +206,6 @@
     <string name="qrCode">QR kodas</string>
     <string name="contactsContacts">Adresatai</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Taikyti</string>
     <string name="done">Atlikta</string>
     <string name="groupEdit">Taisyti grupę</string>
     <string name="appearanceThemes">Apipavidalinimas</string>
diff --git a/libsession/src/main/res/values-lt/strings.xml b/libsession/src/main/res/values-lt/strings.xml
index 83c5023f0c..2f551ce75a 100644
--- a/libsession/src/main/res/values-lt/strings.xml
+++ b/libsession/src/main/res/values-lt/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Nėra</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Dabar</string>
-    <string name="DateUtils_yesterday">Vakar</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session yra atrakinta</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jūs</string>
     <string name="draft">Juodraštis</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Žymėti kaip skaitytą</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Nutildyti 2 valandoms</string>
     <string name="notificationsMute1Day">Nutildyti 1 dienai</string>
     <string name="notificationsContentShowNameOnly">Tik vardą</string>
-    <string name="arrays__images">Paveikslai</string>
     <string name="audio">Garso įrašai</string>
     <string name="video">Vaizdo įrašai</string>
     <string name="max">Maksimali</string>
@@ -209,7 +206,6 @@
     <string name="qrCode">QR kodas</string>
     <string name="contactsContacts">Adresatai</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Taikyti</string>
     <string name="done">Atlikta</string>
     <string name="groupEdit">Taisyti grupę</string>
     <string name="appearanceThemes">Apipavidalinimas</string>
diff --git a/libsession/src/main/res/values-lv-rLV/strings.xml b/libsession/src/main/res/values-lv-rLV/strings.xml
index c7e77f5787..047e565366 100644
--- a/libsession/src/main/res/values-lv-rLV/strings.xml
+++ b/libsession/src/main/res/values-lv-rLV/strings.xml
@@ -28,7 +28,6 @@
     <string name="none">Neviens</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Tagad</string>
-    <string name="DateUtils_yesterday">Vakar</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
diff --git a/libsession/src/main/res/values-lv/strings.xml b/libsession/src/main/res/values-lv/strings.xml
index c7e77f5787..047e565366 100644
--- a/libsession/src/main/res/values-lv/strings.xml
+++ b/libsession/src/main/res/values-lv/strings.xml
@@ -28,7 +28,6 @@
     <string name="none">Neviens</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Tagad</string>
-    <string name="DateUtils_yesterday">Vakar</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
diff --git a/libsession/src/main/res/values-mk-rMK/strings.xml b/libsession/src/main/res/values-mk-rMK/strings.xml
index c162990bfc..8447737be1 100644
--- a/libsession/src/main/res/values-mk-rMK/strings.xml
+++ b/libsession/src/main/res/values-mk-rMK/strings.xml
@@ -24,7 +24,6 @@
     <!-- CustomDefaultPreference -->
     <string name="none">မည်သည့်အရာမှ မဟုတ်သော</string>
     <!-- DateUtils -->
-    <string name="DateUtils_yesterday">မနေ့က </string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -58,7 +57,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session ကိုဖွင့်လိုက်ပါပြီ</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">သင်</string>
     <string name="draft">မူကြမ်း</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">ဖတ်ပြီးသား</string>
@@ -108,7 +106,6 @@
     <string name="notificationsMute2Hours">အသံကို ၂ နာရီ ပိတ်ထားပါ။</string>
     <string name="notificationsMute1Day">အသံကို ၁ ရက် ပိတ်ထားပါ</string>
     <string name="notificationsContentShowNameOnly">အမည်တစ်ခုတည်းသာ</string>
-    <string name="arrays__images">ပုံများ</string>
     <string name="audio">အသံ</string>
     <string name="video">ဗီဒီယို</string>
     <string name="max">အများဆုံး</string>
diff --git a/libsession/src/main/res/values-mk/strings.xml b/libsession/src/main/res/values-mk/strings.xml
index c162990bfc..8447737be1 100644
--- a/libsession/src/main/res/values-mk/strings.xml
+++ b/libsession/src/main/res/values-mk/strings.xml
@@ -24,7 +24,6 @@
     <!-- CustomDefaultPreference -->
     <string name="none">မည်သည့်အရာမှ မဟုတ်သော</string>
     <!-- DateUtils -->
-    <string name="DateUtils_yesterday">မနေ့က </string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -58,7 +57,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session ကိုဖွင့်လိုက်ပါပြီ</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">သင်</string>
     <string name="draft">မူကြမ်း</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">ဖတ်ပြီးသား</string>
@@ -108,7 +106,6 @@
     <string name="notificationsMute2Hours">အသံကို ၂ နာရီ ပိတ်ထားပါ။</string>
     <string name="notificationsMute1Day">အသံကို ၁ ရက် ပိတ်ထားပါ</string>
     <string name="notificationsContentShowNameOnly">အမည်တစ်ခုတည်းသာ</string>
-    <string name="arrays__images">ပုံများ</string>
     <string name="audio">အသံ</string>
     <string name="video">ဗီဒီယို</string>
     <string name="max">အများဆုံး</string>
diff --git a/libsession/src/main/res/values-nb-rNO/strings.xml b/libsession/src/main/res/values-nb-rNO/strings.xml
index b1aa67a43a..b2762e88e4 100644
--- a/libsession/src/main/res/values-nb-rNO/strings.xml
+++ b/libsession/src/main/res/values-nb-rNO/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ingen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nå</string>
-    <string name="DateUtils_yesterday">I går</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session er låst opp</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Deg</string>
     <string name="draft">Utkast</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Merk som lest</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Demp i 2 timer</string>
     <string name="notificationsMute1Day">Demp i 1 dag</string>
     <string name="notificationsContentShowNameOnly">Bare navn</string>
-    <string name="arrays__images">Bilder</string>
     <string name="audio">Lyd</string>
     <string name="video">Video</string>
     <string name="max">Maks</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-kode</string>
     <string name="contactsContacts">Kontakt</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Bruk</string>
     <string name="done">Ferdig</string>
     <string name="groupEdit">Rediger gruppe</string>
     <string name="contactSelect">Velg kontakter</string>
diff --git a/libsession/src/main/res/values-nb/strings.xml b/libsession/src/main/res/values-nb/strings.xml
index b1aa67a43a..b2762e88e4 100644
--- a/libsession/src/main/res/values-nb/strings.xml
+++ b/libsession/src/main/res/values-nb/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ingen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nå</string>
-    <string name="DateUtils_yesterday">I går</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session er låst opp</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Deg</string>
     <string name="draft">Utkast</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Merk som lest</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Demp i 2 timer</string>
     <string name="notificationsMute1Day">Demp i 1 dag</string>
     <string name="notificationsContentShowNameOnly">Bare navn</string>
-    <string name="arrays__images">Bilder</string>
     <string name="audio">Lyd</string>
     <string name="video">Video</string>
     <string name="max">Maks</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-kode</string>
     <string name="contactsContacts">Kontakt</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Bruk</string>
     <string name="done">Ferdig</string>
     <string name="groupEdit">Rediger gruppe</string>
     <string name="contactSelect">Velg kontakter</string>
diff --git a/libsession/src/main/res/values-nl-rNL/strings.xml b/libsession/src/main/res/values-nl-rNL/strings.xml
index 0e5e363599..28c4030290 100644
--- a/libsession/src/main/res/values-nl-rNL/strings.xml
+++ b/libsession/src/main/res/values-nl-rNL/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Geen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
-    <string name="DateUtils_yesterday">Gisteren</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session is ontgrendeld</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jij</string>
     <string name="draft">Concept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Markeren als gelezen</string>
@@ -128,8 +126,7 @@
     <string name="notificationsMute1Hour">Demp voor 1 uur</string>
     <string name="notificationsMute2Hours">Demp voor 2 uur</string>
     <string name="notificationsMute1Day">Demp voor 1 dag</string>
-    <string name="notificationsContentShowNameOnly">Alleen naam</string>
-    <string name="arrays__images">Afbeeldingen</string>
+    <string name="notificationsContentShowNameOnly">Alleen naam</string>F
     <string name="audio">Geluid</string>
     <string name="video">Video</string>
     <string name="max">Maximaal</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-code</string>
     <string name="contactsContacts">Contacten</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Toepassen</string>
     <string name="done">Klaar</string>
     <string name="groupEdit">Groep bewerken</string>
     <string name="contactSelect">Contacten selecteren</string>
diff --git a/libsession/src/main/res/values-nl/strings.xml b/libsession/src/main/res/values-nl/strings.xml
index 0e5e363599..0d8d6c9ab5 100644
--- a/libsession/src/main/res/values-nl/strings.xml
+++ b/libsession/src/main/res/values-nl/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Geen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
-    <string name="DateUtils_yesterday">Gisteren</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session is ontgrendeld</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jij</string>
     <string name="draft">Concept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Markeren als gelezen</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Demp voor 2 uur</string>
     <string name="notificationsMute1Day">Demp voor 1 dag</string>
     <string name="notificationsContentShowNameOnly">Alleen naam</string>
-    <string name="arrays__images">Afbeeldingen</string>
     <string name="audio">Geluid</string>
     <string name="video">Video</string>
     <string name="max">Maximaal</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-code</string>
     <string name="contactsContacts">Contacten</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Toepassen</string>
     <string name="done">Klaar</string>
     <string name="groupEdit">Groep bewerken</string>
     <string name="contactSelect">Contacten selecteren</string>
diff --git a/libsession/src/main/res/values-nn-rNO/strings.xml b/libsession/src/main/res/values-nn-rNO/strings.xml
index d4ab3c072b..a0ef6b2e6f 100644
--- a/libsession/src/main/res/values-nn-rNO/strings.xml
+++ b/libsession/src/main/res/values-nn-rNO/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">Ingen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">No</string>
-    <string name="DateUtils_yesterday">I går</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -65,7 +64,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session er låst opp</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Deg</string>
     <string name="draft">Kladd</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Merk lesen</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">Demp i 2 timar</string>
     <string name="notificationsMute1Day">Demp i 1 dag</string>
     <string name="notificationsContentShowNameOnly">Berre namn</string>
-    <string name="arrays__images">Bilete</string>
     <string name="audio">Lyd</string>
     <string name="max">Maks</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-nn/strings.xml b/libsession/src/main/res/values-nn/strings.xml
index d4ab3c072b..a0ef6b2e6f 100644
--- a/libsession/src/main/res/values-nn/strings.xml
+++ b/libsession/src/main/res/values-nn/strings.xml
@@ -31,7 +31,6 @@
     <string name="none">Ingen</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">No</string>
-    <string name="DateUtils_yesterday">I går</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -65,7 +64,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session er låst opp</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Deg</string>
     <string name="draft">Kladd</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Merk lesen</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">Demp i 2 timar</string>
     <string name="notificationsMute1Day">Demp i 1 dag</string>
     <string name="notificationsContentShowNameOnly">Berre namn</string>
-    <string name="arrays__images">Bilete</string>
     <string name="audio">Lyd</string>
     <string name="max">Maks</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-ny-rMW/strings.xml b/libsession/src/main/res/values-ny-rMW/strings.xml
index b826ddc411..b7b678e953 100644
--- a/libsession/src/main/res/values-ny-rMW/strings.xml
+++ b/libsession/src/main/res/values-ny-rMW/strings.xml
@@ -30,7 +30,6 @@
     <string name="none">Nimaykan</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Kunan</string>
-    <string name="DateUtils_yesterday">Kayna</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -62,7 +61,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session yaykunallami kan.</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Kikin</string>
     <string name="draft">Pichak</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Killkakatishkami nishpa unanchay</string>
@@ -117,7 +115,6 @@
     <string name="notificationsMute2Hours">2 pachata upallayachina</string>
     <string name="notificationsMute1Day">1 punchata upallayachina</string>
     <string name="notificationsContentShowNameOnly">Shutilla</string>
-    <string name="arrays__images">Shuyukuna</string>
     <string name="audio">Uyariy</string>
     <string name="video">Shuyurikuchik</string>
     <string name="max">Chaykamanlla</string>
diff --git a/libsession/src/main/res/values-ny/strings.xml b/libsession/src/main/res/values-ny/strings.xml
index b826ddc411..b7b678e953 100644
--- a/libsession/src/main/res/values-ny/strings.xml
+++ b/libsession/src/main/res/values-ny/strings.xml
@@ -30,7 +30,6 @@
     <string name="none">Nimaykan</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Kunan</string>
-    <string name="DateUtils_yesterday">Kayna</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -62,7 +61,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session yaykunallami kan.</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Kikin</string>
     <string name="draft">Pichak</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Killkakatishkami nishpa unanchay</string>
@@ -117,7 +115,6 @@
     <string name="notificationsMute2Hours">2 pachata upallayachina</string>
     <string name="notificationsMute1Day">1 punchata upallayachina</string>
     <string name="notificationsContentShowNameOnly">Shutilla</string>
-    <string name="arrays__images">Shuyukuna</string>
     <string name="audio">Uyariy</string>
     <string name="video">Shuyurikuchik</string>
     <string name="max">Chaykamanlla</string>
diff --git a/libsession/src/main/res/values-pl-rPL/strings.xml b/libsession/src/main/res/values-pl-rPL/strings.xml
index 71657cb226..4236430ef0 100644
--- a/libsession/src/main/res/values-pl-rPL/strings.xml
+++ b/libsession/src/main/res/values-pl-rPL/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Brak</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teraz</string>
-    <string name="DateUtils_yesterday">Wczoraj</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session jest odblokowany</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ty</string>
     <string name="draft">Szkic</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Przeczytane</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Wycisz na 2 godziny</string>
     <string name="notificationsMute1Day">Wycisz na 1 dzień</string>
     <string name="notificationsContentShowNameOnly">Tylko nazwa</string>
-    <string name="arrays__images">Zdjęcia</string>
     <string name="audio">Dźwięk</string>
     <string name="video">Wideo</string>
     <string name="max">Maksymalny</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">Kod QR</string>
     <string name="contactsContacts">Łączność</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Zastosuj</string>
     <string name="done">Gotowe</string>
     <string name="groupEdit">Edytuj grupę</string>
     <string name="contactSelect">Wybierz kontakty</string>
diff --git a/libsession/src/main/res/values-pl/strings.xml b/libsession/src/main/res/values-pl/strings.xml
index 71657cb226..4236430ef0 100644
--- a/libsession/src/main/res/values-pl/strings.xml
+++ b/libsession/src/main/res/values-pl/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Brak</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teraz</string>
-    <string name="DateUtils_yesterday">Wczoraj</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session jest odblokowany</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ty</string>
     <string name="draft">Szkic</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Przeczytane</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Wycisz na 2 godziny</string>
     <string name="notificationsMute1Day">Wycisz na 1 dzień</string>
     <string name="notificationsContentShowNameOnly">Tylko nazwa</string>
-    <string name="arrays__images">Zdjęcia</string>
     <string name="audio">Dźwięk</string>
     <string name="video">Wideo</string>
     <string name="max">Maksymalny</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">Kod QR</string>
     <string name="contactsContacts">Łączność</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Zastosuj</string>
     <string name="done">Gotowe</string>
     <string name="groupEdit">Edytuj grupę</string>
     <string name="contactSelect">Wybierz kontakty</string>
diff --git a/libsession/src/main/res/values-pt-rBR/strings.xml b/libsession/src/main/res/values-pt-rBR/strings.xml
index af161a8cb9..a4d364f638 100644
--- a/libsession/src/main/res/values-pt-rBR/strings.xml
+++ b/libsession/src/main/res/values-pt-rBR/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Nenhum</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Agora</string>
-    <string name="DateUtils_yesterday">Ontem</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session está destrancado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Você</string>
     <string name="draft">Rascunho</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como lida</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Mutar por 2 horas</string>
     <string name="notificationsMute1Day">Mutar por 1 dia</string>
     <string name="notificationsContentShowNameOnly">Nome somente</string>
-    <string name="arrays__images">Imagens</string>
     <string name="audio">Áudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Max</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">Código QR</string>
     <string name="contactsContacts">Contatos</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplicar</string>
     <string name="done">Concluído</string>
     <string name="groupEdit">Editar Grupo</string>
     <string name="contactSelect">Selecionar Contatos</string>
diff --git a/libsession/src/main/res/values-pt-rPT/strings.xml b/libsession/src/main/res/values-pt-rPT/strings.xml
index ec1995d6da..76401fd2e4 100644
--- a/libsession/src/main/res/values-pt-rPT/strings.xml
+++ b/libsession/src/main/res/values-pt-rPT/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Nenhum</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Agora</string>
-    <string name="DateUtils_yesterday">Ontem</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">O Session está desbloqueado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Você</string>
     <string name="draft">Rascunho</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como lida</string>
@@ -130,7 +128,6 @@
     <string name="notificationsMute2Hours">Silenciar por 2 horas</string>
     <string name="notificationsMute1Day">Silenciar por 1 dia</string>
     <string name="notificationsContentShowNameOnly">Apenas o nome</string>
-    <string name="arrays__images">Imagens</string>
     <string name="audio">Áudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Máxima</string>
diff --git a/libsession/src/main/res/values-pt/strings.xml b/libsession/src/main/res/values-pt/strings.xml
index af161a8cb9..a4d364f638 100644
--- a/libsession/src/main/res/values-pt/strings.xml
+++ b/libsession/src/main/res/values-pt/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Nenhum</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Agora</string>
-    <string name="DateUtils_yesterday">Ontem</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session está destrancado</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Você</string>
     <string name="draft">Rascunho</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marcar como lida</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Mutar por 2 horas</string>
     <string name="notificationsMute1Day">Mutar por 1 dia</string>
     <string name="notificationsContentShowNameOnly">Nome somente</string>
-    <string name="arrays__images">Imagens</string>
     <string name="audio">Áudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Max</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">Código QR</string>
     <string name="contactsContacts">Contatos</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplicar</string>
     <string name="done">Concluído</string>
     <string name="groupEdit">Editar Grupo</string>
     <string name="contactSelect">Selecionar Contatos</string>
diff --git a/libsession/src/main/res/values-ro-rRO/strings.xml b/libsession/src/main/res/values-ro-rRO/strings.xml
index 01afc4cc72..08a62243f4 100644
--- a/libsession/src/main/res/values-ro-rRO/strings.xml
+++ b/libsession/src/main/res/values-ro-rRO/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">Niciuna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Acum</string>
-    <string name="DateUtils_yesterday">Ieri</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session este deblocat</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tu</string>
     <string name="draft">Ciornă</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marchează ca citit</string>
@@ -130,7 +128,6 @@
     <string name="notificationsMute2Hours">Fără sunet pentru 2 ore</string>
     <string name="notificationsMute1Day">Fără sunet pentru o zi</string>
     <string name="notificationsContentShowNameOnly">Doar numele</string>
-    <string name="arrays__images">Imagini</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Maximă</string>
diff --git a/libsession/src/main/res/values-ro/strings.xml b/libsession/src/main/res/values-ro/strings.xml
index 01afc4cc72..08a62243f4 100644
--- a/libsession/src/main/res/values-ro/strings.xml
+++ b/libsession/src/main/res/values-ro/strings.xml
@@ -35,7 +35,6 @@
     <string name="none">Niciuna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Acum</string>
-    <string name="DateUtils_yesterday">Ieri</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session este deblocat</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Tu</string>
     <string name="draft">Ciornă</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marchează ca citit</string>
@@ -130,7 +128,6 @@
     <string name="notificationsMute2Hours">Fără sunet pentru 2 ore</string>
     <string name="notificationsMute1Day">Fără sunet pentru o zi</string>
     <string name="notificationsContentShowNameOnly">Doar numele</string>
-    <string name="arrays__images">Imagini</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Maximă</string>
diff --git a/libsession/src/main/res/values-ru-rRU/strings.xml b/libsession/src/main/res/values-ru-rRU/strings.xml
index c9f035469f..2c3016ddd2 100644
--- a/libsession/src/main/res/values-ru-rRU/strings.xml
+++ b/libsession/src/main/res/values-ru-rRU/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Нет</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Только что</string>
-    <string name="DateUtils_yesterday">Вчера</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session разблокирован</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Вы</string>
     <string name="draft">Черновик</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Пометить как прочитано</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Отключить звук на 2 часа</string>
     <string name="notificationsMute1Day">Отключить звук на 1 день</string>
     <string name="notificationsContentShowNameOnly">Только имя</string>
-    <string name="arrays__images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="video">Видео</string>
     <string name="max">Максимальный</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">QR-код</string>
     <string name="contactsContacts">Контакты</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Применить</string>
     <string name="done">Готово</string>
     <string name="groupEdit">Редактировать группу</string>
     <string name="contactSelect">Выбрать контакты</string>
diff --git a/libsession/src/main/res/values-ru/strings.xml b/libsession/src/main/res/values-ru/strings.xml
index c9f035469f..2c3016ddd2 100644
--- a/libsession/src/main/res/values-ru/strings.xml
+++ b/libsession/src/main/res/values-ru/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Нет</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Только что</string>
-    <string name="DateUtils_yesterday">Вчера</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session разблокирован</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Вы</string>
     <string name="draft">Черновик</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Пометить как прочитано</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Отключить звук на 2 часа</string>
     <string name="notificationsMute1Day">Отключить звук на 1 день</string>
     <string name="notificationsContentShowNameOnly">Только имя</string>
-    <string name="arrays__images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="video">Видео</string>
     <string name="max">Максимальный</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">QR-код</string>
     <string name="contactsContacts">Контакты</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Применить</string>
     <string name="done">Готово</string>
     <string name="groupEdit">Редактировать группу</string>
     <string name="contactSelect">Выбрать контакты</string>
diff --git a/libsession/src/main/res/values-si-rLK/strings.xml b/libsession/src/main/res/values-si-rLK/strings.xml
index 463a16fc3b..74b399d2de 100644
--- a/libsession/src/main/res/values-si-rLK/strings.xml
+++ b/libsession/src/main/res/values-si-rLK/strings.xml
@@ -24,7 +24,6 @@
     <!-- CustomDefaultPreference -->
     <!-- DateUtils -->
     <string name="DateUtils_just_now">දැන්</string>
-    <string name="DateUtils_yesterday">ඊයේ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -53,7 +52,6 @@
     <!-- MuteDialog -->
     <!-- KeyCachingService -->
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">ඔබ</string>
     <!-- MessageNotifier -->
     <!-- Notification Channels -->
     <string name="updateApp">යෙදුම් යාවත්කාල</string>
@@ -132,7 +130,6 @@
     <string name="sessionPrivacy">පෞද්ගලිකත්වය</string>
     <string name="contactsContacts">සබඳතා</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">යොදන්න</string>
     <string name="groupEdit">සමූහය සංස්කරණය</string>
     <string name="appearanceThemes">තේමාව</string>
     <string name="messageVoice">හඬ පණිවිඩය</string>
diff --git a/libsession/src/main/res/values-si/strings.xml b/libsession/src/main/res/values-si/strings.xml
index 463a16fc3b..74b399d2de 100644
--- a/libsession/src/main/res/values-si/strings.xml
+++ b/libsession/src/main/res/values-si/strings.xml
@@ -24,7 +24,6 @@
     <!-- CustomDefaultPreference -->
     <!-- DateUtils -->
     <string name="DateUtils_just_now">දැන්</string>
-    <string name="DateUtils_yesterday">ඊයේ</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -53,7 +52,6 @@
     <!-- MuteDialog -->
     <!-- KeyCachingService -->
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">ඔබ</string>
     <!-- MessageNotifier -->
     <!-- Notification Channels -->
     <string name="updateApp">යෙදුම් යාවත්කාල</string>
@@ -132,7 +130,6 @@
     <string name="sessionPrivacy">පෞද්ගලිකත්වය</string>
     <string name="contactsContacts">සබඳතා</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">යොදන්න</string>
     <string name="groupEdit">සමූහය සංස්කරණය</string>
     <string name="appearanceThemes">තේමාව</string>
     <string name="messageVoice">හඬ පණිවිඩය</string>
diff --git a/libsession/src/main/res/values-sk-rSK/strings.xml b/libsession/src/main/res/values-sk-rSK/strings.xml
index 363b5da72a..ce2442d62d 100644
--- a/libsession/src/main/res/values-sk-rSK/strings.xml
+++ b/libsession/src/main/res/values-sk-rSK/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Žiadna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teraz</string>
-    <string name="DateUtils_yesterday">Včera</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session je odomknutý</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vy</string>
     <string name="draft">Koncept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Označiť ako prečítané</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Stlmiť na 2 hodiny</string>
     <string name="notificationsMute1Day">Stlmiť na 1 deň</string>
     <string name="notificationsContentShowNameOnly">Iba meno</string>
-    <string name="arrays__images">Obrázky</string>
     <string name="audio">Zvuk</string>
     <string name="video">Video</string>
     <string name="max">Maximálna</string>
@@ -208,7 +205,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kontakty</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Použiť</string>
     <string name="done">Dokončené</string>
     <string name="groupEdit">Upraviť skupinu</string>
     <string name="contactSelect">Vyberte kontakty</string>
diff --git a/libsession/src/main/res/values-sk/strings.xml b/libsession/src/main/res/values-sk/strings.xml
index 363b5da72a..ce2442d62d 100644
--- a/libsession/src/main/res/values-sk/strings.xml
+++ b/libsession/src/main/res/values-sk/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Žiadna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teraz</string>
-    <string name="DateUtils_yesterday">Včera</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session je odomknutý</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vy</string>
     <string name="draft">Koncept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Označiť ako prečítané</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Stlmiť na 2 hodiny</string>
     <string name="notificationsMute1Day">Stlmiť na 1 deň</string>
     <string name="notificationsContentShowNameOnly">Iba meno</string>
-    <string name="arrays__images">Obrázky</string>
     <string name="audio">Zvuk</string>
     <string name="video">Video</string>
     <string name="max">Maximálna</string>
@@ -208,7 +205,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kontakty</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Použiť</string>
     <string name="done">Dokončené</string>
     <string name="groupEdit">Upraviť skupinu</string>
     <string name="contactSelect">Vyberte kontakty</string>
diff --git a/libsession/src/main/res/values-sq-rAL/strings.xml b/libsession/src/main/res/values-sq-rAL/strings.xml
index a0e0666263..d73f09820b 100644
--- a/libsession/src/main/res/values-sq-rAL/strings.xml
+++ b/libsession/src/main/res/values-sq-rAL/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Asnjë</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Tani</string>
-    <string name="DateUtils_yesterday">Dje</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session-i u shkyç</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ju</string>
     <string name="draft">Skicë:</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Vëri shenjë si të lexuar</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Heshtoje për 2 orë</string>
     <string name="notificationsMute1Day">Heshtoje për 1 ditë</string>
     <string name="notificationsContentShowNameOnly">Vetëm emrin</string>
-    <string name="arrays__images">Figura</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Maks.</string>
diff --git a/libsession/src/main/res/values-sq/strings.xml b/libsession/src/main/res/values-sq/strings.xml
index a0e0666263..d73f09820b 100644
--- a/libsession/src/main/res/values-sq/strings.xml
+++ b/libsession/src/main/res/values-sq/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Asnjë</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Tani</string>
-    <string name="DateUtils_yesterday">Dje</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session-i u shkyç</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ju</string>
     <string name="draft">Skicë:</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Vëri shenjë si të lexuar</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Heshtoje për 2 orë</string>
     <string name="notificationsMute1Day">Heshtoje për 1 ditë</string>
     <string name="notificationsContentShowNameOnly">Vetëm emrin</string>
-    <string name="arrays__images">Figura</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="max">Maks.</string>
diff --git a/libsession/src/main/res/values-sr-rSP/strings.xml b/libsession/src/main/res/values-sr-rSP/strings.xml
index 5ee6e8de9d..92c118098e 100644
--- a/libsession/src/main/res/values-sr-rSP/strings.xml
+++ b/libsession/src/main/res/values-sr-rSP/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ништа</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Сад</string>
-    <string name="DateUtils_yesterday">Јуче</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session је откључан</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ви</string>
     <string name="draft">Нацрт</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Означи прочитаним</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Утишај 2 сата</string>
     <string name="notificationsMute1Day">Утишај 1 дан</string>
     <string name="notificationsContentShowNameOnly">Само име</string>
-    <string name="arrays__images">Слике</string>
     <string name="audio">Звук</string>
     <string name="video">Видео</string>
     <string name="max">Највиши</string>
diff --git a/libsession/src/main/res/values-sr/strings.xml b/libsession/src/main/res/values-sr/strings.xml
index 5ee6e8de9d..92c118098e 100644
--- a/libsession/src/main/res/values-sr/strings.xml
+++ b/libsession/src/main/res/values-sr/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Ништа</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Сад</string>
-    <string name="DateUtils_yesterday">Јуче</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session је откључан</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ви</string>
     <string name="draft">Нацрт</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Означи прочитаним</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Утишај 2 сата</string>
     <string name="notificationsMute1Day">Утишај 1 дан</string>
     <string name="notificationsContentShowNameOnly">Само име</string>
-    <string name="arrays__images">Слике</string>
     <string name="audio">Звук</string>
     <string name="video">Видео</string>
     <string name="max">Највиши</string>
diff --git a/libsession/src/main/res/values-sv-rSE/strings.xml b/libsession/src/main/res/values-sv-rSE/strings.xml
index 373b6977bd..9fec7291d1 100644
--- a/libsession/src/main/res/values-sv-rSE/strings.xml
+++ b/libsession/src/main/res/values-sv-rSE/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Inga</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
-    <string name="DateUtils_yesterday">Igår</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session är olåst</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Du</string>
     <string name="draft">Utkast</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Läst</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Tysta i 2 timmar</string>
     <string name="notificationsMute1Day">Tysta i 1 dag</string>
     <string name="notificationsContentShowNameOnly">Endast namn</string>
-    <string name="arrays__images">Bilder</string>
     <string name="audio">Ljud</string>
     <string name="video">Filmer</string>
     <string name="max">Max</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-kod</string>
     <string name="contactsContacts">Kontakter</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Tillämpa</string>
     <string name="done">Klar</string>
     <string name="groupEdit">Redigera Grupp</string>
     <string name="contactSelect">Välj Kontakter</string>
diff --git a/libsession/src/main/res/values-sv/strings.xml b/libsession/src/main/res/values-sv/strings.xml
index 373b6977bd..9fec7291d1 100644
--- a/libsession/src/main/res/values-sv/strings.xml
+++ b/libsession/src/main/res/values-sv/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Inga</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
-    <string name="DateUtils_yesterday">Igår</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session är olåst</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Du</string>
     <string name="draft">Utkast</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Läst</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">Tysta i 2 timmar</string>
     <string name="notificationsMute1Day">Tysta i 1 dag</string>
     <string name="notificationsContentShowNameOnly">Endast namn</string>
-    <string name="arrays__images">Bilder</string>
     <string name="audio">Ljud</string>
     <string name="video">Filmer</string>
     <string name="max">Max</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR-kod</string>
     <string name="contactsContacts">Kontakter</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Tillämpa</string>
     <string name="done">Klar</string>
     <string name="groupEdit">Redigera Grupp</string>
     <string name="contactSelect">Välj Kontakter</string>
diff --git a/libsession/src/main/res/values-sw-rKE/strings.xml b/libsession/src/main/res/values-sw-rKE/strings.xml
index 819e660088..53bbe447ce 100644
--- a/libsession/src/main/res/values-sw-rKE/strings.xml
+++ b/libsession/src/main/res/values-sw-rKE/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Hakuna</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sasa</string>
-    <string name="DateUtils_yesterday">Jana</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -62,7 +61,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session imefunguliwa</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Wewe</string>
     <string name="draft">rasimu</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">soma nakili</string>
@@ -119,7 +117,6 @@
     <string name="notificationsMute2Hours">nyamaza kwa masaa 2</string>
     <string name="notificationsMute1Day">toa sauti kwa siku moja</string>
     <string name="notificationsContentShowNameOnly">jina tu</string>
-    <string name="arrays__images">picha</string>
     <string name="audio">Sauti</string>
     <string name="max">mwisho</string>
     <!-- plurals.xml -->
diff --git a/libsession/src/main/res/values-te-rIN/strings.xml b/libsession/src/main/res/values-te-rIN/strings.xml
index 2b9c6ee1d9..aef51a86f5 100644
--- a/libsession/src/main/res/values-te-rIN/strings.xml
+++ b/libsession/src/main/res/values-te-rIN/strings.xml
@@ -37,7 +37,6 @@
     <string name="none">ఏదీ కాదు</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">ఇప్పుడు</string>
-    <string name="DateUtils_yesterday">నిన్న</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session తాళం తీయబడినది</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">మీరు</string>
     <string name="draft">చిత్తు పత్రం</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">చదివినట్టు గుర్తుపెట్టు</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">2 గంటలు నిశబ్దంగా ఉంచు</string>
     <string name="notificationsMute1Day">1 రోజు నిశబ్దంగా ఉంచు</string>
     <string name="notificationsContentShowNameOnly">పేరు మాత్రమే </string>
-    <string name="arrays__images">చిత్రాలు</string>
     <string name="audio">ఆడియో</string>
     <string name="video">వీడియో</string>
     <string name="max">గరిష్టం</string>
diff --git a/libsession/src/main/res/values-te/strings.xml b/libsession/src/main/res/values-te/strings.xml
index 2b9c6ee1d9..aef51a86f5 100644
--- a/libsession/src/main/res/values-te/strings.xml
+++ b/libsession/src/main/res/values-te/strings.xml
@@ -37,7 +37,6 @@
     <string name="none">ఏదీ కాదు</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">ఇప్పుడు</string>
-    <string name="DateUtils_yesterday">నిన్న</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -71,7 +70,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session తాళం తీయబడినది</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">మీరు</string>
     <string name="draft">చిత్తు పత్రం</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">చదివినట్టు గుర్తుపెట్టు</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">2 గంటలు నిశబ్దంగా ఉంచు</string>
     <string name="notificationsMute1Day">1 రోజు నిశబ్దంగా ఉంచు</string>
     <string name="notificationsContentShowNameOnly">పేరు మాత్రమే </string>
-    <string name="arrays__images">చిత్రాలు</string>
     <string name="audio">ఆడియో</string>
     <string name="video">వీడియో</string>
     <string name="max">గరిష్టం</string>
diff --git a/libsession/src/main/res/values-th-rTH/strings.xml b/libsession/src/main/res/values-th-rTH/strings.xml
index 0dcf7ac72f..75c5318993 100644
--- a/libsession/src/main/res/values-th-rTH/strings.xml
+++ b/libsession/src/main/res/values-th-rTH/strings.xml
@@ -29,7 +29,6 @@
     <string name="none">ไม่มี</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">เดี๋ยวนี้</string>
-    <string name="DateUtils_yesterday">เมื่อวานนี้</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -63,7 +62,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session ถูกปลดล็อก</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">คุณ</string>
     <string name="draft">ร่าง</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">ทำเครื่องหมายว่าอ่านแล้ว</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">ปิดเสียง 2 ชั่วโมง</string>
     <string name="notificationsMute1Day">ปิดเสียง 1 วัน</string>
     <string name="notificationsContentShowNameOnly">ชื่อเท่านั้น</string>
-    <string name="arrays__images">ภาพ</string>
     <string name="audio">เสียง</string>
     <string name="video">วิดีโอ</string>
     <string name="max">สูงสุด</string>
diff --git a/libsession/src/main/res/values-th/strings.xml b/libsession/src/main/res/values-th/strings.xml
index 0dcf7ac72f..75c5318993 100644
--- a/libsession/src/main/res/values-th/strings.xml
+++ b/libsession/src/main/res/values-th/strings.xml
@@ -29,7 +29,6 @@
     <string name="none">ไม่มี</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">เดี๋ยวนี้</string>
-    <string name="DateUtils_yesterday">เมื่อวานนี้</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -63,7 +62,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session ถูกปลดล็อก</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">คุณ</string>
     <string name="draft">ร่าง</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">ทำเครื่องหมายว่าอ่านแล้ว</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">ปิดเสียง 2 ชั่วโมง</string>
     <string name="notificationsMute1Day">ปิดเสียง 1 วัน</string>
     <string name="notificationsContentShowNameOnly">ชื่อเท่านั้น</string>
-    <string name="arrays__images">ภาพ</string>
     <string name="audio">เสียง</string>
     <string name="video">วิดีโอ</string>
     <string name="max">สูงสุด</string>
diff --git a/libsession/src/main/res/values-tr-rTR/strings.xml b/libsession/src/main/res/values-tr-rTR/strings.xml
index 947a14fb42..cb0bd43e30 100644
--- a/libsession/src/main/res/values-tr-rTR/strings.xml
+++ b/libsession/src/main/res/values-tr-rTR/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Hiçbiri</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Şimdi</string>
-    <string name="DateUtils_yesterday">Dün</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session kilidi açık</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Siz</string>
     <string name="draft">Taslak</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Okundu işaretle</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 saatliğine sustur</string>
     <string name="notificationsMute1Day">1 günlüğüne sustur</string>
     <string name="notificationsContentShowNameOnly">Yalnızca isim</string>
-    <string name="arrays__images">Görüntüler</string>
     <string name="audio">Ses</string>
     <string name="video">Video</string>
     <string name="max">En Yüksek</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR kod</string>
     <string name="contactsContacts">Kişiler</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Uygula</string>
     <string name="done">Tamamlandı</string>
     <string name="groupEdit">Grubu Düzenle</string>
     <string name="contactSelect">Kişileri Seçin</string>
diff --git a/libsession/src/main/res/values-tr/strings.xml b/libsession/src/main/res/values-tr/strings.xml
index 947a14fb42..cb0bd43e30 100644
--- a/libsession/src/main/res/values-tr/strings.xml
+++ b/libsession/src/main/res/values-tr/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Hiçbiri</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Şimdi</string>
-    <string name="DateUtils_yesterday">Dün</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session kilidi açık</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Siz</string>
     <string name="draft">Taslak</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Okundu işaretle</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 saatliğine sustur</string>
     <string name="notificationsMute1Day">1 günlüğüne sustur</string>
     <string name="notificationsContentShowNameOnly">Yalnızca isim</string>
-    <string name="arrays__images">Görüntüler</string>
     <string name="audio">Ses</string>
     <string name="video">Video</string>
     <string name="max">En Yüksek</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR kod</string>
     <string name="contactsContacts">Kişiler</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Uygula</string>
     <string name="done">Tamamlandı</string>
     <string name="groupEdit">Grubu Düzenle</string>
     <string name="contactSelect">Kişileri Seçin</string>
diff --git a/libsession/src/main/res/values-uk-rUA/strings.xml b/libsession/src/main/res/values-uk-rUA/strings.xml
index 7e0c8729f9..5ddfa6fe21 100644
--- a/libsession/src/main/res/values-uk-rUA/strings.xml
+++ b/libsession/src/main/res/values-uk-rUA/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Жодного</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Зараз</string>
-    <string name="DateUtils_yesterday">Вчора</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -73,7 +72,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session розблоковано</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ви</string>
     <string name="draft">Чернетка</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Позначити як прочитане</string>
@@ -132,7 +130,6 @@
     <string name="notificationsMute2Hours">Вимкнути звук на 2 години</string>
     <string name="notificationsMute1Day">Вимкнути звук на 1 день</string>
     <string name="notificationsContentShowNameOnly">Тільки ім\'я</string>
-    <string name="arrays__images">Зображення</string>
     <string name="audio">Аудіо</string>
     <string name="video">Відео</string>
     <string name="max">Максимум</string>
@@ -218,7 +215,6 @@
     <string name="qrCode">QR-код</string>
     <string name="contactsContacts">Контакти</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Застосувати</string>
     <string name="done">Готово</string>
     <string name="groupEdit">Редагувати Групу</string>
     <string name="contactSelect">Обрати контакти</string>
diff --git a/libsession/src/main/res/values-uk/strings.xml b/libsession/src/main/res/values-uk/strings.xml
index 7e0c8729f9..5ddfa6fe21 100644
--- a/libsession/src/main/res/values-uk/strings.xml
+++ b/libsession/src/main/res/values-uk/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Жодного</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Зараз</string>
-    <string name="DateUtils_yesterday">Вчора</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -73,7 +72,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session розблоковано</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ви</string>
     <string name="draft">Чернетка</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Позначити як прочитане</string>
@@ -132,7 +130,6 @@
     <string name="notificationsMute2Hours">Вимкнути звук на 2 години</string>
     <string name="notificationsMute1Day">Вимкнути звук на 1 день</string>
     <string name="notificationsContentShowNameOnly">Тільки ім\'я</string>
-    <string name="arrays__images">Зображення</string>
     <string name="audio">Аудіо</string>
     <string name="video">Відео</string>
     <string name="max">Максимум</string>
@@ -218,7 +215,6 @@
     <string name="qrCode">QR-код</string>
     <string name="contactsContacts">Контакти</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Застосувати</string>
     <string name="done">Готово</string>
     <string name="groupEdit">Редагувати Групу</string>
     <string name="contactSelect">Обрати контакти</string>
diff --git a/libsession/src/main/res/values-ur-rIN/strings.xml b/libsession/src/main/res/values-ur-rIN/strings.xml
index b81aa01be0..5df0824061 100644
--- a/libsession/src/main/res/values-ur-rIN/strings.xml
+++ b/libsession/src/main/res/values-ur-rIN/strings.xml
@@ -27,7 +27,6 @@
     <!-- CreateProfileActivity -->
     <!-- CustomDefaultPreference -->
     <!-- DateUtils -->
-    <string name="DateUtils_yesterday">کل</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
diff --git a/libsession/src/main/res/values-ur/strings.xml b/libsession/src/main/res/values-ur/strings.xml
index b81aa01be0..5df0824061 100644
--- a/libsession/src/main/res/values-ur/strings.xml
+++ b/libsession/src/main/res/values-ur/strings.xml
@@ -27,7 +27,6 @@
     <!-- CreateProfileActivity -->
     <!-- CustomDefaultPreference -->
     <!-- DateUtils -->
-    <string name="DateUtils_yesterday">کل</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
diff --git a/libsession/src/main/res/values-vi-rVN/strings.xml b/libsession/src/main/res/values-vi-rVN/strings.xml
index d27b42255a..ce3175fb64 100644
--- a/libsession/src/main/res/values-vi-rVN/strings.xml
+++ b/libsession/src/main/res/values-vi-rVN/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Không</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Bây giờ</string>
-    <string name="DateUtils_yesterday">Ngày hôm qua</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -57,7 +56,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session đã mở khóa</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Bạn</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Đánh dấu đã đọc</string>
     <!-- Notification Channels -->
@@ -101,7 +99,6 @@
     <string name="notificationsMute2Hours">Tạm im 2 tiếng</string>
     <string name="notificationsMute1Day">Tạm im 1 ngày</string>
     <string name="notificationsContentShowNameOnly">Tên thôi</string>
-    <string name="arrays__images">Hình ảnh</string>
     <string name="audio">Nhạc</string>
     <string name="video">Đoạn phim</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-vi/strings.xml b/libsession/src/main/res/values-vi/strings.xml
index d13c530a7f..0f47a8b4b3 100644
--- a/libsession/src/main/res/values-vi/strings.xml
+++ b/libsession/src/main/res/values-vi/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Không</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Bây giờ</string>
-    <string name="DateUtils_yesterday">Ngày hôm qua</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -57,7 +56,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session đã mở khóa</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Bạn</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Đánh dấu đã đọc</string>
     <!-- Notification Channels -->
@@ -101,7 +99,6 @@
     <string name="notificationsMute2Hours">Tạm im 2 tiếng</string>
     <string name="notificationsMute1Day">Tạm im 1 ngày</string>
     <string name="notificationsContentShowNameOnly">Tên thôi</string>
-    <string name="arrays__images">Hình ảnh</string>
     <string name="audio">Nhạc</string>
     <string name="video">Đoạn phim</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-xh-rZA/strings.xml b/libsession/src/main/res/values-xh-rZA/strings.xml
index 6062b9dc09..df005ae5d4 100644
--- a/libsession/src/main/res/values-xh-rZA/strings.xml
+++ b/libsession/src/main/res/values-xh-rZA/strings.xml
@@ -54,7 +54,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session eggudwa</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Gwe</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">lamba osome</string>
     <!-- Notification Channels -->
@@ -98,7 +97,6 @@
     <string name="notificationsMute2Hours">Silisa okumala esawa bbiri </string>
     <string name="notificationsMute1Day">Silisa okumala olunaku 1</string>
     <string name="notificationsContentShowNameOnly">Linnya lyoka</string>
-    <string name="arrays__images">Ebifaananyi</string>
     <string name="audio">Doboozi</string>
     <string name="video">Vidiyo</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-xh/strings.xml b/libsession/src/main/res/values-xh/strings.xml
index 6062b9dc09..df005ae5d4 100644
--- a/libsession/src/main/res/values-xh/strings.xml
+++ b/libsession/src/main/res/values-xh/strings.xml
@@ -54,7 +54,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session eggudwa</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Gwe</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">lamba osome</string>
     <!-- Notification Channels -->
@@ -98,7 +97,6 @@
     <string name="notificationsMute2Hours">Silisa okumala esawa bbiri </string>
     <string name="notificationsMute1Day">Silisa okumala olunaku 1</string>
     <string name="notificationsContentShowNameOnly">Linnya lyoka</string>
-    <string name="arrays__images">Ebifaananyi</string>
     <string name="audio">Doboozi</string>
     <string name="video">Vidiyo</string>
     <!-- preferences.xml -->
diff --git a/libsession/src/main/res/values-zh-rCN/strings.xml b/libsession/src/main/res/values-zh-rCN/strings.xml
index e764536578..8c2248b40d 100644
--- a/libsession/src/main/res/values-zh-rCN/strings.xml
+++ b/libsession/src/main/res/values-zh-rCN/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">没有</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">现在</string>
-    <string name="DateUtils_yesterday">昨天</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked"> Session 已解锁</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">您</string>
     <string name="draft">草稿</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">标记为已读</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">静音 2 小时</string>
     <string name="notificationsMute1Day">静音 1 天</string>
     <string name="notificationsContentShowNameOnly">仅名称</string>
-    <string name="arrays__images">图片</string>
     <string name="audio">音频</string>
     <string name="video">视频</string>
     <string name="max">最大</string>
@@ -214,7 +211,6 @@
     <string name="qrCode">二维码</string>
     <string name="contactsContacts">联系人</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">应用</string>
     <string name="done">完成</string>
     <string name="groupEdit">编辑群组</string>
     <string name="contactSelect">选择联系人</string>
diff --git a/libsession/src/main/res/values-zh-rTW/strings.xml b/libsession/src/main/res/values-zh-rTW/strings.xml
index 5d7791d748..8e31a59bd6 100644
--- a/libsession/src/main/res/values-zh-rTW/strings.xml
+++ b/libsession/src/main/res/values-zh-rTW/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">無</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">現在</string>
-    <string name="DateUtils_yesterday">昨天</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session 已經解鎖</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">您</string>
     <string name="draft">草稿</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">標示已讀</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">靜音 2 小時</string>
     <string name="notificationsMute1Day">靜音 1 天</string>
     <string name="notificationsContentShowNameOnly">僅名字</string>
-    <string name="arrays__images">圖片</string>
     <string name="audio">音訊</string>
     <string name="video">影片</string>
     <string name="max">最大的</string>
@@ -214,7 +211,6 @@
     <string name="qrCode">QR Code</string>
     <string name="contactsContacts">聯絡人</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">應用</string>
     <string name="done">完成</string>
     <string name="groupEdit">編輯群組</string>
     <string name="contactSelect">選擇聯絡人</string>
diff --git a/libsession/src/main/res/values-zh/strings.xml b/libsession/src/main/res/values-zh/strings.xml
index 5fc412beb3..90ce6d990d 100644
--- a/libsession/src/main/res/values-zh/strings.xml
+++ b/libsession/src/main/res/values-zh/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">没有</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">现在</string>
-    <string name="DateUtils_yesterday">昨天</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked"> Session 已解锁</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">您</string>
     <string name="draft">草稿</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">标记为已读</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">静音 2 小时</string>
     <string name="notificationsMute1Day">静音 1 天</string>
     <string name="notificationsContentShowNameOnly">仅名称</string>
-    <string name="arrays__images">图片</string>
     <string name="audio">音频</string>
     <string name="video">视频</string>
     <string name="max">最大</string>
@@ -214,7 +211,6 @@
     <string name="qrCode">二维码</string>
     <string name="contactsContacts">联系人</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">应用</string>
     <string name="done">完成</string>
     <string name="groupEdit">编辑群组</string>
     <string name="contactSelect">选择联系人</string>
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index c3875edb4a..eeb7c1351c 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -86,7 +86,6 @@
     <string name="activity_seed_reveal_button_title">Hold to reveal</string>
     <string name="activity_seed_title_2">Meet your recovery phrase</string>
     <string name="activity_settings_upload">Upload</string>
-    <string name="arrays__images">Images</string>
     <string name="attachment_type_selector__drawer_description">Toggle attachment drawer</string>
     <string name="attachment_type_selector__gallery">Gallery</string>
     <string name="attachment_type_selector__gallery_description">Image or video</string>
@@ -100,11 +99,9 @@
     <string name="fragment_enter_public_key_prompt">Start a new conversation by entering someone\'s Session ID or share your Session ID with them.</string>
     <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
     <string name="fragment_view_my_qr_code_title">Scan Me</string>
-    <string name="menu_apply_button">Apply</string>
     <string name="message_details_header__disappears">Disappears</string>
-    <string name="message_details_header__file_id">File Id:</string>
-    <string name="registration_activity__skip">Skip</string> <!-- Replaced during onboarding -->
-    
+    <string name="registration_activity__skip">Skip</string>
+
 
     <!-- RENAMED! -->
     <string name="deleteAfterGroupFirstReleaseConfigOutdated">Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.</string>
@@ -445,7 +442,6 @@
     <string name="groupInviteFailedUser">Failed to invite {name} to {group_name}</string>
     <string name="groupInviteSending">Sending invite</string>
     <string name="groupInviteSent">Invite sent</string>
-    <string name="groupInviteSuccessful">Group invite successful</string>
     <string name="groupInviteVersion">Users must have version {version} or higher to receive invitations</string>
     <string name="groupInviteYou"><b>You</b> were invited to join the group.</string>
     <string name="groupLeave">Leave Group</string>
@@ -574,7 +570,6 @@
     <string name="messageRequestsNonePending">No pending message requests</string>
     <string name="messageRequestsTurnedOff"><b>{name}</b> has message requests from Community conversations turned off, so you cannot send them a message.</string>
     <string name="messageSelect">Select Message</string>
-    <string name="messageStatusFailedToSend">Failed to send</string>
     <string name="messageStatusFailedToSync">Failed to sync</string>
     <string name="messageStatusSyncing">Syncing</string>
     <string name="messageUnread">Unread messages</string>
@@ -691,7 +686,6 @@
     <string name="preview">Preview</string>
     <string name="profile">Profile</string>
     <string name="profileDisplayPicture">Display Picture</string>
-    <string name="profileDisplayPictureRemoveError">Failed to remove display picture.</string>
     <string name="profileDisplayPictureSet">Set Display Picture</string>
     <string name="profileErrorUpdate">Failed to update profile.</string>
     <string name="promote">Promote</string>