diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 7bb569729b..b529bddbe4 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -91,7 +91,9 @@
   <!--Text that is shown when unblocking a Signal contact-->
   <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">ਤੁਸੀਂ ਇਕ ਦੂਜੇ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਅਤੇ ਕਾਲ ਕਰਨ ਦੇ ਯੋਗ ਹੋਵੋਗੇ ਅਤੇ ਤੁਹਾਡਾ ਨਾਂ ਅਤੇ ਫੋਟੋ ਉਨ੍ਹਾਂ ਨਾਲ ਸਾਂਝੀ ਕੀਤੀ ਜਾਏਗੀ।</string>
   <!--Text that is shown when unblocking an SMS contact-->
+  <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">ਤੁਸੀਂ ਇੱਕ ਦੂਜੇ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜ ਸਕੋਗੇ।</string>
   <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">ਪਾਬੰਦੀਸ਼ੁਦਾ ਲੋਕ ਤੁਹਾਨੂੰ ਕਾਲ ਨਹੀਂ ਕਰ ਸਕਣਗੇ ਜਾਂ ਸੁਨੇਹੇ ਨਹੀਂ ਭੇਜ ਸਕਣਗੇ।</string>
+  <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_send_you_messages">ਪਾਬੰਦੀ ਲਗਾਏ ਲੋਕ ਤੁਹਾਨੂੰ ਸੁਨੇਹੇ ਨਹੀਂ ਭੇਜ ਸਕਣਗੇ।</string>
   <!--Message shown on block dialog when blocking the Signal release notes recipient-->
   <string name="BlockUnblockDialog_block_getting_signal_updates_and_news">Signal ਅੱਪਡੇਟ ਤੇ ਖ਼ਬਰਾਂ ਲੈਣ ਤੋਂ ਪਾਬੰਦੀ ਲਾਓ।</string>
   <!--Message shown on unblock dialog when unblocking the Signal release notes recipient-->
@@ -126,6 +128,7 @@
   <string name="CameraContacts__menu_search">ਖੋਜੋ</string>
   <!--Censorship Circumvention Megaphone-->
   <!--Title for an alert that shows at the bottom of the chat list letting people know that circumvention is no longer needed-->
+  <string name="CensorshipCircumventionMegaphone_turn_off_censorship_circumvention">ਕੀ ਸੈਂਸਰਸ਼ਿਪ ਦਾ ਹੱਲ ਬੰਦ ਕਰਨਾ ਹੈ?</string>
   <!--Body for an alert that shows at the bottom of the chat list letting people know that circumvention is no longer needed-->
   <string name="CensorshipCircumventionMegaphone_you_can_now_connect_to_the_signal_service">ਤੁਸੀਂ ਹੁਣ ਵਧੀਆ ਤਜਰਬੇ ਵਾਸਤੇ Signal ਸੇਵਾ ਨਾਲ ਸਿੱਧਾ ਕਨੈਕਟ ਕਰ ਸਕਦੇ ਹੋ।</string>
   <!--Action to prompt the user to disable circumvention since it is no longer needed-->
@@ -216,8 +219,10 @@
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">ਇਹ ਡਿਵਾਈਸ ਡਾਇਲ ਕਾਰਜਾਂ ਨੂੰ ਸਮਰਥਿਤ ਕਰਦੀ ਨਹੀਂ ਜਾਪਦੀ।</string>
   <string name="ConversationActivity_transport_insecure_sms">ਅਸੁਰੱਖਿਅਤ SMS</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_sms_with_sim">ਅਸੁਰੱਖਿਅਤ SMS (%1$s)</string>
   <string name="ConversationActivity_transport_insecure_mms">ਅਸੁਰੱਖਿਅਤ MMS</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_mms_with_sim">ਅਸੁਰੱਖਿਅਤ MMS (%1$s)</string>
   <string name="ConversationActivity_transport_signal">Signal ਸੁਨੇਹਾ</string>
   <string name="ConversationActivity_lets_switch_to_signal">ਆਓ Signal %1$s ਨੂੰ ਅਪਣਾਈਏ</string>
   <string name="ConversationActivity_specify_recipient">ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਸੰਪਰਕ ਚੁਣੋ</string>
@@ -320,7 +325,9 @@
   <!--Message shown to indicate which notification profile is on/active-->
   <string name="ConversationFragment__s_on">%1$s ਚਾਲੂ</string>
   <!--Dialog title for block group link join requests-->
+  <string name="ConversationFragment__block_request">ਕੀ ਬੇਨਤੀ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣੀ ਹੈ?</string>
   <!--Dialog message for block group link join requests-->
+  <string name="ConversationFragment__s_will_not_be_able_to_join_or_request_to_join_this_group_via_the_group_link">%1$s ਗਰੁੱਪ ਲਿੰਕ ਰਾਹੀਂ ਇਸ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਣਗੇ ਜਾਂ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕਰ ਸਕਣਗੇ। ਉਹਨਾਂ ਨੂੰ ਅਜੇ ਵੀ ਖੁਦ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।</string>
   <!--Dialog confirm block request button-->
   <string name="ConversationFragment__block_request_button">ਬੇਨਤੀ ਉੱਤੇ ਪਾਬੰਦੀ</string>
   <!--Dialog cancel block request button-->
@@ -3838,6 +3845,7 @@
   <!--Displayed in a dialog to let the user select a given users story-->
   <!--Displayed in a dialog to let the user select a given users profile photo-->
   <!--Title for a notification at the bottom of the chat list suggesting that the user disable censorship circumvention because the service has become reachable-->
