diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6b9ce635c5..ee55d07d68 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -896,6 +896,12 @@
   <string name="MediaOverviewActivity_save">Uložit</string>
   <string name="MediaOverviewActivity_select_all">Vybrat vše</string>
   <string name="MediaOverviewActivity_delete">Smazat</string>
+  <plurals name="MediaOverviewActivity_d_selected_s">
+    <item quantity="one">%1$d vybraný (%2$s)</item>
+    <item quantity="few">%1$d vybrané (%2$s)</item>
+    <item quantity="many">%1$d vybraných (%2$s)</item>
+    <item quantity="other">%1$d vybraných (%2$s)</item>
+  </plurals>
   <string name="MediaOverviewActivity_file">Soubor</string>
   <string name="MediaOverviewActivity_audio">Audio</string>
   <string name="MediaOverviewActivity_video">Video</string>
@@ -2051,6 +2057,16 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <string name="HelpFragment__debug_log">Ladicí log</string>
   <string name="HelpFragment__could_not_upload_logs">Nepodařilo se nahrát logy</string>
   <string name="HelpFragment__please_be_as_descriptive_as_possible">Popište detailně váš problém, aby to bylo pro nás srozumitelné.</string>
+  <string-array name="HelpFragment__categories_2">
+    <item>-- Vyberte prosím možnost --</item>
+    <item>Něco nefunguje</item>
+    <item>Požadavek na funkci</item>
+    <item>Dotaz</item>
+    <item>Zpětná vazba</item>
+    <item>Jiné</item>
+    <item>Platby (MobileCoin)</item>
+    <item>Příspěvky</item>
+  </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Tato zpráva</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">Nedávno použité</string>
@@ -3450,9 +3466,12 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <string name="SubscribeFragment__confirm">Potvrdit</string>
   <string name="SubscribeFragment__update_subscription">Aktualizovat předplatné</string>
   <string name="SubscribeFragment__your_subscription_has_been_cancelled">Vaše předplatné bylo zrušeno.</string>
+  <string name="SubscribeFragment__update_subscription_question">Aktualizovat předplatné?</string>
   <string name="SubscribeFragment__update">Aktualizovat</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">Dnes vám bude účtována plná částka nového předplatného. Vaše předplatné bude obnoveno %1$s.</string>
   <string name="Subscription__s_per_month">%s/měsíc</string>
   <string name="Subscription__s_per_month_dot_renews_s">%1$s/měsíc · Obnovení %2$s</string>
+  <string name="Subscription__s_per_month_dot_expires_s">%1$s/měsíčně · Exspiruje %2$s</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Signal je nezisková organizace bez inzerentů a investorů, kterou živí pouze lidé, kteří ji používají a oceňují. Přispívejte pravidelně každý měsíc a získejte profilový odznak, abyste se podělili o svou podporu.</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_contribute">Proč podpořit?</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__the_team_at_signal_is_committed">Tým společnosti Signal se zavázal k vývoji open source technologie ochrany soukromí, která chrání svobodu projevu a umožňuje bezpečnou globální komunikaci. Váš příspěvek je pro tento cíl přínosem. Žádné reklamy. Žádné trackery. Bez legrace.</string>
@@ -3463,6 +3482,7 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Zobrazit v profilu</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">Vytvořit doporučený odznak</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">Hotovo</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Pokud máte více odznaků, můžete si jeden z nich vybrat, aby ho ostatní viděli na vašem profilu.</string>
   <string name="ManageDonationsFragment__my_support">Má podpora</string>
   <string name="ManageDonationsFragment__manage_subscription">Spravovat předplatné</string>
   <string name="ManageDonationsFragment__badges">Odznaky</string>
@@ -3480,8 +3500,18 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Chcete-li i nadále podporovat technologii, která je vytvořena pro vás - ne pro vaše data - zvažte možnost stát se měsíčním předplatitelem.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Stát se předplatitelem</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Teď ne</string>
+  <string name="Subscription__verification_failed">Ověření předplatného selhalo</string>
+  <string name="Subscription__please_contact_support_for_more_information">Pro více informací prosím kontaktujte podporu.</string>
   <string name="Subscription__contact_support">Kontaktovat podporu</string>
+  <string name="Subscription__earn_a_s_badge">Získat odznak %1$s</string>
   <string name="SubscribeFragment__processing_payment">Zpracovávání platby…</string>
   <string name="DonationsErrors__payment_failed">Platba selhala</string>
+  <string name="DonationsErrors__your_payment">Vaše platba nemohla být zpracována a nebyla vám účtována. Zkuste to prosím znovu.</string>
+  <string name="DonationsErrors__redemption_still_pending">Na vykoupení se stále čeká</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Možná svůj odznak neuvidíte hned, ale pracujeme na tom!</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay není dostupné</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Musíte si nastavit Google Pay, abyste mohli přispět v rámci aplikace.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Zrušení předplatného selhalo</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Zrušení předplatného vyžaduje aktivní připojení k internetu.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5dda4b3054..a012e2a822 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1905,7 +1905,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
     <item>Rückmeldung</item>
     <item>Sonstiges</item>
     <item>Zahlungen (MobileCoin)</item>
-    <item>Spenden (Unterstützer &amp; Signal Boost)</item>
+    <item>Spenden</item>
   </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Diese Nachricht</string>
@@ -2003,8 +2003,8 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="preferences__help">Hilfe</string>
   <string name="preferences__advanced">Erweiterte Einstellungen</string>
   <string name="preferences__donate_to_signal">An Signal spenden</string>
-  <string name="preferences__subscription">Abonnement</string>
-  <string name="preferences__signal_boost">Signal Boost</string>
+  <string name="preferences__subscription">Dauerspende</string>
+  <string name="preferences__signal_boost">Einmalige Spende</string>
   <string name="preferences__privacy">Datenschutz</string>
   <string name="preferences__mms_user_agent">MMS-Nutzer-Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Manuelle MMS-Einstellungen</string>
@@ -3262,39 +3262,62 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="ViewBadgeBottomSheetDialogFragment__become_a_sustainer">Werde Unterstützer</string>
   <string name="ImageView__badge">Abzeichen</string>
   <string name="SubscribeFragment__signal_is_powered_by_people_like_you">Signal existiert dank Menschen wie dir.</string>
+  <string name="SubscribeFragment__support_technology_that_is_built_for_you">Unterstütze Technologie, die für Dich entwickelt wurde – nicht für deine Daten –, indem du dich der Gemeinschaft von Menschen anschließt, die sie unterstützen. </string>
   <string name="SubscribeFragment__donation_amount">Spendenbetrag</string>
   <string name="SubscribeFragment__more_payment_options">Weitere Zahlungsoptionen</string>
-  <string name="SubscribeFragment__cancel_subscription">Abonnement kündigen</string>
+  <string name="SubscribeFragment__cancel_subscription">Dauerspende kündigen</string>
   <string name="SubscribeFragment__confirm_cancellation">Kündigung bestätigen?</string>
+  <string name="SubscribeFragment__you_wont_be_charged_again">Es werden keine weiteren Gebühren erhoben. Dein Abzeichen wird am Ende deines Abrechnungszeitraums aus deinem Profil entfernt.</string>
   <string name="SubscribeFragment__not_now">Jetzt nicht</string>
   <string name="SubscribeFragment__confirm">Bestätigen</string>
-  <string name="SubscribeFragment__update_subscription">Abonnement aktualisieren</string>
-  <string name="SubscribeFragment__your_subscription_has_been_cancelled">Dein Abonnement wurde gekündigt.</string>
-  <string name="SubscribeFragment__update_subscription_question">Abonnement aktualisieren?</string>
+  <string name="SubscribeFragment__update_subscription">Dauerspende aktualisieren</string>
+  <string name="SubscribeFragment__your_subscription_has_been_cancelled">Deine Dauerspende wurde gekündigt.</string>
+  <string name="SubscribeFragment__update_subscription_question">Dauerspende aktualisieren?</string>
   <string name="SubscribeFragment__update">Aktualisieren</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">Dir wird heute der volle Betrag des neuen Spendenbeitrags in Rechnung gestellt. Deine Dauerspende wird verlängert %1$s.</string>
   <string name="Subscription__s_per_month">%s/Monat</string>
+  <string name="Subscription__s_per_month_dot_renews_s">%1$s/Monat · Verlängert %2$s</string>
+  <string name="Subscription__s_per_month_dot_expires_s">%1$s/Monat  · Läuft ab %2$s</string>
+  <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Signal ist eine Non-Profit-Organisation ohne Werbetreibende oder Investoren, die von den Menschen unterstützt wird, die es nutzen und schätzen. Leiste eine wiederkehrenden monatlichen Beitrag und erhalte ein Profil-Abzeichen, um deine Unterstützung zu teilen. </string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_contribute">Warum einen Beitrag leisten?</string>
+  <string name="SubscribeLearnMoreBottomSheetDialogFragment__the_team_at_signal_is_committed">Das Team von Signal hat sich der Mission verschrieben, eine Open-Source-Datenschutztechnologie zu entwickeln, die die freie Meinungsäußerung schützt und eine sichere globale Kommunikation ermöglicht. Dein Beitrag unterstützt diese Sache. Keine Werbung. Keine Tracker. Im Ernst.</string>
+  <string name="SubscribeLearnMoreBottomSheetDialogFragment__your_contribution_helps_pay">Dein Beitrag hilft, die Entwicklung, Server und Bandbreite einer App zu bezahlen, die von Millionen auf der ganzen Welt für die private und sofortige Kommunikation verwendet wird.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Danke für deine Unterstützung!</string>
+  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost">Danke für den Boost!</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_s_badge">Du hast ein %s Abzeichen erhalten! Durch die Anzeige deines Abzeichens zeigst du den Personen, mit denen du chattest, dass du Signal unterstützt.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Im Profil anzeigen</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">Zum ausgewählten Abzeichen machen</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">Fertig</string>
   <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Wenn du mehrere Abzeichen hast, kannst du eines davon auswählen, um es bei deinem Profil anzuzeigen.</string>
+  <string name="ManageDonationsFragment__my_support">Meine Unterstützung</string>
+  <string name="ManageDonationsFragment__manage_subscription">Dauerspende verwalten</string>
   <string name="ManageDonationsFragment__badges">Abzeichen</string>
-  <string name="ManageDonationsFragment__subscription_faq">Abonnement FAQ</string>
+  <string name="ManageDonationsFragment__subscription_faq">Dauerspende FAQ</string>
+  <string name="ManageDonationsFragment__error_getting_subscription">Fehler beim Abrufen der Dauerspende.</string>
   <string name="BoostFragment__give_signal_a_boost">Gib Signal einen Boost</string>
+  <string name="BoostFragment__say_thanks_and_earn">Sag \"Danke!\" und erhalte ein Boost-Abzeichen für %1$dTage.</string>
   <string name="Boost__enter_custom_amount">Eigenen Betrag eingeben</string>
   <string name="Boost__one_time_contribution">Einmaliger Betrag</string>
+  <string name="MySupportPreference__add_a_signal_boost">Eine einmalige Spende tätigen</string>
   <string name="MySupportPreference__s_per_month">%1$s/Monat</string>
+  <string name="MySupportPreference__renews_s">Verlängert %1$s</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired">Dein Abzeichen ist abgelaufen</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_s_badge_has_expired">Dein %1$s Abzeichen ist abgelaufen. Es ist für andere nicht mehr in deinem Profil sichtbar.</string>
+  <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Um auch weiterhin eine Technologie zu unterstützen, die für Dich und nicht für deine Daten entwickelt wurde, erwäge eine Dauerspende abzuschließen.</string>
+  <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Werde Dauerspende</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Jetzt nicht</string>
+  <string name="Subscription__verification_failed">Verifikation der Dauerspende gescheitert</string>
   <string name="Subscription__please_contact_support_for_more_information">Bitte kontaktiere den Support für weitere Informationen.</string>
   <string name="Subscription__contact_support">Support kontaktieren</string>
   <string name="Subscription__earn_a_s_badge">Erhalte ein %1$s Abzeichen</string>
   <string name="SubscribeFragment__processing_payment">Zahlung wird verarbeitet …</string>
   <string name="DonationsErrors__payment_failed">Zahlung gescheitert</string>
+  <string name="DonationsErrors__your_payment">Ihre Zahlung konnte nicht verarbeitet werden und wurde Ihnen nicht abgebucht. Bitte versuchen Sie es erneut.</string>
   <string name="DonationsErrors__redemption_still_pending">Einlösung noch ausstehend</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Eventuell ist das Abzeichen nicht direkt sichtbar, aber wir arbeiten daran!</string>
   <string name="DonationsErrors__google_pay_unavailable">Google Pay nicht verfügbar</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Du musst Google Pay einrichten, um in der App zu spenden.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Die Kündigung der Dauerspende ist fehlgeschlagen</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Die Kündigung der Dauerspende benötigt eine Internetverbindung.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ac0ea718ba..c02c04ac9e 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -319,10 +319,14 @@
   <string name="ConversationListFragment_mute">Σίγαση</string>
   <string name="ConversationListFragment_unmute">Αναίρεση σίγασης</string>
   <string name="ConversationListFragment_select">Επιλογή</string>
