From 71f6c77b42c79cdb3cc4dfcf726c0068a805ab32 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 19 Sep 2024 11:09:24 -0300
Subject: [PATCH 1/4] Fix missing paymentMethodType in keep-alive payment
 creation.

---
 .../org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
index c16ef02d13..b71e98868c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
@@ -250,6 +250,7 @@ class InAppPaymentKeepAliveJob private constructor(
         subscriberId = subscriber.subscriberId,
         endOfPeriod = endOfCurrentPeriod,
         inAppPaymentData = InAppPaymentData(
+          paymentMethodType = subscriber.paymentMethodType,
           badge = badge,
           amount = FiatValue(
             currencyCode = subscriber.currency.currencyCode,

From 1d719333a3c30937d205de275a107da59a152c2d Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 19 Sep 2024 12:23:51 -0300
Subject: [PATCH 2/4] Heal SEPA transfer keep-alive failures.

---
 .../securesms/jobs/InAppPaymentKeepAliveJob.kt     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
index b71e98868c..c41337f88c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
@@ -10,6 +10,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toDecimalValue
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
 import org.thoughtcrime.securesms.components.settings.app.subscription.manage.DonationRedemptionJobStatus
 import org.thoughtcrime.securesms.components.settings.app.subscription.manage.DonationRedemptionJobWatcher
 import org.thoughtcrime.securesms.database.InAppPaymentTable
@@ -281,6 +282,19 @@ class InAppPaymentKeepAliveJob private constructor(
         )
       )
 
+      SignalDatabase.inAppPayments.getById(current.id)
+    } else if (current.state == InAppPaymentTable.State.END && current.data.error != null && current.data.paymentMethodType == InAppPaymentData.PaymentMethodType.UNKNOWN && subscriber.paymentMethodType.toPaymentSourceType().isBankTransfer) {
+      info(type, "Found failed SEPA payment but there's no payment method assigned. Assigning payment method and retrying.")
+      SignalDatabase.inAppPayments.update(
+        current.copy(
+          state = InAppPaymentTable.State.PENDING,
+          data = current.data.copy(
+            paymentMethodType = subscriber.paymentMethodType,
+            error = null
+          )
+        )
+      )
+
       SignalDatabase.inAppPayments.getById(current.id)
     } else {
       current

From db9a2f04f3ab4adee21a49086e19a0033eedaf26 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 19 Sep 2024 16:03:15 -0400
Subject: [PATCH 3/4] Update translations and other static files.

---
 app/src/main/res/values-ar/strings.xml | 42 ++++++++--------
 app/src/main/res/values-de/strings.xml |  4 +-
 app/src/main/res/values-es/strings.xml | 66 +++++++++++++-------------
 app/src/main/res/values-fr/strings.xml |  2 +-
 app/src/main/res/values-nl/strings.xml | 24 +++++-----
 app/src/main/res/values-uk/strings.xml |  2 +-
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index eaaee528a6..2b30d47325 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -741,12 +741,12 @@
     </plurals>
     <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
-        <item quantity="zero">سَيؤدي هذا إلى حذف كل %1$d الدردشات المُختارة بشكل نهائي من كل أجهزتك.</item>
-        <item quantity="one">سيؤدي هذا إلى حذف الدردشة المُختارة بشكل نهائي من كل أجهزتك.</item>
-        <item quantity="two">سيؤدي هذا إلى حذف كلتا %1$d الدردشتين المُختارتين بشكل نهائي من كل أجهزتك.</item>
-        <item quantity="few">سيؤدي هذا إلى حذف كل الـ %1$d دردشات المُختارة بشكل نهائي من كل أجهزتك.</item>
-        <item quantity="many">سيؤدي هذا إلى حذف كل الـ %1$d دردشة المُختارة بشكل نهائي من كل أجهزتك.</item>
-        <item quantity="other">سيؤدي هذا إلى حذف كل الـ %1$d دردشة المُختارة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="zero">سَيؤدي هذا إلى حذف كل %1$d الدردشات المُحدَّدة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="one">سيؤدي هذا إلى حذف الدردشة المُحدَّدة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="two">سيؤدي هذا إلى حذف كلتا %1$d الدردشتين المُحدَّدتين بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="few">سيؤدي هذا إلى حذف كل الـ %1$d دردشات المُحدَّدة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="many">سيؤدي هذا إلى حذف كل الـ %1$d دردشة المُحدَّدة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="other">سيؤدي هذا إلى حذف كل الـ %1$d دردشة المُحدَّدة بشكل نهائي من كل أجهزتك.</item>
     </plurals>
     <string name="ConversationListFragment_deleting">جارٍالحذف</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
@@ -863,7 +863,7 @@
     <!-- Description for radio item stating anyone can see your phone number -->
     <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">أي شخص لديه رقم هاتفك سَيرى أنك متواجد على سيجنال وسَيتمكن من بدء دردشاتٍ معك.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">لن يتمكّن أي أحد من رؤيتك على سيجنال إلاّ إذا راسلته أو كانت لديك دردشة موجودة معه.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">لن يتمكّن أي أحد من رؤيتك على سيجنال إلّا إذا راسلته أو كانت لديك دردشة موجودة معه.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">أترغبُ بالاستعادة مِن نسخة احتياطية؟</string>
@@ -937,7 +937,7 @@
     <string name="BackupsPreferenceFragment__last_backup">أحدث نسخة احتياطية: %1$s</string>
     <string name="BackupsPreferenceFragment__backup_folder">مجلد النسخ الاحتياطية</string>
     <!-- Title for a preference item allowing the user to selected the hour of the day when their chats are backed up. -->
-    <string name="BackupsPreferenceFragment__backup_time">اختيار وقت النسخ الاحتياطي</string>
+    <string name="BackupsPreferenceFragment__backup_time">وقت النسخ الاحتياطي</string>
     <string name="BackupsPreferenceFragment__verify_backup_passphrase">التحقُّق من كلمة سر النسخة اﻻحتياطية</string>
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">اختبر عبارة السر للنسخة الاحتياطية الخاصة بك وتأكَّد من تطابقها.</string>
     <string name="BackupsPreferenceFragment__turn_on">تشغيل</string>
@@ -961,8 +961,8 @@
     <string name="CustomDefaultPreference_none">لا شيء</string>
 
     <!-- AvatarSelectionBottomSheetDialogFragment -->
-    <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">أخذ صورة يتطلب إذن الوصول إلى الكاميرا.</string>
-    <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">عرض معرض صورك يتطلب الإذن بالتخزين.</string>
+    <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">التقاط صورة يتطلَّب إذن الوصول إلى الكاميرا.</string>
+    <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">الوصول إلى معرض الصور يتطلَّب السماح بالوصول إلى ذاكرة التخزين.</string>
 
     <!-- DateUtils -->
     <string name="DateUtils_just_now">الآن</string>
@@ -1016,8 +1016,8 @@
     <string name="ScheduledMessagesBottomSheet_deleting_progress_message">جارٍ حذف الرسائل المُجدولة…</string>
 
     <!-- DecryptionFailedDialog -->
-    <string name="DecryptionFailedDialog_chat_session_refreshed">لقد تم إنعاش جلسة الدردشة</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">يَستخدم سيجنال التعمية من طرف لطرف ويحتاج بعض الأحيان لإنعاش جلسات الدردشات. إن هذا لا يؤثر على أمان دردشتك، لكن قد تفوتك رسالة من جهة الاتصال هذه، لكن يمكن الطلب منها إعادة إرسالها.</string>
+    <string name="DecryptionFailedDialog_chat_session_refreshed">تمَّ تحديث جلسة الدردشة</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">يَستخدم سيجنال التشفير من طرف لطرف، وقد يتطلَّب الأمر منك تحديث جلسة الدردشة في بعض الأحيان. وهذا لا يؤثِّر على أمان دردشتك، لكن قد تفوتك رسالة من جهة الاتصال هذه، حيث يمكن الطلب منهم إعادة إرسالها.</string>
 
     <!-- LinkDeviceFragment -->
     <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
@@ -1081,17 +1081,17 @@
     <string name="AddLinkDeviceFragment__retry">إعادة المُحاولة</string>
 
     <!-- DeviceListActivity -->
-    <string name="DeviceListActivity_unlink_s">إلغاء ربط \'%1$s\'؟</string>
-    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">لن يكون إرسال واستقبال الرسائل ممكنا بمجرد إلغاء ربط الجهاز.</string>
-    <string name="DeviceListActivity_network_connection_failed">فشل الاتصال بالشبكة</string>
-    <string name="DeviceListActivity_try_again">حاول مجددا</string>
-    <string name="DeviceListActivity_unlinking_device">يجري فك الارتباط بالجهاز…</string>
-    <string name="DeviceListActivity_unlinking_device_no_ellipsis">يجري فك الارتباط بالجهاز</string>
-    <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
+    <string name="DeviceListActivity_unlink_s">أترغبُ بإلغاء ربط \'%1$s\'؟</string>
+    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">لن يكون إرسال واستقبال الرسائل مُمكِنًا بمُجرَّد إلغاء ربط الجهاز.</string>
+    <string name="DeviceListActivity_network_connection_failed">فَشِلَ الاتصال بالشبكة</string>
+    <string name="DeviceListActivity_try_again">حاوِل مرة أخرى.</string>
+    <string name="DeviceListActivity_unlinking_device">جارٍ إلغاء الارتباط بالجهاز…</string>
+    <string name="DeviceListActivity_unlinking_device_no_ellipsis">جارٍ إلغاء الارتباط بالجهاز</string>
+    <string name="DeviceListActivity_network_failed">فَشِلَ الاتصال بالشبكة!</string>
 
     <!-- DeviceListItem -->
-    <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
-    <string name="DeviceListItem_linked_s">مقترن %1$s</string>
+    <string name="DeviceListItem_unnamed_device">جهاز غير مُسمَّى</string>
+    <string name="DeviceListItem_linked_s">مُرتبِط %1$s</string>
     <string name="DeviceListItem_last_active_s">آخر مرة %1$s</string>
     <string name="DeviceListItem_today">اليوم</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0736f13dbf..6338365909 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6960,9 +6960,9 @@
 
     <!-- CallLinkIncomingRequestSheet -->
     <!-- Displayed as line item in sheet for approving or denying a single user -->
-    <string name="CallLinkIncomingRequestSheet__approve_entry">Anfrage bestätigen</string>
+    <string name="CallLinkIncomingRequestSheet__approve_entry">Beitritt zulassen</string>
     <!-- Displayed as line item in sheet for approving or denying a single user -->
-    <string name="CallLinkIncomingRequestSheet__deny_entry">Anfrage ablehnen</string>
+    <string name="CallLinkIncomingRequestSheet__deny_entry">Beitritt ablehnen</string>
 
     <!-- EditCallLinkNameDialogFragment -->
     <!-- App bar title for editing a call name -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index dc19791739..b08703525f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -54,7 +54,7 @@
     <string name="ApplicationPreferencesActivity_pin_created">PIN creado.</string>
     <string name="ApplicationPreferencesActivity_pin_disabled">PIN desactivado.</string>
     <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Registrar frase de recuperación de pagos</string>
-    <string name="ApplicationPreferencesActivity_record_phrase">Registrar clave</string>
+    <string name="ApplicationPreferencesActivity_record_phrase">Registrar frase</string>
     <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Antes de desactivar tu PIN, debes registrar la frase de recuperación de tu cartera de pagos para asegurarte de que puedas recuperar tu cuenta de pagos si lo necesitas.</string>
 
     <!-- NumericKeyboardView -->
@@ -202,7 +202,7 @@
     <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Los participantes del grupo no podrán añadirte de nuevo.</string>
     <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Los participantes del grupo podrán añadirte de nuevo.</string>
     <!-- Text that is shown when unblocking a Signal contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Podrás chatear y hablar por teléfono, y tu nombre y foto se compartirán con esta persona.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Podrás chatear y hablar por teléfono, y se compartirán tu nombre y foto con esta persona.</string>
     <!-- Text that is shown when unblocking an SMS contact -->
     <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Podrás chatear con esta persona.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Las personas que bloquees no podrán llamarte ni enviarte mensajes.</string>
@@ -250,7 +250,7 @@
     <!-- Unknown people row icon content description -->
     <string name="CallInfoView__more_information">Más información</string>
     <!-- Unknown people row info dialog message -->
-    <string name="CallInfoView__before_joining_a_call">Antes de unirte a una llamada, solo podrás ver los nombres de las personas que tengas como contactos en tu teléfono, con las que estás en un grupo o con las que hayas chateado en privado. Verás todos los nombres y las fotos una vez que te hayas unido a la llamada.</string>
+    <string name="CallInfoView__before_joining_a_call">Antes de unirte a una llamada, solo podrás ver los nombres de las personas que tengas como contactos en tu teléfono, con las que estés en un grupo o con las que hayas chateado en privado. Verás todos los nombres y las fotos una vez que te hayas unido a la llamada.</string>
     <!-- Unknown people row info dialog action to close the dialog -->
     <string name="CallInfoView__got_it">Entendido</string>
 
@@ -262,7 +262,7 @@
     <string name="CameraXFragment_tap_for_photo_hold_for_video">Toca para hacer una foto o mantén pulsado para grabar un vídeo</string>
     <string name="CameraXFragment_capture_description">Capturar</string>
     <string name="CameraXFragment_change_camera_description">Cambiar cámara</string>
-    <string name="CameraXFragment_open_gallery_description">Abrir galería de fotos</string>
+    <string name="CameraXFragment_open_gallery_description">Abrir galería</string>
     <!-- Button text asking for access to camera permissions -->
     <string name="CameraXFragment_allow_access">Permitir acceso</string>
     <!-- Dialog title asking users for camera and microphone permission -->
@@ -282,11 +282,11 @@
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
     <string name="CameraXFragment_to_scan_qr_code_allow_camera">Para escanear el código QR, permite que Signal acceda a la cámara.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal necesita acceder a la cámara para hacer fotos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal necesita acceso a la cámara para hacer fotos</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal necesita acceder a la cámara para escanear códigos QR</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal necesita acceso a la cámara para escanear códigos QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal necesita acceder al micrófono para grabar vídeos</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal necesita acceso al micrófono para grabar vídeos</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
     <string name="CameraXFragment_to_capture_photos">Para hacer fotos en Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
@@ -391,7 +391,7 @@
 
     <!-- ConversationItem -->
     <string name="ConversationItem_error_not_sent_tap_for_details">No se ha enviado. Toca para ver más información.</string>
-    <string name="ConversationItem_error_partially_not_delivered">No se ha enviado a todas las personas. Toca aquí para ver más información.</string>
+    <string name="ConversationItem_error_partially_not_delivered">No se ha enviado a todas las personas. Toca para ver más información.</string>
     <string name="ConversationItem_error_network_not_delivered">No se ha podido enviar</string>
     <string name="ConversationItem_group_action_left">%1$s ha abandonado el grupo.</string>
     <string name="ConversationItem_send_paused">Envío pausado</string>
@@ -399,7 +399,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">¿Enviar como MMS no cifrado?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque esta persona ya no usa Signal.\n\n¿Enviar mensaje sin cifrar?</string>
     <string name="ConversationItem_unable_to_open_media">No se puede encontrar una aplicación para mostrar este archivo.</string>
-    <string name="ConversationItem_copied_text">Se ha copiado: %1$s</string>
+    <string name="ConversationItem_copied_text">URL copiada: %1$s</string>
     <string name="ConversationItem_from_s">de %1$s</string>
     <string name="ConversationItem_to_s">a %1$s</string>
     <string name="ConversationItem_read_more">  Leer más</string>
@@ -432,9 +432,9 @@
     <string name="ConversationActivity_add_attachment">Añadir archivo adjunto</string>
     <!-- Accessibility text associated with image button to send an edited message. -->
     <string name="ConversationActivity_send_edit">Enviar versión editada</string>
-    <string name="ConversationActivity_compose_message">Redactar mensaje</string>
+    <string name="ConversationActivity_compose_message">Escribir mensaje</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">No se ha podido adjuntar el archivo.</string>
-    <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">La persona que intentas contactar no tiene un número de teléfono móvil o una dirección de correo electrónico válidos.</string>
+    <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">La persona que intentas contactar no puede recibir SMS en su teléfono o no cuenta con una dirección de correo electrónico válida.</string>
     <string name="ConversationActivity_message_is_empty_exclamation">El mensaje está vacío.</string>
     <string name="ConversationActivity_group_members">Participantes del grupo</string>
     <!-- Warning dialog text shown to user if they try to send a message edit that is too old where %1$d is replaced with the amount of hours, e.g. 3 -->
@@ -463,7 +463,7 @@
     <string name="ConversationActivity_lets_switch_to_signal">Pasémonos a Signal %1$s</string>
     <string name="ConversationActivity_specify_recipient">Selecciona un contacto</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">El archivo adjunto excede el límite de tamaño para el tipo de mensaje que intentas enviar.</string>
-    <string name="ConversationActivity_unable_to_record_audio">No se ha podido grabar el mensaje de voz</string>
+    <string name="ConversationActivity_unable_to_record_audio">No se ha podido grabar el audio</string>
     <string name="ConversationActivity_you_cant_send_messages_to_this_group">No puedes enviar mensajes porque ya no formas parte de este grupo.</string>
     <string name="ConversationActivity_only_s_can_send_messages">Solo %1$s pueden enviar mensajes.</string>
     <string name="ConversationActivity_admins">admins</string>
@@ -852,14 +852,14 @@
 
     <!-- BackupsPreferenceFragment -->
     <string name="BackupsPreferenceFragment__chat_backups">Copias de seguridad de los chats</string>
-    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Las copias de seguridad se cifran con una clave y se guardan en tu dispositivo.</string>
+    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Las copias de seguridad se cifran con una clave de acceso y se guardan en tu dispositivo.</string>
     <string name="BackupsPreferenceFragment__create_backup">Crear copia de seguridad</string>
     <string name="BackupsPreferenceFragment__last_backup">Última copia: %1$s</string>
     <string name="BackupsPreferenceFragment__backup_folder">Carpeta de copias de seguridad</string>
     <!-- Title for a preference item allowing the user to selected the hour of the day when their chats are backed up. -->
     <string name="BackupsPreferenceFragment__backup_time">Hora de la copia de seguridad</string>
     <string name="BackupsPreferenceFragment__verify_backup_passphrase">Verificar clave de copia de seguridad</string>
-    <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Verifica que la clave de tu copia de seguridad sea correcta</string>
+    <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Prueba tu clave de acceso a la copia de seguridad y comprueba que coincida</string>
     <string name="BackupsPreferenceFragment__turn_on">Activar</string>
     <string name="BackupsPreferenceFragment__turn_off">Desactivar</string>
     <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restaurar una copia de seguridad, reinstala Signal. Abre Signal, toca \"Restaurar copia\" y busca la copia de seguridad. %1$s"</string>
@@ -1480,7 +1480,7 @@
     <string name="ImageEditorHud_draw_to_blur_additional_faces_or_areas">Toca sobre la foto para difuminar más caras o zonas</string>
 
     <!-- InputPanel -->
-    <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Mantén pulsado para grabar un audio y suelta para enviarlo</string>
+    <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Mantén pulsado para grabar un mensaje de voz y suelta para enviarlo</string>
     <!-- When editing a message, label shown above the text input field in the composer -->
     <string name="InputPanel_edit_message">Editar mensaje</string>
     <!-- Dialog title shown if users are about to discard their draft message -->
@@ -1621,9 +1621,9 @@
     <string name="MessageRecord_you_updated_group">Has actualizado el grupo.</string>
     <string name="MessageRecord_the_group_was_updated">Se ha actualizado el grupo.</string>
     <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
-    <string name="MessageRecord_outgoing_voice_call">Llamada realizada</string>
+    <string name="MessageRecord_outgoing_voice_call">Llamada saliente</string>
     <!-- Update message shown when placing an outgoing 1:1 video call -->
-    <string name="MessageRecord_outgoing_video_call">Videollamada realizada</string>
+    <string name="MessageRecord_outgoing_video_call">Videollamada saliente</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Llamada entrante</string>
     <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
@@ -1965,8 +1965,8 @@
     <string name="MessageRequestBottomView_report">Denunciar</string>
 
     <!-- PassphraseChangeActivity -->
-    <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Las claves no coinciden.</string>
-    <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Clave de acceso antigua incorrecta</string>
+    <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Las claves de acceso no coinciden.</string>
+    <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">La clave de acceso anterior es incorrecta.</string>
     <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introduce una clave de acceso nueva.</string>
 
     <!-- DeviceProvisioningActivity -->
@@ -2979,8 +2979,8 @@
 
     <!-- change_passphrase_activity -->
     <string name="change_passphrase_activity__old_passphrase">Clave de acceso anterior</string>
-    <string name="change_passphrase_activity__new_passphrase">Nueva clave de acceso</string>
-    <string name="change_passphrase_activity__repeat_new_passphrase">Repetir nueva clave de acceso</string>
+    <string name="change_passphrase_activity__new_passphrase">Clave de acceso nueva</string>
+    <string name="change_passphrase_activity__repeat_new_passphrase">Repetir clave de acceso nueva</string>
 
     <!-- contact_selection_activity -->
     <string name="contact_selection_activity__invite_to_signal">Invitar a Signal</string>
@@ -3134,7 +3134,7 @@
     <!-- Label indicating that the story being replied to no longer exists -->
     <string name="QuoteView_no_longer_available">Ya no está disponible</string>
     <!-- Label for quoted gift -->
-    <string name="QuoteView__donation_for_a_friend">Donación a nombre de alguien</string>
+    <string name="QuoteView__donation_for_a_friend">Donación en nombre de alguien</string>
 
     <!-- conversation_fragment -->
     <string name="conversation_fragment__scroll_to_the_bottom_content_description">Desliza hasta el final</string>
@@ -3456,7 +3456,7 @@
 
     <string name="arrays__images">Imágenes</string>
     <string name="arrays__audio">Audios</string>
-    <string name="arrays__video">Vídeos</string>
+    <string name="arrays__video">Vídeo</string>
     <string name="arrays__documents">Documentos</string>
 
     <string name="arrays__small">Pequeño</string>
@@ -4236,7 +4236,7 @@
     <string name="Permissions_continue">Continuar</string>
     <string name="Permissions_not_now">Ahora no</string>
     <string name="SQLCipherMigrationHelper_migrating_signal_database">Migrar base de datos de Signal</string>
-    <string name="enter_backup_passphrase_dialog__backup_passphrase">Clave de la copia de seguridad</string>
+    <string name="enter_backup_passphrase_dialog__backup_passphrase">Clave de acceso a la copia de seguridad</string>
     <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">Las copias de seguridad se guardarán en una unidad de almacenamiento externo y se cifrarán con la clave de acceso que aparece debajo. Necesitas esta clave para poder restaurar la copia de seguridad.</string>
     <string name="backup_enable_dialog__you_must_have_this_passphrase">Necesitas esta clave para poder restaurar la copia de seguridad.</string>
     <string name="backup_enable_dialog__folder">Carpeta</string>
@@ -4248,7 +4248,7 @@
     <string name="preferences_chats__chat_backups">Copias de seguridad de los chats</string>
     <string name="preferences_chats__transfer_account">Transferir cuenta</string>
     <string name="preferences_chats__transfer_account_to_a_new_android_device">Transferir cuenta a un dispositivo Android nuevo</string>
-    <string name="RegistrationActivity_enter_backup_passphrase">Introduce la clave de la copia de seguridad</string>
+    <string name="RegistrationActivity_enter_backup_passphrase">Introducir clave de la copia de seguridad</string>
     <string name="RegistrationActivity_restore">Restaurar</string>
     <string name="RegistrationActivity_backup_failure_downgrade">No se pueden importar nuevas copias de seguridad</string>
     <!-- Error message indicating that we could not restore the user\'s backup. Displayed in a toast at the bottom of the screen. -->
@@ -4270,10 +4270,10 @@
     <string name="BackupDialog_choose_folder">Seleccionar carpeta</string>
     <string name="BackupDialog_copied_to_clipboard">Se ha copiado al portapapeles</string>
     <string name="BackupDialog_no_file_picker_available">No hay un selector de archivos disponible.</string>
-    <string name="BackupDialog_enter_backup_passphrase_to_verify">Introduce la clave de la copia de seguridad para verificar</string>
+    <string name="BackupDialog_enter_backup_passphrase_to_verify">Introduce tu clave de acceso a la copia de seguridad para verificarla</string>
     <string name="BackupDialog_verify">Verificar</string>
-    <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">¡Clave correcta!</string>
-    <string name="BackupDialog_passphrase_was_not_correct">La clave es incorrecta</string>
+    <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">¡Clave de acceso correcta!</string>
+    <string name="BackupDialog_passphrase_was_not_correct">Clave de acceso incorrecta</string>
     <string name="LocalBackupJob_creating_signal_backup">Creando copia de seguridad…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
     <string name="LocalBackupJob_verifying_signal_backup">Verificando copia de seguridad de Signal…</string>
@@ -5516,7 +5516,7 @@
     <!-- Preference heading for other ways to donate -->
     <string name="ManageDonationsFragment__other_ways_to_give">Otras formas de aportar</string>
     <!-- Preference label to launch badge gifting -->
-    <string name="ManageDonationsFragment__donate_for_a_friend">Donar a nombre de alguien</string>
+    <string name="ManageDonationsFragment__donate_for_a_friend">Donar en nombre de alguien</string>
     <!-- Dialog title shown when a donation requires verifying/confirmation outside of the app and the user hasn\'t done that yet -->
     <string name="ManageDonationsFragment__couldnt_confirm_donation">No se ha podido confirmar la donación</string>
     <!-- Dialog message shown when a monthly donation requires verifying/confirmation outside of the app and the user hasn\'t done that yet, placeholder is money amount -->
@@ -5880,9 +5880,9 @@
     <!-- Donation receipts one-time tab label -->
     <string name="DonationReceiptListFragment__one_time">Puntual</string>
     <!-- Donation receipts gift tab -->
-    <string name="DonationReceiptListFragment__for_a_friend">A nombre de alguien</string>
+    <string name="DonationReceiptListFragment__for_a_friend">En nombre de alguien</string>
     <!-- Donation receipts gift tab label -->
-    <string name="DonationReceiptListFragment__donation_for_a_friend">Donación a nombre de alguien</string>
+    <string name="DonationReceiptListFragment__donation_for_a_friend">Donación en nombre de alguien</string>
     <!-- Donation receipts donation type heading -->
     <string name="DonationReceiptDetailsFragment__donation_type">Tipo de donación</string>
     <!-- Donation receipts date paid heading -->
@@ -6235,7 +6235,7 @@
         <item quantity="other">%1$s · %2$d días</item>
     </plurals>
     <!-- Headline text on start fragment for gifting a badge -->
-    <string name="GiftFlowStartFragment__donate_for_a_friend">Donar a nombre de alguien</string>
+    <string name="GiftFlowStartFragment__donate_for_a_friend">Donar en nombre de alguien</string>
     <!-- Description text on start fragment for gifting a badge -->
     <plurals name="GiftFlowStartFragment__support_signal_by">
         <item quantity="one">Apoya a Signal haciendo una donación en nombre de un amigo o familiar que use Signal. La persona que elijas recibirá una insignia para mostrar en su perfil durante %1$d día.</item>
@@ -6536,7 +6536,7 @@
     <!-- Button label for paying with a credit card -->
     <string name="GatewaySelectorBottomSheet__credit_or_debit_card">Tarjeta de crédito o débito</string>
     <!-- Sheet summary when giving donating for a friend -->
-    <string name="GatewaySelectorBottomSheet__donate_for_a_friend">Donar a nombre de alguien</string>
+    <string name="GatewaySelectorBottomSheet__donate_for_a_friend">Donar en nombre de alguien</string>
     <!-- Button label for paying with iDEAL -->
     <string name="GatewaySelectorBottomSheet__ideal">iDEAL</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 24ad03e2f7..903ce0e70e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1827,7 +1827,7 @@
     <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">Un message de %1$s n’a pas pu être remis</string>
     <string name="MessageRecord_s_changed_their_phone_number">%1$s a changé de numéro de téléphone</string>
     <!-- Update item message shown in the release channel when someone is already a sustainer so we ask them if they want to boost. -->
-    <string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">Vous aimez cette nouvelle fonction ? Soutenez Signal avec un don ponctuel.</string>
+    <string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">Vous aimez cette nouvelle fonctionnalité ? Faites un don ponctuel pour soutenir Signal.</string>
     <!-- Update item message shown when we merge two threads together. First placeholder is a name, second placeholder is a phone number. -->
     <string name="MessageRecord_your_message_history_with_s_and_their_number_s_has_been_merged">L\'historique de vos messages avec %1$s et son numéro %2$s ont été fusionnés.</string>
     <!-- Update item message shown when we merge two threads together and we don\'t know the phone number of the other thread. The placeholder is a person\'s name. -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1800e8ffca..f92a19fd3e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2005,7 +2005,7 @@
     <string name="PassphrasePromptActivity_ok_button_content_description">Wachtwoord instellen</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ongeldig wachtwoord!</string>
     <string name="PassphrasePromptActivity_unlock_signal">Signal ontgrendelen</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal-Android - Vergrendelingsscherm</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal-Android - Vergrendelscherm</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kaart</string>
@@ -3048,8 +3048,8 @@
     </plurals>
     <!-- Displays number of viewers for a story -->
     <plurals name="contact_selection_list_item__number_of_viewers">
-        <item quantity="one">Door %1$d persoon gezien</item>
-        <item quantity="other">Door %1$d personen gezien</item>
+        <item quantity="one">%1$d kijker</item>
+        <item quantity="other">%1$d kijkers</item>
     </plurals>
 
     <!-- conversation_activity -->
@@ -3478,7 +3478,7 @@
     <!-- preferences.xml -->
     <string name="preferences_beta">Bèta</string>
     <string name="preferences__sms_mms">Sms en mms</string>
-    <string name="preferences__pref_use_address_book_photos">Profielfoto\'s uit de contactenlijst van je telefoon gebruiken</string>
+    <string name="preferences__pref_use_address_book_photos">Profielfoto\'s uit telefooncontacten gebruiken</string>
     <string name="preferences__display_contact_photos_from_your_address_book_if_available">Geef indien beschikbaar de profielfoto\'s uit de contactenlijst van je telefoon weer</string>
     <!-- Preference menu item title for a toggle switch for preserving the archived state of muted chats. -->
     <string name="preferences__pref_keep_muted_chats_archived">Gedempte chats gearchiveerd houden</string>
@@ -3772,9 +3772,9 @@
     <!-- Displayed as an action button at the bottom end of the screen -->
     <string name="GrantPermissionsFragment__next">Volgende</string>
     <!-- Displayed as a title at the top of the screen -->
-    <string name="GrantPermissionsFragment__allow_permissions">Geef toestemmingen</string>
+    <string name="GrantPermissionsFragment__allow_permissions">Toestemming geven</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Om je te helpen berichten te sturen naar mensen die je kent, vraagt Signal deze toestemmingen. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Om je te helpen berichten te sturen naar mensen die je kent, vraagt Signal deze machtigingen. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Meldingen</string>
     <!-- Notifications permission row description -->
@@ -5954,8 +5954,8 @@
     <string name="StoriesLandingFragment__hidden_stories">Verborgen verhalen</string>
     <!-- Displayed on each sent story under My Stories -->
     <plurals name="MyStories__d_views">
-        <item quantity="one">Door %1$d persoon gezien</item>
-        <item quantity="other">Door %1$d personen gezien</item>
+        <item quantity="one">%1$d weergave</item>
+        <item quantity="other">%1$d weergaven</item>
     </plurals>
     <!-- Forward story label, displayed in My Stories context menu -->
     <string name="MyStories_forward">Doorsturen</string>
@@ -5969,8 +5969,8 @@
     <string name="MyStories__unable_to_save">Kan niet opslaan</string>
     <!-- Displayed at bottom of story viewer when current item has views -->
     <plurals name="StoryViewerFragment__d_views">
-        <item quantity="one">Door %1$d persoon gezien</item>
-        <item quantity="other">Door %1$d personen gezien</item>
+        <item quantity="one">%1$d weergave</item>
+        <item quantity="other">%1$d weergaven</item>
     </plurals>
     <!-- Displayed at bottom of story viewer when current item has replies -->
     <plurals name="StoryViewerFragment__d_replies">
@@ -5980,9 +5980,9 @@
     <!-- Label on group stories to add a story -->
     <string name="StoryViewerPageFragment__add">Toevoegen</string>
     <!-- Used when view receipts are disabled -->
-    <string name="StoryViewerPageFragment__views_off">Kijkbevestigingen uit</string>
+    <string name="StoryViewerPageFragment__views_off">Weergaven uit</string>
     <!-- Used to join views and replies when both exist on a story item -->
-    <string name="StoryViewerFragment__s_s">%1$s  %2$s</string>
+    <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Jij</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index acb668735c..3e8973ab48 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -4578,7 +4578,7 @@
     <!-- Text shown in a dialog that further explains how to unlock Signal by using the same unlocking methods that are used to unlock their own device -->
     <string name="prompt_passphrase_activity__screen_lock_is_on">Увімкнено блокування екрана, тому Signal надійно захищено відповідно до налаштувань блокування вашого пристрою. Розблокуйте Signal так, як ви зазвичай розблоковуєте телефон (розпізнаванням обличчя, відбитком пальця, PIN-кодом, паролем або графічним ключем).</string>
     <!-- Button in a dialog that will contact Signal support if pressed -->
-    <string name="prompt_passphrase_activity__contact_support">Звернутись у службу підтримки</string>
+    <string name="prompt_passphrase_activity__contact_support">Звернутися в службу підтримки</string>
     <!-- Button text to try again after unlocking has previously failed -->
     <string name="prompt_passphrase_activity__try_again">Повторити спробу</string>
 

From e81fc2900da9f2e67595b51e9e7e2a87578490af Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 19 Sep 2024 16:03:42 -0400
Subject: [PATCH 4/4] Bump version to 7.17.5

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c81a3a9d43..de50614af9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,8 +21,8 @@ plugins {
 
 apply(from = "static-ips.gradle.kts")
 
-val canonicalVersionCode = 1461
-val canonicalVersionName = "7.17.4"
+val canonicalVersionCode = 1462
+val canonicalVersionName = "7.17.5"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100