diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 9463a6f1c0..a2cf71f900 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -2981,6 +2981,9 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <string name="EmojiSearchFragment__no_results_found">No s\'ha trobat cap resultat.</string>
   <string name="NotificationsSettingsFragment__unknown_ringtone">To desconegut</string>
   <!--ConversationSettingsFragment-->
+  <string name="ConversationSettingsFragment__send_message">Envia el missatge</string>
+  <string name="ConversationSettingsFragment__start_video_call">Inicia una trucada de vídeo</string>
+  <string name="ConversationSettingsFragment__start_audio_call">Inicia una trucada d\'àudio</string>
   <string name="ConversationSettingsFragment__message">Missatge</string>
   <string name="ConversationSettingsFragment__video">Vídeo</string>
   <string name="ConversationSettingsFragment__audio">Àudio</string>
@@ -2989,6 +2992,8 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <string name="ConversationSettingsFragment__muted">Silenciat</string>
   <string name="ConversationSettingsFragment__search">Cerca</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Missatges efímers</string>
+  <string name="ConversationSettingsFragment__sounds_and_notifications">Sons i notificacions</string>
+  <string name="ConversationSettingsFragment__contact_details">Detalls del contacte</string>
   <string name="ConversationSettingsFragment__view_safety_number">Mostra el número de seguretat</string>
   <string name="ConversationSettingsFragment__block">Bloca</string>
   <string name="ConversationSettingsFragment__block_group">Bloca el grup</string>
@@ -2998,8 +3003,12 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <string name="ConversationSettingsFragment__see_all">Mostra-ho tot</string>
   <string name="ConversationSettingsFragment__add_members">Afegeix-hi membres</string>
   <string name="ConversationSettingsFragment__permissions">Permisos</string>
+  <string name="ConversationSettingsFragment__requests_and_invites">Sol·licituds i invitacions</string>
   <string name="ConversationSettingsFragment__group_link">Enllaç del grup</string>
+  <string name="ConversationSettingsFragment__add_as_a_contact">Afegeix com a contacte</string>
   <string name="ConversationSettingsFragment__unmute">No la silenciïs</string>
+  <string name="ConversationSettingsFragment__conversation_muted_until_s">Conversa silenciada fins %1$s</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">Conversa silenciada per sempre</string>
   <!--PermissionsSettingsFragment-->
   <string name="PermissionsSettingsFragment__add_members">Afegeix-hi membres</string>
   <string name="PermissionsSettingsFragment__edit_group_info">Edita la informació del grup</string>
@@ -3010,7 +3019,10 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <!--SoundsAndNotificationsSettingsFragment-->
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Silencia les notificacions</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">No silenciat</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">Silenciat fins %1$s</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">Mencions</string>
+  <string name="SoundsAndNotificationsSettingsFragment__always_notify">Notifica-m\'ho sempre</string>
+  <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">No m\'ho notifiquis mai</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">Notificacions personalitzades</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 29c4467e11..43fbfbbc65 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2849,6 +2849,9 @@
   <string name="EmojiSearchFragment__no_results_found">Δε βρέθηκαν αποτελέσματα</string>
   <string name="NotificationsSettingsFragment__unknown_ringtone">Άγνωστος ήχος κλήσης</string>
   <!--ConversationSettingsFragment-->
+  <string name="ConversationSettingsFragment__send_message">Αποστολή μηνύματος</string>
+  <string name="ConversationSettingsFragment__start_video_call">Έναρξη βιντεοκλήσης</string>
+  <string name="ConversationSettingsFragment__start_audio_call">Έναρξη κλήσης ήχου</string>
   <string name="ConversationSettingsFragment__message">Μήνυμα</string>
   <string name="ConversationSettingsFragment__video">Βίντεο</string>
   <string name="ConversationSettingsFragment__audio">Αρχείο ήχου</string>
@@ -2857,6 +2860,8 @@
   <string name="ConversationSettingsFragment__muted">Σε σίγαση</string>
   <string name="ConversationSettingsFragment__search">Αναζήτηση</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Μηνύματα που εξαφανίζονται</string>
+  <string name="ConversationSettingsFragment__sounds_and_notifications">Ήχοι &amp; ειδοποιήσεις</string>
+  <string name="ConversationSettingsFragment__contact_details">Λεπτομέρειες επαφής</string>
   <string name="ConversationSettingsFragment__view_safety_number">Προβολή αριθμού ασφαλείας</string>
   <string name="ConversationSettingsFragment__block">Αποκλεισμός</string>
   <string name="ConversationSettingsFragment__block_group">Φραγή ομάδας</string>
@@ -2866,8 +2871,12 @@
   <string name="ConversationSettingsFragment__see_all">Προβολή όλων</string>
   <string name="ConversationSettingsFragment__add_members">Προσθήκη μελών</string>
   <string name="ConversationSettingsFragment__permissions">Άδειες</string>
+  <string name="ConversationSettingsFragment__requests_and_invites">Αιτήματα &amp; προσκλήσεις</string>
   <string name="ConversationSettingsFragment__group_link">Σύνδεσμος ομάδας</string>
+  <string name="ConversationSettingsFragment__add_as_a_contact">Προσθήκη ως επαφή</string>
   <string name="ConversationSettingsFragment__unmute">Αναίρεση σίγασης</string>
+  <string name="ConversationSettingsFragment__conversation_muted_until_s">Η συνομιλία είναι σε σίγαση έως %1$s</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">Η συνομιλία είνα σε σίγαση για πάντα</string>
   <!--PermissionsSettingsFragment-->
   <string name="PermissionsSettingsFragment__add_members">Προσθήκη μελών</string>
   <string name="PermissionsSettingsFragment__edit_group_info">Επεξεργασία πληροφοριών ομάδας</string>
@@ -2878,6 +2887,7 @@
   <!--SoundsAndNotificationsSettingsFragment-->
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Σίγαση ειδοποιήσεων</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">Μη σιγασμένο</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">Σε σίγαση έως %1$s</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">Αναφορές</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">Προσαρμογή ειδοποιήσεων</string>
   <!--EOF-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1fc53347e2..ebcdac72e4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -609,7 +609,7 @@
   <string name="ManageGroupActivity_mute_notifications">Notifications en sourdine</string>
   <string name="ManageGroupActivity_custom_notifications">Notifications personnalisées</string>
   <string name="ManageGroupActivity_mentions">Mentions</string>