-  <string name="ConversationListFragment_archive">Αρχείο</string>
+  <string name="ConversationListFragment_archive">Αρχειοθέτηση</string>
   <string name="ConversationListFragment_unarchive">Μεταφορά στα εισερχόμενα</string>
   <string name="ConversationListFragment_delete">Διαγραφή</string>
   <string name="ConversationListFragment_select_all">Επιλογή όλων</string>
+  <plurals name="ConversationListFragment_s_selected">
+    <item quantity="one">%d επιλεγμένο</item>
+    <item quantity="other">%d επιλεγμένα</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Μήνυμα ανταλλαγής κλειδιού</string>
   <!--ConversationListItemAction-->
@@ -806,6 +810,10 @@
   <string name="MediaOverviewActivity_save">Αποθήκευση</string>
   <string name="MediaOverviewActivity_select_all">Επιλογή όλων</string>
   <string name="MediaOverviewActivity_delete">Διαγραφή</string>
+  <plurals name="MediaOverviewActivity_d_selected_s">
+    <item quantity="one">%1$d επιλεγμένο (%2$s)</item>
+    <item quantity="other">%1$d επιλεγμένα (%2$s)</item>
+  </plurals>
   <string name="MediaOverviewActivity_file">Αρχείο</string>
   <string name="MediaOverviewActivity_audio">Ήχος</string>
   <string name="MediaOverviewActivity_video">Βίντεο</string>
@@ -1886,6 +1894,16 @@
   <string name="HelpFragment__debug_log">Αρχείο εντοπισμού σφαλμάτων:</string>
   <string name="HelpFragment__could_not_upload_logs">Δεν μπόρεσαν να ανέβουν τα αρχεία καταγραφής</string>
   <string name="HelpFragment__please_be_as_descriptive_as_possible">Παρακαλούμε να είσαι όσο γίνεται πιο περιγραφικός/ή για να μας βοηθήσεις να καταλάβουμε το πρόβλημα.</string>
+  <string-array name="HelpFragment__categories_2">
+    <item>-- Παρακαλώ διάλεξε ένα από τα παρακάτω --</item>
+    <item>Κάτι δεν δουλεύει</item>
+    <item>Αίτημα για νέες δυνατότητες</item>
+    <item>Ερώτηση</item>
+    <item>Σχόλια</item>
+    <item>Άλλο</item>
+    <item>Πληρωμές (MobileCoin)</item>
+    <item>Δωρεές (Συντηρητές &amp; Signal Boost)</item>
+  </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Αυτό το μήνυμα</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">Πρόσφατα χρησιμοποιημένα</string>
@@ -3115,9 +3133,12 @@
   <string name="SubscribeFragment__confirm">Επιβεβαίωση</string>
   <string name="SubscribeFragment__update_subscription">Ανανέωση συνδρομής</string>
   <string name="SubscribeFragment__your_subscription_has_been_cancelled">Η συνδρομή σου ακυρώθηκε.</string>
+  <string name="SubscribeFragment__update_subscription_question">Ανανέωση συνδρομής;</string>
   <string name="SubscribeFragment__update">Ενημέρωση</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">Θα χρεωθείς ολόκληρο το ποσό της νέας συνδρομής σήμερα. Η συνδρομή σου θα ανανεωθεί %1$s.</string>
   <string name="Subscription__s_per_month">%s/μήνα</string>
   <string name="Subscription__s_per_month_dot_renews_s">%1$s/μήνα · Ανανεώνεται %2$s</string>
+  <string name="Subscription__s_per_month_dot_expires_s">%1$s/μήνα · Λήγει %2$s</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Το Signal είναι μια ΜΚΟ χωρις διαφημίσεις και επενδυτές, που συντηρείται μόνο από τα άτομα που το χρησιμοποιούν και το θεωρούν σημαντικό. Με μια επαναλαμβανόμενη μηνιαία συνεισφορά παίρνεις ένα έμβλημα για το προφίλ σου, για να δείξεις την υποστήριξή σου.</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_contribute">Γιατι να συνεισφέρω;</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__the_team_at_signal_is_committed">Η ομάδα του Signal είναι προσηλωμένη στην αποστολή της ανάπτυξης τεχνολογίας ιδιωτικότητας ανοιχτού κώδικα, που προστατεύει την ελευθερία της έκφρασης και δίνει τη δυνατότητα για ασφαλείς παγκόσμιες επικοινωνίες. Η συνεισφορά σου μας βοηθά σε αυτή την αποστολή. Χωρίς διαφημίσεις. Χωρίς παρακολούθηση. Σοβαρά.</string>
@@ -3127,6 +3148,7 @@
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_s_badge">Κέρδισες ένα έμβλημα %s! Δείξε στα άτομα που συνομιλείς πως υποστηρίζεις το Signal, βάζοντας το έμβλημά σου στο προφίλ σου.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Εμφάνιση στο προφίλ</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">Τέλος</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Όταν έχεις πάνω από ένα έμβλημα, μπορείς να επιλέξεις ποιο μπορούν να δουν τα άλλα άτομα στο προφίλ σου</string>
   <string name="ManageDonationsFragment__my_support">Η υποστήριξή μου</string>
   <string name="ManageDonationsFragment__manage_subscription">Διαχείριση συνδρομής</string>
   <string name="ManageDonationsFragment__badges">Εμβλήματα</string>
@@ -3144,8 +3166,18 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Για να συνεχίσεις να υποστηρίζεις τη τεχνολογία που έχει φτιαχτεί για εσένα και όχι για τα δεδομένα σου, παρακαλούμε σκέψου να γίνεις μηνιαίος υποστηρικτής.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Γίνε υποστηρικτής</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Όχι τώρα</string>
+  <string name="Subscription__verification_failed">Αποτυχία επιβεβαίωσης συνδρομής</string>
+  <string name="Subscription__please_contact_support_for_more_information">Παρακαλούμε επικοινώνησε με την υποστήριξη για περισσότερες πληροφορίες.</string>
   <string name="Subscription__contact_support">Επικοινωνία με την υποστήριξη</string>
+  <string name="Subscription__earn_a_s_badge">Κέρδισε ένα έμβλημα %1$s</string>
   <string name="SubscribeFragment__processing_payment">Επεξεργασία πληρωμής…</string>
   <string name="DonationsErrors__payment_failed">Η πληρωμή απέτυχε</string>
+  <string name="DonationsErrors__your_payment">Η πληρωμή σου δεν μπόρεσε να διεκπεραιωθεί και δεν έχεις χρεωθεί. Παρακαλούμε προσπάθησε ξανά.</string>
+  <string name="DonationsErrors__redemption_still_pending">Εκκρεμεί η εξαργύρωση</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Μπορεί να μην δεις το έμβλημά σου κατ\' ευθείαν, αλλά το ετοιμάζουμε!</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay μη διαθέσιμο</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Πρέπει να ενεργοποιήσεις το Google Pay για να κάνεις δωρεά μέσω της εφαρμογής.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Αποτυχία ακύρωσης συνδρομής</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Πρέπει να υπάρχει σύνδεση στο διαδίκτυο για την ακύρωση της συνδρομής.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 7e48855e7b..1fa6fd029b 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -327,6 +327,10 @@
   <string name="ConversationListFragment_unarchive">خارج‌کردن از بایگانی</string>
   <string name="ConversationListFragment_delete">حذف</string>
   <string name="ConversationListFragment_select_all">انتخاب همه</string>
+  <plurals name="ConversationListFragment_s_selected">
+    <item quantity="one">%d انتخاب شد</item>
+    <item quantity="other">%d انتخاب شد</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">پیام تبادل کلید</string>
   <!--ConversationListItemAction-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1fa5b55f4f..89cc0877fb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -328,7 +328,7 @@
   <string name="ConversationListFragment_delete">Supprimer</string>
   <string name="ConversationListFragment_select_all">Tout sélectionner</string>
   <plurals name="ConversationListFragment_s_selected">
-    <item quantity="one">%dsélectionnée</item>
+    <item quantity="one">%d sélectionnée</item>
     <item quantity="other">%d sélectionnées</item>
   </plurals>
   <!--ConversationListItem-->
@@ -3264,7 +3264,9 @@ Nouvelle tentative…</string>
   <string name="SubscribeFragment__confirm">Confirmer</string>
   <string name="SubscribeFragment__update_subscription">Mettre à jour l’abonnement</string>
   <string name="SubscribeFragment__your_subscription_has_been_cancelled">Votre abonnement a été annulé.</string>
+  <string name="SubscribeFragment__update_subscription_question">Mettre à jour d’abonnement ?</string>
   <string name="SubscribeFragment__update">Mise à jour</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">Le montant total du prix du nouvel abonnement vous sera facturé aujourd’hui. Votre abonnement sera renouvelé %1$s.</string>
   <string name="Subscription__s_per_month">%s/mois</string>
   <string name="Subscription__s_per_month_dot_renews_s">%1$s/mois · Renouvellement %2$s</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Signal est une fondation à but non lucratif sans annonceurs ni investisseurs, soutenue uniquement par les gens qui l\'utilisent et l\'apprécient. Faites un don mensuel récurrent et recevez un badge de profil pour afficher votre soutien.</string>
@@ -3277,6 +3279,7 @@ Nouvelle tentative…</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Afficher sur le profil</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">Mettre en avant ce badge</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">Terminé</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Si vous avez plus d’un badge, vous pouvez en choisir un que les autres pourront voir sur votre profil.</string>
   <string name="ManageDonationsFragment__my_support">Mon soutien</string>
   <string name="ManageDonationsFragment__manage_subscription">Gérer l\'abonnement</string>
   <string name="ManageDonationsFragment__badges">Badges</string>
@@ -3294,8 +3297,17 @@ Nouvelle tentative…</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Pour soutenir une technologie conçue pour vous — pas pour vos données — envisagez de prendre un abonnement mensuel.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">S’abonner</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Pas maintenant</string>
+  <string name="Subscription__verification_failed">Échec de la vérification de l’abonnement</string>
+  <string name="Subscription__please_contact_support_for_more_information">Veuillez contacter l’assistance pour plus de renseignements.</string>
   <string name="Subscription__contact_support">Contacter l’assistance</string>
+  <string name="Subscription__earn_a_s_badge">Obtenez un badge %1$s</string>
   <string name="SubscribeFragment__processing_payment">Traitement du paiement…</string>
   <string name="DonationsErrors__payment_failed">Échec de paiement</string>
+  <string name="DonationsErrors__your_payment">Votre paiement n’a pas pu être traité et vous n’avez pas été débité. Veuillez réessayer.</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Vous ne verrez peut-être pas votre badge tout de suite, mais nous y travaillons !</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay indisponible</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Vous devez configurer Google Pay pour faire un don dans l’application.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Échec de l’annulation de l’abonnement</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">L’annulation de l’abonnement nécessite une connexion Internet.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 688d11d759..687891959f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -310,12 +310,15 @@
   <string name="ConversationListFragment_pin">ピン留めする</string>
   <string name="ConversationListFragment_unpin">ピン留め解除</string>
   <string name="ConversationListFragment_mute">ミュート</string>
-  <string name="ConversationListFragment_unmute">ミュートを解除</string>
+  <string name="ConversationListFragment_unmute">ミュート解除</string>
   <string name="ConversationListFragment_select">選択</string>
   <string name="ConversationListFragment_archive">アーカイブする</string>
   <string name="ConversationListFragment_unarchive">受信箱に戻す</string>
   <string name="ConversationListFragment_delete">削除</string>
   <string name="ConversationListFragment_select_all">すべて選択</string>
+  <plurals name="ConversationListFragment_s_selected">
+    <item quantity="other">%d件選択済み</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">鍵交換のメッセージ</string>
   <!--ConversationListItemAction-->
@@ -770,6 +773,9 @@
   <string name="MediaOverviewActivity_save">保存</string>
   <string name="MediaOverviewActivity_select_all">すべて選択</string>
   <string name="MediaOverviewActivity_delete">削除</string>
+  <plurals name="MediaOverviewActivity_d_selected_s">
+    <item quantity="other">%1$d件選択済み (%2$s)</item>
+  </plurals>
   <string name="MediaOverviewActivity_file">ファイル</string>
   <string name="MediaOverviewActivity_audio">音声</string>
   <string name="MediaOverviewActivity_video">動画</string>
@@ -1281,7 +1287,7 @@
   <string name="SharedContactView_invite_to_signal">Signalに招待する</string>
   <string name="SharedContactView_message">Signalメッセージ</string>
   <!--SignalBottomActionBar-->