+  <string name="TurnOffCircumventionMegaphone_turn_off_censorship_circumvention">ਕੀ ਸੈਂਸਰਸ਼ਿਪ ਦਾ ਹੱਲ ਬੰਦ ਕਰਨਾ ਹੈ?</string>
   <!--Body for a notification at the bottom of the chat list suggesting that the user disable censorship circumvention because the service has become reachable-->
   <string name="TurnOffCircumventionMegaphone_you_can_now_connect_to_the_signal_service_directly">ਤੁਸੀਂ ਹੁਣ ਵਧੀਆ ਤਜਰਬੇ ਵਾਸਤੇ Signal ਸੇਵਾ ਨਾਲ ਸਿੱਧਾ ਕਨੈਕਟ ਕਰ ਸਕਦੇ ਹੋ।</string>
   <!--Label for a button to dismiss a notification at the bottom of the chat list suggesting that the user disable censorship circumvention because the service has become reachable-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4d3d9ee78e..fa3321c4e6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -221,8 +221,10 @@
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Wygląda na to, że urządzenie nie wspiera wybierania numeru.</string>
   <string name="ConversationActivity_transport_insecure_sms">Nieszyfrowany SMS</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_sms_with_sim">Nieszyfrowany SMS (%1$s)</string>
   <string name="ConversationActivity_transport_insecure_mms">Nieszyfrowany MMS</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_mms_with_sim">Nieszyfrowany MMS (%1$s)</string>
   <string name="ConversationActivity_transport_signal">Wiadomość Signal</string>
   <string name="ConversationActivity_lets_switch_to_signal">Zacznij używać Signal %1$s</string>
   <string name="ConversationActivity_specify_recipient">Proszę wybierz kontakt</string>
@@ -731,6 +733,7 @@
   <string name="AddGroupDetailsFragment__group_creation_failed">Tworzenie grupy nie powiodło się.</string>
   <string name="AddGroupDetailsFragment__try_again_later">Spróbuj ponownie później.</string>
   <!--Displayed when adding group details to an MMS Group-->
+  <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">Zaznaczyłeś kontakt, którego urządzenie nie obsługuje grup Signal, więc niniejsza grupa będzie grupą MMS-ową. Własne nazwy i zdjęcia grup MMS-owych będą widoczne tylko dla Ciebie.</string>
   <string name="AddGroupDetailsFragment__remove">Usuń</string>
   <string name="AddGroupDetailsFragment__sms_contact">Kontakt SMS</string>
   <string name="AddGroupDetailsFragment__remove_s_from_this_group">Usunąć %1$s z tej grupy?</string>
@@ -1003,6 +1006,7 @@
   <string name="NotificationBarManager__incoming_signal_call">Przychodzące połączenie Signal</string>
   <string name="NotificationBarManager__incoming_signal_group_call">Przychodzące połączenie grupowe Signal</string>
   <!--Temporary notification shown when starting the calling service-->
+  <string name="NotificationBarManager__starting_signal_call_service">Uruchamianie usługi połączeń Signal</string>
   <string name="NotificationBarManager__stopping_signal_call_service">Zatrzymywanie usługi połączeń Signal</string>
   <string name="NotificationBarManager__decline_call">Odrzuć połączenie</string>
   <string name="NotificationBarManager__answer_call">Odbierz</string>
@@ -3779,6 +3783,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--Copy displayed when badge expires after payment failure-->
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">Twoja comiesięczna subskrypcja została anulowana, gdyż nie udało nam się przetworzyć Twojej płatności. Twoja odznaka nie jest już widoczna w Twoim profilu.</string>
   <!--Copy displayed when badge expires after a payment failure and we have a displayable charge failure reason-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s">Twoja comiesięczna darowizna została anulowana. %1$s Twoja odznaka %2$s nie jest już widoczna na profilu.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">Możesz nadal korzystać z Signal, ale jeśli chcesz wesprzeć aplikację i ponownie uaktywnić swoją odznakę, złóż datek.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Odnów subskrypcję</string>
   <!--Button label to send user to Google Pay website-->
@@ -4064,6 +4069,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--Label when a story fails to send due to networking-->
   <string name="StoriesLandingItem__send_failed">Wysyłanie nie powiodło się</string>
   <!--Label when a story fails to send due to identity mismatch-->
+  <string name="StoriesLandingItem__partially_sent">Częściowo wysłana</string>
   <!--Status label when a story fails to send indicating user action to retry-->
   <string name="StoriesLandingItem__tap_to_retry">Stuknij, aby spróbować ponownie</string>
   <!--Title of dialog confirming decision to hide a story-->
@@ -4092,6 +4098,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--Message of dialog to confirm deletion of story-->
   <string name="MyStories__this_story_will_be_deleted">Ta historia zostanie usunięta u Ciebie i wszystkich, którzy ją otrzymali</string>
   <!--Toast shown when story media cannot be saved-->
+  <string name="MyStories__unable_to_save">Nie udało się zapisać</string>
   <!--Displayed at bottom of story viewer when current item has views-->
   <plurals name="StoryViewerFragment__d_views">
     <item quantity="one">%1$d odsłona</item>
@@ -4216,6 +4223,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--Hint text for searching for a story text post recipient.-->
   <string name="TextStoryPostSendFragment__search">Szukaj</string>
   <!--Toast shown when an unexpected error occurs while sending a text story-->
+  <string name="TextStoryPostSendFragment__an_unexpected_error_occurred_try_again">Wystąpił nieoczekiwany błąd</string>
   <!--Title for screen allowing user to hide "My Story" entries from specific people-->
   <!-- Removed by excludeNonTranslatables <string name="HideStoryFromFragment__hide_story_from">Ukryj historię przed…</string> -->
   <!--Done button label for hide story from screen-->
@@ -4312,6 +4320,12 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="ExpandModel__view_more">Pokaż więcej</string>
   <string name="StoriesLinkPopup__visit_link">Odwiedź link</string>
   <!--Duration and price information-->