-  <string name="ManageGroupActivity_chat_color_and_wallpaper">Couleur et fond d’écran des conversations</string>
+  <string name="ManageGroupActivity_chat_color_and_wallpaper">Couleur et fond d’écran de la conversation</string>
   <string name="ManageGroupActivity_until_s">Jusqu’à %1$s</string>
   <string name="ManageGroupActivity_always">Toujours</string>
   <string name="ManageGroupActivity_off">Désactivé</string>
@@ -1730,7 +1730,7 @@
   <string name="CreateProfileActivity__username">Nom d’utilisateur</string>
   <string name="CreateProfileActivity__create_a_username">Créer un nom d’utilisateur</string>
   <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Les noms et les photos des groupes de messages multimédias personnalisés ne seront visibles que par vous.</string>
-  <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">Les descriptions de gruope seront visibles aux membres de ce groupe et aux personnes qui ont été invitées.</string>
+  <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">Les descriptions de groupe seront visibles aux membres de ce groupe et aux personnes qui ont été invitées.</string>
   <!--EditAboutFragment-->
   <string name="EditAboutFragment_about">À propos</string>
   <string name="EditAboutFragment_write_a_few_words_about_yourself">Écrivez quelques mots à votre sujet…</string>
@@ -2136,6 +2136,7 @@
   <!--ConfirmPaymentFragment-->
   <string name="ConfirmPayment__confirm_payment">Confirmer le paiement</string>
   <string name="ConfirmPayment__network_fee">Frais de réseau</string>
+  <string name="ConfirmPayment__error_getting_fee">Erreur dans l’obtention des frais</string>
   <string name="ConfirmPayment__estimated_s">%1$s estimés</string>
   <string name="ConfirmPayment__to">À</string>
   <string name="ConfirmPayment__total_amount">Montant total</string>
@@ -2144,6 +2145,7 @@
   <string name="ConfirmPayment__processing_payment">Traitement du paiement…</string>
   <string name="ConfirmPayment__payment_complete">Paiement effectué</string>
   <string name="ConfirmPayment__payment_failed">Échec du paiement</string>
+  <string name="ConfirmPayment__payment_will_continue_processing">Le traitement du paiement va se poursuivre</string>
   <string name="ConfirmPaymentFragment__invalid_recipient">Destinataire invalide</string>
   <string name="ConfirmPaymentFragment__this_person_has_not_activated_payments">Cette personne n’a pas activé les paiements</string>
   <!--CurrencyAmountFormatter_s_at_s-->
@@ -2472,6 +2474,7 @@
   <string name="TransferOrRestoreFragment__transfer_from_android_device">Transférer d’un appareil Android</string>
   <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Vous avez besoin d’accéder à votre ancien appareil.</string>
   <string name="TransferOrRestoreFragment__restore_from_backup">Restaurer depuis une sauvegarde</string>
+  <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaurez vos messages d’une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</string>
   <!--NewDeviceTransferInstructionsFragment-->
   <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Ouvrez Signal sur votre ancien téléphone Android</string>
   <string name="NewDeviceTransferInstructions__continue">Poursuivre</string>
@@ -2569,6 +2572,7 @@
   <string name="OldDeviceTransferLockedDialog__done">Terminé</string>
   <string name="OldDeviceTransferLockedDialog__cancel_and_activate_this_device">Annuler et activer cette appareil</string>
   <!--AdvancedPreferenceFragment-->
+  <string name="AdvancedPreferenceFragment__transfer_mob_balance">Transférer le solde de MOB ?</string>
   <string name="AdvancedPreferenceFragment__dont_transfer">Ne pas transférer</string>
   <string name="AdvancedPreferenceFragment__transfer">Transférer</string>
   <!--RecipientBottomSheet-->
@@ -2799,6 +2803,7 @@
   <string name="CanNotSendPaymentDialog__send_a_message">Envoyez un message</string>
   <!--GroupsInCommonMessageRequest-->
   <string name="GroupsInCommonMessageRequest__you_have_no_groups_in_common_with_this_person">Vous n’avez aucun groupe en commun avec cette personne. Examinez attentivement les demandes avant d’accepter pour éviter les messages indésirés.</string>
+  <string name="GroupsInCommonMessageRequest__none_of_your_contacts_or_people_you_chat_with_are_in_this_group">Aucun de vos contacts ou des personnes avec lesquelles vous discutez n’est dans ce groupe. Examinez attentivement les demandes avant d’accepter pour éviter les messages indésirés.</string>
   <string name="GroupsInCommonMessageRequest__about_message_requests">À propos des demandes d’échange de messages</string>
   <string name="GroupsInCommonMessageRequest__okay">Valider</string>
   <string name="ChatColorSelectionFragment__heres_a_preview_of_the_chat_color">Voici un aperçu de la couleur de la conversation.</string>
@@ -2925,14 +2930,19 @@
   <string name="EmojiSearchFragment__no_results_found">Aucun résultat trouvé</string>
   <string name="NotificationsSettingsFragment__unknown_ringtone">Sonnerie inconnue</string>
   <!--ConversationSettingsFragment-->
+  <string name="ConversationSettingsFragment__send_message">Envoyer un message</string>
+  <string name="ConversationSettingsFragment__start_video_call">Lancer un appel vidéo</string>
+  <string name="ConversationSettingsFragment__start_audio_call">Lancer un appel audio</string>
   <string name="ConversationSettingsFragment__message">Message</string>
   <string name="ConversationSettingsFragment__video">Vidéo</string>
   <string name="ConversationSettingsFragment__audio">Son</string>
   <string name="ConversationSettingsFragment__call">Appeler</string>
   <string name="ConversationSettingsFragment__mute">Sourdine</string>
   <string name="ConversationSettingsFragment__muted">En sourdine</string>
-  <string name="ConversationSettingsFragment__search">Cherchez</string>
+  <string name="ConversationSettingsFragment__search">Chercher</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Messages éphémères</string>
+  <string name="ConversationSettingsFragment__sounds_and_notifications">Sons et notifications</string>
+  <string name="ConversationSettingsFragment__contact_details">Détails du contact</string>
   <string name="ConversationSettingsFragment__view_safety_number">Afficher le numéro de sécurité</string>
   <string name="ConversationSettingsFragment__block">Bloquer</string>
   <string name="ConversationSettingsFragment__block_group">Bloquer le groupe</string>
@@ -2942,8 +2952,11 @@
   <string name="ConversationSettingsFragment__see_all">Tout afficher</string>
   <string name="ConversationSettingsFragment__add_members">Ajouter des membres</string>
   <string name="ConversationSettingsFragment__permissions">Autorisations</string>