-  <string name="SignalBottomActionBar_more">さらに</string>
+  <string name="SignalBottomActionBar_more">続き</string>
   <!--SignalPinReminders-->
   <string name="SignalPinReminders_well_remind_you_again_later">あとで再度お知らせします。</string>
   <string name="SignalPinReminders_well_remind_you_again_tomorrow">明日、再度お知らせします。</string>
@@ -1817,6 +1823,16 @@
   <string name="HelpFragment__debug_log">デバッグログ:</string>
   <string name="HelpFragment__could_not_upload_logs">ログをアップロードできませんでした</string>
   <string name="HelpFragment__please_be_as_descriptive_as_possible">問題を理解するため、できるだけ詳細に記述してください。</string>
+  <string-array name="HelpFragment__categories_2">
+    <item>-- 選択してください --</item>
+    <item>機能の不具合</item>
+    <item>機能のリクエスト</item>
+    <item>質問</item>
+    <item>フィードバック</item>
+    <item>その他</item>
+    <item>支払い機能 (MobileCoin)</item>
+    <item>寄付  (サポーター &amp; Signalブースト)</item>
+  </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">このメッセージ</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">最近使ったもの</string>
@@ -2038,7 +2054,7 @@
   <!--Internal only preferences-->
   <!--Payments-->
   <string name="PaymentsActivityFragment__all_activity">すべてのアクティビティ</string>
-  <string name="PaymentsAllActivityFragment__all">全員</string>
+  <string name="PaymentsAllActivityFragment__all">すべて</string>
   <string name="PaymentsAllActivityFragment__sent">送信</string>
   <string name="PaymentsAllActivityFragment__received">受信</string>
   <string name="PaymentsHomeFragment__introducing_payments">支払い機能のご紹介 (ベータ)</string>
@@ -2059,7 +2075,7 @@
   <string name="PaymentsHomeFragment__deactivate_payments">支払い機能を停止</string>
   <string name="PaymentsHomeFragment__recovery_phrase">リカバリーフレーズ</string>
   <string name="PaymentsHomeFragment__help">ヘルプ</string>
-  <string name="PaymentsHomeFragment__coin_cleanup_fee">Coin Cleanup手数料</string>
+  <string name="PaymentsHomeFragment__coin_cleanup_fee">コインクリーンアップ手数料</string>
   <string name="PaymentsHomeFragment__sent_payment">送金済み</string>
   <string name="PaymentsHomeFragment__received_payment">受け取り済み</string>
   <string name="PaymentsHomeFragment__processing_payment">支払いを処理しています</string>
@@ -2070,15 +2086,15 @@
   <string name="PaymentsHomeFragment__could_not_enable_payments">支払い機能を有効にできませんでした。あとで再度試してください。</string>
   <string name="PaymentsHomeFragment__deactivate_payments_question">支払い機能を停止しますか？</string>
   <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">支払い機能を停止すると、SignalでMobileCoinを利用できなくなります。</string>
-  <string name="PaymentsHomeFragment__deactivate">支払い機能を停止</string>
+  <string name="PaymentsHomeFragment__deactivate">停止する</string>
   <string name="PaymentsHomeFragment__continue">続ける</string>
   <string name="PaymentsHomeFragment__balance_is_not_currently_available">残高は現在利用できません。</string>
   <string name="PaymentsHomeFragment__payments_deactivated">支払い機能を停止</string>
   <string name="PaymentsHomeFragment__payment_failed">支払いに失敗しました。</string>
   <string name="PaymentsHomeFragment__details">詳細</string>
-  <string name="PaymentsHomeFragment__you_can_use_signal_to_send">Signalでは仮想通貨のMobileCoinを支払いに利用できます。すべての支払い規約はMobileCoinsとMobileCoin Walletに準じます。この機能は試験段階で、問題が発生したり、取引や残高が修復できなくなる恐れがあります。</string>
-  <string name="PaymentsHomeFragment__activate">同意</string>
-  <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoinの規約を見る</string>
+  <string name="PaymentsHomeFragment__you_can_use_signal_to_send">SignalでMobileCoinを利用できます。すべての支払いは、MobileCoinsとMobileCoin Walletの利用規約に準じます。この機能はベータ版であり、問題が発生したり、支払いや残高を失う恐れがあります。</string>
+  <string name="PaymentsHomeFragment__activate">有効にする</string>
+  <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoinの利用規約</string>
   <string name="PaymentsHomeFragment__payments_not_available">Signalの支払い機能はもう利用できません。残金は取引所に移行できますが、送金や入金は今後できません。</string>
   <!--PaymentsAddMoneyFragment-->
   <string name="PaymentsAddMoneyFragment__add_funds">入金</string>
@@ -2091,18 +2107,18 @@
   <string name="PaymentsDetailsFragment__status">状態</string>
   <string name="PaymentsDetailsFragment__submitting_payment">支払いを送信しています…</string>
   <string name="PaymentsDetailsFragment__processing_payment">支払いを処理しています…</string>
-  <string name="PaymentsDetailsFragment__payment_complete">支払いを完了しました。</string>
-  <string name="PaymentsDetailsFragment__payment_failed">支払いに失敗しました。</string>
-  <string name="PaymentsDetailsFragment__network_fee">ネットワーク料金</string>
+  <string name="PaymentsDetailsFragment__payment_complete">支払いを完了しました</string>
+  <string name="PaymentsDetailsFragment__payment_failed">支払いできませんでした</string>
+  <string name="PaymentsDetailsFragment__network_fee">ネットワーク手数料</string>
   <string name="PaymentsDetailsFragment__sent_by">送金者</string>
   <string name="PaymentsDetailsFragment__sent_to_s">%1$s に送金</string>
   <string name="PaymentsDetailsFragment__you_on_s_at_s">%1$s の %2$s にあなたから</string>
   <string name="PaymentsDetailsFragment__s_on_s_at_s">%2$s の %3$s に %1$s から</string>
   <string name="PaymentsDetailsFragment__to">宛先</string>
   <string name="PaymentsDetailsFragment__from">差出人</string>
-  <string name="PaymentsDetailsFragment__information">金額と時間を含む取引詳細は、MobileCoinの元帳の一部です。</string>
-  <string name="PaymentsDetailsFragment__coin_cleanup_fee">Coin Cleanup手数料</string>
-  <string name="PaymentsDetailsFragment__coin_cleanup_information">クリーンアップ手数料は、細分化されたコインを結合して取引を完了することができない場合に請求されます。クリーンアップすることで、送金を続けることができます。</string>
+  <string name="PaymentsDetailsFragment__information">支払い金額や時刻などの取引の詳細は、MobileCoin台帳の一部です。</string>
+  <string name="PaymentsDetailsFragment__coin_cleanup_fee">コインクリーンアップ手数料</string>
+  <string name="PaymentsDetailsFragment__coin_cleanup_information">「コインクリーンアップ手数料」は、お手持ちのコインを組み合わせて取引を完了できない場合に発生します。クリーンアップすることで、送金を続けることができます。</string>
   <string name="PaymentsDetailsFragment__no_details_available">この取引にこれ以上の情報はありません</string>
   <string name="PaymentsDetailsFragment__sent_payment">送金済み</string>
   <string name="PaymentsDetailsFragment__received_payment">受け取り済み</string>
@@ -2127,7 +2143,7 @@
   <!--CreatePaymentFragment-->
   <string name="CreatePaymentFragment__request">申請</string>
   <string name="CreatePaymentFragment__pay">払う</string>
-  <string name="CreatePaymentFragment__available_balance_s">利用可能な残高: %1$s</string>
+  <string name="CreatePaymentFragment__available_balance_s">利用可能残高: %1$s</string>
   <string name="CreatePaymentFragment__toggle_content_description">切り替え</string>
   <string name="CreatePaymentFragment__1">1</string>
   <string name="CreatePaymentFragment__2">2</string>
@@ -2148,12 +2164,12 @@
   <string name="EditNoteFragment_note">メモ</string>
   <!--ConfirmPaymentFragment-->
   <string name="ConfirmPayment__confirm_payment">支払いを確認</string>
-  <string name="ConfirmPayment__network_fee">ネットワーク料金</string>
+  <string name="ConfirmPayment__network_fee">ネットワーク手数料</string>
   <string name="ConfirmPayment__error_getting_fee">手数料取得でエラー</string>
   <string name="ConfirmPayment__estimated_s">概算 %1$s</string>
   <string name="ConfirmPayment__to">宛先</string>
   <string name="ConfirmPayment__total_amount">合計</string>
-  <string name="ConfirmPayment__balance_s">差引: %1$s</string>
+  <string name="ConfirmPayment__balance_s">残高: %1$s</string>
   <string name="ConfirmPayment__submitting_payment">支払いを送信しています…</string>
   <string name="ConfirmPayment__processing_payment">支払いを処理しています…</string>
   <string name="ConfirmPayment__payment_complete">支払い完了</string>
@@ -2491,7 +2507,7 @@
   <string name="NewDeviceTransferInstructions__first_bullet">1.</string>
   <string name="NewDeviceTransferInstructions__tap_on_your_profile_photo_in_the_top_left_to_open_settings">左上の写真をタップして、設定を開きます</string>
   <string name="NewDeviceTransferInstructions__second_bullet">2.</string>
-  <string name="NewDeviceTransferInstructions__tap_on_account">アカウントをタップ</string>
+  <string name="NewDeviceTransferInstructions__tap_on_account">「アカウント」をタップ</string>
   <string name="NewDeviceTransferInstructions__third_bullet">3.</string>
   <string name="NewDeviceTransferInstructions__tap_transfer_account_and_then_continue_on_both_devices">両方の端末で「アカウントの移転」、「続ける」の順にタップします</string>
   <!--NewDeviceTransferSetupFragment-->
@@ -2633,7 +2649,7 @@
   <string name="GroupLinkBottomSheet_copied_to_clipboard">クリップボードにコピーしました</string>
   <string name="GroupLinkBottomSheet_the_link_is_not_currently_active">このリンクは現在利用できません</string>
   <!--VoiceNotePlaybackPreparer-->
-  <string name="VoiceNotePlaybackPreparer__failed_to_play_voice_message">音声メッセージを再生できませんでした。</string>
+  <string name="VoiceNotePlaybackPreparer__failed_to_play_voice_message">音声メッセージを再生できませんでした</string>
   <!--VoiceNoteMediaDescriptionCompatFactory-->
   <string name="VoiceNoteMediaItemFactory__voice_message">音声メッセージ · %1$s</string>
   <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s から %2$s</string>
@@ -2753,13 +2769,13 @@
   <string name="WallpaperCropActivity__blur_photo">写真をぼかす</string>
   <!--InfoCard-->
   <string name="payment_info_card_about_mobilecoin">MobileCoinについて</string>
-  <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoinは、プライバシーを考慮した仮想通貨です。</string>
+  <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoinは、プライバシーを重視した新しいデジタル通貨です。</string>
   <string name="payment_info_card_adding_funds">入金</string>
   <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoinをウォレットアドレスに送信することで、Singnalで使う口座に入金できます。</string>
   <string name="payment_info_card_cashing_out">出金</string>
   <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoinを扱っている取引所にいつでも出金できます。取引所のあなたの口座に送付するだけです。</string>
-  <string name="payment_info_card_hide_this_card">このカードを隠しますか?</string>
-  <string name="payment_info_card_hide">閉じる</string>
+  <string name="payment_info_card_hide_this_card">このカードを隠しますか？</string>
+  <string name="payment_info_card_hide">隠す</string>
   <string name="payment_info_card_record_recovery_phrase">リカバリーフレーズを保存</string>
   <string name="payment_info_card_your_recovery_phrase_gives_you">リカバリーフレーズは、支払口座を復元するもう一つの方法です。</string>
   <string name="payment_info_card_record_your_phrase">リカバリーフレーズを記録</string>
@@ -2813,7 +2829,7 @@
   <string name="PaymentRecoveryPhraseConfirmFragment__done">完了</string>
   <string name="PaymentRecoveryPhraseConfirmFragment__recovery_phrase_confirmed">リカバリーフレーズが確認されました。</string>
   <!--PaymentsRecoveryEntryFragment-->
-  <string name="PaymentsRecoveryEntryFragment__enter_recovery_phrase">リカバリーフレーズを入力</string>
+  <string name="PaymentsRecoveryEntryFragment__enter_recovery_phrase">リカバリーパスフレーズを入力してください</string>
   <string name="PaymentsRecoveryEntryFragment__enter_word_d">次の単語を入力 %1$d</string>
   <string name="PaymentsRecoveryEntryFragment__word_d">単語 %1$d</string>
   <string name="PaymentsRecoveryEntryFragment__next">次へ</string>
@@ -2823,7 +2839,7 @@
   <!--PaymentNotificationsView-->
   <string name="PaymentNotificationsView__view">表示する</string>
   <!--UnreadPayments-->