+  <plurals name="GiftRowItem_s_dot_d_day_duration">
+    <item quantity="one">%1$s · aktywna %2$d dzień</item>
+    <item quantity="few">%1$s · aktywna %2$d dni</item>
+    <item quantity="many">%1$s · aktywna %2$d dni</item>
+    <item quantity="other">%1$s · aktywna %2$d dni</item>
+  </plurals>
   <!--Tagline for gift row items-->
   <string name="GiftRowItem__send_a_gift_badge">Wyślij odznakę w prezencie</string>
   <!--Headline text on start fragment for gifting a badge-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 450fd941af..64147f7f42 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -220,8 +220,11 @@
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Овај уређај изгледа не подржава радње бирања.</string>
   <string name="ConversationActivity_transport_insecure_sms">Необезбеђени СМС</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_sms_with_sim">Nebezbedan SMS (%1$s)</string>
   <string name="ConversationActivity_transport_insecure_mms">Необезбеђени ММС</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_mms_with_sim">Nebezbedan MMS (%1$s)</string>
+  <string name="ConversationActivity_transport_signal">Signal poruka</string>
   <string name="ConversationActivity_lets_switch_to_signal">Пребацимо се на Signal %1$s</string>
   <string name="ConversationActivity_specify_recipient">Одредите примаоца</string>
   <string name="ConversationActivity_unblock">Одблокирај</string>
@@ -692,6 +695,7 @@
   <string name="AddGroupDetailsFragment__group_creation_failed">Креирање групе није успело.</string>
   <string name="AddGroupDetailsFragment__try_again_later">Покушајте поново касније.</string>
   <!--Displayed when adding group details to an MMS Group-->
+  <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">Izabrali ste kontakt koji ne podržava Signal grupe, tako da će ova grupa biti MMS. Prilagođeni nazivi i fotografije MMS grupa biće vidljivi samo vama.</string>
   <string name="AddGroupDetailsFragment__remove">Уклони</string>
   <string name="AddGroupDetailsFragment__sms_contact">SMS контакт</string>
   <string name="AddGroupDetailsFragment__remove_s_from_this_group">Желите да уклоните %1$s из ове групе?</string>
@@ -953,6 +957,7 @@
   <string name="NotificationBarManager__incoming_signal_call">Долазни Signal позив</string>
   <string name="NotificationBarManager__incoming_signal_group_call">Долазни Signal групни позив</string>
   <!--Temporary notification shown when starting the calling service-->
+  <string name="NotificationBarManager__starting_signal_call_service">Pokretanje Signalove usluge poziva</string>
   <string name="NotificationBarManager__stopping_signal_call_service">Заустављање сервиса позива Signal-а</string>
   <string name="NotificationBarManager__decline_call">Одбиј позив</string>
   <string name="NotificationBarManager__answer_call">Одговори на позив</string>
@@ -1370,6 +1375,7 @@
   <!--Title for dialog warning about lacking bluetooth permissions during a call-->
   <string name="WebRtcCallActivity__bluetooth_permission_denied">Bluetooth дозвола одбијена</string>
   <!--Message for dialog warning about lacking bluetooth permissions during a call and references the permission needed by name-->
+  <string name="WebRtcCallActivity__please_enable_the_nearby_devices_permission_to_use_bluetooth_during_a_call">Omogućite dozvolu „Uređaji u blizini“ da biste koristili bluetooth tokom poziva.</string>
   <!--Positive action for bluetooth warning dialog to open settings-->
   <string name="WebRtcCallActivity__open_settings">Отворити подешавања</string>
   <!--Negative aciton for bluetooth warning dialog to dismiss dialog-->
@@ -3622,6 +3628,7 @@
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_nonprofit_with_no">Signal је непрофитна без оглашивача или инвеститора, што је одржило само људи који га користе и цене. Направите понављајући месечни допринос и примите значку профила да бисте поделили своју подршку.</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_donate">Зашто донирати?</string>
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_committed_to_developing">Signal се залаже за развој технологије приватности отвореног кода која штити слободно изражавање и омогућава сигурну глобалну комуникацију.</string>
+  <string name="SubscribeLearnMoreBottomSheetDialogFragment__your_donation">Vaša donacija podstiče ovaj cilj i koristi se za razvoj i rad aplikacije koju milioni koriste za privatnu komunikaciju. Bez oglasa. Bez praćenja. Bez zezanja.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Хвала вам на подршци!</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost">Хвала вам на Boost!</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display">Добили сте %s беџ! Прикажите ову значку на свом профилу да бисте подигли свест о донирању Signal.</string>
@@ -3672,12 +3679,16 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and">Ваша Boost значка је истекла, и не може више де се види на вашем профилу.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate">Можете поново активирати своју Boost значку још 30 дана са једнократним доприносом.</string>
   <!--Displayed when we do not think the user is a subscriber when their boost expires-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_keep">I dalje možete da koristite Signal, ali da biste podržali tehnologiju koja je napravljena za vas, razmotrite opciju da postanete podržavalac tako što ćete davati mesečnu donaciju.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer">Постати одрживач</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">Додајте Буст</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Не сада</string>
   <!--Copy displayed when badge expires after user inactivity-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically">Vaša periodična mesečna donacija je automatski otkazana jer ste predugo bili neaktivni. Značka „%1$s“ više nije vidljiva na vašem profilu.</string>
   <!--Copy displayed when badge expires after payment failure-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">Vaša periodična mesečna donacija je otkazana jer nismo mogli da obradimo vašu uplatu. Vaša značka više nije vidljiva na vašem profilu.</string>
   <!--Copy displayed when badge expires after a payment failure and we have a displayable charge failure reason-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s">Vaša periodična mesečna donacija je otkazana. %1$s Značka „%2$s“ više nije vidljiva na vašem profilu.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">Још увек можете да кориситите Signal али да подржите апликацију и поново активирате своју значку, обновите сада.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Обновити претплату</string>
   <!--Button label to send user to Google Pay website-->
@@ -3927,6 +3938,7 @@
   <!--Donation receipts amount title-->
   <string name="DonationReceiptDetailsFragment__amount">Сума</string>
   <!--Donation receipts thanks-->