+  <string name="ConversationSettingsFragment__requests_and_invites">Demandes d’ajout et invitations</string>
   <string name="ConversationSettingsFragment__group_link">Lien de groupe</string>
+  <string name="ConversationSettingsFragment__add_as_a_contact">Ajouter comme contact</string>
   <string name="ConversationSettingsFragment__unmute">Réactiver les notifications</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">Conversation en sourdine pour toujours</string>
   <!--PermissionsSettingsFragment-->
   <string name="PermissionsSettingsFragment__add_members">Ajouter des membres</string>
   <string name="PermissionsSettingsFragment__edit_group_info">Modifier les renseignements</string>
@@ -2955,6 +2968,8 @@
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Mettre les notifications en sourdine</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">Désactivée</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">Mentions</string>
+  <string name="SoundsAndNotificationsSettingsFragment__always_notify">Toujours m’avertir</string>
+  <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">Ne pas m’avertir</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">Notifications personnalisées</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 93f88656e5..3c3891df2d 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -3155,6 +3155,9 @@
   <string name="EmojiSearchFragment__no_results_found">תוצאות לא נמצאו</string>
   <string name="NotificationsSettingsFragment__unknown_ringtone">צלצול בלתי ידוע</string>
   <!--ConversationSettingsFragment-->
+  <string name="ConversationSettingsFragment__send_message">שלח הודעה</string>
+  <string name="ConversationSettingsFragment__start_video_call">התחל שיחת וידאו</string>
+  <string name="ConversationSettingsFragment__start_audio_call">התחל שיחת שמע</string>
   <string name="ConversationSettingsFragment__message">הודעה</string>
   <string name="ConversationSettingsFragment__video">סרטון</string>
   <string name="ConversationSettingsFragment__audio">שמע</string>
@@ -3163,6 +3166,8 @@
   <string name="ConversationSettingsFragment__muted">מושתק</string>
   <string name="ConversationSettingsFragment__search">חפש</string>
   <string name="ConversationSettingsFragment__disappearing_messages">הודעות נעלמות</string>
+  <string name="ConversationSettingsFragment__sounds_and_notifications">צלילים והתראות</string>
+  <string name="ConversationSettingsFragment__contact_details">פרטי איש קשר</string>
   <string name="ConversationSettingsFragment__view_safety_number">הצג מספר ביטחון</string>
   <string name="ConversationSettingsFragment__block">חוסם</string>
   <string name="ConversationSettingsFragment__block_group">חסום קבוצה</string>
@@ -3172,8 +3177,12 @@
   <string name="ConversationSettingsFragment__see_all">ראה הכל</string>
   <string name="ConversationSettingsFragment__add_members">הוסף חברי קבוצה</string>
   <string name="ConversationSettingsFragment__permissions">הרשאות</string>
+  <string name="ConversationSettingsFragment__requests_and_invites">בקשות והזמנות</string>
   <string name="ConversationSettingsFragment__group_link">קישור קבוצה</string>
+  <string name="ConversationSettingsFragment__add_as_a_contact">הוסף כאיש קשר</string>
   <string name="ConversationSettingsFragment__unmute">בטל השתקה</string>
+  <string name="ConversationSettingsFragment__conversation_muted_until_s">שיחות מושתקות עד %1$s</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">שיחות מושתקות לתמיד</string>
   <!--PermissionsSettingsFragment-->
   <string name="PermissionsSettingsFragment__add_members">הוסף חברי קבוצה</string>
   <string name="PermissionsSettingsFragment__edit_group_info">ערוך מידע קבוצה</string>
@@ -3184,7 +3193,10 @@
   <!--SoundsAndNotificationsSettingsFragment-->
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">השתק התראות</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">לא מושתק</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">מושתק עד %1$s</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">אזכורים</string>
+  <string name="SoundsAndNotificationsSettingsFragment__always_notify">יידע תמיד</string>
+  <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">אל תיידע</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">התראות מותאמות אישית</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 171eccd33d..185d914a87 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2812,7 +2812,7 @@
   <string name="ConversationSettingsFragment__video">動画</string>
   <string name="ConversationSettingsFragment__audio">音声</string>
   <string name="ConversationSettingsFragment__call">発信</string>
-  <string name="ConversationSettingsFragment__mute">ミュートする</string>
+  <string name="ConversationSettingsFragment__mute">ミュート</string>
   <string name="ConversationSettingsFragment__muted">ミュート中</string>
   <string name="ConversationSettingsFragment__search">検索</string>
   <string name="ConversationSettingsFragment__disappearing_messages">消えるメッセージ</string>
@@ -2821,19 +2821,21 @@
   <string name="ConversationSettingsFragment__view_safety_number">安全番号を表示</string>
   <string name="ConversationSettingsFragment__block">ブロック</string>
   <string name="ConversationSettingsFragment__block_group">グループをブロック</string>
-  <string name="ConversationSettingsFragment__unblock">ブロックを解除する</string>
-  <string name="ConversationSettingsFragment__unblock_group">グループのブロック解除</string>
+  <string name="ConversationSettingsFragment__unblock">ブロックを解除</string>
+  <string name="ConversationSettingsFragment__unblock_group">グループのブロックを解除</string>
   <string name="ConversationSettingsFragment__add_to_a_group">グループへ追加</string>
   <string name="ConversationSettingsFragment__see_all">すべて表示</string>
-  <string name="ConversationSettingsFragment__add_members">メンバーを追加する</string>
+  <string name="ConversationSettingsFragment__add_members">メンバーの追加</string>
   <string name="ConversationSettingsFragment__permissions">アクセス許可</string>
   <string name="ConversationSettingsFragment__requests_and_invites">申請と招待</string>
   <string name="ConversationSettingsFragment__group_link">グループリンク</string>
   <string name="ConversationSettingsFragment__add_as_a_contact">連絡先に追加</string>
   <string name="ConversationSettingsFragment__unmute">ミュートを解除</string>
+  <string name="ConversationSettingsFragment__conversation_muted_until_s">チャットは%1$sまでミュートされます</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">チャットは常にミュートされます</string>
   <!--PermissionsSettingsFragment-->
