diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9c63ef250f..15a3968b00 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -604,12 +604,8 @@
   <string name="WebRtcCallScreen_new_safety_number_title">رقم أمان جديد</string>
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">صورة</string>
-  <string name="attachment_type_selector__image_description">صورة</string>
   <string name="attachment_type_selector__audio">صوت</string>
   <string name="attachment_type_selector__audio_description">صوت</string>
-  <string name="attachment_type_selector__video">فيديو</string>
-  <string name="attachment_type_selector__video_description">فيديو</string>
   <string name="attachment_type_selector__contact">جهة اتصال</string>
   <string name="attachment_type_selector__contact_description">متصل</string>
   <string name="attachment_type_selector__camera">كاميرا</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c4c798617b..b5fbaf1b19 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -313,7 +313,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <!--InviteActivity-->
   <string name="InviteActivity_share">Споделяне</string>
   <string name="InviteActivity_choose_contacts">Избор на контакти</string>
-  <string name="InviteActivity_cancel">Откажи</string>
+  <string name="InviteActivity_cancel">Отказване</string>
   <string name="InviteActivity_sending">Изпращане...</string>
   <string name="InviteActivity_heart_content_description">Сърце</string>
   <string name="InviteActivity_invitations_sent">Поканите изпратени!</string>
@@ -352,7 +352,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="NotificationBarManager__deny_call">Отхвърляне на обаждането</string>
   <string name="NotificationBarManager__answer_call">Приеми обаждането</string>
   <string name="NotificationBarManager__end_call">Прекрати обаждането</string>
-  <string name="NotificationBarManager__cancel_call">Откажи обаждането</string>
+  <string name="NotificationBarManager__cancel_call">Прекратяване на обаждането</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедийно съобщение</string>
   <string name="NotificationMmsMessageRecord_downloading_mms_message">Изтегляне на MMS съобщение</string>
@@ -375,7 +375,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Въведете нова парола!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Свържи това устройство?</string>
-  <string name="DeviceProvisioningActivity_cancel">ОТКАЖИ</string>
+  <string name="DeviceProvisioningActivity_cancel">ОТКАЗВАНЕ</string>
   <string name="DeviceProvisioningActivity_continue">ПРОДЪЛЖИ</string>
   <string name="DeviceProvisioningActivity_title">Свържи това устройство?</string>
   <string name="DeviceProvisioningActivity_content_intro">Ще може да</string>
@@ -606,12 +606,8 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Натиснете, за да активирате видео</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Изображение</string>
-  <string name="attachment_type_selector__image_description">Изображение</string>
   <string name="attachment_type_selector__audio">Аудио</string>
   <string name="attachment_type_selector__audio_description">Аудио</string>
-  <string name="attachment_type_selector__video">Видео</string>
-  <string name="attachment_type_selector__video_description">Видео</string>
   <string name="attachment_type_selector__contact">Контакт</string>
   <string name="attachment_type_selector__contact_description">Контакт</string>
   <string name="attachment_type_selector__camera">Камера</string>
@@ -1022,6 +1018,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="preferences_chats__show_invitation_prompts">Показване на покани</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Показване на покани за контакти без Сигнал</string>
   <string name="preferences_chats__message_text_size">Размер на текста</string>
+  <string name="preferences_events__contact_joined_signal">Един от контактите Ви се присъедини към Сигнал!</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d8eb53fd85..29acd2a636 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -38,7 +38,7 @@
   <string name="ApplicationPreferencesActivity_Off">Inactiu</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <string name="ApplicationPreferencesActivity_privacy_summary">Contrasenya %1$s, Seguretat de pantalla %2$s</string>
-  <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Llengua %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Tema: %1$s, Llengua: %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <plurals name="AppProtectionPreferenceFragment_minutes">
     <item quantity="one">1 minut</item>