+  <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Hvala vam što podržavate Signal. Vaš doprinos omogućava podsticanje misije razvoja tehnologije otvorenog koda za zaštitu privatnosti koja štiti slobodno izražavanje i omogućava bezbednu globalnu komunikaciju milionima širom sveta. Ako ste rezident Sjedinjenih Američkih Država, sačuvajte ovu priznanicu za svoju poresku evidenciju. Signal Technology Foundation je neprofitna organizacija izuzeta od oporezivanja u Sjedinjenim Američkim Državama prema odeljku 501c3 Zakona o internim prihodima. Naš savezni poreski broj je 82–4506840.</string>
   <!--Donation receipt type-->
   <string name="DonationReceiptDetailsFragment__s_dash_s">%1$s - %2$s</string>
   <!--Donation reciepts screen empty state title-->
@@ -3961,6 +3973,7 @@
   <!--Label when a story fails to send due to networking-->
   <string name="StoriesLandingItem__send_failed">Слање није успело</string>
   <!--Label when a story fails to send due to identity mismatch-->
+  <string name="StoriesLandingItem__partially_sent">Delimično poslato</string>
   <!--Status label when a story fails to send indicating user action to retry-->
   <string name="StoriesLandingItem__tap_to_retry">Пипнути да се понови</string>
   <!--Title of dialog confirming decision to hide a story-->
@@ -3988,6 +4001,7 @@
   <!--Message of dialog to confirm deletion of story-->
   <string name="MyStories__this_story_will_be_deleted">Ова прича ће бити избрисана за вас и све који су је примили.</string>
   <!--Toast shown when story media cannot be saved-->
+  <string name="MyStories__unable_to_save">Nije moguće sačuvati</string>
   <!--Displayed at bottom of story viewer when current item has views-->
   <plurals name="StoryViewerFragment__d_views">
     <item quantity="one">%1$d преглед</item>
@@ -4109,6 +4123,7 @@
   <!--Hint text for searching for a story text post recipient.-->
   <string name="TextStoryPostSendFragment__search">Претрага</string>
   <!--Toast shown when an unexpected error occurs while sending a text story-->
+  <string name="TextStoryPostSendFragment__an_unexpected_error_occurred_try_again">Došlo je do neočekivane greške</string>
   <!--Title for screen allowing user to hide "My Story" entries from specific people-->
   <!-- Removed by excludeNonTranslatables <string name="HideStoryFromFragment__hide_story_from">Сакриј причу од…</string> -->
   <!--Done button label for hide story from screen-->
@@ -4204,6 +4219,11 @@
   <string name="ExpandModel__view_more">Види још</string>
   <string name="StoriesLinkPopup__visit_link">Посетите везу</string>
   <!--Duration and price information-->
+  <plurals name="GiftRowItem_s_dot_d_day_duration">
+    <item quantity="one">%1$s · trajanje: %2$d dan</item>
+    <item quantity="few">%1$s · trajanje: %2$d dan(a)</item>
+    <item quantity="other">%1$s · trajanje: %2$d dan(a)</item>
+  </plurals>
   <!--Tagline for gift row items-->
   <string name="GiftRowItem__send_a_gift_badge">Послати поклон значку</string>
   <!--Headline text on start fragment for gifting a badge-->
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index 04cfbd3533..3ef7c17ca1 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -218,8 +218,10 @@
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">呢部機似乎無得撥輪喎。</string>
   <string name="ConversationActivity_transport_insecure_sms">唔安全嘅短訊</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_sms_with_sim">唔安全嘅短訊 (%1$s)</string>
   <string name="ConversationActivity_transport_insecure_mms">唔安全嘅多媒體短訊</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_mms_with_sim">唔安全嘅多媒體短訊 (%1$s)</string>
   <string name="ConversationActivity_transport_signal">Signal 訊息</string>
   <string name="ConversationActivity_lets_switch_to_signal">不如我哋齊齊轉會 Signal %1$s</string>
   <string name="ConversationActivity_specify_recipient">請揀一位聯絡人吖</string>
@@ -617,6 +619,7 @@
   <string name="AddGroupDetailsFragment__group_creation_failed">開唔到新谷。</string>
   <string name="AddGroupDetailsFragment__try_again_later">陣間再試下啦。</string>
   <!--Displayed when adding group details to an MMS Group-->
+  <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">您揀左一個唔支援 Signal 群組嘅聯絡人。所以呢個群組將會用多媒體短訊。只有您先可以睇到自訂多媒體短訊群組嘅名同埋相。</string>
   <string name="AddGroupDetailsFragment__remove">移除</string>
   <string name="AddGroupDetailsFragment__sms_contact">短訊聯絡人</string>
   <string name="AddGroupDetailsFragment__remove_s_from_this_group">係咪要踼 %1$s 出呢個谷？</string>
@@ -856,6 +859,7 @@
   <string name="NotificationBarManager__incoming_signal_call">打入嚟嘅 Signal 通話</string>
   <string name="NotificationBarManager__incoming_signal_group_call">打入嚟嘅 Signal 成谷通話</string>
   <!--Temporary notification shown when starting the calling service-->
+  <string name="NotificationBarManager__starting_signal_call_service">開始 Signal 通話服務</string>
   <string name="NotificationBarManager__stopping_signal_call_service">停止緊 Signal 通話服務</string>
   <string name="NotificationBarManager__decline_call">拒絕通話</string>
   <string name="NotificationBarManager__answer_call">接聽通話</string>
@@ -1100,6 +1104,7 @@
   <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_do_you_want_to_join_this_group_you_wont_see_their_messages">係咪要加入呢個群組，仲同群組成員分享您嘅名同相？您要同意先可以睇到佢哋嘅訊息。</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>
@@ -1236,8 +1241,11 @@
   <!--Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect-->
   <string name="WebRtcCallActivity__reconnecting">重新連緊線…</string>
   <!--Title for dialog warning about lacking bluetooth permissions during a call-->
+  <string name="WebRtcCallActivity__bluetooth_permission_denied">藍牙權限被拒</string>
   <!--Message for dialog warning about lacking bluetooth permissions during a call and references the permission needed by name-->
+  <string name="WebRtcCallActivity__please_enable_the_nearby_devices_permission_to_use_bluetooth_during_a_call">請您啟用「附近裝置」權限嚟喺通話嗰陣用藍牙。</string>
   <!--Positive action for bluetooth warning dialog to open settings-->