-  <string name="PermissionsSettingsFragment__add_members">メンバーを追加する</string>
-  <string name="PermissionsSettingsFragment__edit_group_info">グループの情報を編集</string>
+  <string name="PermissionsSettingsFragment__add_members">メンバーの追加</string>
+  <string name="PermissionsSettingsFragment__edit_group_info">グループ情報を編集</string>
   <string name="PermissionsSettingsFragment__all_members">すべてのメンバー</string>
   <string name="PermissionsSettingsFragment__only_admins">管理者のみ</string>
   <string name="PermissionsSettingsFragment__who_can_add_new_members">メンバーを追加できる人は？</string>
@@ -2841,7 +2843,10 @@
   <!--SoundsAndNotificationsSettingsFragment-->
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">通知をミュート</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">ミュートしていません</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">%1$sまでミュート中</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">メンション</string>
+  <string name="SoundsAndNotificationsSettingsFragment__always_notify">常に通知する</string>
+  <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">通知しない</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">カスタム通知</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dbc1704e0a..44451e2c1d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -287,7 +287,7 @@
   <string name="ConversationFragment_failed_to_open_message">Openen van bericht is mislukt</string>
   <string name="ConversationFragment_you_can_swipe_to_the_right_reply">Je kunt elk bericht naar rechts vegen om snel een reactie te schijven</string>
   <string name="ConversationFragment_you_can_swipe_to_the_left_reply">Je kunt elk bericht naar links vegen om snel een reactie te schijven</string>
-  <string name="ConversationFragment_outgoing_view_once_media_files_are_automatically_removed">Uitgaande eenmaligeweergave-media worden onmiddellijk gewist zodra ze zijn verzonden. Je kunt je eigen media dus niet terugzien. – Gebruik eenmaligeweergave-berichten niet ter beveiliging, want Signal kan niet garanderen dat een bericht op het apparaat van een ander daadwerkelijk wordt gewist.</string>
+  <string name="ConversationFragment_outgoing_view_once_media_files_are_automatically_removed">Uitgaande eenmaligeweergave-media worden onmiddellijk gewist zodra ze zijn verzonden. Je kunt je eigen media dus niet terugzien. — Gebruik eenmaligeweergave-berichten niet ter beveiliging, want Signal kan niet garanderen dat een bericht op het apparaat van een ander daadwerkelijk wordt gewist.</string>
   <string name="ConversationFragment_you_already_viewed_this_message">Je hebt dit eenmaligeweergave-bericht al weergegeven</string>
   <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">Je kunt in dit speciale gesprek notities voor jezelf achterlaten.\nAls je de Signal app op een ander apparaat gekoppeld hebt, dan worden alle notities van na het moment van koppelen gesynchroniseerd. Je kunt dus notities toevoegen en teruglezen vanaf al je gekoppelde apparaten.</string>
   <string name="ConversationFragment__d_group_members_have_the_same_name">%1$d groepsleden hebben dezelfde naam.</string>
@@ -2297,12 +2297,12 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="Insights__percent">%</string>
   <string name="Insights__title">Inzichten</string>
   <string name="InsightsDashboardFragment__title">Inzichten</string>
-  <string name="InsightsDashboardFragment__signal_protocol_automatically_protected">%1$d%% van je verzonden berichten over de afgelopen %2$d dagen werden automatisch beschermd door het Signal-protocol. Gesprekken tussen Signal-gebruikers zijn altijd eind-tot-eind-versleuteld.</string>
+  <string name="InsightsDashboardFragment__signal_protocol_automatically_protected">%1$d%% van je verzonden berichten over de afgelopen %2$d dagen waren beveiligde Signal-berichten in plaats van onbeveiligde sms- of mms-berichten. Signal-berichten worden altijd eind-tot-eind-versleuteld uitgewisseld, in tegenstelling tot sms- en mms-berichten.</string>
   <string name="InsightsDashboardFragment__boost_your_signal">Je kunt meer gesprekken beveiligd voeren</string>
-  <string name="InsightsDashboardFragment__not_enough_data">Niet genoeg gegevens</string>
-  <string name="InsightsDashboardFragment__your_insights_percentage_is_calculated_based_on">Je inzichten-percentage wordt berekend op basis van berichten welke je hebt verzonden in de afgelopen %1$d dagen welke niet zijn verlopen en niet handmatig zijn gewist.</string>
+  <string name="InsightsDashboardFragment__not_enough_data">Niet genoeg gegevens om een inzicht te geven</string>
+  <string name="InsightsDashboardFragment__your_insights_percentage_is_calculated_based_on">Je inzichten-percentage wordt berekend op basis van berichten die niet zijn verlopen en niet handmatig zijn gewist en die je in de afgelopen %1$d dagen hebt verzonden.</string>
   <string name="InsightsDashboardFragment__start_a_conversation">Begin een gesprek</string>
-  <string name="InsightsDashboardFragment__invite_your_contacts">Communiceer voortaan beveiligd en maak nieuwe functies mogelijk welke verder gaan dan de limitaties van onversleutelde sms-berichten, door meer contactpersonen uit te nodigen om Signal te gebruiken.</string>
+  <string name="InsightsDashboardFragment__invite_your_contacts">Communiceer voortaan beveiligd en maak nieuwe functies mogelijk welke verder gaan dan de limitaties van onversleutelde sms-berichten, door meer van je contactpersonen uit te nodigen om Signal te gebruiken.</string>
   <string name="InsightsDashboardFragment__this_stat_was_generated_locally">Deze statistiek is lokaal gegenereerd op jouw apparaat en kan alleen door jou gezien worden. Ze wordt nooit geüpload.</string>
   <string name="InsightsDashboardFragment__encrypted_messages">Versleutelde berichten</string>
   <string name="InsightsDashboardFragment__cancel">Annuleren</string>
@@ -2906,8 +2906,8 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="AdvancedPrivacySettingsFragment__show_status_icon">Pictogram weergeven</string>
   <string name="AdvancedPrivacySettingsFragment__show_an_icon">Laat in de berichtdetails een pictogram zien bij berichten die zijn afgeleverd met een verzegelde afzender</string>
   <!--ExpireTimerSettingsFragment-->