@@ -206,7 +206,7 @@
   <string name="ConversationListItemAction_archived_conversations_d">Converses arxivades (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Usant personalitzat: %s</string>
-  <string name="CustomDefaultPreference_using_default">Usant predeterminat: %s</string>
+  <string name="CustomDefaultPreference_using_default">Per defecte: %s</string>
   <string name="CustomDefaultPreference_none">Cap</string>
   <!--DateUtils-->
   <string name="DateUtils_just_now">Ara mateix</string>
@@ -603,12 +603,8 @@ Comproveu que aquest és el vostre número. Anem a verificar-ho amb un SMS.</str
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Toqueu per a activar el vídeo</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imatge</string>
-  <string name="attachment_type_selector__image_description">Imatge</string>
   <string name="attachment_type_selector__audio">Àudio</string>
   <string name="attachment_type_selector__audio_description">Àudio</string>
-  <string name="attachment_type_selector__video">Vídeo</string>
-  <string name="attachment_type_selector__video_description">Vídeo</string>
   <string name="attachment_type_selector__contact">Contacte</string>
   <string name="attachment_type_selector__contact_description">Contacte</string>
   <string name="attachment_type_selector__camera">Càmera</string>
@@ -885,7 +881,7 @@ ha fallat.
   <string name="AndroidManifest_archived_conversations">Converses arxivades</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importació i exportació</string>
-  <string name="arrays__use_default">Predeterminat</string>
+  <string name="arrays__use_default">Per defecte</string>
   <string name="arrays__use_custom">Personalitzat</string>
   <string name="arrays__mute_for_one_hour">Silencia-ho 1 hora</string>
   <string name="arrays__mute_for_two_hours">Silencia-ho 2 hores</string>
@@ -997,7 +993,7 @@ ha fallat.
   <string name="preferences__dark_theme">Fosc</string>
   <string name="preferences__appearance">Aparença</string>
   <string name="preferences__theme">Tema</string>
-  <string name="preferences__default">Predeterminat</string>
+  <string name="preferences__default">Per defecte</string>
   <string name="preferences__language">Llengua</string>
   <string name="preferences__signal_messages_and_calls">Missatges i trucades Signal</string>
   <string name="preferences__free_private_messages_and_calls">Missatges i trucades privades gratuïtes per als usuaris del Signal </string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ab203efc71..97fde209cf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -616,12 +616,8 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.</string>
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Ťuknutím povolíte video</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Obrázek</string>
-  <string name="attachment_type_selector__image_description">Obrázek</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -1038,6 +1034,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences_chats__show_invitation_prompts">Zobrazovat pozvánky</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Zobrazovat pozvánky prokontakty které nemají Signal</string>
   <string name="preferences_chats__message_text_size">Velikost písma zprávy</string>
+  <string name="preferences_events__contact_joined_signal">Kontakt se připojil k Signalu</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7ae7bcf5c4..329076c9ce 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -593,12 +593,8 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Tryk for at aktivere video</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Billede</string>
-  <string name="attachment_type_selector__image_description">Billede</string>
   <string name="attachment_type_selector__audio">Lyd</string>
   <string name="attachment_type_selector__audio_description">Lyd</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontaktperson</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c0eb3951d0..72c219d4cb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,7 +21,7 @@
   </plurals>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Entsperrt Signal und Benachrichtigungen über Nachrichten dauerhaft</string>
+  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dies entsperrt Signal und Benachrichtigungen über Nachrichten dauerhaft</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Registrierung für Signal-Nachrichten und -Anrufe wird gelöscht …</string>
@@ -594,12 +594,8 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Zum Aktivieren deiner Videoübertragung antippen</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Bild</string>
-  <string name="attachment_type_selector__image_description">Bild</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -991,11 +987,12 @@ Das Warten auf eine Bestätigungs-SMS hat zu lange gedauert.</string>
   <string name="preferences_app_protection__app_access">App-Zugriff</string>
   <string name="preferences_app_protection__communication">Kommunikation</string>
   <string name="preferences_chats__chats">Unterhaltungen</string>
-  <string name="preferences_notifications__message_notifications">Benachrichtigungen über Nachrichten</string>
+  <string name="preferences_notifications__message_notifications">Nachrichten</string>
   <string name="preferences_notifications__events">Ereignisse</string>
   <string name="preferences_chats__show_invitation_prompts">Einladungshinweise anzeigen</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Einladungshinweise für Kontakte ohne Signal anzeigen</string>
   <string name="preferences_chats__message_text_size">Schriftgröße für Nachrichten</string>
+  <string name="preferences_events__contact_joined_signal">Neue Signal-Kontakte</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 05f5dbb86b..8e55546f35 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -606,12 +606,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Πάτα για να ενεργοποιήσεις το βίντεό σου</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Εικόνα</string>
-  <string name="attachment_type_selector__image_description">Εικόνα</string>
   <string name="attachment_type_selector__audio">Ήχος</string>
   <string name="attachment_type_selector__audio_description">Ήχος</string>
-  <string name="attachment_type_selector__video">Βίντεο</string>
-  <string name="attachment_type_selector__video_description">Βίντεο</string>
   <string name="attachment_type_selector__contact">Επαφή</string>
   <string name="attachment_type_selector__contact_description">Επαφή</string>
   <string name="attachment_type_selector__camera">Κάμερα</string>
@@ -641,6 +637,9 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Η συζήτηση έχει σιγαθεί</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Μήνυμα Signal</string>
+  <string name="conversation_activity__type_message_sms_insecure">Μη ασφαλές SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Μη ασφαλές MMS</string>
   <string name="conversation_activity__from_sim_name">Από τον/την %1$s</string>
   <string name="conversation_activity__send">Αποστολή</string>
   <string name="conversation_activity__remove">Αφαίρεση</string>
@@ -901,7 +900,10 @@
   <string name="arrays__audio">Ήχοι</string>
   <string name="arrays__video">Βίντεο</string>
   <string name="arrays__documents">Αρχεία</string>
+  <string name="arrays__small">Μικρό</string>
   <string name="arrays__normal">Κανονικό</string>
+  <string name="arrays__large">Μεγάλο</string>
+  <string name="arrays__extra_large">Πολύ μεγάλο</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ώρα</item>
@@ -1015,6 +1017,15 @@
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Υποστήριξη για κλήσεις βίντεο και φωνής επόμενης γενιάς, όταν ενεργοποιηθεί και από τις δύο πλευρές. Αυτό το χαρακτηριστικό είναι σε δοκιμαστική λειτουργία beta.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Αναμετάδοση όλων των κλήσεων μέσω του σέρβερ Signal για να αποφύγεις την αποκάλυψη της IP διεύθυνσής σου στην επαφή σου. Η ενεργοποίηση θα χαλάσει την ποιότητα των κλήσεων.</string>
   <string name="preferences_advanced__always_relay_calls">Πάντα να αναμεταδίδονται οι κλήσεις</string>
+  <string name="preferences_app_protection__app_access">Πρόσβαση εφαρμογής</string>
+  <string name="preferences_app_protection__communication">Επικοινωνία</string>
+  <string name="preferences_chats__chats">Συνομιλίες</string>
+  <string name="preferences_notifications__message_notifications">Ειδοποιήσεις μηνυμάτων</string>
+  <string name="preferences_notifications__events">Εκδηλώσεις</string>
+  <string name="preferences_chats__show_invitation_prompts">Εμφάνιση υπενθυμίσεων πρόσκλησης</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Προβολή υπενθυμίσεων πρόσκλησης για επαφές που δεν έχουν Signal</string>
+  <string name="preferences_chats__message_text_size">Μέγεθος γραμματοσειράς μηνύματος</string>
+  <string name="preferences_events__contact_joined_signal">Η επαφή εγκατέστησε το Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 559bf39ccf..06981ea695 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -616,12 +616,8 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Pulse para habilitar su vídeo</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imagen</string>
-  <string name="attachment_type_selector__image_description">Imagen</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Vídeo</string>
-  <string name="attachment_type_selector__video_description">Vídeo</string>
   <string name="attachment_type_selector__contact">Contacto</string>
   <string name="attachment_type_selector__contact_description">Contacto</string>
   <string name="attachment_type_selector__camera">Cámara</string>
@@ -1043,6 +1039,7 @@ por SMS.
   <string name="preferences_chats__show_invitation_prompts">Mostrar ofrecimientos de invitación</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Muestra ofrecimientos de invitación para contactos sin Signal</string>
   <string name="preferences_chats__message_text_size">Tamaño de fuente del mensaje</string>
+  <string name="preferences_events__contact_joined_signal">Un contacto se ha unido a Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c9cf48d902..2522e6fe09 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -615,12 +615,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Koputa, et lubada oma video</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Pilt</string>
-  <string name="attachment_type_selector__image_description">Pilt</string>
   <string name="attachment_type_selector__audio">Heli</string>
   <string name="attachment_type_selector__audio_description">Heli</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kaamera</string>
@@ -650,6 +646,9 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Vestlus vaigistatud</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Signali sõnum</string>
+  <string name="conversation_activity__type_message_sms_insecure">Turvamata SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Turvamata MMS</string>
   <string name="conversation_activity__from_sim_name">Kontaktilt %1$s</string>
   <string name="conversation_activity__send">Saada</string>
   <string name="conversation_activity__remove">Eemalda</string>
@@ -920,7 +919,10 @@
   <string name="arrays__audio">Heli</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokumendid</string>
+  <string name="arrays__small">Väike</string>
   <string name="arrays__normal">Keskmine</string>
+  <string name="arrays__large">Suur</string>
+  <string name="arrays__extra_large">Ekstrasuur</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tund</item>
@@ -1034,6 +1036,15 @@
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Tugi järgmise generatsiooni video- ja häälkõnedele, kui mõlemad osapooled lubavad selle. See funktsioon on beetastaatuses.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Vahenda kõik kõned Signali serveri kaudu, et vältida oma IP-aadressi levitamist oma kontaktile. Lubamine vähendab kõnekvaliteeti.</string>
   <string name="preferences_advanced__always_relay_calls">Alati vahenda kõned</string>
+  <string name="preferences_app_protection__app_access">Rakenduse ligipääs</string>
+  <string name="preferences_app_protection__communication">Suhtlus</string>
+  <string name="preferences_chats__chats">Vestlused</string>
+  <string name="preferences_notifications__message_notifications">Sõnumiteated</string>
+  <string name="preferences_notifications__events">Sündmused</string>
+  <string name="preferences_chats__show_invitation_prompts">Kuva kutsete teateid</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Kuva kutsete teateid kontaktidele, kellel pole Signalit</string>
+  <string name="preferences_chats__message_text_size">Sõnumi fondisuurus</string>
+  <string name="preferences_events__contact_joined_signal">Kontakt liitus Signaliga</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 15b353d789..b6993a5560 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -572,12 +572,8 @@ Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
   <string name="WebRtcCallScreen_new_safety_number_title">Segurtasun zenbaki berria</string>
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Irudia</string>
-  <string name="attachment_type_selector__image_description">Irudia</string>
   <string name="attachment_type_selector__audio">Audioa</string>
   <string name="attachment_type_selector__audio_description">Audioa</string>
-  <string name="attachment_type_selector__video">Bideoa</string>
-  <string name="attachment_type_selector__video_description">Bideoa</string>
   <string name="attachment_type_selector__contact">Kontaktua</string>
   <string name="attachment_type_selector__contact_description">Kontaktua</string>
   <string name="attachment_type_selector__camera">Kamera</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ae54e5236c..9777d82ec2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -498,9 +498,7 @@
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">تصویر</string>
   <string name="attachment_type_selector__audio">صدا</string>
-  <string name="attachment_type_selector__video">ویدئو</string>
   <string name="attachment_type_selector__contact">مخاطب</string>
   <string name="attachment_type_selector__camera">دوربین</string>
   <string name="attachment_type_selector__location">موقعیت</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 774006071f..e81068c945 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -231,6 +231,7 @@ Vastaanotettu: %4$s</string>
   <string name="DeviceListItem_last_active_s">Viimeksi käytetty %s</string>
   <string name="DeviceListItem_today">tänään</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Tuntematon tiedosto</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimoi Play Servicesin puuttumista</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Tämä laite ei tue Play Servicesiä. Napsauta tästä ottaaksesi pois päältä virransäästöominaisuudet, jotka estävät Signalia hakemasta viestejä taustalla.</string>
@@ -320,8 +321,8 @@ seuraa niiden uudelleentuonnista viestien kaksoiskappaleita.</string>
   <string name="InviteActivity_invitations_sent">Kutsut lähetetty!</string>
   <string name="InviteActivity_invite_to_signal">Kutsu Signaliin</string>
   <plurals name="InviteActivity_send_sms_to_friends">
-    <item quantity="one">LÄHETÄ SMS 1 YSTÄVÄLLE</item>
-    <item quantity="other">LÄHETÄ SMS %d YSTÄVÄLLE</item>
+    <item quantity="one">LÄHETÄ TEKSTIVIESTI 1 YSTÄVÄLLE</item>
+    <item quantity="other">LÄHETÄ TEKSTIVIESTI %d YSTÄVÄLLE</item>
   </plurals>
   <plurals name="InviteActivity_send_sms_invites">
     <item quantity="one">Lähetä 1 SMS-kutsu?</item>
@@ -366,6 +367,7 @@ seuraa niiden uudelleentuonnista viestien kaksoiskappaleita.</string>
   <string name="MessageRecord_s_called_you">%s soitti sinulle</string>
   <string name="MessageRecord_called_s">Soitit puhelun: %s</string>
   <string name="MessageRecord_missed_call_from">Vastaamatta jäänyt puhelu: %s</string>
+  <string name="MessageRecord_s_joined_signal">%s liittyi Signaliin</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Sinä asetit viestien katoamisajan: %1$s</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s asetti viestien katoamisajan: %2$s</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">Sinun ja yhteystiedon %s turvanumero on vaihtunut.</string>
@@ -484,6 +486,7 @@ Tarkista vielä, että tämä on varmasti numerosi! Aiomme seuraavaksi vahvistaa
   <string name="RegistrationProgressActivity_too_many_requests">Liian monta pyyntöä!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Olet jo äskettäin pyytänyt puhelua. Voit pyytää uutta puhelua 20 minuutin kuluttua.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Rekisteröintiristiriita</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Tämä numero on jo rekisteröity toiselle Signal-palvelimelle. Sinun täytyy  vapauttaa rekisteröinti ennen uudelleenrekisteröitymistä.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Rekisteröinti suoritettu</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">Signalin rekisteröityminen onnistui.</string>
@@ -511,6 +514,7 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <string name="ThreadRecord_called_you">Soitti sinulle</string>
   <string name="ThreadRecord_missed_call">Vastaamatta jäänyt puhelu</string>
   <string name="ThreadRecord_media_message">Mediaviesti</string>
+  <string name="ThreadRecord_s_joined_signal">%s liittyi Signaliin</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Katoavien viestien ajaksi asetettu %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">Sinun ja yhteystiedon %s turvanumero on vaihtunut.</string>
   <!--UpdateApkReadyListener-->
@@ -587,6 +591,7 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Pikavastaus ei toimi, kun Signal on lukittu!</string>
   <string name="QuickResponseService_problem_sending_message">Ongelma viestin lähettämisessä!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Avaa hakemisto</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Uusi viesti</string>
@@ -599,12 +604,8 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Käytä video-tilaa napsauttamalla</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Kuva</string>
-  <string name="attachment_type_selector__image_description">Kuva</string>
   <string name="attachment_type_selector__audio">Äänitallenne</string>
   <string name="attachment_type_selector__audio_description">Äänitallenne</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Yhteystieto</string>
   <string name="attachment_type_selector__contact_description">Yhteystieto</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -634,6 +635,9 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Keskustelu mykistetty</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Signal-viesti</string>
+  <string name="conversation_activity__type_message_sms_insecure">Salaamaton SMS-viesti</string>
+  <string name="conversation_activity__type_message_mms_insecure">Salaamaton MMS-viesti</string>
   <string name="conversation_activity__from_sim_name">SIM-kortilta %1$s</string>
   <string name="conversation_activity__send">Lähetä</string>
   <string name="conversation_activity__remove">Poista</string>
@@ -876,7 +880,11 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="arrays__images">Kuvat</string>
   <string name="arrays__audio">Äänitallenteet</string>
   <string name="arrays__video">Videot</string>
+  <string name="arrays__documents">Dokumentit</string>
+  <string name="arrays__small">Pieni</string>
   <string name="arrays__normal">Normaali</string>
+  <string name="arrays__large">Suuri</string>
+  <string name="arrays__extra_large">Erittäin suuri</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tunti</item>
@@ -990,6 +998,9 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Tuki seuraavan sukupolven video- ja äänipuheluille, jos asetus on päällä molemmilla osapuolilla. Tämä on vielä beta-vaiheessa.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Välitä kaikki puhelut Signal-palvelimen kautta välttääksesi IP-osoitteesi paljastumista yhteystiedollesi. Tämä toiminto heikentää puhelun laatua.</string>
   <string name="preferences_advanced__always_relay_calls">Välitä aina kaikki puhelut</string>
+  <string name="preferences_chats__chats">Keskustelut</string>
+  <string name="preferences_notifications__message_notifications">Viesti-ilmoitukset</string>
+  <string name="preferences_events__contact_joined_signal">Yhteistietosi liittyi Signaliin</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 42bb3e9378..54259ddf0c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -601,12 +601,8 @@ Réception d\'un message d\'échange de clés pour une version invalide du proto
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Appuyez pour activer votre vidéo</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Image</string>
-  <string name="attachment_type_selector__image_description">Image</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Vidéo</string>
-  <string name="attachment_type_selector__video_description">Vidéo</string>
   <string name="attachment_type_selector__contact">Contact</string>
   <string name="attachment_type_selector__contact_description">Contact</string>
   <string name="attachment_type_selector__camera">Appareil photo</string>
@@ -1016,6 +1012,7 @@ par SMS.</string>
   <string name="preferences_chats__show_invitation_prompts">Afficher les invitations</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Afficher les invitations pour les contacts sans Signal</string>
   <string name="preferences_chats__message_text_size">Taille de la police du message</string>
+  <string name="preferences_events__contact_joined_signal">Votre contact a rejoint Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ff5fa1a512..4aa3f447ff 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -477,9 +477,7 @@
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imaxe</string>
   <string name="attachment_type_selector__audio">Audio</string>
-  <string name="attachment_type_selector__video">Vídeo</string>
   <string name="attachment_type_selector__contact">Contacto</string>
   <string name="attachment_type_selector__camera">Cámara</string>
   <string name="attachment_type_selector__location">Localización</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1b0150a279..3c25848421 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -624,12 +624,8 @@ Primljena poruka razmjene ključeva za pogrešnu inačicu protokola.</string>
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Pritisnite da omogućite svoj video</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Slika</string>
-  <string name="attachment_type_selector__image_description">Slika</string>
   <string name="attachment_type_selector__audio">Zvuk</string>
   <string name="attachment_type_selector__audio_description">Zvuk</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -1047,6 +1043,7 @@ neuspješno.</string>
   <string name="preferences_chats__show_invitation_prompts">Prikaži upite za pozivnice</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Prikaži upite za pozivnice za kontakte koji ne koriste Signal</string>
   <string name="preferences_chats__message_text_size">Veličina fonta poruke</string>
+  <string name="preferences_events__contact_joined_signal">Kontakt se prijavio/la u Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 265303fe77..c4703b5a45 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -77,14 +77,14 @@
   <string name="ConversationItem_expires_s">Lejár: %s</string>
   <string name="ConversationItem_error_not_delivered">Nincs kézbesítve</string>
   <string name="ConversationItem_view_secure_media_question">Megnézed a titkosított médiát?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ez a média egy titkosított adatbázisban van tárolva. Sajnos, hogy megnézd egy külső tartalommegjelenítőben, jelenleg szükséges, hogy az adat átmenetileg dekódolva és kiírva legyen a tárolóra. Biztosan ezt szeretnéd tenni?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ez a média egy titkosított adatbázisban van tárolva. Sajnos, hogy megnézd egy külső tartalommegjelenítőben, jelenleg szükséges, hogy az adat átmenetileg visszafejtve és kiírva legyen a tárolóra. Biztosan ezt szeretnéd tenni?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Hiba, elévült kulcs-csere üzenet érkezett.</string>
   <string name="ConversationItem_received_key_exchange_message_tap_to_process">Kulcs-csere üzenet érkezett, érints a feldolgozáshoz.</string>
   <string name="ConversationItem_group_action_left">%1$s elhagyta a csoportot.</string>
   <string name="ConversationItem_click_for_details">Érints a részletekért</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Érints a védtelen visszaálláshoz</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Visszaállás védtelen SMS-re?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Visszaállás védtelen MMS-re?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Visszaállás titkosítatlan SMS-re?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Visszaállás titkosítatlan MMS-re?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ez az üzenet <b>nem</b> lesz titkosítva, mert a címzett már nem Signal felhasználó.\n\nVédtelen üzenet küldése?</string>
   <string name="ConversationItem_unable_to_open_media">Nem található alkalmazás ez a média megnyitásához.</string>
   <string name="ConversationItem_from_s">tőle: %s</string>
@@ -545,21 +545,21 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="KeyExchangeInitiator_send">Küldés</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Rossz titkosított üzenet</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Dekódolás, kérlek várj...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Visszafejtés, kérlek várj...</string>
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Üzenet titkosítva nem létező munkamenethez</string>
   <!--EncryptingSmsDatabase-->
-  <string name="EncryptingSmsDatabase_error_decrypting_message">Hiba az üzenet dekódolása közben.</string>
+  <string name="EncryptingSmsDatabase_error_decrypting_message">Hiba az üzenet visszafejtése közben.</string>
   <!--ThreadDatabase-->
-  <string name="ThreadDatabase_error_decrypting_message">Hiba az üzenet dekódolása közben.</string>
+  <string name="ThreadDatabase_error_decrypting_message">Hiba az üzenet visszafejtése közben.</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Kapcsolódás az MMS kiszolgálóhoz...</string>
   <string name="MmsDatabase_downloading_mms">MMS letöltése...</string>
   <string name="MmsDatabase_mms_download_failed">MMS letöltés sikertelen!</string>
   <string name="MmsDatabase_downloading">Letöltés...</string>
   <string name="MmsDatabase_mms_pending_download">Érints és add meg az MMS beállításokat a letöltés folyatásához.</string>
-  <string name="MmsDatabase_error_decrypting_message">Hiba az üzenet dekódolása közben.</string>
+  <string name="MmsDatabase_error_decrypting_message">Hiba az üzenet visszafejtése közben.</string>
   <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS dekódolása, kérlek várj...</string>
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS visszafejtése, kérlek várj...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Rossz titkosított MMS üzenet</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS üzenet titkosítva nem létező munkamenethez</string>
   <!--MuteDialog-->
@@ -618,12 +618,8 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Érints a videód engedélyezéséhez</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Kép</string>
-  <string name="attachment_type_selector__image_description">Kép</string>
   <string name="attachment_type_selector__audio">Hang</string>
   <string name="attachment_type_selector__audio_description">Hang</string>
-  <string name="attachment_type_selector__video">Videó</string>
-  <string name="attachment_type_selector__video_description">Videó</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -653,6 +649,9 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Beszélgetés némítva</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Signal üzenet</string>
+  <string name="conversation_activity__type_message_sms_insecure">Nem biztonságos SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Nem biztonságos MMS</string>
   <string name="conversation_activity__from_sim_name">%1$s hálózaton</string>
   <string name="conversation_activity__send">Küldés</string>
   <string name="conversation_activity__remove">Eltávolítás</string>
@@ -924,7 +923,10 @@ sikertelen.
   <string name="arrays__audio">Hang</string>
   <string name="arrays__video">Videó</string>
   <string name="arrays__documents">Dokumentumok</string>
+  <string name="arrays__small">Kicsi</string>
   <string name="arrays__normal">Normál</string>
+  <string name="arrays__large">Nagy</string>
+  <string name="arrays__extra_large">Extra nagy</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d óra</item>
@@ -1038,6 +1040,15 @@ sikertelen.
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Támogatás a következő generációs videó- és hanghívásokhoz, amikor mindkét félnél engedélyezve van. Ez a funkció jelenleg beta.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Összes hívás átjátszása a Signal kiszolgálón, elkerülve az IP címed felfedését a kontaktodnak. Az engedélyezése csökkenteni fogja a hívásminőséget.</string>
   <string name="preferences_advanced__always_relay_calls">Hívások átjátszása mindig</string>
+  <string name="preferences_app_protection__app_access">Alkalmazás hozzáférés</string>
+  <string name="preferences_app_protection__communication">Kommunikáció</string>
+  <string name="preferences_chats__chats">Csevegések</string>
+  <string name="preferences_notifications__message_notifications">Üzenet értesítések</string>
+  <string name="preferences_notifications__events">Események</string>
+  <string name="preferences_chats__show_invitation_prompts">Meghívó mutatása</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Meghívók megjelenítése a Signal nélküli kontaktokhoz</string>
+  <string name="preferences_chats__message_text_size">Üzenet betűméret</string>
+  <string name="preferences_events__contact_joined_signal">Kontakt csatlakozott a Signal-hoz</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9f677f65af..5b0be0ae76 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -529,9 +529,7 @@ Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <string name="WebRtcCallScreen_new_safety_number_title">Angka keamanan baru</string>
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Gambar</string>
   <string name="attachment_type_selector__audio">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
   <string name="attachment_type_selector__contact">Kontak</string>
   <string name="attachment_type_selector__camera">Kamera</string>
   <string name="attachment_type_selector__location">Lokasi</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9629cc8349..538fe81704 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -603,12 +603,8 @@ Ricevuto un messaggio di scambio chiavi per una versione di protocollo non valid
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Tocca per abilitare il tuo video</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Immagine</string>
-  <string name="attachment_type_selector__image_description">Immagine</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Contatto</string>
   <string name="attachment_type_selector__contact_description">Contatto</string>
   <string name="attachment_type_selector__camera">Fotocamera</string>
@@ -638,6 +634,9 @@ Ricevuto un messaggio di scambio chiavi per una versione di protocollo non valid
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversazione mutata</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Messaggio Signal</string>
+  <string name="conversation_activity__type_message_sms_insecure">SMS non sicuro</string>
+  <string name="conversation_activity__type_message_mms_insecure">MMS non sicuro</string>
   <string name="conversation_activity__from_sim_name">Da %1$s</string>
   <string name="conversation_activity__send">Invia</string>
   <string name="conversation_activity__remove">Elimina</string>
@@ -894,7 +893,10 @@ non riuscita.
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Documenti</string>
+  <string name="arrays__small">Piccolo</string>
   <string name="arrays__normal">Normale</string>
+  <string name="arrays__large">Grande</string>
+  <string name="arrays__extra_large">Enorme</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ora</item>
@@ -1008,6 +1010,15 @@ non riuscita.
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Supporta le telefonate e videochiamate di ultimissima generazione quando abilitata da entrambi le parti. Questa funzionalità è in versione beta.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Ritrasmetti le chiamate attraverso i server di Signal per non rivelare il tuo indirizzo IP ai tuoi contatti. Abilitandolo verrà ridotta la qualità della chiamata.</string>
   <string name="preferences_advanced__always_relay_calls">Ritrasmetti sempre le chiamate</string>
+  <string name="preferences_app_protection__app_access">Accesso app</string>
+  <string name="preferences_app_protection__communication">Comunicazione</string>
+  <string name="preferences_chats__chats">Conversazioni</string>
+  <string name="preferences_notifications__message_notifications">Notifiche messaggi</string>
+  <string name="preferences_notifications__events">Eventi</string>
+  <string name="preferences_chats__show_invitation_prompts">Mostra i messaggi di invito</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Visualizza messaggio di invito per i contatti senza Signal</string>
+  <string name="preferences_chats__message_text_size">Dimensione carattere messaggio</string>
+  <string name="preferences_events__contact_joined_signal">Un nuovo contatto si è unito a Signal!</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5fba054925..9075ff0709 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -600,12 +600,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">יש ללחוץ כדי להפעיל את הווידאו שלך</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">תמונה</string>
-  <string name="attachment_type_selector__image_description">תמונה</string>
   <string name="attachment_type_selector__audio">קול</string>
   <string name="attachment_type_selector__audio_description">שמע</string>
-  <string name="attachment_type_selector__video">סרט</string>
-  <string name="attachment_type_selector__video_description">סרטון</string>
   <string name="attachment_type_selector__contact">איש קשר</string>
   <string name="attachment_type_selector__contact_description">איש קשר</string>
   <string name="attachment_type_selector__camera">מצלמה</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3fa6c3558c..304ff8bab6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -211,6 +211,7 @@
   <string name="DeviceListItem_last_active_s">最終活動 %s</string>
   <string name="DeviceListItem_today">今日</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">不明なファイル</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">欠けているGoogle Play開発者サービスに最適化する</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">この端末はGoogle Play開発者サービスをサポートしていません。タップして，休眠中の通信を止めるバッテリー最適化機能を切ってください。</string>
@@ -560,6 +561,7 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signalのロック中はクイック・レスポンスは使えません</string>
   <string name="QuickResponseService_problem_sending_message">メッセージ送信で問題発生</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">フォルダを開ける</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">新規メッセージ</string>
@@ -572,12 +574,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">タップして動画を有効する</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">画像</string>
-  <string name="attachment_type_selector__image_description">画像</string>
   <string name="attachment_type_selector__audio">音声</string>
   <string name="attachment_type_selector__audio_description">音声</string>
-  <string name="attachment_type_selector__video">動画</string>
-  <string name="attachment_type_selector__video_description">動画</string>
   <string name="attachment_type_selector__contact">連絡先</string>
   <string name="attachment_type_selector__contact_description">連絡先</string>
   <string name="attachment_type_selector__camera">カメラ</string>
@@ -607,6 +605,9 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">会話を消音</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">メッセージ</string>
+  <string name="conversation_activity__type_message_sms_insecure">安全でないSMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">安全でないMMS</string>
   <string name="conversation_activity__from_sim_name">%1$sから</string>
   <string name="conversation_activity__send">送信</string>
   <string name="conversation_activity__remove">削除</string>
@@ -833,7 +834,10 @@
   <string name="arrays__audio">音声</string>
   <string name="arrays__video">動画</string>
   <string name="arrays__documents">文書</string>
+  <string name="arrays__small">小さい</string>
   <string name="arrays__normal">普通</string>
+  <string name="arrays__large">大きい</string>
+  <string name="arrays__extra_large">非常に大きい</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d時間前</item>
@@ -946,6 +950,15 @@
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">次世代のビデオ音声通話を有効にする（相手も有効にした場合）。この機能はβ版です。</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">すべての通話をSignalサーバーに中継して，IPアドレスが相手に漏れることを防ぐ。ただし通話の質は下がります。</string>
   <string name="preferences_advanced__always_relay_calls">いつも中継する</string>
+  <string name="preferences_app_protection__app_access">アプリのアクセス</string>
+  <string name="preferences_app_protection__communication">通信</string>
+  <string name="preferences_chats__chats">チャット</string>
+  <string name="preferences_notifications__message_notifications">メッセージの通知</string>
+  <string name="preferences_notifications__events">イベント</string>
+  <string name="preferences_chats__show_invitation_prompts">招待状を表示</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Signalを持っていない連絡先に招待状を表示する</string>
+  <string name="preferences_chats__message_text_size">メッセージのフォントの大きさ</string>
+  <string name="preferences_events__contact_joined_signal">連絡先がSignalに参加しました</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ce1b4cea8c..d8e5582439 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -586,12 +586,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">ចុច ដើម្បីបើកវីដេអូរបស់អ្នក</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">រូបភាព</string>
-  <string name="attachment_type_selector__image_description">រូបភាព</string>
   <string name="attachment_type_selector__audio">សំឡេង</string>
   <string name="attachment_type_selector__audio_description">សំឡេង</string>
-  <string name="attachment_type_selector__video">វីដេអូ</string>
-  <string name="attachment_type_selector__video_description">វីដេអូ</string>
   <string name="attachment_type_selector__contact">ទំនាក់ទំនង</string>
   <string name="attachment_type_selector__contact_description">ទំនាក់ទំនង</string>
   <string name="attachment_type_selector__camera">កាមេរ៉ា</string>
@@ -621,6 +617,9 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">បិទសំឡេងការសន្ទនា</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">សារ Signal</string>
+  <string name="conversation_activity__type_message_sms_insecure">SMS គ្មានសុវត្ថិភាព</string>
+  <string name="conversation_activity__type_message_mms_insecure">MMS គ្មានសុវត្ថិភាព</string>
   <string name="conversation_activity__from_sim_name">ពី %1$s</string>
   <string name="conversation_activity__send">ផ្ញើ</string>
   <string name="conversation_activity__remove">លុប</string>
@@ -867,7 +866,10 @@
   <string name="arrays__audio">សំឡេង</string>
   <string name="arrays__video">វីដេអូ</string>
   <string name="arrays__documents">ឯកសារ</string>
+  <string name="arrays__small">តូច</string>
   <string name="arrays__normal">ធម្មតា</string>
+  <string name="arrays__large">ធំ</string>
+  <string name="arrays__extra_large">ធំបំផុត</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d ម៉ោង</item>
@@ -980,6 +982,15 @@
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">គាំទ្រការហៅវីដេអូនិងសំឡេង សម្រាប់ជំនាន់ក្រោយ នៅពេលត្រូវបានបើកដោយភាគីទាំងពីរ។ នេះជាមុខងារសាកល្បង។</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">បញ្ជូនការហៅទូរស័ព្ទទាំងអស់តាមរយៈម៉ាស៊ីនមេ Signal ដើម្បីជៀសវាងការបង្ហាញអាសយដ្ឋាន IP របស់អ្នកទៅកាន់លេខទំនាក់ទំនងរបស់អ្នក។ ការអនុញ្ញាតនេះនឹងកាត់បន្ថយគុណភាពការហៅ។</string>
   <string name="preferences_advanced__always_relay_calls">តែងតែបញ្ជូនការហៅ</string>
+  <string name="preferences_app_protection__app_access">ចូលប្រើប្រាស់កម្មវិធី</string>
+  <string name="preferences_app_protection__communication">ការទំនាក់ទំនង</string>
+  <string name="preferences_chats__chats">ការជជែក</string>
+  <string name="preferences_notifications__message_notifications">សារផ្តល់ដំណឹង</string>
+  <string name="preferences_notifications__events">ព្រឹត្តិការណ៍</string>
+  <string name="preferences_chats__show_invitation_prompts">បង្ហាញការណែនាំលិខិតអញ្ជើញ</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">បង្ហាញការណែនាំលិខិតអញ្ជើញ សម្រាប់លេខទំនាក់ទំនង ក្រៅពី Signal</string>
+  <string name="preferences_chats__message_text_size">ទំហំអក្សរសារ</string>
+  <string name="preferences_events__contact_joined_signal">ទាក់ទងចូលរួម Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 81582e6ae6..e8f4afe762 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -502,12 +502,8 @@
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">이미지</string>
-  <string name="attachment_type_selector__image_description">이미지</string>
   <string name="attachment_type_selector__audio">오디오</string>
   <string name="attachment_type_selector__audio_description">오디오</string>
-  <string name="attachment_type_selector__video">동영상</string>
-  <string name="attachment_type_selector__video_description">동영상</string>
   <string name="attachment_type_selector__contact">연락처</string>
   <string name="attachment_type_selector__contact_description">연락처</string>
   <string name="attachment_type_selector__camera">카메라</string>
diff --git a/res/values-lg/strings.xml b/res/values-lg/strings.xml
index 0fafe845e4..89c211519a 100644
--- a/res/values-lg/strings.xml
+++ b/res/values-lg/strings.xml
@@ -497,9 +497,7 @@ Dammu okebere e namba yo.  Tugenda kugikakasa no bubaka ku simu</string>
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">kifananyi</string>
   <string name="attachment_type_selector__audio">doboozi</string>
-  <string name="attachment_type_selector__video">Akatambi</string>
   <string name="attachment_type_selector__contact">Contact</string>
   <string name="attachment_type_selector__camera">Camera</string>
   <string name="attachment_type_selector__location">wosangibwa</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 470e95a63d..dc90989c69 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -633,12 +633,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Bakstelėkite, norėdami įjungti savo vaizdą</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Paveikslas</string>
-  <string name="attachment_type_selector__image_description">Paveikslas</string>
   <string name="attachment_type_selector__audio">Garsas</string>
   <string name="attachment_type_selector__audio_description">Garso įrašai</string>
-  <string name="attachment_type_selector__video">Vaizdas</string>
-  <string name="attachment_type_selector__video_description">Vaizdo įrašai</string>
   <string name="attachment_type_selector__contact">Kontaktas</string>
   <string name="attachment_type_selector__contact_description">Kontaktas</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -647,6 +643,10 @@
   <string name="attachment_type_selector__location_description">Vieta</string>
   <string name="attachment_type_selector__gif">GIF</string>
   <string name="attachment_type_selector__gif_description">Gif</string>
+  <string name="attachment_type_selector__gallery_description">Paveikslas ar vaizdo įrašas</string>
+  <string name="attachment_type_selector__document_description">Dokumentas</string>
+  <string name="attachment_type_selector__gallery">Galerija</string>
+  <string name="attachment_type_selector__document">Dokumentas</string>
   <string name="attachment_type_selector__drawer_description">Perjungti priedų stalčių</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Sena slaptafrazė</string>
@@ -1071,9 +1071,12 @@ yra prisijungęs prie belaidžio (Wi-Fi) arba duomenų perdavimo tinklo.
   <string name="preferences_chats__chats">Pokalbiai</string>
   <string name="preferences_notifications__message_notifications">Žinučių pranešimai</string>
   <string name="preferences_notifications__events">Įvykiai</string>
+  <string name="preferences_notifications__in_chat_sounds">Garsai pokalbiuose</string>
+  <string name="preferences_notifications__show">Rodyti</string>
   <string name="preferences_chats__show_invitation_prompts">Rodyti pakvietimų užklausas</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Rodyti pakvietimų užklausas kontaktams, kurie neturi Signal</string>
   <string name="preferences_chats__message_text_size">Žinučių šrifto dydis</string>
+  <string name="preferences_events__contact_joined_signal">Kontaktas prisijungė prie Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6e46fd56e4..4c9d418ef2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -557,12 +557,8 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversion.</string>
   <string name="WebRtcCallScreen_new_safety_number_title">Ny sikkerhets nummer</string>
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Bilde</string>
-  <string name="attachment_type_selector__image_description">Bilde</string>
   <string name="attachment_type_selector__audio">Lyd</string>
   <string name="attachment_type_selector__audio_description">Lyd</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 360fb3b8cf..aea242c33d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -601,12 +601,8 @@ Sleuteluitwisselingsbericht ontvangen voor een verkeerde protocol-versie.</strin
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Tik om je video in te schakelen</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Afbeelding</string>
-  <string name="attachment_type_selector__image_description">Afbeelding</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Contactpersoon</string>
   <string name="attachment_type_selector__contact_description">Contactpersoon</string>
   <string name="attachment_type_selector__camera">Camera</string>
@@ -1011,6 +1007,7 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="preferences_chats__show_invitation_prompts">Uitnodigings vragen tonen</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Toon een vraag of contacten zonder Signal uitgenodigd moeten worden</string>
   <string name="preferences_chats__message_text_size">Tekstgrootte voor berichten</string>
+  <string name="preferences_events__contact_joined_signal">Contact gebruikt nu Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
index 1993671e12..9b632930b9 100644
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -607,12 +607,8 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Trykk for å skru på videoen din</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Bilete</string>
-  <string name="attachment_type_selector__image_description">Bilete</string>
   <string name="attachment_type_selector__audio">Lyd</string>
   <string name="attachment_type_selector__audio_description">Lyd</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -1026,6 +1022,7 @@ Signal fekk tidsavbrot ved venting på stadfestingsmeldinga.</string>
   <string name="preferences_chats__show_invitation_prompts">Oppfordring om invitering</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Vis oppfordring om å invitera kontaktar som ikkje har Signal</string>
   <string name="preferences_chats__message_text_size">Skriftstorleik i meldingar</string>
+  <string name="preferences_events__contact_joined_signal">Ein kontakt tok i bruk Signal!</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -1129,7 +1126,7 @@ Signal fekk tidsavbrot ved venting på stadfestingsmeldinga.</string>
   <string name="reminder_header_push_text">Oppgrader kommunikasjonsopplevinga.</string>
   <string name="reminder_header_push_button">SLÅ PÅ</string>
   <string name="reminder_header_invite_title">Inviter til Signal</string>
-  <string name="reminder_header_invite_text">Ta samtalen med %1$sjå til neste nivå.</string>
+  <string name="reminder_header_invite_text">Ta samtalen med %1$s til neste nivå.</string>
   <string name="reminder_header_invite_button">INVITER</string>
   <string name="reminder_header_share_title">Inviter vennane dine!</string>
   <string name="reminder_header_share_text">Jo fleire vennar som brukar Signal, desto betre vert det.</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index d84930d94b..7bdc1484e6 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -524,9 +524,7 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Bilde</string>
   <string name="attachment_type_selector__audio">Lyd</string>
-  <string name="attachment_type_selector__video">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
   <string name="attachment_type_selector__location">Lokasjon</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index dea47ff42e..c1036d17ae 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -635,12 +635,8 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Dotnij, aby włączyć wideo</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Obraz</string>
-  <string name="attachment_type_selector__image_description">Obraz</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Dźwięk</string>
-  <string name="attachment_type_selector__video">Wideo</string>
-  <string name="attachment_type_selector__video_description">Wideo</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -670,6 +666,9 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Rozmowa jest wyciszona</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Wiadomość Signal</string>
+  <string name="conversation_activity__type_message_sms_insecure">Nieszyfrowany SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Nieszyfrowany MMS</string>
   <string name="conversation_activity__from_sim_name">Od %1$s</string>
   <string name="conversation_activity__send">Wyślij</string>
   <string name="conversation_activity__remove">Usuń</string>
@@ -922,7 +921,10 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Wideo</string>
   <string name="arrays__documents">Dokumenty</string>
+  <string name="arrays__small">Mały</string>
   <string name="arrays__normal">Normalnie</string>
+  <string name="arrays__large">Duży</string>
+  <string name="arrays__extra_large">Bardzo duży</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d godzina</item>
@@ -1038,6 +1040,10 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Wsparcie dla rozmów wideo i audio następnej generacji, gdy jest aktywowane przez obu rozmówców. Funkcja jest w fazie testów.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Przekazuj połączenia do serwerów Signal, aby uniknąć ujawnienia swojego IP swoim kontaktom. Włączenie tej opcji pogorszy jakość połączenia.</string>
   <string name="preferences_advanced__always_relay_calls">Zawsze przekazuj połączenia</string>
+  <string name="preferences_chats__show_invitation_prompts">Pokazuj zachętę do zaproszenia</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Pokazuj zachętę do zaproszenia kontaktów bez Signal</string>
+  <string name="preferences_chats__message_text_size">Rozmiar czcionki dla wiadomości</string>
+  <string name="preferences_events__contact_joined_signal">Kontakt dołączył do Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9b8459c5d4..c3e840af90 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -615,12 +615,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Clique para habilitar seu vídeo</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imagem</string>
-  <string name="attachment_type_selector__image_description">Imagem</string>
   <string name="attachment_type_selector__audio">Áudio</string>
   <string name="attachment_type_selector__audio_description">Áudio</string>
-  <string name="attachment_type_selector__video">Vídeo</string>
-  <string name="attachment_type_selector__video_description">Vídeo</string>
   <string name="attachment_type_selector__contact">Contato</string>
   <string name="attachment_type_selector__contact_description">Contato</string>
   <string name="attachment_type_selector__camera">Câmera</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a151dc323e..cd6d9fe153 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -134,6 +134,10 @@ que %2$s reinstalou o Signal.</string>
   <string name="ConversationActivity_error_sending_voice_message">Erro no envio de mensagem de voz</string>
   <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Não existe uma aplicação capaz de lidar com este tipo de ligação no seu dispositivo.</string>
   <!--ConversationAdapter-->
+  <plurals name="ConversationAdapter_n_unread_messages">
+    <item quantity="one">%d mensagem não lida</item>
+    <item quantity="other">%d mensagens não lidas</item>
+  </plurals>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviadas/Recebidas: %2$s</string>
@@ -225,6 +229,7 @@ que %2$s reinstalou o Signal.</string>
   <string name="DeviceListItem_last_active_s">Activo pela última vez %s</string>
   <string name="DeviceListItem_today">Hoje</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Ficheiro desconhecido</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Otimiza para os Play Services em falta.</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo não suporta os Play Services. Clica para desativar o sistema que otimização de bateria que previne o Signal de recolher mensagens quando inativo.</string>
@@ -365,6 +370,7 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <string name="MessageRecord_s_called_you">%s ligou-lhe</string>
   <string name="MessageRecord_called_s">Ligou para %s</string>
   <string name="MessageRecord_missed_call_from">Chamada perdida de %s</string>
+  <string name="MessageRecord_s_joined_signal">%s juntou-se à rede Signal!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Definiu o tempo de mensagens a desaparecer em %1$s</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s definiu o tempo de mensagens a desaparecer em %2$s</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">O seu número de segurança com %s mudou.</string>
@@ -462,6 +468,8 @@ Verifique que este é o seu número! Estamos prestes a confirmá-lo com uma SMS.
   <string name="RegistrationActivity_i_understand">Eu compreendo</string>
   <string name="RegistrationActivity_play_services_error">Erro dos Play Services</string>
   <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Os Google Play Services estão a ser atualizados ou estão temporariamente indisponíveis. Por favor, tenta outra vez.</string>
+  <string name="RegistrationActivity_more_information">Mais informação</string>
+  <string name="RegistrationActivity_less_information">Menos informação</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Problemas possíveis.</string>
   <!--RegistrationProgressActivity-->
@@ -484,6 +492,7 @@ Verifique que este é o seu número! Estamos prestes a confirmá-lo com uma SMS.
   <string name="RegistrationProgressActivity_too_many_requests">Demasiados pedidos!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Já requereu uma chamada recentemente. Pode pedir outra dentro de 20 minutos.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflito de registo</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Este número já se encontra registado num servidor Signal diferente. Tem de eliminar esse registo antes de o registar aqui.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Registo completo!</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">O registo Signal foi completado com sucesso.</string>
@@ -513,6 +522,7 @@ Mensagem de troca de chave inválida para esta versão do protocolo.
   <string name="ThreadRecord_called_you">Ligou-lhe</string>
   <string name="ThreadRecord_missed_call">Chamada perdida</string>
   <string name="ThreadRecord_media_message">Mensagem media</string>
+  <string name="ThreadRecord_s_joined_signal">%s juntou-se à rede Signal!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Tempo de mensagens a desaparecer definido para %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">O seu número de segurança com %s mudou.</string>
   <!--UpdateApkReadyListener-->
@@ -589,6 +599,7 @@ Mensagem de troca de chave inválida para esta versão do protocolo.
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A resposta rápida encontra-se indisponível quando o Signal está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">Problema no envio da mensagem!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Abrir directório</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Mensagem nova</string>
@@ -601,12 +612,8 @@ Mensagem de troca de chave inválida para esta versão do protocolo.
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Clica para ligar o teu vídeo</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imagem</string>
-  <string name="attachment_type_selector__image_description">Imagem</string>
   <string name="attachment_type_selector__audio">Áudio</string>
   <string name="attachment_type_selector__audio_description">Áudio</string>
-  <string name="attachment_type_selector__video">Vídeo</string>
-  <string name="attachment_type_selector__video_description">Vídeo</string>
   <string name="attachment_type_selector__contact">Contacto</string>
   <string name="attachment_type_selector__contact_description">Contacto</string>
   <string name="attachment_type_selector__camera">Câmara</string>
@@ -636,6 +643,9 @@ Mensagem de troca de chave inválida para esta versão do protocolo.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversa silenciada</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Mensagem Signal</string>
+  <string name="conversation_activity__type_message_sms_insecure">SMS insegura</string>
+  <string name="conversation_activity__type_message_mms_insecure">MMS insegura</string>
   <string name="conversation_activity__from_sim_name">De %1$s</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
@@ -785,6 +795,7 @@ Verifique o seu número de telefone para contactar com Signal
 NÚMERO DE TELEFONE</string>
   <string name="registration_activity__phone_number">TELEFONE</string>
   <string name="registration_activity__register">Registar</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Sinal facilita a sua comunicação, utilizando o seu número de telefone e livro de enredeços. Amigos e contactos que já conseguem falar consigo telefonicamente podem chegar até si facilmente via Signal.\n\nO registo envia alguma informação de contacto para o servidor. Esta não é armazenada.</string>
   <string name="registration_activity__powered_by_twilio">Providenciado por twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Alguns possíveis problemas
@@ -898,7 +909,11 @@ falhou.
   <string name="arrays__images">Imagens</string>
   <string name="arrays__audio">Áudio</string>
   <string name="arrays__video">Vídeo</string>
+  <string name="arrays__documents">Documentos</string>
+  <string name="arrays__small">Pequeno</string>
   <string name="arrays__normal">Normal</string>
+  <string name="arrays__large">Grande</string>
+  <string name="arrays__extra_large">Extra grande</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -1012,6 +1027,15 @@ falhou.
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Suporte para vídeo chamadas e chamadas de voz de próxima geração quando ligado por ambas as partes. Esta funcionalidade está em beta.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Retransmite todas as chamadas pelo servidor do Signal para evitar revelar o teu IP ao teu contact. Ao ligar a qualidade da chamada irá ser reduzida.</string>
   <string name="preferences_advanced__always_relay_calls">Retransmitir todas as chamadas</string>
+  <string name="preferences_app_protection__app_access">Acesso da aplicação</string>
+  <string name="preferences_app_protection__communication">Comunicação</string>
+  <string name="preferences_chats__chats">Conversas</string>
+  <string name="preferences_notifications__message_notifications">Notificações de mensagens</string>
+  <string name="preferences_notifications__events">Eventos</string>
+  <string name="preferences_chats__show_invitation_prompts">Mostrar notificações de convite</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Mostrar notificações de convite para contactos sem Signal</string>
+  <string name="preferences_chats__message_text_size">Tamanho de letra da mensagem</string>
+  <string name="preferences_events__contact_joined_signal">Um contacto juntou-se à rede Signal!</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4dc02039da..32b1d1ae9c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -621,12 +621,8 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Apasă pentru a activa video-ul tău</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imagine</string>
-  <string name="attachment_type_selector__image_description">Imagine</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Contact</string>
   <string name="attachment_type_selector__contact_description">Contact</string>
   <string name="attachment_type_selector__camera">Cameră</string>
@@ -1054,6 +1050,7 @@ SMS a eșuat.</string>
   <string name="preferences_chats__show_invitation_prompts">Afișează solicitări invatații</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Arată solicitări invitații pentru contactele fără Signal</string>
   <string name="preferences_chats__message_text_size">Marime font mesaje</string>
+  <string name="preferences_events__contact_joined_signal">Un contact a venit pe Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e1017272ce..9b32be8bd0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -635,12 +635,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Нажмите для активации видео</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Изображение</string>
-  <string name="attachment_type_selector__image_description">Изображение</string>
   <string name="attachment_type_selector__audio">Аудио</string>
   <string name="attachment_type_selector__audio_description">Аудио</string>
-  <string name="attachment_type_selector__video">Видео</string>
-  <string name="attachment_type_selector__video_description">Видео</string>
   <string name="attachment_type_selector__contact">Контакт</string>
   <string name="attachment_type_selector__contact_description">Контакт</string>
   <string name="attachment_type_selector__camera">Камера</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b7c4da6c93..12cf23d8bb 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -447,12 +447,8 @@ Bola prijatá správa vzájomnej výmeny kľúčov s neplatnou verziou protokolu
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Obrázok</string>
-  <string name="attachment_type_selector__image_description">Obrázok</string>
   <string name="attachment_type_selector__audio">Zvuk</string>
   <string name="attachment_type_selector__audio_description">Zvuk</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontak</string>
   <string name="attachment_type_selector__camera">Kamera</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 668a7fea37..68c61a6407 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -632,12 +632,8 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Tapnite za vklop videa</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Slika</string>
-  <string name="attachment_type_selector__image_description">Slika</string>
   <string name="attachment_type_selector__audio">Zvok</string>
   <string name="attachment_type_selector__audio_description">Zvok</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Stik</string>
   <string name="attachment_type_selector__contact_description">Stik</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -963,7 +959,7 @@ bila uspešna.</string>
   <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Samodejno zakleni Signal po nastavljenem času neaktivnosti</string>
   <string name="preferences__inactivity_timeout_passphrase">Geslo za zaklep aplikacije</string>
   <string name="preferences__inactivity_timeout_interval">Časovni interval za zaklep aplikacije</string>
-  <string name="preferences__notifications">Vklop/izklop</string>
+  <string name="preferences__notifications">Obvestila</string>
   <string name="preferences__enable_message_notifications">Vklopi obvestila o novih sporočilih</string>
   <string name="preferences__new_contacts_notifications">Obvestilo o novih uporabnikih</string>
   <string name="preferences__show_a_notification_for_new_signal_contacts">Prikaži obvestilo o novih uporabnikih aplikacije Signal</string>
@@ -1055,6 +1051,7 @@ bila uspešna.</string>
   <string name="preferences_chats__show_invitation_prompts">Prikazuj obvestila o povabilih</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Prikazuj obvestila o povabilih za stike, ki nimajo nameščene aplikacije Signal.</string>
   <string name="preferences_chats__message_text_size">Velikost črk v sporočilu</string>
+  <string name="preferences_events__contact_joined_signal">Oseba iz imenika se je pridružila Signalu</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index fd735d91ae..7ae81c7419 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -603,12 +603,8 @@ U pranua mesazh për shkembim çelsash për një verzion të protokolli jo valid
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Prek për të aktivizuar videon tënd</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Imazh</string>
-  <string name="attachment_type_selector__image_description">Pamje</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__audio_description">Audio</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 81d77d785c..1187a9e849 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -625,12 +625,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Тапните да укључите ваш видео</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Слика</string>
-  <string name="attachment_type_selector__image_description">Слика</string>
   <string name="attachment_type_selector__audio">Звук</string>
   <string name="attachment_type_selector__audio_description">Звук</string>
-  <string name="attachment_type_selector__video">Видео</string>
-  <string name="attachment_type_selector__video_description">Видео</string>
   <string name="attachment_type_selector__contact">Контакт</string>
   <string name="attachment_type_selector__contact_description">Контакт</string>
   <string name="attachment_type_selector__camera">Камера</string>
@@ -1032,6 +1028,10 @@
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Подршка за видео и гласовне позиве следеће генерације ако су укључени за обе стране. Ова функционалност је у пробној фази.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Преусмеравање свих позива преко Сигналовог сервера да би се избегло откривање ваше ИП адресе вашем контакту.  Умањује квалитет позива.</string>
   <string name="preferences_advanced__always_relay_calls">Увек преусмеравај позиве</string>
+  <string name="preferences_chats__chats">Ћаскања</string>
+  <string name="preferences_notifications__events">Догађаји</string>
+  <string name="preferences_chats__message_text_size">Величина фонта поруке</string>
+  <string name="preferences_events__contact_joined_signal">Контакт се придружио Сигналу</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5e74b79e2a..01befc1059 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -85,6 +85,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Använd okrypterat MMS istället?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Detta meddelande kommer <b>inte</b> krypteras eftersom mottagaren inte längre är en Signal-användare. \n\nSkicka osäkert meddelande?</string>
   <string name="ConversationItem_unable_to_open_media">Kan ej hitta app som kan öppna denna fil.</string>
+  <string name="ConversationItem_copied_text">Kopierade %s</string>
   <string name="ConversationItem_from_s">från %s</string>
   <string name="ConversationItem_to_s">till %s</string>
   <!--ConversationActivity-->
@@ -603,12 +604,8 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Tryck för att aktivera video</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Bild</string>
-  <string name="attachment_type_selector__image_description">Bild</string>
   <string name="attachment_type_selector__audio">Ljud</string>
   <string name="attachment_type_selector__audio_description">Ljud</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__contact_description">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -617,6 +614,10 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="attachment_type_selector__location_description">Plats</string>
   <string name="attachment_type_selector__gif">GIF</string>
   <string name="attachment_type_selector__gif_description">Gif</string>
+  <string name="attachment_type_selector__gallery_description">Bild eller video</string>
+  <string name="attachment_type_selector__document_description">Dokument</string>
+  <string name="attachment_type_selector__gallery">Galleri</string>
+  <string name="attachment_type_selector__document">Dokument</string>
   <string name="attachment_type_selector__drawer_description">Dölj/visa bilagor</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Gammal lösenfras</string>
@@ -891,6 +892,9 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="arrays__normal">Normal</string>
   <string name="arrays__large">Stor</string>
   <string name="arrays__extra_large">Extra stor</string>
+  <string name="arrays__default">Standard</string>
+  <string name="arrays__high">Hög</string>
+  <string name="arrays__max">Max</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d timme</item>
@@ -1009,9 +1013,13 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences_chats__chats">Chatt</string>
   <string name="preferences_notifications__message_notifications">Meddelandenotifieringar</string>
   <string name="preferences_notifications__events">Händelser</string>
+  <string name="preferences_notifications__in_chat_sounds">Ljud i chatter</string>
+  <string name="preferences_notifications__show">Visa</string>
   <string name="preferences_chats__show_invitation_prompts">Visa inbjudningsmeddelande</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Visa inbjudningsmeddelande för kontakter utan Signal</string>
   <string name="preferences_chats__message_text_size">Teckenstorlek för meddelande</string>
+  <string name="preferences_events__contact_joined_signal">Kontakt anslöt sig till Signal</string>
+  <string name="preferences_notifications__priority">Prioritet</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 1346c87c9b..1dccb58dcd 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -414,9 +414,7 @@
   <!--WebRtcCallScreen-->
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">படம்</string>
   <string name="attachment_type_selector__audio">கேள்</string>
-  <string name="attachment_type_selector__video">காணொளி</string>
   <string name="attachment_type_selector__contact">தொடர்பு</string>
   <string name="attachment_type_selector__camera">நிழற்படக்கருவி</string>
   <string name="attachment_type_selector__location">இடம்</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 21458b56a5..1b8a43556b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -578,12 +578,8 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">Videonuzu etkinleştirmek için dokunun</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Resim</string>
-  <string name="attachment_type_selector__image_description">Resim</string>
   <string name="attachment_type_selector__audio">Ses</string>
   <string name="attachment_type_selector__audio_description">Ses</string>
-  <string name="attachment_type_selector__video">Video</string>
-  <string name="attachment_type_selector__video_description">Video</string>
   <string name="attachment_type_selector__contact">Kişi</string>
   <string name="attachment_type_selector__contact_description">Kişi</string>
   <string name="attachment_type_selector__camera">Kamera</string>
@@ -613,6 +609,9 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Sohbet sessize alındı</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Signal mesajı</string>
+  <string name="conversation_activity__type_message_sms_insecure">Güvensiz SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Güvensiz MMS</string>
   <string name="conversation_activity__from_sim_name">Gönderen %1$s</string>
   <string name="conversation_activity__send">Gönder</string>
   <string name="conversation_activity__remove">Kaldır</string>
@@ -856,7 +855,10 @@ başarısız.</string>
   <string name="arrays__audio">Ses</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Belgeler</string>
+  <string name="arrays__small">Küçük</string>
   <string name="arrays__normal">Normal</string>
+  <string name="arrays__large">Büyük</string>
+  <string name="arrays__extra_large">Çok büyük</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d saat</item>
@@ -969,6 +971,10 @@ başarısız.</string>
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Her iki tarafta etkinleştirildiğinde gelecek nesil görüntü ve sesli aramaları destekle. Bu özellik deneme aşamasındadır.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Karşımdaki kişiye IP adresimi göstermemek için tüm aramaları Signal sunucuları aracılığı ile ilet. Bunu etkinleştirmek arama kalitesini düşürür.</string>
   <string name="preferences_advanced__always_relay_calls">Tüm aramaları aracı ile ilet</string>
+  <string name="preferences_app_protection__communication">İletişim</string>
+  <string name="preferences_notifications__message_notifications">Mesaj bildirimleri</string>
+  <string name="preferences_chats__message_text_size">Mesaj font boyutu</string>
+  <string name="preferences_events__contact_joined_signal">Kişi Signal\'e katıldı</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 56ff36335e..8d44c7b743 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -607,12 +607,8 @@
   <string name="WebRtcCallScreen_new_safety_number_title">Новий номер безпеки</string>
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Зображення</string>
-  <string name="attachment_type_selector__image_description">Зображення</string>
   <string name="attachment_type_selector__audio">Аудіо</string>
   <string name="attachment_type_selector__audio_description">Аудіо</string>
-  <string name="attachment_type_selector__video">Відео</string>
-  <string name="attachment_type_selector__video_description">Відео</string>
   <string name="attachment_type_selector__contact">Контакт</string>
   <string name="attachment_type_selector__contact_description">Контакт</string>
   <string name="attachment_type_selector__camera">Камера</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 04bcb357fd..b0e12a45d7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -498,9 +498,7 @@ Nhận thông tin trao đổi chìa khóa về phiên bản giao thức không h
   <string name="WebRtcCallScreen_you_may_wish_to_verify_this_contact">Bạn có thể sẽ cần xác minh mã số an toàn với liên hệ này.</string>
   <!--WebRtcCallControls-->
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">Hình ảnh</string>
   <string name="attachment_type_selector__audio">Âm thanh</string>
-  <string name="attachment_type_selector__video">Đoạn phim</string>
   <string name="attachment_type_selector__contact">Liên lạc</string>
   <string name="attachment_type_selector__camera">Máy ảnh</string>
   <string name="attachment_type_selector__location">Vị trí</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 790571e942..3390f65fb3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -581,12 +581,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">点击以启用你的视频</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">图片</string>
-  <string name="attachment_type_selector__image_description">图片</string>
   <string name="attachment_type_selector__audio">音频</string>
   <string name="attachment_type_selector__audio_description">音频</string>
-  <string name="attachment_type_selector__video">视频</string>
-  <string name="attachment_type_selector__video_description">视频</string>
   <string name="attachment_type_selector__contact">联系人</string>
   <string name="attachment_type_selector__contact_description">联系人</string>
   <string name="attachment_type_selector__camera">相机</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b5e5fadaf1..ba144b0c0d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -591,12 +591,8 @@
   <!--WebRtcCallControls-->
   <string name="WebRtcCallControls_tap_to_enable_your_video">輕觸開啟你的視訊</string>
   <!--attachment_type_selector-->
-  <string name="attachment_type_selector__image">圖片</string>
-  <string name="attachment_type_selector__image_description">圖片</string>
   <string name="attachment_type_selector__audio">音訊</string>
   <string name="attachment_type_selector__audio_description">音訊</string>
-  <string name="attachment_type_selector__video">影片</string>
-  <string name="attachment_type_selector__video_description">影片</string>
   <string name="attachment_type_selector__contact">聯絡人</string>
   <string name="attachment_type_selector__contact_description">聯絡人</string>
   <string name="attachment_type_selector__camera">相機</string>
@@ -1000,6 +996,7 @@ Signal 在等待簡訊驗證時超時。</string>
   <string name="preferences_chats__show_invitation_prompts">顯示邀請提示</string>
   <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">不用 Signal 來顯示給聯絡人的邀請提示</string>
   <string name="preferences_chats__message_text_size">訊息字體大小</string>
+  <string name="preferences_events__contact_joined_signal">聯絡人已加入 Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->