+  <string name="WebRtcCallActivity__open_settings">打開設定</string>
   <!--Negative aciton for bluetooth warning dialog to dismiss dialog-->
   <string name="WebRtcCallActivity__not_now">遲啲先啦</string>
   <!--WebRtcCallView-->
@@ -1476,8 +1484,11 @@
   <string name="ThreadRecord_video">影片</string>
   <string name="ThreadRecord_chat_session_refreshed">傾偈階段已經重新整理</string>
   <!--Displayed in the notification when the user is sent a gift-->
+  <string name="ThreadRecord__you_received_a_gift">您收到一份禮品</string>
   <!--Displayed in the notification when the user sends a gift-->
+  <string name="ThreadRecord__you_sent_a_gift">您送出咗一份禮品</string>
   <!--Displayed in the notification when the user has opened a received gift-->
+  <string name="ThreadRecord__you_redeemed_a_gift_badge">您換領咗一個禮品徽章</string>
   <!--UpdateApkReadyListener-->
   <string name="UpdateApkReadyListener_Signal_update">Signal 更新</string>
   <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Signal 出咗新版本喇，撳一下以更新</string>
@@ -1616,6 +1627,7 @@
   <string name="SingleRecipientNotificationBuilder_message_request">訊息請求</string>
   <string name="SingleRecipientNotificationBuilder_you">您</string>
   <!--Notification subtext for group stories-->
+  <string name="SingleRecipientNotificationBuilder__s_dot_story">%1$s • 限時動態</string>
   <!--ThumbnailView-->
   <string name="ThumbnailView_Play_video_description">播片</string>
   <string name="ThumbnailView_Has_a_caption_description">有題字</string>
@@ -1754,6 +1766,7 @@
   <!--Label indicating that the story being replied to no longer exists-->
   <string name="QuoteView_no_longer_available">已經收檔</string>
   <!--Label for quoted gift-->
+  <string name="QuoteView__gift">禮品</string>
   <!--conversation_fragment-->
   <string name="conversation_fragment__scroll_to_the_bottom_content_description">拉到落最底</string>
   <!--BubbleOptOutTooltip-->
@@ -3412,6 +3425,8 @@
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__your_donation">擔當呢份使命，全靠您嘅捐款做後援，幫手補貼程式開發同營運嘅燈油火蠟，等世界上數以百萬計嘅人，都用到同一個 app 做私密通訊，開住個「爐」為對方焗一份蘋果派。無廣告、無追蹤、堅過石堅。</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">多謝您嘅鼎力支持！</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost">多謝您為我哋集氣！</string>
+  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display">您得到「%s」徽章！不妨喺您嘅個人資料顯示徽章，等大家一呼百應，一齊捐款撐起 Signal。</string>
+  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display">您得到「贊助徽章」！不妨喺您嘅個人資料顯示徽章，等大家一呼百應，一齊捐款撐起 Signal。</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also">不妨考慮埋</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer">擔當月供課金計劃嘅後援。</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">掛上去個人資料度展示</string>
@@ -3435,7 +3450,9 @@
   <string name="ManageDonationsFragment__subscription_faq">課金計劃問答</string>
   <string name="ManageDonationsFragment__error_getting_subscription">攞返課金計劃嘅時候發生錯誤。</string>
   <!--Preference heading for other ways to donate-->
+  <string name="ManageDonationsFragment__other_ways_to_give">其他捐款方式</string>
   <!--Preference label to launch badge gifting-->
+  <string name="ManageDonationsFragment__gift_a_badge">贈送徽章</string>
   <string name="BoostFragment__give_signal_a_boost">Signal 賣旗籌款</string>
   <!--Description text in boost sheet-->
   <string name="BoostFragment__make_a_one_time">單次捐款奉送「集氣」襟章一枚，為期 %1$d 日，聊作心意。</string>
@@ -3461,8 +3478,11 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">買多支旗</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">遲啲先啦</string>
   <!--Copy displayed when badge expires after user inactivity-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically">因為您冇用一段時間，所以您嘅每月定期捐款已經自動取消。您嘅個人資料唔會再顯示「%1$s」徽章。</string>
   <!--Copy displayed when badge expires after payment failure-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">因為我哋處理唔到您嘅付款，所以您嘅每月定期捐款已經取消。您嘅個人資料唔會再顯示徽章。</string>
   <!--Copy displayed when badge expires after a payment failure and we have a displayable charge failure reason-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s">您嘅每月定期捐款已經取消。%1$s 您嘅個人資料唔會再顯示「%2$s」徽章。</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">Signal 一切如常運作，並讓您自由使用。若要繼續支持呢個 app 並掛返起您個襟章，請立即續期。</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">為課金計劃續期</string>
   <!--Button label to send user to Google Pay website-->
@@ -3483,9 +3503,13 @@
   <string name="DonationsErrors__still_processing">仲處理緊</string>
   <string name="DonationsErrors__couldnt_add_badge">加唔到個襟章</string>
   <!--Displayed when badge credential couldn\'t be verified-->
+  <string name="DonationsErrors__failed_to_validate_badge">驗證唔到徵章</string>
   <!--Displayed when badge credential couldn\'t be verified-->
+  <string name="DonationsErrors__could_not_validate">驗證唔到伺服器回應。請聯絡支援團隊。</string>
   <!--Displayed as title when some generic error happens during gift badge sending-->
+  <string name="DonationsErrors__failed_to_send_gift_badge">傳送唔到禮品徽章</string>
   <!--Displayed as message when some generic error happens during gift badge sending-->
+  <string name="DonationsErrors__could_not_send_gift_badge">傳送唔到禮品徽章。請聯絡支援團隊。</string>
   <string name="DonationsErrors__your_badge_could_not">您個襟章加唔到落去您個帳戶度，但有可能已經扣咗您數。請聯絡支援。</string>
   <string name="DonationsErrors__your_payment_is_still">仲處理緊您嘅付款。視乎您嘅上網速度，可能需時幾分鐘。</string>
   <string name="DonationsErrors__google_pay_unavailable">用唔到 Google Pay</string>