-  <string name="UnreadPayments__s_sent_you_s">%1$s があなたに %2$s を送金</string>
+  <string name="UnreadPayments__s_sent_you_s">%1$s があなたに%2$sを送金しました</string>
   <string name="UnreadPayments__d_new_payment_notifications">%1$d 件の新しい支払い通知</string>
   <!--CanNotSendPaymentDialog-->
   <string name="CanNotSendPaymentDialog__cant_send_payment">送金できません</string>
@@ -3165,9 +3181,12 @@
   <string name="SubscribeFragment__confirm">解除する</string>
   <string name="SubscribeFragment__update_subscription">サブスクリプションを更新</string>
   <string name="SubscribeFragment__your_subscription_has_been_cancelled">あなたのサブスクリプションは解除されました。</string>
-  <string name="SubscribeFragment__update">アップデートする</string>
+  <string name="SubscribeFragment__update_subscription_question">サブスクリプションを更新しますか？</string>
+  <string name="SubscribeFragment__update">更新する</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">本日、新しいサブスクリプション料金の全額が請求されます。サブスクリプションは、%1$sに更新されます。</string>
   <string name="Subscription__s_per_month">%s/月</string>
   <string name="Subscription__s_per_month_dot_renews_s">%1$s/月 · 更新 %2$s</string>
+  <string name="Subscription__s_per_month_dot_expires_s">%1$s/月 · 期限 %2$s</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Signalは、広告主や投資家を持たない非営利団体であり、Signalを利用し、評価くださる方々によって支えられています。毎月の定期的なご寄付をいただき、あなたのご支援を示すプロフィールバッジを受け取ってください。</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_contribute">寄付をお願いする理由</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__the_team_at_signal_is_committed">Signalのチームは、表現の自由を守り、安全なグローバルコミュニケーションを可能にする、オープンソースのプライバシー技術を開発するというミッションに取り組んでいます。あなたの寄付がこの目的を後押しします。広告はありません。トラッカーもいません。</string>
@@ -3178,6 +3197,7 @@
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">プロフィールに表示する</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">注目のバッジにする</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">完了</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">複数のバッジを持っている場合は、自分のプロフィールに表示するバッジを選ぶことができます。</string>
   <string name="ManageDonationsFragment__my_support">マイサポート</string>
   <string name="ManageDonationsFragment__manage_subscription">サブスクリプションの管理</string>
   <string name="ManageDonationsFragment__badges">バッジ</string>
@@ -3195,10 +3215,18 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">データのためではなく、あなたのために作られた技術を継続的に支援するため、毎月のサブスクリプションをご検討ください。</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">サブスクリプションを行う</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">あとで</string>
+  <string name="Subscription__verification_failed">サブスクリプションを確認できませんでした</string>
+  <string name="Subscription__please_contact_support_for_more_information">詳しくはサポートにお問い合わせください。</string>
   <string name="Subscription__contact_support">サポートに問い合わせる</string>
   <string name="Subscription__earn_a_s_badge">%1$sバッジを獲得しましょう</string>
   <string name="SubscribeFragment__processing_payment">支払いを処理しています…</string>
-  <string name="DonationsErrors__payment_failed">支払いに失敗しました。</string>
+  <string name="DonationsErrors__payment_failed">支払いできませんでした</string>
+  <string name="DonationsErrors__your_payment">支払処理ができず、課金しませんでした。あとで再度試してください。</string>
+  <string name="DonationsErrors__redemption_still_pending">償還保留中</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">すぐにはバッジが表示されないかもしれませんが、対応作業中です！</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Payを利用できません</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">アプリ内でご寄付いただくには、Google Payを設定してください。</string>
   <string name="DonationsErrors__failed_to_cancel_subscription">サブスクリプションを解除できませんでした</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">サブスクリプションを解除するには、インターネット接続が必要です。</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 0c4f1df186..72d9b0ee56 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -327,6 +327,10 @@
   <string name="ConversationListFragment_unarchive">अनआर्काईव्ह</string>
   <string name="ConversationListFragment_delete">हटवा</string>
   <string name="ConversationListFragment_select_all">सर्व निवडा</string>
+  <plurals name="ConversationListFragment_s_selected">
+    <item quantity="one">%d निवडले</item>
+    <item quantity="other">%d निवडले</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">की विनिमय संदेश</string>
   <!--ConversationListItemAction-->
@@ -758,10 +762,12 @@
   <!--InviteActivity-->
   <string name="InviteActivity_share">सामायिक करा</string>
   <string name="InviteActivity_share_with_contacts">संपर्कांसोबत सामायिक करा</string>
+  <string name="InviteActivity_share_via">…यासोबत सामायिक करा</string>
   <string name="InviteActivity_cancel">रद्द करा</string>
   <string name="InviteActivity_sending">पाठवत आहे…</string>
   <string name="InviteActivity_invitations_sent">आमंत्रणे पाठविली!</string>
   <string name="InviteActivity_invite_to_signal">Signal वर आमंत्रित करा</string>
+  <string name="InviteActivity_send_sms">SMS पाठवा (%d)</string>
   <plurals name="InviteActivity_send_sms_invites">
     <item quantity="one">%d SMS आमंत्रण पाठवायचे?</item>
     <item quantity="other">%d SMS आमंत्रणे पाठवायची?</item>
@@ -807,6 +813,10 @@
   <string name="MediaOverviewActivity_save">जतन करा</string>
   <string name="MediaOverviewActivity_select_all">सर्व निवडा</string>
   <string name="MediaOverviewActivity_delete">हटवा</string>
+  <plurals name="MediaOverviewActivity_d_selected_s">
+    <item quantity="one">%1$d निवडले (%2$s)</item>
+    <item quantity="other">%1$d निवडले (%2$s)</item>
+  </plurals>
   <string name="MediaOverviewActivity_file">फाईल</string>
   <string name="MediaOverviewActivity_audio">ऑडिओ</string>
   <string name="MediaOverviewActivity_video">व्हिडिओ</string>
@@ -833,7 +843,9 @@
   <string name="NotificationBarManager_signal_call_in_progress">Signal कॉल प्रगती मध्ये</string>
   <string name="NotificationBarManager__establishing_signal_call">Signal कॉल प्रस्थापित करत आहे</string>
   <string name="NotificationBarManager__incoming_signal_call">येणारा Signal कॉल</string>
+  <string name="NotificationBarManager__incoming_signal_group_call">येणारे Signal गट काॅल</string>
   <string name="NotificationBarManager__stopping_signal_call_service">Signal कॉल सेवा बंद करत आहे</string>
+  <string name="NotificationBarManager__decline_call">कॉल नाकारा</string>
   <string name="NotificationBarManager__answer_call">कॉलला उत्तर द्या</string>
   <string name="NotificationBarManager__end_call">कॉल संपवा</string>
   <string name="NotificationBarManager__cancel_call">कॉल रद्द करा</string>
@@ -1209,8 +1221,15 @@
   <string name="WebRtcCallView__reconnecting">पुनःकनेक्ट करत आहे…</string>
   <string name="WebRtcCallView__joining">सामील होत आहे…</string>
   <string name="WebRtcCallView__disconnected">डिसकनेक्ट झाले</string>
+  <string name="WebRtcCallView__s_will_be_notified">%1$s ला अधिसूचित केले जाईल </string>
+  <string name="WebRtcCallView__s_is_calling_you">%1$s तुम्हाला काॅल करत आहे</string>
+  <plurals name="WebRtcCallView__s_is_calling_you_s_s_and_d_others">
+    <item quantity="one">%1$s तुम्हाला, %2$s, %3$s आणि इतर %4$d जणांना काॅल करत आहे</item>
+    <item quantity="other">%1$s तुम्हाला, %2$s, %3$s आणि इतर %4$d जणांना काॅल करत आहे</item>
+  </plurals>
   <string name="WebRtcCallView__no_one_else_is_here">येथे अजून कुणीही नाही</string>
   <string name="WebRtcCallView__s_is_in_this_call">%1$s या कॉलमध्ये आहे</string>
+  <string name="WebRtcCallView__s_are_in_this_call">%1$s  या काॅल मध्ये आहे</string>
   <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s आणि %2$s या कॉलमध्ये आहेत</string>
   <string name="WebRtcCallView__s_is_presenting">%1$s सादर करत आहे</string>
   <plurals name="WebRtcCallView__s_s_and_d_others_are_in_this_call">
@@ -1493,6 +1512,7 @@
   <string name="MessageNotifier_reacted_s_to_s">%1$s प्रतिसाद दिला यास: \"%2$s\".</string>
   <string name="MessageNotifier_reacted_s_to_your_video">आपल्या व्हिडिओला %1$s प्रतिसाद दिला.</string>
   <string name="MessageNotifier_reacted_s_to_your_image">आपल्या चित्राला %1$s प्रतिसाद दिला.</string>
+  <string name="MessageNotifier_reacted_s_to_your_gif">%1$s प्रतिक्रिया तुमच्या GIF ला दिली.</string>
   <string name="MessageNotifier_reacted_s_to_your_file">आपल्या फाईलला %1$s प्रतिसाद दिला. </string>
   <string name="MessageNotifier_reacted_s_to_your_audio">आपल्या ऑडिओला %1$s प्रतिसाद दिला.</string>
   <string name="MessageNotifier_reacted_s_to_your_view_once_media">आपल्या एकदा-बघा मिडियाला %1$s प्रतिसाद दिला.</string>
@@ -1799,8 +1819,10 @@
   <string name="recipients_panel__to"><small>एक नाव किंवा नंबर प्रविष्ट करा</small></string>
   <!--verify_display_fragment-->
   <string name="verify_display_fragment__tap_to_scan">स्कॅन करण्यासाठी टॅप करा</string>
+  <string name="verify_display_fragment__failed_to_verify_safety_number">सुरक्षितता नंबरची पडताळणी करण्यात अयशस्वी</string>
   <string name="verify_display_fragment__loading">लोड होत आहे…</string>
   <string name="verify_display_fragment__mark_as_verified">सत्यापित म्हणून चिन्हांकित करा</string>
+  <string name="verify_display_fragment__clear_verification">सत्यापन साफ करा</string>
   <!--verify_identity-->
   <string name="verify_identity__share_safety_number">सुरक्षितता नंबर सामायिक करा</string>
   <!--verity_scan_fragment-->
@@ -1810,6 +1832,10 @@
   <string name="webrtc_answer_decline_button__swipe_down_to_reject">नकार देण्यासाठी खाली स्वाइप करा</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">काही समस्यांकडे आपण लक्ष देण्याची गरज आहे.</string>
+  <string name="message_details_header__sent">पाठवले :</string>
+  <string name="message_details_header__received">प्राप्त झाले :</string>
+  <string name="message_details_header__disappears">नाहिसे होणार :</string>
+  <string name="message_details_header__via">द्वारे :</string>
   <!--message_details_recipient_header-->
   <string name="message_details_recipient_header__pending_send">प्रलंबित</string>
   <string name="message_details_recipient_header__sent_to">याला पाठवले</string>
@@ -1947,6 +1973,8 @@
   <string name="preferences__help">मदत</string>
   <string name="preferences__advanced">प्रगत</string>
   <string name="preferences__donate_to_signal">Signal ला देणगी द्या</string>
+  <string name="preferences__subscription">सब्स्क्रिप्शन</string>
+  <string name="preferences__signal_boost">Signal बूस्ट</string>
   <string name="preferences__privacy">गोपनीयता</string>
   <string name="preferences__mms_user_agent">MMS वापरकर्ता एजंट</string>
   <string name="preferences__advanced_mms_access_point_names">व्यक्तिचलित MMS सेटिंग</string>
@@ -2478,6 +2506,7 @@
   <string name="RegistrationActivity_call_me_instead_available_in">नाहीतर मला कॉल करा \n (%1$02d:%2$02d मध्ये उपलब्ध)</string>
   <string name="RegistrationActivity_contact_signal_support">Signal समर्थनाशी संपर्क साधा</string>
   <string name="RegistrationActivity_code_support_subject">Signal नोंदणी - Android करिता सत्यापन कोड</string>
+  <string name="RegistrationActivity_incorrect_code">चुकीचा कोड</string>
   <string name="BackupUtil_never">कधीही नाही</string>
   <string name="BackupUtil_unknown">अज्ञात</string>
   <string name="preferences_app_protection__see_my_phone_number">माझा फोन नंबर बघा</string>
@@ -2892,16 +2921,28 @@
   <string name="AccountSettingsFragment__account">खाते</string>
   <string name="AccountSettingsFragment__youll_be_asked_less_frequently">वेळेनुसार आपल्याला कमी वारंवार विचारले जाईल</string>
   <string name="AccountSettingsFragment__require_your_signal_pin">Signal सोबत पुन्हा नोंदणी करताना आपला Signal PIN आवश्यक करा.</string>
+  <string name="AccountSettingsFragment__change_phone_number">फोन नंबर बदला</string>
   <!--ChangeNumberFragment-->
   <string name="ChangeNumberFragment__continue">सुरू ठेवा</string>
+  <string name="ChangeNumber__your_phone_number_has_been_changed">तुमचा फोन नंबर बदलला आहे.</string>
   <!--ChangeNumberEnterPhoneNumberFragment-->