-  <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_new_chats_started_by_you_will_disappear_after_they_have_been_seen">Voor alle nieuwe gesprekken die jij zelf begint zullen berichten voor iedereen die ze heeft gezien nadat de ingestelde tijd is verlopen worden gewist. – Gebruik verlopende berichten niet ter beveiliging, want Signal kan niet garanderen dat berichten op het apparaat van een ander ook daadwerkelijk worden gewist.</string>
-  <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_this_chat_will_disappear_after_they_have_been_seen">Nieuwe berichten in dit gesprek zullen voor iedereen die ze heeft gezien nadat de ingestelde tijd is verlopen worden gewist. – Gebruik dit niet ter beveiliging, want Signal kan niet garanderen dat berichten op het apparaat van een ander ook daadwerkelijk worden gewist.</string>
+  <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_new_chats_started_by_you_will_disappear_after_they_have_been_seen">Voor alle nieuwe gesprekken die jij zelf begint zullen berichten voor iedereen die ze heeft gezien nadat de ingestelde tijd is verlopen worden gewist. — Gebruik dit niet ter beveiliging, want Signal kan niet garanderen dat berichten op het apparaat van een ander ook daadwerkelijk worden gewist.</string>
+  <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_this_chat_will_disappear_after_they_have_been_seen">Nieuwe berichten in dit gesprek zullen voor iedereen die ze heeft gezien nadat de ingestelde tijd is verlopen worden gewist. — Gebruik dit niet ter beveiliging, want Signal kan niet garanderen dat berichten op het apparaat van een ander ook daadwerkelijk worden gewist.</string>
   <string name="ExpireTimerSettingsFragment__off">Uit</string>
   <string name="ExpireTimerSettingsFragment__4_weeks">4 weken</string>
   <string name="ExpireTimerSettingsFragment__1_week">1 week</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 93cd2ea971..488eb25697 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3155,7 +3155,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="ConversationSettingsFragment__audio">Audio</string>
   <string name="ConversationSettingsFragment__call">Zadzwoń</string>
   <string name="ConversationSettingsFragment__mute">Wycisz</string>
-  <string name="ConversationSettingsFragment__muted">Wyciszony</string>
+  <string name="ConversationSettingsFragment__muted">Wyciszono</string>
   <string name="ConversationSettingsFragment__search">Szukaj</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Znikające wiadomości</string>
   <string name="ConversationSettingsFragment__sounds_and_notifications">Dźwięki i powiadomienia</string>
@@ -3166,7 +3166,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="ConversationSettingsFragment__unblock">Odblokuj</string>
   <string name="ConversationSettingsFragment__unblock_group">Odblokuj grupę</string>
   <string name="ConversationSettingsFragment__add_to_a_group">Dodaj do grupy</string>
-  <string name="ConversationSettingsFragment__see_all">Zobacz wszystkie</string>
+  <string name="ConversationSettingsFragment__see_all">Zobacz wszystkich</string>
   <string name="ConversationSettingsFragment__add_members">Dodaj członków</string>
   <string name="ConversationSettingsFragment__permissions">Uprawnienia</string>
   <string name="ConversationSettingsFragment__requests_and_invites">Prośby o przyjęcie i zaproszenia</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 3f1d7f702b..60af9ca2d1 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -2986,6 +2986,9 @@
   <string name="EmojiSearchFragment__no_results_found">Não foram encontrados resultados</string>
   <string name="NotificationsSettingsFragment__unknown_ringtone">Toque desconhecido</string>
   <!--ConversationSettingsFragment-->
+  <string name="ConversationSettingsFragment__send_message">Enviar mensagem</string>
+  <string name="ConversationSettingsFragment__start_video_call">Iniciar videochamada</string>
+  <string name="ConversationSettingsFragment__start_audio_call">Iniciar chamada de áudio</string>
   <string name="ConversationSettingsFragment__message">Mensagem</string>
   <string name="ConversationSettingsFragment__video">Vídeo</string>
   <string name="ConversationSettingsFragment__audio">Áudio</string>
@@ -2994,6 +2997,8 @@
   <string name="ConversationSettingsFragment__muted">Silenciado</string>
   <string name="ConversationSettingsFragment__search">Procurar</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Destruição de mensagens</string>
+  <string name="ConversationSettingsFragment__sounds_and_notifications">Sons e notificações</string>
+  <string name="ConversationSettingsFragment__contact_details">Detalhes de contacto</string>
   <string name="ConversationSettingsFragment__view_safety_number">Ver número de segurança</string>
   <string name="ConversationSettingsFragment__block">Bloquear</string>
   <string name="ConversationSettingsFragment__block_group">Bloquear grupo</string>
@@ -3003,8 +3008,12 @@
   <string name="ConversationSettingsFragment__see_all">Ver tudo</string>
   <string name="ConversationSettingsFragment__add_members">Adicionar membros</string>
   <string name="ConversationSettingsFragment__permissions">Permissões</string>
+  <string name="ConversationSettingsFragment__requests_and_invites">Pedidos e convites</string>
   <string name="ConversationSettingsFragment__group_link">Link do grupo</string>
+  <string name="ConversationSettingsFragment__add_as_a_contact">Adicionar como contacto</string>
   <string name="ConversationSettingsFragment__unmute">Remover do silêncio</string>
+  <string name="ConversationSettingsFragment__conversation_muted_until_s">Conversa silenciada até %1$s</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">Conversa silenciada para sempre</string>
   <!--PermissionsSettingsFragment-->
   <string name="PermissionsSettingsFragment__add_members">Adicionar membros</string>
   <string name="PermissionsSettingsFragment__edit_group_info">Editar informação do grupo</string>
@@ -3015,7 +3024,10 @@
   <!--SoundsAndNotificationsSettingsFragment-->
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Silenciar notificações</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">Não silenciado(a)</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">Silenciada até %1$s</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">Menções</string>
+  <string name="SoundsAndNotificationsSettingsFragment__always_notify">Notificar sempre</string>
+  <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">Não notificar</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">Notificações personalizadas</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index dd3cc23ef9..26d5d73add 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -884,6 +884,8 @@
   <!--MediaSendActivity-->
   <string name="MediaSendActivity_add_a_caption">Adaugă un titlu…</string>
   <string name="MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit">Un element a fost eliminat pentru că depășește limita de mărime</string>
+  <string name="MediaSendActivity_an_item_was_removed_because_it_had_an_unknown_type">Un element a fost eliminat pentru că a avut un format necunoscut</string>
+  <string name="MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit_or_had_an_unknown_type">Un element a fost eliminat pentru că a depășit limita de mărime sau a avut un format necunoscut</string>
   <string name="MediaSendActivity_camera_unavailable">Cameră indisponibilă.</string>
   <string name="MediaSendActivity_message_to_s">Mesaj către %s</string>
   <string name="MediaSendActivity_message">Mesaj</string>
@@ -1066,6 +1068,7 @@
   <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Ați marcat numărul tău de siguranță cu %s ca și verificat de pe alt dispozitiv</string>
   <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Ați marcat numărul tău de siguranță cu %s ca și neverificat</string>
   <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Ați marcat numărul tău de siguranță cu %s ca și neverificat de pe alt dispozitiv</string>