@@ -3496,19 +3520,27 @@
   <string name="NetworkFailure__network_error_check_your_connection_and_try_again">網絡有問題。請檢查您嘅連線，然後再試下啦。</string>
   <string name="NetworkFailure__retry">再試一次</string>
   <!--Displayed as a dialog title when the selected recipient for a gift doesn\'t support gifting-->
+  <string name="DonationsErrors__recipient_verification_failed">驗證唔到接收人。</string>
   <!--Displayed as a dialog message when the selected recipient for a gift doesn\'t support gifting-->
+  <string name="DonationsErrors__target_does_not_support_gifting">對方唔支援送禮。</string>
   <!--Displayed as a dialog title when the user\'s profile could not be fetched, likely due to lack of internet-->
+  <string name="DonationsErrors__could_not_verify_recipient">驗證唔到接收人。</string>
   <!--Displayed as a dialog message when the user\'s profile could not be fetched, likely due to lack of internet-->
+  <string name="DonationsErrors__please_check_your_network_connection">請檢查您嘅網路連線，然後再試一次。</string>
   <!--Gift message view title-->
+  <string name="GiftMessageView__gift_badge">禮品徽章</string>
   <!--Gift message view expiry information-->
   <plurals name="GiftMessageView__lasts_for_d_months">
     <item quantity="other">為期 %1$d 個月</item>
   </plurals>
   <!--Gift badge redeem action label-->
+  <string name="GiftMessageView__redeem">換領</string>
   <!--Gift badge view action label-->
   <string name="GiftMessageView__view">睇下</string>
   <!--Gift badge redeeming action label-->
+  <string name="GiftMessageView__redeeming">換領緊…</string>
   <!--Gift badge redeemed label-->
+  <string name="GiftMessageView__redeemed">換領咗</string>
   <!--Stripe decline code generic_failure-->
   <string name="DeclineCode__try_another_payment_method_or_contact_your_bank">試下轉另一個付款方法，又或者聯絡返您間銀行問清楚。</string>
   <!--Stripe decline code verify on Google Pay and try again-->
@@ -3680,6 +3712,7 @@
   <!--Donation receipts one-time tab label-->
   <string name="DonationReceiptListFragment__one_time">單次</string>
   <!--Donation receipts gift tab label-->
+  <string name="DonationReceiptListFragment__gift">禮品</string>
   <!--Donation receipts boost row label-->
   <string name="DonationReceiptListFragment__boost">集氣</string>
   <!--Donation receipts details title-->
@@ -3701,6 +3734,7 @@
   <!--Donation receipt type-->
   <string name="DonationReceiptDetailsFragment__s_dash_s">%1$s - %2$s</string>
   <!--Donation reciepts screen empty state title-->
+  <string name="DonationReceiptListFragment__no_receipts">無收據</string>
   <!--region "Stories Tab"-->
   <!--Label for Chats tab in home app screen-->
   <string name="ConversationListTabs__chats">傾偈</string>
@@ -3731,6 +3765,7 @@
   <!--Label when a story fails to send due to networking-->
   <string name="StoriesLandingItem__send_failed">傳送失敗</string>
   <!--Label when a story fails to send due to identity mismatch-->
+  <string name="StoriesLandingItem__partially_sent">已部分傳送</string>
   <!--Status label when a story fails to send indicating user action to retry-->
   <string name="StoriesLandingItem__tap_to_retry">撳一下再試一次</string>
   <!--Title of dialog confirming decision to hide a story-->
@@ -3756,6 +3791,7 @@
   <!--Message of dialog to confirm deletion of story-->
   <string name="MyStories__this_story_will_be_deleted">呢味是日花生，您同埋收到佢嘅全世界都會剷走佢個囉噃。</string>
   <!--Toast shown when story media cannot be saved-->
+  <string name="MyStories__unable_to_save">儲存唔到</string>
   <!--Displayed at bottom of story viewer when current item has views-->
   <plurals name="StoryViewerFragment__d_views">
     <item quantity="other">%1$d 次遊覽</item>
@@ -3773,6 +3809,7 @@
   <!--Displayed when viewing a post from another user with no replies-->
   <string name="StoryViewerPageFragment__reply">回覆</string>
   <!--Label for the reply button in story viewer, which will launch the group story replies bottom sheet.-->
+  <string name="StoryViewerPageFragment__reply_to_group">回覆群組</string>
   <!--Displayed when a story has no views-->
   <string name="StoryViewsFragment__no_views_yet">未有人遊覽</string>
   <!--Displayed when a story has no replies yet-->
@@ -3798,6 +3835,7 @@
   <!--Story settings private stories heading-->
   <string name="StorySettingsFragment__private_stories">私伙放送是日花生</string>
   <!--Note at bottom of story settings regarding who can see private stories.-->
+  <string name="StorySettingsFragment__private_stories_can_only_be_viewed">只有您加入嘅成員先可以睇到私人限時動態。只有您先可以睇到限時動態嘅名。</string>
   <!--Option label for creating a new private story-->
   <string name="StorySettingsFragment__new_private_story">整多味私伙放送是日花生</string>
   <!--Page title for My Story options-->
@@ -3869,6 +3907,7 @@
   <!--Hint text for searching for a story text post recipient.-->
   <string name="TextStoryPostSendFragment__search">搜尋</string>
   <!--Toast shown when an unexpected error occurs while sending a text story-->
+  <string name="TextStoryPostSendFragment__an_unexpected_error_occurred_try_again">發生未知錯誤</string>
   <!--Title for screen allowing user to hide "My Story" entries from specific people-->
   <!-- Removed by excludeNonTranslatables <string name="HideStoryFromFragment__hide_story_from">隱藏是日花生唔俾佢睇…</string> -->
   <!--Done button label for hide story from screen-->