+  <string name="ChangeNumberEnterPhoneNumberFragment__change_number"> नंबर बदला</string>
+  <string name="ChangeNumberEnterPhoneNumberFragment__your_old_number">तुमचा जुना नंबर</string>
+  <string name="ChangeNumberEnterPhoneNumberFragment__old_phone_number">जुना फोन नंबर</string>
+  <string name="ChangeNumberEnterPhoneNumberFragment__your_new_number">तुमचा नवीन नंबर</string>
+  <string name="ChangeNumberEnterPhoneNumberFragment__new_phone_number">नवीन फोन नंबर</string>
   <string name="ChangeNumberEnterPhoneNumberFragment__the_phone_number_you_entered_doesnt_match_your_accounts">आपण प्रविष्ट केलेला फोन नंबर आपल्या खात्याशी जुळत नाही.</string>
   <!--ChangeNumberVerifyFragment-->
+  <string name="ChangeNumberVerifyFragment__change_number">फोन नंबर बदला</string>
   <!--ChangeNumberConfirmFragment-->
+  <string name="ChangeNumberConfirmFragment__change_number">नंबर बदला</string>
   <string name="ChangeNumberConfirmFragment__edit_number">नंबर संपादित करा</string>
   <!--ChangeNumberRegistrationLockFragment-->
   <!--ChangeNumberPinDiffersFragment-->
+  <string name="ChangeNumberPinDiffersFragment__pins_do_not_match">पिन जुळत नाहीत</string>
+  <string name="ChangeNumberPinDiffersFragment__keep_old_pin">जुना PIN ठेवा</string>
   <string name="ChangeNumberPinDiffersFragment__update_pin">PIN अद्यतनित करा</string>
+  <string name="ChangeNumberPinDiffersFragment__keep_old_pin_question">जुना पिन ठेवायचा ?</string>
   <!--ChangeNumberLockActivity-->
   <string name="ChangeNumberLockActivity__retry">पुन्हा प्रयत्न करा</string>
   <string name="ChangeNumberLockActivity__leave">सोडा</string>
@@ -2957,6 +2998,7 @@
   <string name="HelpFragment__copyright_signal_messenger">कॉपीराईट Signal संदेशक</string>
   <string name="HelpFragment__licenced_under_the_gplv3">GPLv3 खाली परवानाधारक</string>
   <!--DataAndStorageSettingsFragment-->
+  <string name="DataAndStorageSettingsFragment__media_quality">मिडिया दर्जा</string>
   <string name="DataAndStorageSettingsFragment__high">उंच</string>
   <string name="DataAndStorageSettingsFragment__standard">मानक</string>
   <string name="DataAndStorageSettingsFragment__calls">कॉल</string>
@@ -3085,6 +3127,8 @@
   <string name="ContactFilterView__search_name_or_number">नाव किंवा नंबर शोधा</string>
   <!--VoiceNotePlayerView-->
   <string name="VoiceNotePlayerView__dot_s">· %1$s</string>
+  <string name="VoiceNotePlayerView__stop_voice_message">व्हॉईस संदेश बंद </string>
+  <string name="VoiceNotePlayerView__pause_voice_message">व्हॉईस संदेश थांबवा</string>
   <!--AvatarPickerFragment-->
   <string name="AvatarPickerFragment__avatar_preview">अवतार पुनरावलोकन</string>
   <string name="AvatarPickerFragment__camera">कॅमेरा</string>
@@ -3109,20 +3153,44 @@
   <string name="ContactSelectionListItem__dot_s">· %1$s</string>
   <!--DSLSettingsToolbar-->
   <string name="DSLSettingsToolbar__navigate_up">वर नॅव्हिगेट करा</string>
+  <string name="MultiselectForwardFragment__forward_to">यांना फॉर्वर्ड करा</string>
+  <string name="MultiselectForwardFragment__add_a_message">संदेश जोडा</string>
+  <plurals name="MultiselectForwardFragment_send_d_messages">
+    <item quantity="one">%1$d संदेश पाठवा</item>
+    <item quantity="other">%1$d संदेश पाठवा</item>
+  </plurals>
+  <plurals name="MultiselectForwardFragment_messages_sent">
+    <item quantity="one">संदेश पाठवला</item>
+    <item quantity="other">संदेश पाठवले</item>
+  </plurals>
+  <plurals name="MultiselectForwardFragment_messages_failed_to_send">
+    <item quantity="one">संदेश पाठवण्यात अयशस्वी</item>
+    <item quantity="other">संदेश पाठवण्यात अयशस्वी</item>
+  </plurals>
   <!--Media V2-->
+  <string name="MediaReviewFragment__add_a_message">संदेश जोडा</string>
+  <string name="MediaReviewFragment__add_a_reply">प्रत्युत्तर जोडा</string>
+  <string name="MediaReviewFragment__send_to">यांना पाठवा</string>
+  <string name="MediaReviewFragment__view_once_message">एकदा-बघा संदेश</string>
   <string name="ImageEditorHud__cancel">रद्द करा</string>
+  <string name="ImageEditorHud__write_text">मजकूर लिहा</string>
+  <string name="ImageEditorHud__add_a_sticker">स्टिकर जोडा</string>
   <string name="ImageEditorHud__blur">अस्पष्ट</string>
+  <string name="ImageEditorHud__clear_all">सर्व साफ करा</string>
   <string name="ImageEditorHud__undo">अनडू करा</string>
   <string name="ImageEditorHud__delete">हटवा</string>
   <string name="MediaCountIndicatorButton__send">पाठवा</string>
+  <string name="MediaReviewSelectedItem__tap_to_remove">हटवण्यासाठी टॅप करा</string>
   <string name="MediaReviewSelectedItem__tap_to_select">निवडण्यासाठी टॅप करा</string>
   <string name="MediaReviewImagePageFragment__discard">टाकून द्या</string>
+  <string name="MediaReviewImagePageFragment__discard_changes">बदल रद्द करायचे ?</string>
   <string name="SelectFeaturedBadgeFragment__preview">पुनरावलोकन</string>
   <string name="SubscribeFragment__signal_is_powered_by_people_like_you">Signal आपल्यासारख्या लोकांद्वारा समर्थित आहे.</string>
   <string name="SubscribeFragment__donation_amount">देणगी रक्कम</string>
   <string name="SubscribeFragment__not_now">आता नाही</string>
   <string name="SubscribeFragment__confirm">पुष्टी करा</string>
   <string name="SubscribeFragment__update">अद्यतन</string>
+  <string name="Subscription__s_per_month">%s/महिना</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">ठीक</string>
   <string name="Boost__enter_custom_amount">कस्टम रक्कम प्रविष्ट करा</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">आता नाही</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ca4c1d7a0c..67753eda11 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -3289,6 +3289,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="SubscribeFragment__your_subscription_has_been_cancelled">Je maandelijkse donatie is geannuleerd.</string>
   <string name="SubscribeFragment__update_subscription_question">Maandelijkse donatie aanpassen?</string>
   <string name="SubscribeFragment__update">Bijwerken</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">Vandaag wordt het volledige bedrag voor de maandelijkse donatie afgeschreven. Je donatie wordt vernieuwd op %1$s.</string>
   <string name="Subscription__s_per_month">%s/maand</string>
   <string name="Subscription__s_per_month_dot_renews_s">%1$s/maand · Wordt %2$s vernieuwd</string>
   <string name="Subscription__s_per_month_dot_expires_s">%1$s/maand · Verloopt %2$s</string>
@@ -3302,6 +3303,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Op profiel weergeven</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">Badge op je profiel weergeven</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">Klaar</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Als je meerdere badges hebt dan kun je er één kiezen om voor anderen op je profiel weer te geven.</string>
   <string name="ManageDonationsFragment__my_support">Mijn bijdrage</string>
   <string name="ManageDonationsFragment__manage_subscription">Maandelijkse donatie beheren</string>
   <string name="ManageDonationsFragment__badges">Badges</string>
@@ -3319,9 +3321,18 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Als je door wilt gaan met het ondersteunen van technologie die is gemaakt voor jou—niet voor het verzamelen van je gegevens—overweeg dan om maandelijks te doneren.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Wordt een maandelijkse ondersteuner</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Niet nu</string>
+  <string name="Subscription__verification_failed">Bevestiging van maandelijkse donatie is mislukt</string>
+  <string name="Subscription__please_contact_support_for_more_information">Neem contact op met de ondersteuning voor meer informatie.</string>
   <string name="Subscription__contact_support">Neem contact op met ondersteuning</string>
   <string name="Subscription__earn_a_s_badge">Verdien een %1$s badge</string>
   <string name="SubscribeFragment__processing_payment">Overschrijving aan het verwerken …</string>
   <string name="DonationsErrors__payment_failed">Overschrijving is mislukt</string>
+  <string name="DonationsErrors__your_payment">Je overschrijving kon niet worden verwerkt, daarom is er geen geld overgemaakt. Probeer het opnieuw.</string>
+  <string name="DonationsErrors__redemption_still_pending">Terugbetaling nog in afwachting</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Het kan zijn dat je de badge niet gelijk ziet maar we werken er aan.</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay is niet beschikbaar</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Je moet ‘Google Pay’ instellen om vanuit de Signal app donaties te kunnen doen.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Het annuleren van je maandelijkse donatie is mislukt</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Om je maandelijkse donatie te annuleren moet je toegang hebben tot internet.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 35d4c44bb3..edc40f7b9b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -814,6 +814,10 @@
   <string name="MediaOverviewActivity_save">Guardar</string>
   <string name="MediaOverviewActivity_select_all">Selecionar tudo</string>
   <string name="MediaOverviewActivity_delete">Eliminar</string>
+  <plurals name="MediaOverviewActivity_d_selected_s">
+    <item quantity="one">%1$d selecionado(a) (%2$s)</item>
+    <item quantity="other">%1$d selecionados(as) (%2$s)</item>
+  </plurals>
   <string name="MediaOverviewActivity_file">Ficheiro</string>
   <string name="MediaOverviewActivity_audio">Áudio</string>
   <string name="MediaOverviewActivity_video">Vídeo</string>
@@ -1903,6 +1907,16 @@
   <string name="HelpFragment__debug_log">Relatório de depuração:</string>
   <string name="HelpFragment__could_not_upload_logs">Não é possível fazer o upload de relatórios</string>
   <string name="HelpFragment__please_be_as_descriptive_as_possible">Por favor, seja tão descritivo quanto possível para nos ajudar a perceber o problema.</string>
+  <string-array name="HelpFragment__categories_2">
+    <item>-- Por favor, selecione uma opção --</item>
+    <item>Algo não está a funcionar</item>
+    <item>Pedido de funcionalidade</item>
+    <item>Questão</item>
+    <item>Feedback</item>
+    <item>Outro(a)</item>
+    <item>Pagamentos (MobileCoin)</item>
+    <item>Doações (Sustainers &amp; Signal Boost)</item>
+  </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Esta mensagem</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">Recentemente utilizados</string>
@@ -3302,8 +3316,18 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Para continuar a suportar a tecnologia que foi construída para si (não para os seus dados), considere fazer uma assinatura mensal.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Torne-se um assinante</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Agora não</string>
+  <string name="Subscription__verification_failed">Falha na verificação da assinatura</string>
+  <string name="Subscription__please_contact_support_for_more_information">Por favor, contacte o \'Suporte\' para mais informações.</string>
   <string name="Subscription__contact_support">Contactar o Suporte</string>
+  <string name="Subscription__earn_a_s_badge">Ganhe um crachá %1$s</string>
   <string name="SubscribeFragment__processing_payment">A processar pagamento…</string>
   <string name="DonationsErrors__payment_failed">Falha de pagamento</string>
+  <string name="DonationsErrors__your_payment">Não foi possível processar o seu pagamento e não lhe foi feita nenhuma cobrança. Por favor, tente novamente. </string>
+  <string name="DonationsErrors__redemption_still_pending">Resgate ainda pendente</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Poderá ainda não ver o seu crachá, mas estamos a trabalhar nisso!</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay indisponível</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Definiu o Google Pay para as doações in-app.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Ocorreu um erro ao tentar cancelar a assinatura</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">O cancelamento da sua assinatura exige que esteja disponível uma ligação à internet.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 3b3b0a4ae3..847e8b7020 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -855,6 +855,11 @@
   <string name="MediaOverviewActivity_save">Salvează</string>
   <string name="MediaOverviewActivity_select_all">Selectează tot</string>
   <string name="MediaOverviewActivity_delete">Șterge</string>
+  <plurals name="MediaOverviewActivity_d_selected_s">
+    <item quantity="one">%1$d selectat (%2$s)</item>
+    <item quantity="few">%1$d selectate (%2$s)</item>
+    <item quantity="other">%1$d selectate (%2$s)</item>
+  </plurals>
   <string name="MediaOverviewActivity_file">Fișier</string>
   <string name="MediaOverviewActivity_audio">Audio</string>
   <string name="MediaOverviewActivity_video">Video</string>