+  <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">Un mesaj de la %s nu a putut fi livrat</string>
   <!--Group Calling update messages-->
   <string name="MessageRecord_s_started_a_group_call_s">%1$s a început un apel de grup · %2$s</string>
   <string name="MessageRecord_s_is_in_the_group_call_s">%1$s este în apelul de grup · %2$s</string>
@@ -1803,6 +1806,8 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">Pentru a putea trimite mesaje multimedia cât și mesaje într-un grup, apăsați \'OK\' și completați setările solicitate. Setările MMS pentru operatorul tău pot fi găsite cautând după \'APN operatorul tău\'. Această operațiune este necesară o singură dată.</string>
   <!--BadDecryptLearnMoreDialog-->
   <string name="BadDecryptLearnMoreDialog_delivery_issue">Problemă de livrare</string>
+  <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_individual">Un mesaj, autocolant, reacție sau confirmare de citire nu a putut fi livrată către tine de la %s. Este posibil să fi încercat să trimită direct sau într-un grup.</string>
+  <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_group">Un mesaj, autocolant, reacție sau confirmare de citire nu a putut fi livrată către tine de la %s.</string>
   <!--profile_create_activity-->
   <string name="CreateProfileActivity_first_name_required">Prenume (obligatoriu)</string>
   <string name="CreateProfileActivity_last_name_optional">Nume (opțional)</string>
@@ -2136,6 +2141,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="PaymentsHomeFragment__recovery_phrase">Frază de recuperare</string>
   <string name="PaymentsHomeFragment__help">Ajutor</string>
   <string name="PaymentsHomeFragment__unknown_amount">---</string>
+  <string name="PaymentsHomeFragment__deactivate">Dezactivare</string>
   <string name="PaymentsHomeFragment__continue">Continuă</string>
   <string name="PaymentsHomeFragment__payment_failed">Plata a eșuat</string>
   <string name="PaymentsHomeFragment__details">Detalii</string>
@@ -2628,6 +2634,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="RecipientBottomSheet_add_to_a_group">Adaugaţi la un grup</string>
   <string name="RecipientBottomSheet_add_to_another_group">Adaugaţi la alt grup</string>
   <string name="RecipientBottomSheet_view_safety_number">Afișează numărul de siguranță</string>
+  <string name="RecipientBottomSheet_make_admin">Faceți administrator</string>
   <string name="RecipientBottomSheet_remove_as_admin">Eliminați ca administrator</string>
   <string name="RecipientBottomSheet_remove_from_group">Eliminați din grup</string>
   <string name="RecipientBottomSheet_message_description">Mesaj</string>
@@ -2729,6 +2736,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--ShareActivity-->
   <string name="ShareActivity__share">Distribuiți</string>
   <string name="ShareActivity__send">Trimiteți</string>
+  <string name="ShareActivity__comma_s">, %1$s</string>
   <string name="ShareActivity__sharing_to_multiple_chats_is">Distribuirea la conversații multiple este disponibilă doar pentru mesaje Signal</string>
   <!--MultiShareDialogs-->
   <string name="MultiShareDialogs__failed_to_send_to_some_users">Trimiterea către unii utilizatori nu a reușit</string>
@@ -2783,6 +2791,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--DeactivateWalletFragment-->
   <string name="DeactivateWalletFragment__deactivate_wallet">Dezactivare portofel</string>
   <string name="DeactivateWalletFragment__your_balance">Soldul dvs.</string>
+  <string name="DeactivateWalletFragment__deactivate">Dezactivare</string>
   <!--PaymentsRecoveryStartFragment-->
   <string name="PaymentsRecoveryStartFragment__recovery_phrase">Frază de recuperare</string>
   <string name="PaymentsRecoveryStartFragment__start">Start</string>
@@ -2791,10 +2800,12 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--PaymentsRecoveryPasteFragment-->
   <string name="PaymentsRecoveryPasteFragment__recovery_phrase">Frază de recuperare</string>
   <string name="PaymentsRecoveryPasteFragment__next">Următorul</string>
+  <string name="PaymentsRecoveryPasteFragment__invalid_recovery_phrase">Frază de recuperare invalidă</string>
   <!--PaymentsRecoveryPhraseFragment-->
   <string name="PaymentsRecoveryPhraseFragment__next">Următorul</string>
   <string name="PaymentsRecoveryPhraseFragment__edit">Editează</string>
   <string name="PaymentsRecoveryPhraseFragment__previous">Înapoi</string>
+  <string name="PaymentsRecoveryPhraseFragment__invalid_recovery_phrase">Frază de recuperare invalidă</string>
   <string name="PaymentsRecoveryPhraseFragment__copy_to_clipboard">Copiere în clipboard?</string>
   <string name="PaymentsRecoveryPhraseFragment__copy">Copy</string>
   <!--PaymentsRecoveryPhraseConfirmFragment-->
@@ -2943,6 +2954,9 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="EmojiSearchFragment__no_results_found">Nici un rezultat gasit</string>
   <string name="NotificationsSettingsFragment__unknown_ringtone">Ton de apel necunoscut</string>
   <!--ConversationSettingsFragment-->
+  <string name="ConversationSettingsFragment__send_message">Trimite mesaj</string>
+  <string name="ConversationSettingsFragment__start_video_call">Începeți un apel video</string>
+  <string name="ConversationSettingsFragment__start_audio_call">Începeți un apel audio</string>
   <string name="ConversationSettingsFragment__message">Mesaj</string>
   <string name="ConversationSettingsFragment__video">Video</string>
   <string name="ConversationSettingsFragment__audio">Audio</string>
@@ -2951,6 +2965,8 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="ConversationSettingsFragment__muted">Fără sunet</string>
   <string name="ConversationSettingsFragment__search">Căutare</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Dispariție mesaje</string>
+  <string name="ConversationSettingsFragment__sounds_and_notifications">Sunete și notificări</string>
+  <string name="ConversationSettingsFragment__contact_details">Detalii contact</string>
   <string name="ConversationSettingsFragment__view_safety_number">Afișează numărul de siguranță</string>
   <string name="ConversationSettingsFragment__block">Blochează</string>
   <string name="ConversationSettingsFragment__block_group">Blocați grupul</string>