@@ -3928,6 +3967,7 @@
   <!--Displayed in story caption when content is longer than 5 lines-->
   <string name="StoryViewerPageFragment__see_more">… 睇埋佢</string>
   <!--Displayed in toast after sending a direct reply-->
+  <string name="StoryDirectReplyDialogFragment__sending_reply">傳送緊回覆…</string>
   <!--Displayed in the viewer when a story is no longer available-->
   <string name="StorySlateView__this_story_is_no_longer_available">呢味是日花生已經收爐。</string>
   <!--Displayed in the viewer when the network is not available-->
@@ -3961,33 +4001,53 @@
   <string name="ExpandModel__view_more">睇多啲</string>
   <string name="StoriesLinkPopup__visit_link">打開條拎去睇</string>
   <!--Duration and price information-->
+  <plurals name="GiftRowItem_s_dot_d_day_duration">
+    <item quantity="other">%1$s · 為期 %2$d 日</item>
+  </plurals>
   <!--Tagline for gift row items-->
+  <string name="GiftRowItem__send_a_gift_badge">送出一個禮品徽章</string>
   <!--Headline text on start fragment for gifting a badge-->
+  <string name="GiftFlowStartFragment__gift_a_badge">贈送徽章</string>
   <!--Description text on start fragment for gifting a badge-->
+  <string name="GiftFlowStartFragment__gift_someone_a_badge">用其他人嘅名義捐款俾 Signal 可以向對方送上一個徽章。呢個徽章會顯示喺佢嘅個人資料照片到。</string>
   <!--Action button label for start fragment for gifting a badge-->
   <string name="GiftFlowStartFragment__next">下一步</string>
   <!--Title text on choose recipient page for badge gifting-->
+  <string name="GiftFlowRecipientSelectionFragment__choose_recipient">揀選接收人</string>
   <!--Title text on confirm gift page-->
+  <string name="GiftFlowConfirmationFragment__confirm_gift">確認禮品</string>
   <!--Heading text specifying who the gift will be sent to-->
   <string name="GiftFlowConfirmationFragment__send_to">傳畀</string>
   <!--Text explaining that gift will be sent to the chosen recipient-->
+  <string name="GiftFlowConfirmationFragment__your_gift_will_be_sent_in">您嘅禮品會以一對一訊息傳送俾接收人。您可以喺下面加入自己嘅訊息。</string>
   <!--Text explaining that this gift is a one time donation-->
+  <string name="GiftFlowConfirmationFragment__one_time_donation">一次性捐款</string>
   <!--Hint for add message input-->
   <string name="GiftFlowConfirmationFragment__add_a_message">寫返句訊息</string>
   <!--Displayed in the dialog while verifying the chosen recipient-->
+  <string name="GiftFlowConfirmationFragment__verifying_recipient">驗證緊接收人…</string>
   <!--Title for sheet shown when opening a redeemed gift-->
+  <string name="ViewReceivedGiftBottomSheet__s_sent_you_a_gift">%1$s 送咗一份禮品俾您</string>
   <!--Title for sheet shown when opening a sent gift-->
   <string name="ViewSentGiftBottomSheet__thanks_for_your_support">多謝您嘅鼎力支持！</string>
   <!--Description for sheet shown when opening a redeemed gift-->
+  <string name="ViewReceivedGiftBottomSheet__youve_received_a_gift_badge">%1$s 送咗一個禮品徽章俾您！不妨喺您嘅個人資料顯示呢個徽章，等大家一呼百應，一齊撐起 Signal。</string>
   <!--Description for sheet shown when opening a sent gift-->
+  <string name="ViewSentGiftBottomSheet__youve_gifted_a_badge">您送左一個徵章俾 %1$s。當佢接受咗之後就可以揀要顯示定係隱藏徽章。</string>
   <!--Primary action for pending gift sheet to redeem badge now-->
+  <string name="ViewReceivedGiftSheet__redeem">換領</string>
   <!--Primary action for pending gift sheet to redeem badge later-->
   <string name="ViewReceivedGiftSheet__not_now">遲啲先啦</string>
   <!--Dialog text while redeeming a gift-->
+  <string name="ViewReceivedGiftSheet__redeeming_gift">換領緊禮品…</string>
   <!--Snackbar text when user presses "not now" on redemption sheet-->
+  <string name="ConversationFragment__you_can_redeem_your_badge_later">您可以稍後先換領徽章。</string>
   <!--Description text in gift thanks sheet-->
+  <string name="GiftThanksSheet__youve_gifted_a_badge_to_s">您送左一個徵章俾 %1$s。當佢接受咗之後就可以揀要顯示定係隱藏徽章。</string>
   <!--Expired gift sheet title-->
+  <string name="ExpiredGiftSheetConfiguration__your_gift_badge_has_expired">您嘅禮品徽章已經過期</string>
   <!--Expired gift sheet top description text-->
+  <string name="ExpiredGiftSheetConfiguration__your_gift_badge_has_expired_and_is">您嘅禮品徽章已經過期，其他人唔會再喺您嘅個人資料到見到徽章。</string>
   <!--Expired gift sheet bottom description text-->
   <string name="ExpiredGiftSheetConfiguration__to_continue">如果您想繼續力撐為您而設嘅科技，請考慮做我哋月供課金計劃嘅後援金主。</string>
   <!--Expired gift sheet make a monthly donation button-->
@@ -4003,8 +4063,18 @@
     <item quantity="other">成谷放送是日花生 · %1$d 位花生友</item>
   </plurals>
   <!--Gift expiry days remaining-->
+  <plurals name="Gifts__d_days_remaining">
+    <item quantity="other">剩返 %1$d 日</item>
+  </plurals>
   <!--Gift expiry hours remaining-->
+  <plurals name="Gifts__d_hours_remaining">
+    <item quantity="other">剩返 %1$d 個鐘</item>
+  </plurals>
   <!--Gift expiry minutes remaining-->
+  <plurals name="Gifts__d_minutes_remaining">
+    <item quantity="other">剩返 %1$d 分鐘</item>
+  </plurals>
   <!--Gift expiry expired-->