@@ -1974,6 +1979,16 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="HelpFragment__debug_log">Jurnalul de depanare:</string>
   <string name="HelpFragment__could_not_upload_logs">Nu s-au putut încărca jurnalele</string>
   <string name="HelpFragment__please_be_as_descriptive_as_possible">Vă rugăm să fiți cât mai descriptivi pentru a ne ajuta să înțelegem problema.</string>
+  <string-array name="HelpFragment__categories_2">
+    <item>-- Vă rugăm selectați o opțiune --</item>
+    <item>Ceva nu funcționează</item>
+    <item>Solicitare funcționalitate nouă</item>
+    <item>Întrebare</item>
+    <item>Opinie</item>
+    <item>Altceva</item>
+    <item>Plăți (MobileCoin)</item>
+    <item>Donații (Susținători &amp; Signal Boost)</item>
+  </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Acest mesaj</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">Utilizate recent</string>
@@ -3336,7 +3351,6 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="MediaReviewImagePageFragment__youll_lose_any_changes">Veți pierde toate modificările făcute acestei fotografii.</string>
   <string name="CameraFragment__failed_to_open_camera">Camera nu a putut fi deschisă</string>
   <string name="BadgesOverviewFragment__my_badges">Insignele mele</string>
-  <string name="BadgesOverviewFragment__featured_badge">Insignă evidențiată</string>
   <string name="BadgesOverviewFragment__display_badges_on_profile">Afișați insignele pe profil</string>
   <string name="BadgesOverviewFragment__failed_to_update_profile">Actualizarea profilului a eșuat</string>
   <string name="BadgeSelectionFragment__select_badges">Selectați insigne</string>
@@ -3357,9 +3371,12 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="SubscribeFragment__confirm">Confirmă</string>
   <string name="SubscribeFragment__update_subscription">Actualizare abonament</string>
   <string name="SubscribeFragment__your_subscription_has_been_cancelled">Abonamentul dvs. a fost anulat.</string>
+  <string name="SubscribeFragment__update_subscription_question">Actualizați abonamentul?</string>
   <string name="SubscribeFragment__update">Actualizează</string>
+  <string name="SubscribeFragment__you_will_be_charged_the_full_amount">Veți fi taxat cu prețul integral al noului abonament astăzi. Abonamentul dvs. se va reînnoi %1$s.</string>
   <string name="Subscription__s_per_month">%s/lună</string>
   <string name="Subscription__s_per_month_dot_renews_s">%1$s/lună · Se reînnoiește %2$s</string>
+  <string name="Subscription__s_per_month_dot_expires_s">%1$s/lună · Expiră %2$s</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Signal este o organizație non-profit, fără agenți de publicitate sau investitori, susținută doar de oamenii care o folosesc și o apreciază. Faceți o contribuție lunară recurentă și primiți o insignă de profil pentru a vă împărtăși sprijinul.</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_contribute">De ce să contribuiți?</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__the_team_at_signal_is_committed">Echipa de la Signal este dedicată misiunii de a dezvolta o tehnologie de confidențialitate open source care protejează libertatea de exprimare și permite o comunicare globală securizată. Contribuția dumneavoastră susține această cauză. Fără reclame. Fără elemente de urmărire. Pe bune.</string>
@@ -3369,6 +3386,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_s_badge">Ați dobândit o insignă %s! Afișarea insignei va arăta persoanelor cu care discutați că susțineți Signal.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Afișați la profil</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">Gata</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Atunci când aveți mai mult de o insignă, puteți alege una pe care să o afișați pentru ca ceilalți să o vadă pe profilul dvs.</string>
   <string name="ManageDonationsFragment__my_support">Sprijinul meu</string>
   <string name="ManageDonationsFragment__manage_subscription">Gestionare abonament</string>
   <string name="ManageDonationsFragment__badges">Insigne</string>
@@ -3386,8 +3404,18 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Pentru a continua să sprijiniți o tehnologie construită pentru dvs, —nu pentru datele dvs.—, vă rugăm să luați în considerare posibilitatea de a deveni un abonat lunar.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Deveniți un abonat</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Nu acum</string>
+  <string name="Subscription__verification_failed">Verificarea abonamentului a eșuat</string>
+  <string name="Subscription__please_contact_support_for_more_information">Vă rugăm contactați suportul pentru mai multe informații.</string>
   <string name="Subscription__contact_support">Contactează suportul</string>
+  <string name="Subscription__earn_a_s_badge">Obțineți o insignă %1$s</string>
   <string name="SubscribeFragment__processing_payment">Se procesează plata…</string>
   <string name="DonationsErrors__payment_failed">Plata a eșuat</string>
+  <string name="DonationsErrors__your_payment">Plata dvs. nu a putut fi procesată iar dvs. nu ați fost taxat. Vă rugăm încercați din nou.</string>
+  <string name="DonationsErrors__redemption_still_pending">Atribuire în curs</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Este posibil să nu vedeți insigna dvs. imediat, dar ne ocupăm de asta!</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay nu este disponibil</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Trebuie să configurați Google Pay pentru a face donații în aplicație.</string>
+  <string name="DonationsErrors__failed_to_cancel_subscription">Nu s-a reușit anularea abonamentul</string>
+  <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Anularea abonamentului necesită o conexiune la internet.</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f9bf4d1e21..b179794ccf 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2057,6 +2057,16 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
   <string name="HelpFragment__debug_log">Denník ladenia:</string>
   <string name="HelpFragment__could_not_upload_logs">Nepodarilo sa nahrať denníky</string>
   <string name="HelpFragment__please_be_as_descriptive_as_possible">Prosíme, čo najpodrobnejšie popíšte situáciu a pomôžte nám tak porozumieť vášmu problému.</string>
+  <string-array name="HelpFragment__categories_2">
+    <item>-- Vyberte si prosím jednu možnosť --</item>
+    <item>Niečo nefunguje</item>
+    <item>Žiadosť o funkciu</item>
+    <item>Otázka</item>
+    <item>Spätná väzba</item>
+    <item>Iné</item>
+    <item>Platby (MobileCoin)</item>
+    <item>Príspevky (Udržiavanie a Signal Boost)</item>
+  </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Táto správa</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">Nedávno použité</string>
@@ -3487,9 +3497,14 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">Ak chcete pokračovať v podpore technológie, ktorá je vytvorená pre vás -nie pre vaše údaje-, zvážte možnosť stať sa mesačným predplatiteľom.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Staňte sa predplatiteľmi</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Teraz nie</string>
+  <string name="Subscription__please_contact_support_for_more_information">Pre viac informácií kontaktujte podporu.</string>
   <string name="Subscription__contact_support">Kontaktovať zákaznícku podporu</string>
   <string name="SubscribeFragment__processing_payment">Spracovanie platby…</string>
   <string name="DonationsErrors__payment_failed">Platba zlyhala</string>
+  <string name="DonationsErrors__your_payment">Vašu platbu sa nepodarilo spracovať a nebola vám naúčtovaná. Skúste to prosím znova.</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Možno svoj odznak neuvidíte hneď, ale pracujeme na tom!</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay je nedostupný</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Ak chcete prispieť v aplikácii, musíte si nastaviť službu Google Pay.</string>
   <string name="DonationsErrors__failed_to_cancel_subscription">Predplatné sa nepodarilo zrušiť</string>
   <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Zrušenie predplatného vyžaduje internetové pripojenie.</string>
   <!--EOF-->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 247a924dc1..08c3553f68 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -3327,6 +3327,9 @@ spastrohet dhe krejt lënda do të fshihet.</item>
   <string name="SubscribeFragment__processing_payment">Po kryhet pagesa…</string>
   <string name="DonationsErrors__payment_failed">Pagesa dështoi</string>
   <string name="DonationsErrors__your_payment">Pagesa juaj s’u përpunuar do dhe nuk ju është faturuar. Ju lutemi, riprovoni.</string>
+  <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Stemën tuaj mund të mos e shihni menjëherë, por po merremi me të!</string>
+  <string name="DonationsErrors__google_pay_unavailable">Google Pay i Pakapshëm</string>
+  <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">Duhet të ujdisni Google Pay, që të dhuroni që nga brenda aplikacionit.</string>
   <string name="DonationsErrors__failed_to_cancel_subscription">S’u arrit të anulohej pajtimi</string>
   <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Anulimi i pajtimit lyp lidhje në Internet.</string>
   <!--EOF-->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4ab411aeab..3bd7b47bc6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -320,13 +320,13 @@
   <string name="ConversationListFragment_unread">Oläst</string>
   <string name="ConversationListFragment_pin">Fäst</string>
   <string name="ConversationListFragment_unpin">Lossa</string>
-  <string name="ConversationListFragment_mute">Tysta</string>
+  <string name="ConversationListFragment_mute">Ljud av</string>
   <string name="ConversationListFragment_unmute">Ljud på</string>
   <string name="ConversationListFragment_select">Välj</string>
   <string name="ConversationListFragment_archive">Arkivera</string>
   <string name="ConversationListFragment_unarchive">Avarkivera</string>
   <string name="ConversationListFragment_delete">Ta bort</string>
-  <string name="ConversationListFragment_select_all">Markera alla</string>
+  <string name="ConversationListFragment_select_all">Välj alla</string>
   <plurals name="ConversationListFragment_s_selected">
     <item quantity="one">%d vald</item>
     <item quantity="other">%d valda</item>
@@ -812,7 +812,7 @@
   <string name="MediaOverviewActivity_List_view_description">Listvy</string>
   <string name="MediaOverviewActivity_Selected_description">Valda</string>
   <string name="MediaOverviewActivity_save">Spara</string>
-  <string name="MediaOverviewActivity_select_all">Markera alla</string>
+  <string name="MediaOverviewActivity_select_all">Välj alla</string>
   <string name="MediaOverviewActivity_delete">Ta bort</string>
   <plurals name="MediaOverviewActivity_d_selected_s">
     <item quantity="one">%1$d vald (%2$s)</item>
@@ -1261,7 +1261,7 @@
   <string name="WebRtcCallView__flip">Vänd</string>
   <string name="WebRtcCallView__speaker">Högtalare</string>
   <string name="WebRtcCallView__camera">Kamera</string>
-  <string name="WebRtcCallView__mute">Tysta</string>
+  <string name="WebRtcCallView__mute">Ljud av</string>
   <string name="WebRtcCallView__end_call">Avsluta samtal</string>
   <!--CallParticipantsListDialog-->
   <plurals name="CallParticipantsListDialog_in_this_call_d_people">
@@ -1927,10 +1927,10 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <!--arrays.xml-->
   <string name="arrays__use_default">Använd standardinställning</string>
   <string name="arrays__use_custom">Använd anpassad inställning</string>
-  <string name="arrays__mute_for_one_hour">Tysta i 1 timme</string>
-  <string name="arrays__mute_for_eight_hours">Tysta i 8 timmar</string>
-  <string name="arrays__mute_for_one_day">Tysta i 1 dag</string>
-  <string name="arrays__mute_for_seven_days">Tysta i 7 dagar</string>
+  <string name="arrays__mute_for_one_hour">Ljud av i 1 timme</string>
+  <string name="arrays__mute_for_eight_hours">Ljud av i 8 timmar</string>
+  <string name="arrays__mute_for_one_day">Ljud av i 1 dag</string>
+  <string name="arrays__mute_for_seven_days">Ljud av i 7 dagar</string>
   <string name="arrays__always">Alltid</string>
   <string name="arrays__settings_default">Inställningars standardvärden</string>
   <string name="arrays__enabled">Aktiverad</string>
@@ -3123,8 +3123,8 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="ConversationSettingsFragment__video">Video</string>
   <string name="ConversationSettingsFragment__audio">Ljud</string>
   <string name="ConversationSettingsFragment__call">Ring</string>
-  <string name="ConversationSettingsFragment__mute">Tysta</string>
-  <string name="ConversationSettingsFragment__muted">Tystad</string>
+  <string name="ConversationSettingsFragment__mute">Ljud av</string>
+  <string name="ConversationSettingsFragment__muted">Ljudet av</string>
   <string name="ConversationSettingsFragment__search">Sök</string>
   <string name="ConversationSettingsFragment__disappearing_messages">Försvinnande meddelanden</string>
   <string name="ConversationSettingsFragment__sounds_and_notifications">Ljud &amp; aviseringar</string>
@@ -3156,9 +3156,9 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="PermissionsSettingsFragment__who_can_edit_this_groups_info">Vem kan redigera denna grupps information?</string>
   <string name="PermissionsSettingsFragment__who_can_send_messages">Vem kan skicka meddelanden?</string>
   <!--SoundsAndNotificationsSettingsFragment-->
