Skip to content

Commit d4dc03c

Browse files
RawaRawa
committed
Fix duplicate verifying purchase string
1 parent 5a125c8 commit d4dc03c

File tree

24 files changed

+24
-25
lines changed

24 files changed

+24
-25
lines changed

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ fun PlayPayment(
146146
stringResource(id = R.string.payment_status_pending)
147147
PaymentStatus.VERIFICATION_IN_PROGRESS ->
148148
stringResource(
149-
id = R.string.payment_status_verification_in_progress
149+
id = R.string.verifying_purchase
150150
)
151151
else -> null
152152
}

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/PaymentDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private fun PreviewPaymentDialogPurchasePending() {
5454
PaymentDialog(
5555
paymentDialogData =
5656
PaymentDialogData(
57-
title = R.string.payment_pending_dialog_title,
57+
title = R.string.verifying_purchase,
5858
message = R.string.payment_pending_dialog_message,
5959
confirmAction = PaymentDialogAction.Close,
6060
closeOnDismiss = true,

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fun VerificationPendingDialog(onClose: () -> Unit) {
3333
icon = {}, // Makes it look a bit more balanced
3434
title = {
3535
Text(
36-
text = stringResource(id = R.string.payment_pending_dialog_title),
36+
text = stringResource(id = R.string.verifying_purchase),
3737
style = MaterialTheme.typography.headlineSmall,
3838
)
3939
},

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PurchaseResultExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fun PurchaseResult.toPaymentDialogData(): PaymentDialogData? =
3535
PurchaseResult.Completed.Pending,
3636
is PurchaseResult.Error.VerificationError ->
3737
PaymentDialogData(
38-
title = R.string.payment_pending_dialog_title,
38+
title = R.string.verifying_purchase,
3939
message = R.string.payment_pending_dialog_message,
4040
confirmAction = PaymentDialogAction.Close,
4141
)

‎android/lib/resource/src/main/res/values-da/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Vi kunne ikke starte betalingsprocessen. Prøv igen senere.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad-tjenester er ikke tilgængelige</string>
272272
<string name="payment_pending_dialog_message">Vi er i øjeblikket ved at bekræfte dit køb, det kan tage noget tid. Din tid vil blive tilføjet, hvis bekræftelsen lykkes.</string>
273-
<string name="payment_pending_dialog_title">Bekræfter køb</string>
274273
<string name="payment_status_pending">Google Play-betaling afventer</string>
275274
<string name="please_enter_a_valid_ip_address">Indtast en gyldig IPv4- eller IPv6-adresse</string>
276275
<string name="please_enter_a_valid_remote_server_port">Indtast en gyldig fjernserverport</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">For at vi bedre kan hjælpe dig, bedes du skrive på engelsk eller svensk og nævne hvilket land, du befinder dig i.</string>
371370
<string name="username">Brugernavn</string>
372371
<string name="verifying_api_method">Bekræfter API-metode...</string>
372+
<string name="verifying_purchase">Bekræfter køb</string>
373373
<string name="verifying_voucher">Bekræfter kupon…</string>
374374
<string name="version">Version</string>
375375
<string name="view_logs">Se app-logfiler</string>

‎android/lib/resource/src/main/res/values-de/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Wir konnten den Zahlungsvorgang nicht starten, bitte versuchen Sie es später noch einmal.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad-Dienste nicht verfügbar</string>
272272
<string name="payment_pending_dialog_message">Wir verifizieren gerade Ihren Kauf, dies kann einige Zeit dauern. Ihre Zeit wird hinzugefügt, wenn die Verifizierung erfolgreich ist.</string>
273-
<string name="payment_pending_dialog_title">Kauf verifizieren</string>
274273
<string name="payment_status_pending">Google-Play-Zahlung ausstehend</string>
275274
<string name="please_enter_a_valid_ip_address">Bitte geben Sie eine gültige IPv4- oder IPv6-Adresse ein</string>
276275
<string name="please_enter_a_valid_remote_server_port">Bitte geben Sie einen gültigen Remote-Server-Port ein</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Um Ihnen besser weiterhelfen zu können, schreiben Sie uns bitte auf Englisch oder Schwedisch und geben Sie an, aus welchem Land Sie die Verbindung herstellen.</string>
371370
<string name="username">Benutzername</string>
372371
<string name="verifying_api_method">API-Methode verifizieren …</string>
372+
<string name="verifying_purchase">Kauf verifizieren</string>
373373
<string name="verifying_voucher">Gutschein verifizieren …</string>
374374
<string name="version">Version</string>
375375
<string name="view_logs">App-Protokolle anzeigen</string>

‎android/lib/resource/src/main/res/values-es/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">No hemos podido iniciar el proceso de pago. Inténtelo de nuevo más tarde.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Servicios de Mullvad no disponibles</string>
272272
<string name="payment_pending_dialog_message">Estamos verificando su compra en este momento. Esto podría tardar algún tiempo. Su tiempo se añadirá si pasa la verificación.</string>
273-
<string name="payment_pending_dialog_title">Verificando la compra</string>
274273
<string name="payment_status_pending">Pago a Google Play pendiente</string>
275274
<string name="please_enter_a_valid_ip_address">Escriba una dirección IPv4 o IPv6 válida</string>
276275
<string name="please_enter_a_valid_remote_server_port">Introduzca un puerto de servidor remoto válido</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Para ayudarle mejor, escriba en inglés o sueco e indique desde qué país se está conectando.</string>
371370
<string name="username">Nombre de usuario</string>
372371
<string name="verifying_api_method">Verificando método de API...</string>
372+
<string name="verifying_purchase">Verificando la compra</string>
373373
<string name="verifying_voucher">Verificando el cupón…</string>
374374
<string name="version">Versión</string>
375375
<string name="view_logs">Ver registros de la aplicación</string>

‎android/lib/resource/src/main/res/values-fi/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Emme pystyneet aloittamaan maksun käsittelyä. Yritä myöhemmin uudelleen.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad-palvelut eivät ole käytettävissä</string>
272272
<string name="payment_pending_dialog_message">Vahvistamme ostostasi parhaillaan. Siinä saattaa vierähtää jonkin aikaa. Tilillesi lisätään käyttöaikaa, kunhan ostoksen vahvistus onnistuu.</string>
273-
<string name="payment_pending_dialog_title">Ostoksen vahvistaminen</string>
274273
<string name="payment_status_pending">Google Play -maksu odottaa</string>
275274
<string name="please_enter_a_valid_ip_address">Anna kelvollinen IPv4- tai IPv6-osoite</string>
276275
<string name="please_enter_a_valid_remote_server_port">Anna kelvollinen etäpalvelimen portti</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Jotta voisimme avustaa sinua paremmin, kirjoita englanniksi tai ruotsiksi ja mainitse, mistä maasta muodostat yhteyden.</string>
371370
<string name="username">Käyttäjätunnus</string>
372371
<string name="verifying_api_method">Vahvistetaan API-menetelmää...</string>
372+
<string name="verifying_purchase">Ostoksen vahvistaminen</string>
373373
<string name="verifying_voucher">Kuponkia vahvistetaan…</string>
374374
<string name="version">Versio</string>
375375
<string name="view_logs">Tarkastele sovelluslokeja</string>

‎android/lib/resource/src/main/res/values-fr/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Nous n\'avons pas pu lancer le processus de paiement, merci de réessayer plus tard.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Services Mullvad indisponibles</string>
272272
<string name="payment_pending_dialog_message">Nous vérifions actuellement votre achat, ce qui peut prendre un certain temps. Votre temps sera ajouté si la vérification réussit.</string>
273-
<string name="payment_pending_dialog_title">Vérification de l\'achat</string>
274273
<string name="payment_status_pending">Paiement Google Play en attente</string>
275274
<string name="please_enter_a_valid_ip_address">Merci de saisir une adresse IPv4 ou IPv6 valide</string>
276275
<string name="please_enter_a_valid_remote_server_port">Merci de saisir un port de serveur distant valide</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Pour nous permettre de mieux vous assister, merci d\'écrire en anglais ou en suédois et d\'indiquer le pays à partir duquel vous vous connectez.</string>
371370
<string name="username">Nom d\'utilisateur</string>
372371
<string name="verifying_api_method">Vérification de la méthode API...</string>
372+
<string name="verifying_purchase">Vérification de l\'achat</string>
373373
<string name="verifying_voucher">Vérification du bon…</string>
374374
<string name="version">Version</string>
375375
<string name="view_logs">Afficher les journaux de l\'application</string>

‎android/lib/resource/src/main/res/values-it/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Non siamo riusciti ad avviare il processo di pagamento, riprova più tardi.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Servizi Mullvad non disponibili</string>
272272
<string name="payment_pending_dialog_message">Stiamo verificando il tuo acquisto, l\'operazione potrebbe richiedere del tempo. Il tuo tempo verrà aggiunto quando la verifica avrà avuto esito positivo.</string>
273-
<string name="payment_pending_dialog_title">Verifica dell\'acquisto</string>
274273
<string name="payment_status_pending">Pagamento Google Play in sospeso</string>
275274
<string name="please_enter_a_valid_ip_address">Inserisci un indirizzo IPv4 o IPv6 valido</string>
276275
<string name="please_enter_a_valid_remote_server_port">Inserisci una porta di server remoto valida</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Per consentirci di assisterti meglio, scrivi in ​​inglese o in svedese e indica da quale Paese ti stai connettendo.</string>
371370
<string name="username">Nome utente</string>
372371
<string name="verifying_api_method">Verifica del metodo API...</string>
372+
<string name="verifying_purchase">Verifica dell\'acquisto</string>
373373
<string name="verifying_voucher">Verifica del voucher…</string>
374374
<string name="version">Versione</string>
375375
<string name="view_logs">Visualizza registri app</string>

‎android/lib/resource/src/main/res/values-ja/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">決済処理を開始できませんでした。後でもう一度お試しください。</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvadサービスを使用できません</string>
272272
<string name="payment_pending_dialog_message">購入を確認中です。これにはしばらく時間がかかる場合があります。正常に確認されると、この時間が追加されます。</string>
273-
<string name="payment_pending_dialog_title">購入を確認中</string>
274273
<string name="payment_status_pending">Google Playの決済は未完了です</string>
275274
<string name="please_enter_a_valid_ip_address">有効な IPv4 または IPv6 アドレスを入力してください</string>
276275
<string name="please_enter_a_valid_remote_server_port">有効なリモートサーバーのポートを入力してください</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">最適なサポートを提供するため、英語またはスウェーデン語でご入力ください。また、接続元の国をお知らせください。</string>
371370
<string name="username">ユーザー名</string>
372371
<string name="verifying_api_method">API 接続方法を検証しています...</string>
372+
<string name="verifying_purchase">購入を確認中</string>
373373
<string name="verifying_voucher">バウチャーを確認中…</string>
374374
<string name="version">バージョン</string>
375375
<string name="view_logs">アプリのログを表示</string>

‎android/lib/resource/src/main/res/values-ko/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">결제 프로세스를 시작할 수 없습니다. 나중에 다시 시도해 주세요.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad 서비스 사용 불가</string>
272272
<string name="payment_pending_dialog_message">구매를 현재 확인하는 중이므로 다소 시간이 걸릴 수 있습니다. 확인을 성공적으로 마치면 시간이 추가됩니다.</string>
273-
<string name="payment_pending_dialog_title">구매 확인 중</string>
274273
<string name="payment_status_pending">Google Play 결제 보류 중</string>
275274
<string name="please_enter_a_valid_ip_address">유효한 IPv4 또는 IPv6 주소를 입력하세요</string>
276275
<string name="please_enter_a_valid_remote_server_port">유효한 원격 서버 포트를 입력하세요</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">더 나은 지원을 위해 영어 또는 스웨덴어로 메시지를 작성하고 연결 국가를 포함하세요.</string>
371370
<string name="username">사용자 이름</string>
372371
<string name="verifying_api_method">API 방법 확인 중...</string>
372+
<string name="verifying_purchase">구매 확인 중</string>
373373
<string name="verifying_voucher">바우처 확인 중…</string>
374374
<string name="version">버전</string>
375375
<string name="view_logs">앱 로그 보기</string>

‎android/lib/resource/src/main/res/values-my/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">လက်ရှိတွင် ပေးချေမှု လုပ်ငန်းစဉ်ကို စတင်၍ မရနိုင်ပါ၊ နောက်မှ ထပ်ကြိုးစားကြည့်ပါ။</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad ဝန်ဆောင်မှုများကို မရရှိနိုင်ပါ</string>
272272
<string name="payment_pending_dialog_message">သင့်ဝယ်ယူမှုကို လက်ရှိတွင် ကျွန်ုပ်တို့ စစ်ဆေး အတည်ပြုနေဆဲဖြစ်ပြီး အချိန်အနည်းငယ်ကြာနိုင်ပါသည်။ စစ်ဆေး အတည်ပြုမှု အောင်မြင်ပါက သင့်အချိန်များကို ပေါင်းထည့်သွားပါမည်။</string>
273-
<string name="payment_pending_dialog_title">ဝယ်ယူမှုကို စစ်ဆေးနေဆဲ</string>
274273
<string name="payment_status_pending">Google Play ပေးချေမှုကို ဆိုင်းငံ့ထားဆဲ</string>
275274
<string name="please_enter_a_valid_ip_address">မှန်ကန်သော IPv4 သို့မဟုတ် IPv6 လိပ်စာကို ရိုက်ထည့်ပေးပါ</string>
276275
<string name="please_enter_a_valid_remote_server_port">မှန်ကန်သော အဝေးဆာဗာ ပေါ့တ်ကို ရိုက်ထည့်ပေးပါ</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">သင့်အား ပို၍ အကူအညီပေးနိုင်ရန် အင်္ဂလိပ်ဘာသာ သို့မဟုတ် ဆွီဒင်ဘာသာဖြင့် ရေးပြီး မည်သည့်နိုင်ငံမှ သင်ချိတ်ဆက်နေသည်ကို ထည့်သွင်းဖော်ပြပါ။</string>
371370
<string name="username">သုံးစွဲသူအမည်</string>
372371
<string name="verifying_api_method">API နည်းလမ်းကို စိစစ်နေဆဲ...</string>
372+
<string name="verifying_purchase">ဝယ်ယူမှုကို စစ်ဆေးနေဆဲ</string>
373373
<string name="verifying_voucher">ဘောက်ချာကို စစ်ဆေးနေဆဲ…</string>
374374
<string name="version">ဗားရှင်း</string>
375375
<string name="view_logs">အက်ပ်မှတ်တမ်းများ ကြည့်ရန်</string>

‎android/lib/resource/src/main/res/values-nb/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Vi kunne ikke starte betalingsprosessen. Prøv igjen senere.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad-tjenester utilgjengelig</string>
272272
<string name="payment_pending_dialog_message">Vi behandler kjøpet. Det kan ta litt tid. Hvis kjøpet blir bekreftet, legges tiden din til.</string>
273-
<string name="payment_pending_dialog_title">Bekrefter kjøp</string>
274273
<string name="payment_status_pending">Google Play-betaling venter</string>
275274
<string name="please_enter_a_valid_ip_address">Skriv inn en gyldig IPv4- eller IPv6-adresse</string>
276275
<string name="please_enter_a_valid_remote_server_port">Skriv inn en gyldig ekstern server-port</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">For at vi skal kunne hjelpe deg bedre, ber vi deg om å skrive på engelsk eller svensk og fortelle hvilket land du befinner deg i.</string>
371370
<string name="username">Brukernavn</string>
372371
<string name="verifying_api_method">Bekrefter API-metode ...</string>
372+
<string name="verifying_purchase">Bekrefter kjøp</string>
373373
<string name="verifying_voucher">Bekrefter kupong …</string>
374374
<string name="version">Versjon</string>
375375
<string name="view_logs">Se applogger</string>

‎android/lib/resource/src/main/res/values-nl/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">We kunnen het betalingsproces niet starten, probeer het later opnieuw.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Mullvad-diensten niet beschikbaar</string>
272272
<string name="payment_pending_dialog_message">We verifiëren momenteel uw aankoop, dit kan even duren. Uw tijd wordt toegevoegd als de controle succesvol is.</string>
273-
<string name="payment_pending_dialog_title">Aankoop verifiëren</string>
274273
<string name="payment_status_pending">Google Play-betaling in behandeling</string>
275274
<string name="please_enter_a_valid_ip_address">Voer een geldig IPv4- of IPv6-adres in</string>
276275
<string name="please_enter_a_valid_remote_server_port">Voer een geldige poort op de externe server in</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Om u beter te kunnen helpen, kunt u in het Engels of Zweeds schrijven. Vermeld uit welk land u komt.</string>
371370
<string name="username">Gebruikersnaam</string>
372371
<string name="verifying_api_method">API-methode verifiëren ...</string>
372+
<string name="verifying_purchase">Aankoop verifiëren</string>
373373
<string name="verifying_voucher">Voucher verifiëren …</string>
374374
<string name="version">Versie</string>
375375
<string name="view_logs">Applogboeken weergeven</string>

‎android/lib/resource/src/main/res/values-pl/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<string name="payment_obfuscation_id_error_dialog_message">Nie mogliśmy rozpocząć procesu płatności. Spróbuj ponownie później.</string>
271271
<string name="payment_obfuscation_id_error_dialog_title">Usługi Mullvad są niedostępne</string>
272272
<string name="payment_pending_dialog_message">Weryfikujemy zakup. Może to zająć trochę czasu. Jeśli weryfikacja powiedzie się, czas zostanie dodany.</string>
273-
<string name="payment_pending_dialog_title">Weryfikowanie zakupu</string>
274273
<string name="payment_status_pending">Oczekiwanie na płatność Google Play</string>
275274
<string name="please_enter_a_valid_ip_address">Wprowadź prawidłowy adres IPv4 lub IPv6</string>
276275
<string name="please_enter_a_valid_remote_server_port">Wprowadź prawidłowy port serwera zdalnego</string>
@@ -370,6 +369,7 @@
370369
<string name="user_message_hint">Abyśmy mogli lepiej Ci pomóc, napisz w języku angielskim lub szwedzkim i podaj kraj, z którego się łączysz.</string>
371370
<string name="username">Nazwa użytkownika</string>
372371
<string name="verifying_api_method">Weryfikowanie metody interfejsu API...</string>
372+
<string name="verifying_purchase">Weryfikowanie zakupu</string>
373373
<string name="verifying_voucher">Weryfikowanie kuponu…</string>
374374
<string name="version">Wersja</string>
375375
<string name="view_logs">Wyświetl dzienniki aplikacji</string>

0 commit comments

Comments
 (0)