+  <string name="Gifts__expired">過咗期</string>
   <!--EOF-->
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index fad74befed..da9efcfb09 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -218,8 +218,10 @@
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">此裝置似乎不支援撥打動作。</string>
   <string name="ConversationActivity_transport_insecure_sms">不安全的短訊</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_sms_with_sim">不安全的短訊 (%1$s)</string>
   <string name="ConversationActivity_transport_insecure_mms">不安全的多媒體短訊</string>
   <!--A title for the option to send an SMS with a placeholder to put the name of their SIM card-->
+  <string name="ConversationActivity_transport_insecure_mms_with_sim">不安全的多媒體短訊 (%1$s)</string>
   <string name="ConversationActivity_transport_signal">Signal 訊息</string>
   <string name="ConversationActivity_lets_switch_to_signal">我們不如改用 Signal 吧 %1$s</string>
   <string name="ConversationActivity_specify_recipient">請選擇一個聯絡人</string>
@@ -617,6 +619,7 @@
   <string name="AddGroupDetailsFragment__group_creation_failed">群組建立失敗。</string>
   <string name="AddGroupDetailsFragment__try_again_later">請稍後再試。</string>
   <!--Displayed when adding group details to an MMS Group-->
+  <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">您選擇了一個不支援 Signal 群組的聯絡人。因此，這群組將會用多媒體短訊。只有您可看見自訂多媒體短訊群組的名稱和照片。</string>
   <string name="AddGroupDetailsFragment__remove">移除</string>
   <string name="AddGroupDetailsFragment__sms_contact">短訊聯絡人</string>
   <string name="AddGroupDetailsFragment__remove_s_from_this_group">要從此群組中移除 %1$s 嗎？</string>
@@ -856,6 +859,7 @@
   <string name="NotificationBarManager__incoming_signal_call">Signal 來電</string>
   <string name="NotificationBarManager__incoming_signal_group_call">Signal 群組來電</string>
   <!--Temporary notification shown when starting the calling service-->
+  <string name="NotificationBarManager__starting_signal_call_service">開始 Signal 通話服務</string>
   <string name="NotificationBarManager__stopping_signal_call_service">正在停止 Signal 通話服務</string>
   <string name="NotificationBarManager__decline_call">拒接通話</string>
   <string name="NotificationBarManager__answer_call">接聽通話</string>
@@ -3477,6 +3481,7 @@
   <!--Copy displayed when badge expires after payment failure-->
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">我們未能處理您的付款，因此您的每月定期捐款已取消。您的徽章不再見於您的個人資料中。</string>
   <!--Copy displayed when badge expires after a payment failure and we have a displayable charge failure reason-->
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s">您的每月定期捐款已經取消。%1$s 您的個人資料不會再顯示「%2$s」徽章。</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">您可如常使用 Signal，沒有關係。假如您希望支持此應用程式並延續您的徽章，請立即續期。</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">為訂閱續期</string>
   <!--Button label to send user to Google Pay website-->
@@ -3759,6 +3764,7 @@
   <!--Label when a story fails to send due to networking-->
   <string name="StoriesLandingItem__send_failed">傳送失敗</string>
   <!--Label when a story fails to send due to identity mismatch-->
+  <string name="StoriesLandingItem__partially_sent">已部分傳送</string>
   <!--Status label when a story fails to send indicating user action to retry-->
   <string name="StoriesLandingItem__tap_to_retry">輕觸以重試</string>
   <!--Title of dialog confirming decision to hide a story-->
@@ -3784,6 +3790,7 @@
   <!--Message of dialog to confirm deletion of story-->
   <string name="MyStories__this_story_will_be_deleted">此限時動態將為您以及已接收的所有人刪除。</string>
   <!--Toast shown when story media cannot be saved-->
+  <string name="MyStories__unable_to_save">無法儲存</string>
   <!--Displayed at bottom of story viewer when current item has views-->
   <plurals name="StoryViewerFragment__d_views">
     <item quantity="other">%1$d 次觀看</item>
@@ -3899,6 +3906,7 @@
   <!--Hint text for searching for a story text post recipient.-->
   <string name="TextStoryPostSendFragment__search">搜尋</string>
   <!--Toast shown when an unexpected error occurs while sending a text story-->
+  <string name="TextStoryPostSendFragment__an_unexpected_error_occurred_try_again">發生未知錯誤</string>
   <!--Title for screen allowing user to hide "My Story" entries from specific people-->
   <!-- Removed by excludeNonTranslatables <string name="HideStoryFromFragment__hide_story_from">對這些人隱藏限時動態…</string> -->
   <!--Done button label for hide story from screen-->
@@ -3992,6 +4000,9 @@
   <string name="ExpandModel__view_more">檢視更多</string>
   <string name="StoriesLinkPopup__visit_link">造訪連結</string>
   <!--Duration and price information-->
+  <plurals name="GiftRowItem_s_dot_d_day_duration">
+    <item quantity="other">%1$s · 為期 %2$d 天</item>
+  </plurals>
   <!--Tagline for gift row items-->
   <string name="GiftRowItem__send_a_gift_badge">送贈一枚禮品徽章</string>
   <!--Headline text on start fragment for gifting a badge-->
diff --git a/app/static-ips.gradle b/app/static-ips.gradle
index 5216c2b316..9127e4f460 100644
--- a/app/static-ips.gradle
+++ b/app/static-ips.gradle
@@ -1,5 +1,5 @@
 ext.service_ips='new String[]{"13.248.212.111","76.223.92.165"}'
-ext.storage_ips='new String[]{"142.250.80.51"}'
+ext.storage_ips='new String[]{"142.251.40.147"}'
 ext.cdn_ips='new String[]{"108.139.29.116","108.139.29.3","108.139.29.31","108.139.29.99"}'
 ext.cdn2_ips='new String[]{"104.18.33.175","172.64.154.81"}'
 ext.cds_ips='new String[]{"20.73.137.187"}'