-  <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Tysta aviseringar</string>
-  <string name="SoundsAndNotificationsSettingsFragment__not_muted">Inte tystad</string>
-  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">Tystad till %1$s</string>
+  <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Stäng av ljudet för aviseringar</string>
+  <string name="SoundsAndNotificationsSettingsFragment__not_muted">Ljud på</string>
+  <string name="SoundsAndNotificationsSettingsFragment__muted_until_s">Ljudet är avstängt till %1$s</string>
   <string name="SoundsAndNotificationsSettingsFragment__mentions">Omnämnanden</string>
   <string name="SoundsAndNotificationsSettingsFragment__always_notify">Meddela alltid</string>
   <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">Meddela inte</string>
@@ -3192,7 +3192,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="AvatarPickerFragment__save">Spara</string>
   <string name="AvatarPickerFragment__select_an_avatar">Välj en avatar</string>
   <string name="AvatarPickerFragment__clear_avatar">Ta bort avatar</string>
-  <string name="AvatarPickerFragment__edit">Ändra</string>
+  <string name="AvatarPickerFragment__edit">Redigera</string>
   <string name="AvatarPickerRepository__failed_to_save_avatar">Det gick inte att spara avataren</string>
   <!--TextAvatarCreationFragment-->
   <string name="TextAvatarCreationFragment__preview">Förhandsgranskning</string>
@@ -3313,8 +3313,8 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="Subscription__please_contact_support_for_more_information">Vänligen kontakta supporten för mer information.</string>
   <string name="Subscription__contact_support">Kontakta support</string>
   <string name="Subscription__earn_a_s_badge">Tjäna ett %1$s-märke</string>
-  <string name="SubscribeFragment__processing_payment">Bearbetar betalning…</string>
-  <string name="DonationsErrors__payment_failed">Betalning misslyckades</string>
+  <string name="SubscribeFragment__processing_payment">Bearbetar betalningen…</string>
+  <string name="DonationsErrors__payment_failed">Betalningen misslyckades</string>
   <string name="DonationsErrors__your_payment">Din betalning kunde inte behandlas och du har inte debiterats. Vänligen försök igen.</string>
   <string name="DonationsErrors__redemption_still_pending">Inlösen väntar fortfarande</string>
   <string name="DonationsErrors__you_might_not_see_your_badge_right_away">Du kanske inte ser ditt märke direkt, men vi jobbar på det!</string>
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index da1229320f..5a371fac00 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -32,7 +32,7 @@
   <string name="ApplicationPreferencesActivity_Off">唔用</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">%1$s短訊，%2$s多媒體短訊</string>
   <string name="ApplicationPreferencesActivity_privacy_summary">%1$s畫面鎖，%2$s註冊鎖</string>
-  <string name="ApplicationPreferencesActivity_appearance_summary">佈景主題：%1$s，語言：%2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">色系：%1$s，語言：%2$s</string>
   <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">註冊鎖需要用到 PIN 碼。停用 PIN 碼嘅話，就要先停用註冊鎖。</string>
   <string name="ApplicationPreferencesActivity_pin_created">整好咗 PIN 碼。</string>
   <string name="ApplicationPreferencesActivity_pin_disabled">停用咗 PIN 碼。</string>
@@ -180,8 +180,8 @@
   <string name="ConversationItem_read_more">  睇埋佢</string>
   <string name="ConversationItem_download_more">  下載埋佢</string>
   <string name="ConversationItem_pending">  仲要等等</string>
-  <string name="ConversationItem_this_message_was_deleted">呢個訊息已被刪除。</string>
-  <string name="ConversationItem_you_deleted_this_message">您已刪除呢個訊息。</string>
+  <string name="ConversationItem_this_message_was_deleted">呢個訊息已被扠走。</string>
+  <string name="ConversationItem_you_deleted_this_message">您已扠走呢個訊息。</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_add_attachment">加附件</string>
   <string name="ConversationActivity_select_contact_info">揀選聯絡人資訊</string>
@@ -270,8 +270,8 @@
   <string name="ConversationFragment_sms">短訊</string>
   <string name="ConversationFragment_deleting">刪除緊</string>
   <string name="ConversationFragment_deleting_messages">刪除緊啲訊息…</string>
-  <string name="ConversationFragment_delete_for_me">淨係扠走我自己嘅記錄</string>
-  <string name="ConversationFragment_delete_for_everyone">全世界都要扠走</string>
+  <string name="ConversationFragment_delete_for_me">刪走我自己嘅紀錄</string>
+  <string name="ConversationFragment_delete_for_everyone">全世界扠咗佢</string>
   <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">呢個訊息會喺對話中用緊最近版本嘅 Signal 嘅所有人度扠走。佢哋會見到您刪除咗一個訊息囉。</string>
   <string name="ConversationFragment_quoted_message_not_found">搵唔到原來嘅訊息</string>
   <string name="ConversationFragment_quoted_message_no_longer_available">原來嘅訊息已經無咗</string>
@@ -281,7 +281,7 @@
   <string name="ConversationFragment_outgoing_view_once_media_files_are_automatically_removed">發出去嘅流聲掠影多媒體檔案喺送出之後就會自動剷走</string>
   <string name="ConversationFragment_you_already_viewed_this_message">呢個訊息您已經睇過</string>
   <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">喺呢度，您可以札低一啲提示畀自己。\n如果您嘅帳戶有其他連結咗嘅機，新嘅筆記會自動同步處理。</string>
-  <string name="ConversationFragment__d_group_members_have_the_same_name">個谷有 %1$d 個成員撞名。</string>
+  <string name="ConversationFragment__d_group_members_have_the_same_name">個谷有 %1$d 位成員撞名。</string>
   <string name="ConversationFragment__tap_to_review">撳一下細閱</string>
   <string name="ConversationFragment__review_requests_carefully">請求要金睛火眼睇清楚</string>
   <string name="ConversationFragment__signal_found_another_contact_with_the_same_name">Signal 搵到另一位聯絡人，都係同一個名。</string>
@@ -315,7 +315,7 @@
   <string name="ConversationListFragment_archive">封印</string>
   <string name="ConversationListFragment_unarchive">解除封印</string>
   <string name="ConversationListFragment_delete">刪除</string>
-  <string name="ConversationListFragment_select_all">全部揀選</string>
+  <string name="ConversationListFragment_select_all">全部揀晒</string>
   <plurals name="ConversationListFragment_s_selected">
     <item quantity="other">揀選咗 %d 個</item>
   </plurals>
@@ -482,7 +482,7 @@
   </plurals>
   <!--GroupsV1MigrationSuggestionsReminder-->
   <plurals name="GroupsV1MigrationSuggestionsReminder_members_couldnt_be_added_to_the_new_group">
-    <item quantity="other">%1$d 個成員冇辦法重新加入去個新版谷度。您而家要唔要加返佢哋？</item>
+    <item quantity="other">%1$d 位成員冇辦法重新加入去個新版谷度。您而家要唔要加返佢哋？</item>
   </plurals>
   <plurals name="GroupsV1MigrationSuggestionsReminder_add_members">
     <item quantity="other">加成員</item>
@@ -521,7 +521,7 @@
   <string name="LinkPreviewView_domain_date">%1$s · %2$s</string>
   <!--LinkPreviewRepository-->
   <plurals name="LinkPreviewRepository_d_members">
-    <item quantity="other">%1$d 個成員</item>
+    <item quantity="other">%1$d 位成員</item>
   </plurals>
   <!--PendingMembersActivity-->
   <string name="PendingMembersActivity_pending_group_invites">仲等緊嘅入谷邀請</string>
@@ -531,7 +531,7 @@
   <string name="PendingMembersActivity_you_have_no_pending_invites">您無仲等緊嘅邀請。</string>
   <string name="PendingMembersActivity_invites_by_other_group_members">個谷其他成員發出嘅邀請</string>
   <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">個谷其他成員無仲等緊嘅邀請。</string>
-  <string name="PendingMembersActivity_missing_detail_explanation">谷嘅其他成員邀請咗邊位，唔會喺呢度詳細顯示出嚟。獲邀請嘅人若然選擇加入，佢哋嘅資訊到時就會同呢個谷分享。佢哋入谷之前，唔會見到呢個谷嘅任何訊息。</string>
+  <string name="PendingMembersActivity_missing_detail_explanation">個谷其他成員邀請咗邊位，唔會詳細顯示出嚟。獲邀請嘅人若然選擇加入，佢哋嘅資訊到時就會同呢個谷分享。佢哋入谷之前，唔會見到呢個谷嘅任何訊息。</string>
   <string name="PendingMembersActivity_revoke_invite">撤回邀請</string>
   <string name="PendingMembersActivity_revoke_invites">撤回呢啲邀請</string>
   <plurals name="PendingMembersActivity_revoke_d_invites">
@@ -551,7 +551,7 @@
   <string name="AddMembersActivity__this_person_cant_be_added_to_legacy_groups">舊版嘅谷加唔到呢個人。</string>
   <string name="AddMembersActivity__this_person_cant_be_added_to_announcement_groups">佈告谷加唔到呢個人。</string>
   <plurals name="AddMembersActivity__add_d_members_to_s">
-    <item quantity="other">係咪要加 %3$d 個成員入去「%2$s」度？</item>
+    <item quantity="other">係咪要加 %3$d 位成員入去「%2$s」度？</item>
   </plurals>
   <string name="AddMembersActivity__add">加入去</string>
   <string name="AddMembersActivity__add_members">加成員</string>
@@ -572,19 +572,19 @@
   <string name="AddGroupDetailsFragment__sms_contact">短訊聯絡人</string>
   <string name="AddGroupDetailsFragment__remove_s_from_this_group">係咪要踼 %1$s 出呢個谷？</string>
   <plurals name="AddGroupDetailsFragment__d_members_do_not_support_new_groups">
-    <item quantity="other">%d 個成員唔支援新版谷，因此呢個谷將會係舊版谷。</item>
+    <item quantity="other">%d 位成員唔支援新版谷，因此呢個谷將會係舊版谷。</item>
   </plurals>
   <plurals name="AddGroupDetailsFragment__d_members_do_not_support_new_groups_so_this_group_cannot_be_created">
-    <item quantity="other">%d 個成員唔支援新版谷，因此呢個谷就開唔成嘞。</item>
+    <item quantity="other">%d 位成員唔支援新版谷，因此呢個谷就開唔成嘞。</item>
   </plurals>
   <!--NonGv2MemberDialog-->
   <string name="NonGv2MemberDialog_single_users_are_non_gv2_capable">將會開一個舊版谷，因為「%1$s」用緊舊版本嘅 Signal。您可以等佢更新咗 Signal 之後先開一個新版谷，又或者踼走佢先開新谷。</string>
   <plurals name="NonGv2MemberDialog_d_users_are_non_gv2_capable">
-    <item quantity="other">將會開一個舊版谷，因為 %1$d 個成員用緊舊版本嘅 Signal。您可以等佢哋更新咗 Signal 之後先開一個新版谷，又或者踼走佢哋先開新谷。</item>
+    <item quantity="other">將會開一個舊版谷，因為 %1$d 位成員用緊舊版本嘅 Signal。您可以等佢哋更新咗 Signal 之後先開一個新版谷，又或者踼走佢哋先開新谷。</item>
   </plurals>
   <string name="NonGv2MemberDialog_single_users_are_non_gv2_capable_forced_migration">開唔成呢個谷，因為「%1$s」用緊舊版本嘅 Signal。您要踼走佢先開得成呢個谷。</string>
   <plurals name="NonGv2MemberDialog_d_users_are_non_gv2_capable_forced_migration">
-    <item quantity="other">開唔成呢個谷，因為 %1$d 個成員用緊舊版本嘅 Signal。您要踼走佢哋先開得成呢個谷。</item>
+    <item quantity="other">開唔成呢個谷，因為 %1$d 位成員用緊舊版本嘅 Signal。您要踼走佢哋先開得成呢個谷。</item>
   </plurals>
   <!--ManageGroupActivity-->
   <string name="ManageGroupActivity_member_requests_and_invites">成員請求同邀請</string>
@@ -607,7 +607,7 @@
   <string name="ManageGroupActivity_view_all_members">睇晒所有成員</string>
   <string name="ManageGroupActivity_see_all">全部睇晒</string>
   <plurals name="ManageGroupActivity_added">
-    <item quantity="other">%d 個成員已加咗入嚟。</item>
+    <item quantity="other">%d 位成員已加咗入嚟。</item>
   </plurals>
   <string name="ManageGroupActivity_only_admins_can_enable_or_disable_the_sharable_group_link">只有話事人先可以啟用或停用可分享嘅谷拎。</string>
   <string name="ManageGroupActivity_only_admins_can_enable_or_disable_the_option_to_approve_new_members">只有話事人先可以啟用或停用係咪審批新成員。</string>