@@ -2960,8 +2976,12 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="ConversationSettingsFragment__see_all">Vezi tot</string>
   <string name="ConversationSettingsFragment__add_members">Adăugare membri</string>
   <string name="ConversationSettingsFragment__permissions">Permisiuni</string>
+  <string name="ConversationSettingsFragment__requests_and_invites">Solicitări și invitații</string>
   <string name="ConversationSettingsFragment__group_link">Link grup</string>
+  <string name="ConversationSettingsFragment__add_as_a_contact">Adaugă ca și contact</string>
   <string name="ConversationSettingsFragment__unmute">Activare sunet notificări</string>
+  <string name="ConversationSettingsFragment__conversation_muted_until_s">Conversaţia este acum silenţiosă până la %1$s</string>
+  <string name="ConversationSettingsFragment__conversation_muted_forever">Conversația este silenţiosă pentru totdeauna</string>
   <!--PermissionsSettingsFragment-->
   <string name="PermissionsSettingsFragment__add_members">Adăugare membri</string>
   <string name="PermissionsSettingsFragment__edit_group_info">Editare informații despre grup</string>
@@ -2972,7 +2992,10 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--SoundsAndNotificationsSettingsFragment-->
   <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Notificări fără sunet</string>
   <string name="SoundsAndNotificationsSettingsFragment__not_muted">Nu este pe silențios</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">Silențios până la %1$s</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">Mențiuni</string>
+  <string name="SoundsAndNotificationsSettingsFragment__always_notify">Notifică întotdeauna</string>
+  <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">Nu mă anunța</string>
   <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">Notificări personalizate</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6256183549..9b707ca441 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1745,7 +1745,7 @@
   <string name="AndroidManifest_archived_conversations">已存档对话</string>
   <string name="AndroidManifest_remove_photo">删除图片</string>
   <!--Message Requests Megaphone-->
-  <string name="MessageRequestsMegaphone__message_requests">通信请求</string>
+  <string name="MessageRequestsMegaphone__message_requests">消息请求</string>
   <string name="MessageRequestsMegaphone__users_can_now_choose_to_accept">用户现在可以选择接受一个新的对话，配置文件名可以让人们知道谁在给他们发信息。</string>
   <string name="MessageRequestsMegaphone__add_profile_name">添加用户名</string>
   <!--HelpFragment-->
@@ -2097,7 +2097,7 @@
   <string name="CreatePaymentFragment__add_note">添加备注</string>
   <string name="CreatePaymentFragment__conversions_are_just_estimates">转换仅为估计，可能并不准确。</string>
   <!--EditNoteFragment-->
-  <string name="EditNoteFragment_note">注释</string>
+  <string name="EditNoteFragment_note">备注</string>
   <!--ConfirmPaymentFragment-->
   <string name="ConfirmPayment__confirm_payment">确认付款</string>
   <string name="ConfirmPayment__network_fee">网络费</string>
@@ -2149,8 +2149,8 @@
   <string name="conversation_insecure__invite">邀请</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">删除已选</string>
-  <string name="conversation_list_batch__menu_pin_selected">已选标记</string>
-  <string name="conversation_list_batch__menu_unpin_selected">已选取消标记</string>
+  <string name="conversation_list_batch__menu_pin_selected">置顶已选</string>
+  <string name="conversation_list_batch__menu_unpin_selected">取消置顶已选</string>
   <string name="conversation_list_batch__menu_select_all">选择全部</string>
   <string name="conversation_list_batch_archive__menu_archive_selected">存档已选择</string>
   <string name="conversation_list_batch_unarchive__menu_unarchive_selected">取消存档已选择项目</string>
@@ -2159,9 +2159,9 @@
   <!--conversation_list-->
   <string name="conversation_list_settings_shortcut">设置快捷方式</string>
   <string name="conversation_list_search_description">搜索</string>
-  <string name="conversation_list__pinned">已标记</string>
+  <string name="conversation_list__pinned">已置顶</string>
   <string name="conversation_list__chats">聊天</string>
-  <string name="conversation_list__you_can_only_pin_up_to_d_chats">您最多只能标记%1$d个对话。</string>
+  <string name="conversation_list__you_can_only_pin_up_to_d_chats">您最多只能置顶%1$d个对话。</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">联系人图片</string>
   <string name="conversation_list_item_view__archived">已存档</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index dbb2fdc6f6..4719c42952 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -87,12 +87,12 @@
   <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">您將無法再接收來自此群組的訊息或更新，而且成員也無法再把您加入此群組。</string>
   <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">群組成員將無法再把您加入此群組。</string>
   <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">群組成員將能夠再把您加入此群組。</string>
-  <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">您將能夠再相互傳送訊息和通話，您的名稱和照片也會與其分享。</string>
+  <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">您將能夠再互相傳送訊息和通話，您的名稱和照片也會與對方分享。</string>
   <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">已封鎖的人將無法撥打或傳送訊息給您。</string>
   <string name="BlockUnblockDialog_unblock_s">要解除封鎖 %1$s 嗎？</string>
   <string name="BlockUnblockDialog_block">封鎖</string>
   <string name="BlockUnblockDialog_block_and_leave">封鎖並退出</string>
-  <string name="BlockUnblockDialog_report_spam_and_block">檢舉垃圾訊息並封鎖</string>
+  <string name="BlockUnblockDialog_report_spam_and_block">舉報垃圾訊息並封鎖</string>
   <!--BucketedThreadMedia-->
   <string name="BucketedThreadMedia_Today">今天</string>
   <string name="BucketedThreadMedia_Yesterday">昨天</string>
@@ -138,8 +138,8 @@
   <string name="CommunicationActions_insecure_call">不安全的通話</string>
   <string name="CommunicationActions_carrier_charges_may_apply">電訊商可能會收費。您正撥打的號碼未有在 Signal 上註冊，因此通話將透過您的流動電訊公司打出，而非經由互聯網接通。</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_your_safety_number_with_s_has_changed">你與%1$s的安全碼已經發生變更。這表示可能有人嘗試擷取你們的對話，或只是%2$s重新安裝了Signal。</string>
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact">你可能需要與這個聯絡人驗證安全碼。</string>
+  <string name="ConfirmIdentityDialog_your_safety_number_with_s_has_changed">您與 %1$s 之間的安全碼已變更。這可能代表有人正嘗試截取您的通訊，又或者不過是 %2$s 已重新安裝 Signal。</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact">您不妨與此聯絡人驗證一下安全碼。</string>
   <string name="ConfirmIdentityDialog_accept">接受</string>
   <!--ContactsCursorLoader-->
   <string name="ContactsCursorLoader_recent_chats">最近的聊天</string>