@@ -693,7 +693,7 @@
   <string name="GroupJoinBottomSheetDialogFragment_direct_join">係咪要加入呢個谷，並且向所有成員分享您嘅名同埋相？</string>
   <string name="GroupJoinBottomSheetDialogFragment_admin_approval_needed">呢個谷嘅話事人要先審批您嘅請求，先可以畀您加入呢個谷。當您請求加入嘅時候，您嘅名同埋相將會向呢個谷嘅成員分享。</string>
   <plurals name="GroupJoinBottomSheetDialogFragment_group_dot_d_members">
-    <item quantity="other">谷 · %1$d 個成員</item>
+    <item quantity="other">谷 · %1$d 位成員</item>
   </plurals>
   <!--GroupJoinUpdateRequiredBottomSheetDialogFragment-->
   <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal_to_use_group_links">更新 Signal 以使用谷拎</string>
@@ -760,7 +760,7 @@
   </plurals>
   <string name="MediaOverviewActivity_Media_delete_progress_title">刪除緊</string>
   <string name="MediaOverviewActivity_Media_delete_progress_message">刪除緊啲訊息…</string>
-  <string name="MediaOverviewActivity_Select_all">全部揀選</string>
+  <string name="MediaOverviewActivity_Select_all">全部揀晒</string>
   <string name="MediaOverviewActivity_collecting_attachments">啲附件執返齊埋欄先…</string>
   <string name="MediaOverviewActivity_Sort_by">排序方法</string>
   <string name="MediaOverviewActivity_Newest">最新到最舊</string>
@@ -771,7 +771,7 @@
   <string name="MediaOverviewActivity_List_view_description">一行行顯示</string>
   <string name="MediaOverviewActivity_Selected_description">已揀選</string>
   <string name="MediaOverviewActivity_save">儲存</string>
-  <string name="MediaOverviewActivity_select_all">全部揀選</string>
+  <string name="MediaOverviewActivity_select_all">全部揀晒</string>
   <string name="MediaOverviewActivity_delete">刪除</string>
   <plurals name="MediaOverviewActivity_d_selected_s">
     <item quantity="other">揀選咗 %1$d 個 (%2$s)</item>
@@ -864,10 +864,10 @@
   <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">加唔到您入新版谷度，已經邀請咗您加入。</string>
   <string name="MessageRecord_chat_session_refreshed">傾偈階段已經重新整理</string>
   <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited">
-    <item quantity="other">加唔到 %1$s 個成員入新版谷度，已經邀請咗佢哋加入。</item>
+    <item quantity="other">加唔到 %1$s 位成員入新版谷度，已經邀請咗佢哋加入。</item>
   </plurals>
   <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_removed">
-    <item quantity="other">加唔到 %1$s 個成員入新版谷度，已經剷走咗佢哋。</item>
+    <item quantity="other">加唔到 %1$s 位成員入新版谷度，已經剷走咗佢哋。</item>
   </plurals>
   <!--Profile change updates-->
   <string name="MessageRecord_changed_their_profile_name_to">%1$s 將佢個人資料嘅名轉咗做 %2$s。</string>
@@ -1028,27 +1028,27 @@
   <string name="MessageRequestBottomView_delete">刪除</string>
   <string name="MessageRequestBottomView_block">封鎖</string>
   <string name="MessageRequestBottomView_unblock">解除封鎖</string>
-  <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">您肯唔肯俾 %1$s 發訊息畀您，並同佢分享您嘅名同相？您話制之前，佢都唔會知您睇過佢個訊息嘅。</string>
+  <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">您肯唔肯俾 %1$s 發訊息畀您，並同佢分享您嘅名同相？您話䎺之前，佢都唔會知您睇過佢個訊息嘅。</string>
   <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them">您肯唔肯俾 %1$s 發訊息畀您，並同佢分享您嘅名同相？您解除封鎖佢之前，您都唔會收到佢任何嘅訊息。</string>
   <string name="MessageRequestBottomView_continue_your_conversation_with_this_group_and_share_your_name_and_photo">係咪要繼續同呢個谷對話，並向個谷嘅所有成員分享您嘅名同相？</string>
   <string name="MessageRequestBottomView_upgrade_this_group_to_activate_new_features">升級呢個谷以啟用新功能，例如 @點名講 同埋個谷嘅話事人功能。呢個谷入面未有分享佢嘅名或相嘅成員將會獲邀加入。</string>
   <string name="MessageRequestBottomView_this_legacy_group_can_no_longer_be_used">呢個舊版谷冇得繼續用，因為太大喇。谷嘅人數上限係 %1$d 人。</string>
   <string name="MessageRequestBottomView_continue_your_conversation_with_s_and_share_your_name_and_photo">係咪要繼續同 %1$s 對話，並同佢分享您嘅名同相？</string>
-  <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">係咪要加入呢個谷，並同個谷嘅所有成員分享您嘅名同相？您話制之前，佢哋都唔會知您睇過個訊息嘅。</string>
-  <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">係咪要加入呢個谷？您話制之前，佢哋都唔會知您睇過個訊息嘅。</string>
+  <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">係咪要加入呢個谷，並同個谷嘅所有成員分享您嘅名同相？您話䎺之前，佢哋都唔會知您睇過個訊息嘅。</string>
+  <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">係咪要加入呢個谷？您話䎺之前，佢哋都唔會知您睇過個訊息嘅。</string>
   <string name="MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members">係咪要解除封鎖呢個谷，並同個谷嘅所有成員分享您嘅名同相？您解除封鎖之前，都唔會收到佢哋任何嘅訊息。</string>
   <string name="MessageRequestProfileView_view">睇下</string>
   <string name="MessageRequestProfileView_member_of_one_group">係 %1$s 嘅成員</string>
   <string name="MessageRequestProfileView_member_of_two_groups">係 %1$s 同 %2$s 嘅成員</string>
   <string name="MessageRequestProfileView_member_of_many_groups">係 %1$s、%2$s 同 %3$s 嘅成員</string>
   <plurals name="MessageRequestProfileView_members">
-    <item quantity="other">%1$d 個成員</item>
+    <item quantity="other">%1$d 位成員</item>
   </plurals>
   <plurals name="MessageRequestProfileView_members_and_invited">
-    <item quantity="other">%1$d 個成員 (+%2$d 個邀請)</item>
+    <item quantity="other">%1$d 位成員 (+%2$d 位獲邀)</item>
   </plurals>
   <plurals name="MessageRequestProfileView_member_of_d_additional_groups">
-    <item quantity="other">%d 個額外嘅谷</item>
+    <item quantity="other">其餘 %d 個谷</item>
   </plurals>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">兩次所打嘅密碼有出入噃！</string>
@@ -1143,7 +1143,7 @@
   <!--RedPhone-->
   <string name="RedPhone_answering">接聽緊…</string>
   <string name="RedPhone_ending_call">收緊線…</string>
-  <string name="RedPhone_ringing">喺對面冷緊鐘…</string>
+  <string name="RedPhone_ringing">喺對面唥緊鐘…</string>
   <string name="RedPhone_busy">佔線</string>
   <string name="RedPhone_recipient_unavailable">對方未能接聽</string>
   <string name="RedPhone_network_failed">網絡唔得掂！</string>
@@ -1340,7 +1340,7 @@
   <!--SubmitDebugLogActivity-->
   <string name="SubmitDebugLogActivity_edit">有嘢改</string>
   <string name="SubmitDebugLogActivity_done">搞掂</string>
-  <string name="SubmitDebugLogActivity_tap_a_line_to_delete_it">撳一下就會剷走個一行</string>
+  <string name="SubmitDebugLogActivity_tap_a_line_to_delete_it">撳一下就會剷走嗰一行</string>
   <string name="SubmitDebugLogActivity_submit">提交</string>
   <string name="SubmitDebugLogActivity_failed_to_submit_logs">提交唔到記錄檔</string>
   <string name="SubmitDebugLogActivity_success">成功！</string>
@@ -1567,18 +1567,18 @@
   <string name="ContactSelectionListFragment_s_is_not_a_signal_user">「%1$s」唔係 Signal 使用者。請檢查使用者名稱，然後再試下啦。</string>
   <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">您唔使加自己入個谷度</string>
   <string name="ContactSelectionListFragment_maximum_group_size_reached">谷嘅人數已經到頂</string>
-  <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">Signal 嘅谷最多可以有 %1$d 個成員。</string>
+  <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">Signal 嘅谷最多可以有 %1$d 位成員。</string>
   <string name="ContactSelectionListFragment_recommended_member_limit_reached">夠晒建議嘅成員人數喇</string>
-  <string name="ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer">Signal 谷頂櫳 %1$d 個成員就弗到漏油嘞。再加多啲成員嘅話，收發訊息就可能會有延遲。</string>
+  <string name="ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer">Signal 谷頂櫳 %1$d 位成員就佮佮冚㗎嘞。再加多啲成員嘅話，收發訊息就可能會有延遲。</string>
   <plurals name="ContactSelectionListFragment_d_members">
-    <item quantity="other">%1$d 個成員</item>
+    <item quantity="other">%1$d 位成員</item>
   </plurals>
   <!--contact_selection_list_fragment-->
   <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal 要存取您嘅聯絡人，先可以顯示畀您睇。</string>
   <string name="contact_selection_list_fragment__show_contacts">顯示聯絡人</string>
   <!--contact_selection_list_item-->
   <plurals name="contact_selection_list_item__number_of_members">
-    <item quantity="other">%1$d 個成員</item>
+    <item quantity="other">%1$d 位成員</item>
   </plurals>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Signal 訊息</string>
@@ -1961,7 +1961,7 @@
   <string name="preferences__light_theme">淺色</string>
   <string name="preferences__dark_theme">深色</string>
   <string name="preferences__appearance">版面</string>
-  <string name="preferences__theme">佈景主題</string>
+  <string name="preferences__theme">色系</string>
   <string name="preferences__chat_wallpaper">傾偈背景</string>
   <string name="preferences__chat_color_and_wallpaper">傾偈顏色同背景</string>
   <string name="preferences__disable_pin">停用 PIN 碼</string>
@@ -2225,7 +2225,7 @@
   <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_select_all">全部揀選</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>
   <string name="conversation_list_batch__menu_mark_as_read">剔低話睇咗</string>
@@ -2671,7 +2671,7 @@
   <!--ReviewCardDialogFragment-->
   <string name="ReviewCardDialogFragment__review_members">批閱成員</string>
   <string name="ReviewCardDialogFragment__review_request">批閱請求</string>
-  <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d 個谷嘅成員撞名，請批閱下列嘅成員並視乎情況做要做嘅嘢。</string>
+  <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">個谷嘅 %1$d 位成員撞名，請批閱下列成員並視乎情況做要做嘅嘢。</string>
   <string name="ReviewCardDialogFragment__if_youre_not_sure">假如您唔肯定係邊個發出請求，請批閱下列嘅聯絡人並去做要做嘅嘢。</string>
   <string name="ReviewCardDialogFragment__no_other_groups_in_common">無其他有緣相遇嘅谷。</string>
   <string name="ReviewCardDialogFragment__no_groups_in_common">無有緣相遇嘅谷。</string>
@@ -2725,7 +2725,7 @@
   <!--CreateGroupActivity-->
   <string name="CreateGroupActivity__skip">飛過</string>
   <plurals name="CreateGroupActivity__d_members">
-    <item quantity="other">%1$d 個成員</item>
+    <item quantity="other">%1$d 位成員</item>
   </plurals>
   <!--ShareActivity-->
   <string name="ShareActivity__share">分享</string>
@@ -2956,7 +2956,7 @@
   <string name="ExpireTimerSettingsFragment__save">儲存</string>
   <string name="CustomExpireTimerSelectorView__seconds">秒</string>
   <string name="CustomExpireTimerSelectorView__minutes">分鐘</string>
-  <string name="CustomExpireTimerSelectorView__hours">鐘頭</string>
+  <string name="CustomExpireTimerSelectorView__hours">個鐘</string>
   <string name="CustomExpireTimerSelectorView__days">日</string>
   <string name="CustomExpireTimerSelectorView__weeks">星期</string>
   <!--HelpSettingsFragment-->
@@ -3207,7 +3207,7 @@
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">掛上去個人資料度展示</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">揀選為賣飛佛襟章</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__done">搞掂</string>
-  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">若果您有多過一枚襟章，您可揀選一枚做賣飛佛襟章，掛上去個人資料度畀其他人睇到。</string>
+  <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">若您有唔止一枚襟章，您可揀一枚做賣飛佛襟章，掛上去個人資料度畀其他人睇到。</string>
   <string name="ManageDonationsFragment__my_support">我擔當後援</string>
   <string name="ManageDonationsFragment__manage_subscription">管理課金計劃</string>
   <string name="ManageDonationsFragment__badges">襟章</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a32cb120c2..31f4dd7829 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1048,7 +1048,7 @@
     <item quantity="other">%1$d 個成員 (+%2$d 個邀請)</item>
   </plurals>
   <plurals name="MessageRequestProfileView_member_of_d_additional_groups">
-    <item quantity="other">%d 個額外群組</item>
+    <item quantity="other">另 %d 個群組</item>
   </plurals>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">密碼不匹配！</string>