@@ -208,7 +208,7 @@
   <string name="ConversationActivity_unable_to_record_audio">無法錄製音訊！</string>
   <string name="ConversationActivity_you_cant_send_messages_to_this_group">您無法向此群組傳送訊息，因為您已不再是成員。</string>
   <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">您的裝置上沒有應用程式可處理此連結。</string>
-  <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">您的請求已被傳送至群組管理員。在他們採取行動時會通知你。</string>
+  <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">您欲加入群組的請求已傳送至此群組的管理員。一經處理，將會通知您。</string>
   <string name="ConversationActivity_cancel_request">取消請求</string>
   <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">如要傳送語音訊息，請允許Signal存取您的咪高峰。</string>
   <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal需要存取咪高峰來傳送語音訊息，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「咪高峰」。</string>
@@ -239,7 +239,7 @@
   <string name="ConversationActivity_join">加入</string>
   <string name="ConversationActivity_full">已滿</string>
   <string name="ConversationActivity_error_sending_media">傳送媒體時發生錯誤</string>
-  <string name="ConversationActivity__reported_as_spam_and_blocked">已檢舉垃圾訊息並封鎖。</string>
+  <string name="ConversationActivity__reported_as_spam_and_blocked">已舉報垃圾訊息並封鎖。</string>
   <string name="ConversationActivity_gifs_have_moved">GIF 已搬遷</string>
   <string name="ConversationActivity_look_for_gifs_next_to_emoji_and_stickers">GIF 已歸於表情符號和貼圖旁邊，敬請查看。</string>
   <string name="ConversationActivity__gifs_are_now_here">GIF 新居於此。</string>
@@ -322,7 +322,7 @@
   <string name="CreateProfileActivity_error_setting_profile_photo">設定個人資料照片時發生錯誤</string>
   <string name="CreateProfileActivity_problem_setting_profile">設定個人資料時發生問題</string>
   <string name="CreateProfileActivity_set_up_your_profile">設定您的個人資料</string>
-  <string name="CreateProfileActivity_signal_profiles_are_end_to_end_encrypted">您的個人資料經端對端加密。當您進行或接受新的對話時，或是加入新的群組，您的個人資料 (連同您其後所作的變更) 將會被您的聯絡人看見。</string>
+  <string name="CreateProfileActivity_signal_profiles_are_end_to_end_encrypted">您的個人資料經端對端加密。您的個人資料 (連同您其後所作的變更) 將會供您的聯絡人看見，亦會在您開展或接受新的對話，又或加入新的群組時，向別人展示。</string>
   <string name="CreateProfileActivity_set_avatar_description">設定頭像</string>
   <!--ChooseBackupFragment-->
   <string name="ChooseBackupFragment__restore_from_backup">要從備份還原嗎？</string>
@@ -1618,7 +1618,7 @@
   </plurals>
   <string name="expiration_days_abbreviated">%d 天</string>
   <plurals name="expiration_weeks">
-    <item quantity="other">%d 週</item>
+    <item quantity="other">%d 星期</item>
   </plurals>
   <string name="expiration_weeks_abbreviated">%d 週</string>
   <string name="expiration_combined">%1$s %2$s</string>
@@ -1680,15 +1680,15 @@
   <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">此群組中的成員，以及獲邀加入群組的人，將會見到群組描述。</string>
   <!--EditAboutFragment-->
   <string name="EditAboutFragment_about">關於</string>
-  <string name="EditAboutFragment_write_a_few_words_about_yourself">三言兩語自我介紹一下…</string>
+  <string name="EditAboutFragment_write_a_few_words_about_yourself">錯折中行過 尚有點忘我…</string>
   <string name="EditAboutFragment_count">%1$d/%2$d</string>
   <string name="EditAboutFragment_speak_freely">☝️息尚存</string>
   <string name="EditAboutFragment_encrypted">清風不識字</string>
-  <string name="EditAboutFragment_be_kind">年輕怎麼就是錯 誰不解䆁就恨我</string>
+  <string name="EditAboutFragment_be_kind">抬頭尚有天空 埋頭尚有智慧</string>
   <string name="EditAboutFragment_coffee_lover">無盛世 無亂世 坐在咖啡店</string>
   <string name="EditAboutFragment_free_to_chat">即使要蒙著我嘴 我亦可高呼</string>
   <string name="EditAboutFragment_taking_a_break">人間有味是清歡</string>
-  <string name="EditAboutFragment_working_on_something_new">標準有新嘗試 摩打有新電池</string>
+  <string name="EditAboutFragment_working_on_something_new">新世紀 我請你要有準備</string>
   <!--EditProfileFragment-->
   <string name="EditProfileFragment__edit_group">編輯群組</string>
   <string name="EditProfileFragment__group_name">群組名稱</string>
@@ -2822,8 +2822,8 @@
   <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_new_chats_started_by_you_will_disappear_after_they_have_been_seen">啟用時，在您開展的新聊天中所傳送和接收的新訊息，待看過後將會依限時消失。</string>
   <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_this_chat_will_disappear_after_they_have_been_seen">啟用時，在此聊天中所傳送和接收的新訊息，待看過後將會依限時消失。</string>
   <string name="ExpireTimerSettingsFragment__off">關閉</string>
-  <string name="ExpireTimerSettingsFragment__4_weeks">4 週</string>
-  <string name="ExpireTimerSettingsFragment__1_week">1 週</string>
+  <string name="ExpireTimerSettingsFragment__4_weeks">4 星期</string>
+  <string name="ExpireTimerSettingsFragment__1_week">1 星期</string>
   <string name="ExpireTimerSettingsFragment__1_day">1 天</string>
   <string name="ExpireTimerSettingsFragment__8_hours">8 小時</string>
   <string name="ExpireTimerSettingsFragment__1_hour">1 小時</string>
@@ -2836,7 +2836,7 @@
   <string name="CustomExpireTimerSelectorView__minutes">分鐘</string>
   <string name="CustomExpireTimerSelectorView__hours">小時</string>
   <string name="CustomExpireTimerSelectorView__days">天</string>
-  <string name="CustomExpireTimerSelectorView__weeks">週</string>
+  <string name="CustomExpireTimerSelectorView__weeks">星期</string>
   <!--HelpSettingsFragment-->
   <string name="HelpSettingsFragment__support_center">支援中心</string>
   <string name="HelpSettingsFragment__contact_us">聯絡我們</string>