diff options
Diffstat (limited to 'android/lib')
27 files changed, 88 insertions, 134 deletions
diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt index 39cc584a57..078cd3b838 100644 --- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt +++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt @@ -47,7 +47,7 @@ class BillingPaymentRepository( .associate { it.products.first() to it.purchaseState.toPaymentStatus() } emit( billingRepository - .queryProducts(listOf(ProductIds.OneMonth)) + .queryProducts(listOf(ProductIds.OneMonth, ProductIds.ThreeMonths)) .toPaymentAvailability(productIdToPaymentStatus) ) } @@ -121,14 +121,14 @@ class BillingPaymentRepository( return@flow } if (purchase.purchaseState == Purchase.PurchaseState.PENDING) { - emit(PurchaseResult.Completed.Pending) + emit(PurchaseResult.Completed.Pending(ProductId(purchase.products.first()))) } else { emit(PurchaseResult.VerificationStarted) emit( verifyPurchase(event.purchases.first()) .fold( { PurchaseResult.Error.VerificationError(null) }, - { PurchaseResult.Completed.Success }, + { productId -> PurchaseResult.Completed.Success(productId) }, ) ) } @@ -164,10 +164,12 @@ class BillingPaymentRepository( } private suspend fun verifyPurchase(purchase: Purchase) = - playPurchaseRepository.verifyPlayPurchase( - PlayPurchase( - productId = purchase.products.first(), - purchaseToken = PlayPurchasePaymentToken(purchase.purchaseToken), + playPurchaseRepository + .verifyPlayPurchase( + PlayPurchase( + productId = purchase.products.first(), + purchaseToken = PlayPurchasePaymentToken(purchase.purchaseToken), + ) ) - ) + .map { ProductId(purchase.products.first()) } } diff --git a/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt b/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt index d04c40029e..97815d41ee 100644 --- a/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt +++ b/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt @@ -385,6 +385,7 @@ class BillingPaymentRepositoryTest { val mockBillingPurchase: Purchase = mockk() val mockBillingResult: BillingResult = mockk() every { mockBillingPurchase.purchaseState } returns Purchase.PurchaseState.PENDING + every { mockBillingPurchase.products } returns listOf("MOCK") every { mockBillingResult.responseCode } returns BillingResponseCode.OK coEvery { mockBillingRepository.startPurchaseFlow( diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt index 1849c5abf9..61d8ec89e3 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt @@ -39,11 +39,13 @@ sealed class TunnelState { } } - fun isUsingDaita(): Boolean { + fun isBlocked(): Boolean { return when (this) { - is Connected -> endpoint.daita - is Connecting -> endpoint?.daita ?: false - else -> false + is Connected, + is Disconnected -> false + is Connecting, + is Disconnecting -> true + is Error -> this.errorState.isBlocking } } } diff --git a/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/ProductIds.kt b/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/ProductIds.kt index 8754968891..7ff6cc2921 100644 --- a/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/ProductIds.kt +++ b/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/ProductIds.kt @@ -2,4 +2,5 @@ package net.mullvad.mullvadvpn.lib.payment object ProductIds { const val OneMonth = "one_month" + const val ThreeMonths = "three_months" } diff --git a/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PurchaseResult.kt b/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PurchaseResult.kt index f5b89bffe6..203dc8c61e 100644 --- a/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PurchaseResult.kt +++ b/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PurchaseResult.kt @@ -10,12 +10,12 @@ sealed interface PurchaseResult { data object VerificationStarted : PurchaseResult sealed interface Completed : PurchaseResult { - data object Success : Completed + data class Success(val productId: ProductId) : Completed data object Cancelled : Completed // This ends our part of the purchase flow. The rest is handled by Google and the api. - data object Pending : Completed + data class Pending(val productId: ProductId) : Completed } sealed interface Error : PurchaseResult { diff --git a/android/lib/resource/src/main/res/drawable/google_pay_primary_logo_logo_svgrepo_com.xml b/android/lib/resource/src/main/res/drawable/google_pay_primary_logo_logo_svgrepo_com.xml new file mode 100644 index 0000000000..eff207b6d4 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable/google_pay_primary_logo_logo_svgrepo_com.xml @@ -0,0 +1,13 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="79dp" android:viewportHeight="948" android:viewportWidth="2387.3" android:width="200dp"> + + <path android:fillColor="#5F6368" android:pathData="M1129.1,463.2V741h-88.2V54.8h233.8c56.4,-1.2 110.9,20.2 151.4,59.4c41,36.9 64.1,89.7 63.2,144.8c1.2,55.5 -21.9,108.7 -63.2,145.7c-40.9,39 -91.4,58.5 -151.4,58.4L1129.1,463.2L1129.1,463.2zM1129.1,139.3v239.6h147.8c32.8,1 64.4,-11.9 87.2,-35.5c46.3,-45 47.4,-119.1 2.3,-165.4c-0.8,-0.8 -1.5,-1.6 -2.3,-2.3c-22.5,-24.1 -54.3,-37.3 -87.2,-36.4L1129.1,139.3L1129.1,139.3zM1692.5,256.2c65.2,0 116.6,17.4 154.3,52.2c37.7,34.8 56.5,82.6 56.5,143.2V741H1819v-65.2h-3.8c-36.5,53.7 -85.1,80.5 -145.7,80.5c-51.7,0 -95,-15.3 -129.8,-46c-33.8,-28.5 -53,-70.7 -52.2,-115c0,-48.6 18.4,-87.2 55.1,-115.9c36.7,-28.7 85.7,-43.1 147.1,-43.1c52.3,0 95.5,9.6 129.3,28.7v-20.2c0.2,-30.2 -13.2,-58.8 -36.4,-78c-23.3,-21 -53.7,-32.5 -85.1,-32.1c-49.2,0 -88.2,20.8 -116.9,62.3l-77.6,-48.9C1545.6,286.8 1608.8,256.2 1692.5,256.2L1692.5,256.2zM1578.4,597.3c-0.1,22.8 10.8,44.2 29.2,57.5c19.5,15.3 43.7,23.5 68.5,23c37.2,-0.1 72.9,-14.9 99.2,-41.2c29.2,-27.5 43.8,-59.7 43.8,-96.8c-27.5,-21.9 -65.8,-32.9 -115,-32.9c-35.8,0 -65.7,8.6 -89.6,25.9C1590.4,550.4 1578.4,571.7 1578.4,597.3L1578.4,597.3zM2387.3,271.5L2093,948h-91l109.2,-236.7l-193.6,-439.8h95.8l139.9,337.3h1.9l136.1,-337.3L2387.3,271.5z"/> + + <path android:fillColor="#4285F4" android:pathData="M772.8,403.2c0,-26.9 -2.2,-53.7 -6.8,-80.2H394.2v151.8h212.9c-8.8,49 -37.2,92.3 -78.7,119.8v98.6h127.1C729.9,624.7 772.8,523.2 772.8,403.2L772.8,403.2z"/> + + <path android:fillColor="#34A853" android:pathData="M394.2,788.5c106.4,0 196,-34.9 261.3,-95.2l-127.1,-98.6c-35.4,24 -80.9,37.7 -134.2,37.7c-102.8,0 -190.1,-69.3 -221.3,-162.7H42v101.6C108.9,704.5 245.2,788.5 394.2,788.5z"/> + + <path android:fillColor="#FBBC04" android:pathData="M172.9,469.7c-16.5,-48.9 -16.5,-102 0,-150.9V217.2H42c-56,111.4 -56,242.7 0,354.1L172.9,469.7z"/> + + <path android:fillColor="#EA4335" android:pathData="M394.2,156.1c56.2,-0.9 110.5,20.3 151.2,59.1L658,102.7C586.6,35.7 492.1,-1.1 394.2,0C245.2,0 108.9,84.1 42,217.2l130.9,101.6C204.1,225.4 291.4,156.1 394.2,156.1z"/> + +</vector> diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml index ad2d271799..0bbfee2878 100644 --- a/android/lib/resource/src/main/res/values-da/strings.xml +++ b/android/lib/resource/src/main/res/values-da/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Viser påmindelser, når kontotiden er ved at udløbe</string> <string name="account_time_notification_channel_name">Påmindelser om kontotid</string> <string name="add">Tilføj</string> - <string name="add_30_days_time">Tilføj 30 dages tid</string> <string name="add_30_days_time_x">Tilføj 30 dages tid (%1$s)</string> <string name="add_a_server">Tilføj en server</string> <string name="add_dns_server_dialog_title">Tilføj DNS-server</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Ikke alle vores servere er %1$s-kompatible. Derfor bruger vi automatisk multihop til at aktivere %1$s med enhver server.</string> <string name="daita_info">Hvis du aktiverer \"%1$s\", skal du manuelt vælge en server, der er %2$s-aktiveret. Det kan medføre, at du ender i en blokeret tilstand, indtil du har valgt en kompatibel server i visningen \"Vælg placering\".</string> <string name="daita_multihop">%1$s: Multihop</string> + <string name="days_were_added_30">30 dage blev føjet til din konto.</string> <string name="delete">Slet</string> <string name="delete_custom_list_confirmation_description">Vil du slette \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" blev slettet</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Login mislykkedes</string> <string name="login_title">Log ind</string> <string name="malware_info">Advarsel: Malware-blokkeren er ikke antivirus og bør ikke behandles som sådan. Dette er blot et ekstra lag af beskyttelse.</string> - <string name="manage_account">Administrer konto</string> <string name="manage_devices">Administrer enheder</string> <string name="manage_devices_confirm_removal_description_line1">Fjern %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">Enheden fjernes fra listen og logges ud.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">For at begynde at bruge appen skal du først føje tid til din konto.</string> <string name="payment_billing_error_dialog_message">Vi kunne ikke starte betalingsprocessen. Sørg for, at du har den nyeste version af Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play er ikke tilgængelig</string> - <string name="payment_completed_dialog_message">30 dage blev føjet til din konto.</string> - <string name="payment_completed_dialog_title">Tid blev tilføjet</string> <string name="payment_obfuscation_id_error_dialog_message">Vi kunne ikke starte betalingsprocessen. Prøv igen senere.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad-tjenester er ikke tilgængelige</string> - <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> - <string name="payment_status_pending">Google Play-betaling afventer</string> + <string name="payment_status_pending_short">Google Play-betaling afventer</string> <string name="please_enter_a_valid_ip_address">Indtast en gyldig IPv4- eller IPv6-adresse</string> <string name="please_enter_a_valid_remote_server_port">Indtast en gyldig fjernserverport</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml index 5435e48109..73573dfb00 100644 --- a/android/lib/resource/src/main/res/values-de/strings.xml +++ b/android/lib/resource/src/main/res/values-de/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Erinnerungen anzeigen, wenn die Kontozeit bald abläuft</string> <string name="account_time_notification_channel_name">Erinnerungen an die Kontozeit</string> <string name="add">Hinzufügen</string> - <string name="add_30_days_time">30 Tage Zeit hinzufügen</string> <string name="add_30_days_time_x">30 Tage Zeit hinzufügen (%1$s)</string> <string name="add_a_server">Server hinzufügen</string> <string name="add_dns_server_dialog_title">DNS-Server hinzufügen</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Nicht alle unsere Server sind %1$s-fähig. Daher verwenden wir automatisch Multihop, um %1$s mit jedem Server zu aktivieren.</string> <string name="daita_info">Wenn Sie „%1$s“ aktivieren, müssen Sie manuell einen Server auswählen, der %2$s-fähig ist. Dies kann dazu führen, dass Sie in einem blockierten Zustand landen, bis Sie einen kompatiblen Server in der Ansicht „Standort auswählen“ ausgewählt haben.</string> <string name="daita_multihop">%1$s: Multihop</string> + <string name="days_were_added_30">30 Tage wurden zu Ihrem Konto hinzugefügt.</string> <string name="delete">Löschen</string> <string name="delete_custom_list_confirmation_description">„%1$s“ löschen?</string> <string name="delete_custom_list_message">„%1$s“ wurde gelöscht</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Anmeldung fehlgeschlagen</string> <string name="login_title">Anmelden</string> <string name="malware_info">Der Malware-Blocker ist kein Antivirusprogramm und sollte auch nicht als solches behandelt werden. Es dient lediglich als zusätzliche Schutzschicht.</string> - <string name="manage_account">Konto verwalten</string> <string name="manage_devices">Geräte verwalten</string> <string name="manage_devices_confirm_removal_description_line1">%1$s entfernen?</string> <string name="manage_devices_confirm_removal_description_line2">Das Gerät wird aus der Liste entfernt und abgemeldet.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Um mit der Nutzung dieser App zu beginnen, müssen Sie erst einmal Zeit zu Ihrem Konto hinzufügen.</string> <string name="payment_billing_error_dialog_message">Wir konnten den Zahlungsvorgang nicht starten. Bitte vergewissern Sie sich, dass Sie die neueste Version von Google Play haben.</string> <string name="payment_billing_error_dialog_title">Google Play nicht verfügbar</string> - <string name="payment_completed_dialog_message">30 Tage wurden zu Ihrem Konto hinzugefügt.</string> - <string name="payment_completed_dialog_title">Zeit erfolgreich hinzugefügt</string> <string name="payment_obfuscation_id_error_dialog_message">Wir konnten den Zahlungsvorgang nicht starten, bitte versuchen Sie es später noch einmal.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad-Dienste nicht verfügbar</string> - <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> - <string name="payment_status_pending">Google-Play-Zahlung ausstehend</string> + <string name="payment_status_pending_short">Google-Play-Zahlung ausstehend</string> <string name="please_enter_a_valid_ip_address">Bitte geben Sie eine gültige IPv4- oder IPv6-Adresse ein</string> <string name="please_enter_a_valid_remote_server_port">Bitte geben Sie einen gültigen Remote-Server-Port ein</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml index ac81c247ff..31a1720096 100644 --- a/android/lib/resource/src/main/res/values-es/strings.xml +++ b/android/lib/resource/src/main/res/values-es/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Muestra avisos cuando el tiempo de la cuenta está a punto de caducar</string> <string name="account_time_notification_channel_name">Recordatorios de tiempo de la cuenta</string> <string name="add">Añadir</string> - <string name="add_30_days_time">Añadir 30 días</string> <string name="add_30_days_time_x">Añadir 30 días (%1$s)</string> <string name="add_a_server">Añadir un servidor</string> <string name="add_dns_server_dialog_title">Añadir servidor DNS</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">No todos nuestros servidores están habilitados para %1$s. Por lo tanto, utilizamos el salto múltiple de forma automática para habilitar %1$s con cualquier servidor.</string> <string name="daita_info">Si habilita «%1$s», deberá seleccionar manualmente un servidor que esté habilitado para %2$s. Esto puede provocar que termine bloqueado hasta que seleccione un servidor compatible en la vista «Seleccionar ubicación».</string> <string name="daita_multihop">%1$s: Salto múltiple</string> + <string name="days_were_added_30">Se han añadido 30 días a su cuenta.</string> <string name="delete">Eliminar</string> <string name="delete_custom_list_confirmation_description">¿Eliminar «%1$s»?</string> <string name="delete_custom_list_message">Se ha eliminado «%1$s»</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Error de inicio de sesión</string> <string name="login_title">Iniciar sesión</string> <string name="malware_info">Advertencia: El bloqueador de malware no es un antivirus y no debe considerarse como tal, tan solo es un nivel de protección adicional.</string> - <string name="manage_account">Administrar cuenta</string> <string name="manage_devices">Gestionar dispositivos</string> <string name="manage_devices_confirm_removal_description_line1">¿Quitar %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">El dispositivo se quitará de la lista y se cerrará la sesión en él.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Para empezar a usar la aplicación, primero necesita agregar tiempo a su cuenta.</string> <string name="payment_billing_error_dialog_message">No hemos podido iniciar el proceso de pago. Asegúrese de tener la última versión de Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play no disponible</string> - <string name="payment_completed_dialog_message">Se han añadido 30 días a su cuenta.</string> - <string name="payment_completed_dialog_title">Se añadió correctamente el tiempo</string> <string name="payment_obfuscation_id_error_dialog_message">No hemos podido iniciar el proceso de pago. Inténtelo de nuevo más tarde.</string> <string name="payment_obfuscation_id_error_dialog_title">Servicios de Mullvad no disponibles</string> - <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> - <string name="payment_status_pending">Pago a Google Play pendiente</string> + <string name="payment_status_pending_short">Pago a Google Play pendiente</string> <string name="please_enter_a_valid_ip_address">Escriba una dirección IPv4 o IPv6 válida</string> <string name="please_enter_a_valid_remote_server_port">Introduzca un puerto de servidor remoto válido</string> <string name="port">Puerto</string> diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml index 9df735f87b..310aaf6040 100644 --- a/android/lib/resource/src/main/res/values-fi/strings.xml +++ b/android/lib/resource/src/main/res/values-fi/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Näyttää muistutuksia, kun tilin käyttöaika on umpeutumassa</string> <string name="account_time_notification_channel_name">Muistutukset tilin käyttöajasta</string> <string name="add">Lisää</string> - <string name="add_30_days_time">Lisää 30 päivää käyttöaikaa</string> <string name="add_30_days_time_x">Lisää 30 päivää käyttöaikaa (%1$s)</string> <string name="add_a_server">Lisää palvelin</string> <string name="add_dns_server_dialog_title">Lisää DNS-palvelin</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Kaikissa palvelimissamme ei ole %1$s-tukea. Siksi käytämme multihopia automaattisesti mahdollistaaksemme %1$s:n millä tahansa palvelimella.</string> <string name="daita_info">Kun \"%1$s\" otetaan käyttöön, sinun on valittava manuaalisesti palvelin, jossa on %2$s-tuki. Tämä voi aiheuttaa sen, että päädyt estettyyn tilaan, kunnes olet valinnut yhteensopivan palvelimen \"Valitse sijainti\" -näkymästä.</string> <string name="daita_multihop">%1$s: multihop</string> + <string name="days_were_added_30">Tilillesi lisättiin 30 päivää käyttöaikaa.</string> <string name="delete">Poista</string> <string name="delete_custom_list_confirmation_description">Poistetaanko \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" poistettiin</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Sisäänkirjautuminen epäonnistui</string> <string name="login_title">Kirjaudu sisään</string> <string name="malware_info">Varoitus: haittaohjelmien estotoiminto ei ole virustorjuntaohjelma, eikä sitä pidä käyttää sellaisena – kyseessä on vain ylimääräinen suojauskerros.</string> - <string name="manage_account">Tilin hallinta</string> <string name="manage_devices">Hallitse laitteita</string> <string name="manage_devices_confirm_removal_description_line1">Poistetaanko %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">Laite poistetaan luettelosta ja kirjataan ulos.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Voit aloittaa sovelluksen käyttämisen lisäämällä ensin aikaa tilillesi.</string> <string name="payment_billing_error_dialog_message">Emme pystyneet aloittamaan maksun käsittelyä. Varmista, että käytät Google Playn uusinta versiota.</string> <string name="payment_billing_error_dialog_title">Google Play ei ole käytettävissä</string> - <string name="payment_completed_dialog_message">Tilillesi lisättiin 30 päivää käyttöaikaa.</string> - <string name="payment_completed_dialog_title">Aika lisättiin onnistuneesti</string> <string name="payment_obfuscation_id_error_dialog_message">Emme pystyneet aloittamaan maksun käsittelyä. Yritä myöhemmin uudelleen.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad-palvelut eivät ole käytettävissä</string> - <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> - <string name="payment_status_pending">Google Play -maksu odottaa</string> + <string name="payment_status_pending_short">Google Play -maksu odottaa</string> <string name="please_enter_a_valid_ip_address">Anna kelvollinen IPv4- tai IPv6-osoite</string> <string name="please_enter_a_valid_remote_server_port">Anna kelvollinen etäpalvelimen portti</string> <string name="port">Portti</string> diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml index 31172da91d..710db2f8a8 100644 --- a/android/lib/resource/src/main/res/values-fr/strings.xml +++ b/android/lib/resource/src/main/res/values-fr/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Affiche des rappels lorsque le temps du compte va expirer</string> <string name="account_time_notification_channel_name">Rappels de temps pour le compte</string> <string name="add">Ajouter</string> - <string name="add_30_days_time">Ajouter 30 jours de temps</string> <string name="add_30_days_time_x">Ajouter 30 jours de temps (%1$s)</string> <string name="add_a_server">Ajouter un serveur</string> <string name="add_dns_server_dialog_title">Ajouter un serveur DNS</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Tous nos serveurs ne sont pas compatibles %1$s. C\'est pourquoi nous utilisons automatiquement le multihop pour activer %1$s avec n\'importe quel serveur.</string> <string name="daita_info">Si vous activez « %1$s », vous devez sélectionner manuellement un serveur avec %2$s activé. Vous risquez alors de vous retrouver dans une situation de blocage tant que vous n\'avez pas sélectionné un serveur compatible dans la vue « Sélectionner une localisation ».</string> <string name="daita_multihop">%1$s : multihop</string> + <string name="days_were_added_30">30 jours ont été ajoutés à votre compte.</string> <string name="delete">Supprimer</string> <string name="delete_custom_list_confirmation_description">Supprimer « %1$s » ?</string> <string name="delete_custom_list_message">« %1$s » a été supprimé</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Échec de la connexion</string> <string name="login_title">Connexion</string> <string name="malware_info">Avertissement : le bloqueur de malware n\'est pas un anti-virus et ne doit pas être traité comme tel, il s\'agit juste d\'une couche de protection supplémentaire.</string> - <string name="manage_account">Gérer le compte</string> <string name="manage_devices">Gérer les appareils</string> <string name="manage_devices_confirm_removal_description_line1">Supprimer %1$s ?</string> <string name="manage_devices_confirm_removal_description_line2">L\'appareil sera supprimé de la liste et déconnecté.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Pour commencer à utiliser l\'application, vous devez d\'abord ajouter du temps à votre compte.</string> <string name="payment_billing_error_dialog_message">Nous n\'avons pas pu lancer le processus de paiement, merci de vérifier que vous disposez de la dernière version de Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play indisponible</string> - <string name="payment_completed_dialog_message">30 jours ont été ajoutés à votre compte.</string> - <string name="payment_completed_dialog_title">Le temps a bien été ajouté</string> <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> <string name="payment_obfuscation_id_error_dialog_title">Services Mullvad indisponibles</string> - <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> - <string name="payment_status_pending">Paiement Google Play en attente</string> + <string name="payment_status_pending_short">Paiement Google Play en attente</string> <string name="please_enter_a_valid_ip_address">Merci de saisir une adresse IPv4 ou IPv6 valide</string> <string name="please_enter_a_valid_remote_server_port">Merci de saisir un port de serveur distant valide</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml index 1d7cfbf528..5a58201d45 100644 --- a/android/lib/resource/src/main/res/values-it/strings.xml +++ b/android/lib/resource/src/main/res/values-it/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Mostra promemoria quando il tempo dell\'account sta per scadere</string> <string name="account_time_notification_channel_name">Promemoria temporali per l\'account</string> <string name="add">Aggiungi</string> - <string name="add_30_days_time">Aggiungi 30 giorni di tempo</string> <string name="add_30_days_time_x">Aggiungi 30 giorni di tempo (%1$s)</string> <string name="add_a_server">Aggiungi un server</string> <string name="add_dns_server_dialog_title">Aggiungi server DNS</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Non tutti i nostri server sono abilitati per %1$s. Pertanto, utilizziamo automaticamente il multihop per abilitare %1$s con un server qualsiasi.</string> <string name="daita_info">Abilitando “%1$s” dovrai selezionare manualmente un server abilitato per %2$s. Questo può comportare uno stato di blocco finché non selezioni un server compatibile nella vista “Seleziona posizione”.</string> <string name="daita_multihop">%1$s: Multihop</string> + <string name="days_were_added_30">30 giorni aggiunti al tuo account.</string> <string name="delete">Elimina</string> <string name="delete_custom_list_confirmation_description">Eliminare \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" eliminato</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Accesso non riuscito</string> <string name="login_title">Accedi</string> <string name="malware_info">Avvertenza: questa protezione dai malware non è un antivirus e non deve essere trattata come tale, è solo un ulteriore livello di protezione.</string> - <string name="manage_account">Gestisci account</string> <string name="manage_devices">Gestisci dispositivi</string> <string name="manage_devices_confirm_removal_description_line1">Rimuovere %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">Il dispositivo verrà rimosso dall\'elenco e disconnesso.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Per iniziare a utilizzare l\'app, devi prima aggiungere tempo al tuo account.</string> <string name="payment_billing_error_dialog_message">Non siamo riusciti ad avviare il processo di pagamento, assicurati di avere la versione più recente di Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play non disponibile</string> - <string name="payment_completed_dialog_message">30 giorni aggiunti al tuo account.</string> - <string name="payment_completed_dialog_title">L\'ora è stata aggiunta correttamente</string> <string name="payment_obfuscation_id_error_dialog_message">Non siamo riusciti ad avviare il processo di pagamento, riprova più tardi.</string> <string name="payment_obfuscation_id_error_dialog_title">Servizi Mullvad non disponibili</string> - <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> - <string name="payment_status_pending">Pagamento Google Play in sospeso</string> + <string name="payment_status_pending_short">Pagamento Google Play in sospeso</string> <string name="please_enter_a_valid_ip_address">Inserisci un indirizzo IPv4 o IPv6 valido</string> <string name="please_enter_a_valid_remote_server_port">Inserisci una porta di server remoto valida</string> <string name="port">Porta</string> diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml index 7a04ad5dd8..314b1f5d1b 100644 --- a/android/lib/resource/src/main/res/values-ja/strings.xml +++ b/android/lib/resource/src/main/res/values-ja/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">アカウントの期限切れが迫っているときにリマインダーを表示します</string> <string name="account_time_notification_channel_name">アカウント時間のリマインダー</string> <string name="add">追加</string> - <string name="add_30_days_time">30日分を追加する</string> <string name="add_30_days_time_x">30日分を追加する (%1$s)</string> <string name="add_a_server">サーバーを追加</string> <string name="add_dns_server_dialog_title">DNS サーバーを追加</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">すべてのサーバーが%1$sに対応しているわけではないため、どのサーバーでも%1$sが有効になるようにマルチホップを自動的に使用しています。</string> <string name="daita_info">“%1$s” を有効化した場合、%2$s対応のサーバーを手動で選択する必要があります。これにより、“場所を選択する” で互換性のあるサーバーを選択するまでブロック状態となる可能性があります。</string> <string name="daita_multihop">%1$s: マルチホップ</string> + <string name="days_were_added_30">アカウントに30日分が追加されました。</string> <string name="delete">削除</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" を削除しますか？</string> <string name="delete_custom_list_message">\"%1$s\" は削除されました</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">ログインに失敗しました</string> <string name="login_title">ログイン</string> <string name="malware_info">警告: マルウェアブロッカーはウィルス対策ではありませんので、そのような用途には使用しないでください。あくまで追加の保護レイヤーに過ぎません。</string> - <string name="manage_account">アカウントを管理する</string> <string name="manage_devices">デバイスを管理する</string> <string name="manage_devices_confirm_removal_description_line1">%1$sを削除しますか？</string> <string name="manage_devices_confirm_removal_description_line2">リストからデバイスが削除され、ログアウトされます。</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">アプリを使い始めるには、まずはアカウントに時間を追加する必要があります。</string> <string name="payment_billing_error_dialog_message">決済処理を開始できませんでした。最新バージョンのGoogle Playを使用していることを確認してください。</string> <string name="payment_billing_error_dialog_title">Google Playを使用できません</string> - <string name="payment_completed_dialog_message">アカウントに30日分が追加されました。</string> - <string name="payment_completed_dialog_title">時間を正常に追加しました</string> <string name="payment_obfuscation_id_error_dialog_message">決済処理を開始できませんでした。後でもう一度お試しください。</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvadサービスを使用できません</string> - <string name="payment_pending_dialog_message">購入を確認中です。これにはしばらく時間がかかる場合があります。正常に確認されると、この時間が追加されます。</string> - <string name="payment_status_pending">Google Playの決済は未完了です</string> + <string name="payment_status_pending_short">Google Playの決済は未完了です</string> <string name="please_enter_a_valid_ip_address">有効な IPv4 または IPv6 アドレスを入力してください</string> <string name="please_enter_a_valid_remote_server_port">有効なリモートサーバーのポートを入力してください</string> <string name="port">ポート</string> diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml index 292d76e24c..89c5766c84 100644 --- a/android/lib/resource/src/main/res/values-ko/strings.xml +++ b/android/lib/resource/src/main/res/values-ko/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">계정 시간이 만료되려고 할 때 알림 표시</string> <string name="account_time_notification_channel_name">계정 시간 알림</string> <string name="add">추가</string> - <string name="add_30_days_time">30일 시간 추가</string> <string name="add_30_days_time_x">30일 시간 추가(%1$s)</string> <string name="add_a_server">서버 추가</string> <string name="add_dns_server_dialog_title">DNS 서버 추가</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">일부 서버에는 %1$s가 활성화되어 있지 않습니다. 따라서 당사는 모든 서버에서 %1$s를 활성화하기 위해 자동으로 멀티홉을 사용합니다.</string> <string name="daita_info">“%1$s”을 활성화하면 %2$s가 활성화된 서버를 수동으로 선택해야 합니다. 이로 인해 “위치 선택” 창에서 호환되는 서버를 선택할 때까지 차단된 상태에 빠질 수 있습니다.</string> <string name="daita_multihop">%1$s: 멀티홉</string> + <string name="days_were_added_30">귀하의 계정에 30일이 추가되었습니다.</string> <string name="delete">삭제</string> <string name="delete_custom_list_confirmation_description">\"%1$s\"을(를) 삭제하시겠습니까?</string> <string name="delete_custom_list_message">\"%1$s\"이(가) 삭제되었습니다</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">로그인 실패</string> <string name="login_title">로그인</string> <string name="malware_info">경고: 맬웨어 차단기는 안티바이러스가 아니며 하나의 추가 보호 계층일 뿐입니다.</string> - <string name="manage_account">계정 관리</string> <string name="manage_devices">장치 관리</string> <string name="manage_devices_confirm_removal_description_line1">%1$s을(를) 제거하시겠습니까?</string> <string name="manage_devices_confirm_removal_description_line2">장치가 목록에서 제거되고 로그아웃됩니다.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">앱 사용을 시작하려면, 먼저 계정에 시간을 추가해야 합니다.</string> <string name="payment_billing_error_dialog_message">결제 프로세스를 시작할 수 없습니다. Google Play가 최신 버전인지 확인하세요.</string> <string name="payment_billing_error_dialog_title">Google Play 사용 불가</string> - <string name="payment_completed_dialog_message">귀하의 계정에 30일이 추가되었습니다.</string> - <string name="payment_completed_dialog_title">시간이 성공적으로 추가되었습니다.</string> <string name="payment_obfuscation_id_error_dialog_message">결제 프로세스를 시작할 수 없습니다. 나중에 다시 시도해 주세요.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad 서비스 사용 불가</string> - <string name="payment_pending_dialog_message">구매를 현재 확인하는 중이므로 다소 시간이 걸릴 수 있습니다. 확인을 성공적으로 마치면 시간이 추가됩니다.</string> - <string name="payment_status_pending">Google Play 결제 보류 중</string> + <string name="payment_status_pending_short">Google Play 결제 보류 중</string> <string name="please_enter_a_valid_ip_address">유효한 IPv4 또는 IPv6 주소를 입력하세요</string> <string name="please_enter_a_valid_remote_server_port">유효한 원격 서버 포트를 입력하세요</string> <string name="port">포트</string> diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml index 22e661b269..28fd3349b4 100644 --- a/android/lib/resource/src/main/res/values-my/strings.xml +++ b/android/lib/resource/src/main/res/values-my/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">အကောင့်အချိန် သက်တမ်းကုန်ခါနီးချိန်၌ သတိပေးချက်များ ပြသပေးပါသည်</string> <string name="account_time_notification_channel_name">အကောင့်အချိန် သတိပေးချက်များ</string> <string name="add">ပေါင်းထည့်ရန်</string> - <string name="add_30_days_time">အချိန် ရက် 30 ကို ပေါင်းထည့်ရန်</string> <string name="add_30_days_time_x">အချိန် ရက် 30 ကို ပေါင်းထည့်ရန် (%1$s)</string> <string name="add_a_server">ဆာဗာ ပေါင်းထည့်ရန်</string> <string name="add_dns_server_dialog_title">DNS ဆာဗာကို ပေါင်းထည့်ရန်</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">ကျွန်ုပ်တို့၏ဆာဗာအားလုံးတွင် %1$s ကိုဖွင့်ထားခြင်းမရှိပါ။ ထို့ကြောင့် ကျွန်ုပ်တို့သည် မည်သည့်ဆာဗာနှင့်မဆို %1$s ကိုဖွင့်ရန် မာလ်တီဟော့ပ်ကို အလိုအလျောက်အသုံးပြုပါသည်။</string> <string name="daita_info">“%1$s” ကို ဖွင့်လိုက်လျှင် သင်သည် %2$s ကိုဖွင့်ထားသည့် ဆာဗာကို ကိုယ်တိုင်ရွေးချယ်ရမည်ဖြစ်သည်။ ၎င်းသည် \"တည်နေရာကိုရွေးချယ်ပါ\" မြင်ကွင်းတွင် တွဲဖက်သုံးနိုင်သောဆာဗာကို မရွေးချယ်ရသေးမချင်း ပိတ်ဆို့ခံထားသောအခြေအနေတွင် အဆုံးသတ်စေနိုင်သည်။</string> <string name="daita_multihop">%1$s: မာလ်တီဟော့ပ်</string> + <string name="days_were_added_30">သင့်အကောင့်ထဲသို့ ရက် 30 ကို ပေါင်းထည့်ပြီးပါပြီ။</string> <string name="delete">ဖျက်ရန်</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" ကို ဖျက်မည်လား။</string> <string name="delete_custom_list_message">\"%1$s\" ကို ဖျက်ပြီးပါပြီ</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">ဝင်ရောက်မှု မအောင်မြင်ပါ</string> <string name="login_title">ဝင်ရန်</string> <string name="malware_info">သတိပေးချက်- မဲလ်ဝဲရ် ပိတ်ဆို့မှုသည် အပိုအကာအကွယ်လွှာ တစ်ခုသာဖြစ်ပြီး ဗိုင်းရပ်စ် ကာကွယ်ရေး (anti-virus) မဟုတ်၍ ၎င်းအဖြစ် မမှတ်ယူသင့်ပါ။</string> - <string name="manage_account">အကောင့် စီမံခန့်ခွဲရန်</string> <string name="manage_devices">စက်များကို စီမံရန်</string> <string name="manage_devices_confirm_removal_description_line1">%1$s ကို ဖယ်ရှားမလား။</string> <string name="manage_devices_confirm_removal_description_line2">စက်ကို စာရင်းမှ ဖယ်ရှားပြီး စနစ်မှ ထွက်သွားလိမ့်မည်။</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">အက်ပ်ကို စသုံးရန်အတွက် ဦးစွာ သင့်အကောင့်တွင် အချိန်ပေါင်းထည့်ပေးရန် လိုအပ်ပါသည်။</string> <string name="payment_billing_error_dialog_message">လက်ရှိတွင် ပေးချေမှု လုပ်ငန်းစဉ်ကို စတင်၍ မရနိုင်ပါ၊ Google Play နောက်ဆုံး ဗားရှင်း သင့်တွင်ရှိနေကြောင်း သေချာပါစေ။</string> <string name="payment_billing_error_dialog_title">Google Play ကို မရရှိနိုင်ပါ</string> - <string name="payment_completed_dialog_message">သင့်အကောင့်ထဲသို့ ရက် 30 ကို ပေါင်းထည့်ပြီးပါပြီ။</string> - <string name="payment_completed_dialog_title">အချိန်ကို အောင်မြင်စွာ ပေါင်းထည့်ပြီးပြီ</string> <string name="payment_obfuscation_id_error_dialog_message">လက်ရှိတွင် ပေးချေမှု လုပ်ငန်းစဉ်ကို စတင်၍ မရနိုင်ပါ၊ နောက်မှ ထပ်ကြိုးစားကြည့်ပါ။</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad ဝန်ဆောင်မှုများကို မရရှိနိုင်ပါ</string> - <string name="payment_pending_dialog_message">သင့်ဝယ်ယူမှုကို လက်ရှိတွင် ကျွန်ုပ်တို့ စစ်ဆေး အတည်ပြုနေဆဲဖြစ်ပြီး အချိန်အနည်းငယ်ကြာနိုင်ပါသည်။ စစ်ဆေး အတည်ပြုမှု အောင်မြင်ပါက သင့်အချိန်များကို ပေါင်းထည့်သွားပါမည်။</string> - <string name="payment_status_pending">Google Play ပေးချေမှုကို ဆိုင်းငံ့ထားဆဲ</string> + <string name="payment_status_pending_short">Google Play ပေးချေမှုကို ဆိုင်းငံ့ထားဆဲ</string> <string name="please_enter_a_valid_ip_address">မှန်ကန်သော IPv4 သို့မဟုတ် IPv6 လိပ်စာကို ရိုက်ထည့်ပေးပါ</string> <string name="please_enter_a_valid_remote_server_port">မှန်ကန်သော အဝေးဆာဗာ ပေါ့တ်ကို ရိုက်ထည့်ပေးပါ</string> <string name="port">ပေါ့တ်</string> diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml index 81459c2484..6b55ea807a 100644 --- a/android/lib/resource/src/main/res/values-nb/strings.xml +++ b/android/lib/resource/src/main/res/values-nb/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Viser påminnelser når tidsavbrudd for kontoen er i ferd med å inntreffe</string> <string name="account_time_notification_channel_name">Påminnelser om tidsavbrudd for konto</string> <string name="add">Legg til</string> - <string name="add_30_days_time">Legg til 30 dager</string> <string name="add_30_days_time_x">Legg til 30 dager (%1$s)</string> <string name="add_a_server">Legg til en server</string> <string name="add_dns_server_dialog_title">Legg til DNS-server</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Ikke alle serverne våre er %1$s-aktiverte. Derfor bruker vi automatisk multihopp for å aktivere %1$s med alle servere.</string> <string name="daita_info">Hvis du aktiverer «%1$s», må du manuelt velge en server som har aktivert %2$s. Dette kan føre til at du havner i en blokkert tilstand inntil du har valgt en kompatibel server under «Velg plassering».</string> <string name="daita_multihop">%1$s: Multihopp</string> + <string name="days_were_added_30">30 dager ble lagt til kontoen din.</string> <string name="delete">Slett</string> <string name="delete_custom_list_confirmation_description">Slette «%1$s»?</string> <string name="delete_custom_list_message">«%1$s» ble slettet</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Kunne ikke logge inn</string> <string name="login_title">Logg inn</string> <string name="malware_info">Advarsel: Blokkeringen av skadelig programvare er ikke et antivirusprogram og skal ikke brukes som dette. Det er bare et ekstra lag med beskyttelse.</string> - <string name="manage_account">Administrer konto</string> <string name="manage_devices">Behandle enheter</string> <string name="manage_devices_confirm_removal_description_line1">Fjerne %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">Enheten blir fjernet fra listen og logget ut.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">For å starte bruken av appen, må du først legge til tid til kontoen.</string> <string name="payment_billing_error_dialog_message">Vi kunne ikke starte betalingsprosessen. Kontroller om du har siste versjon av Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play utilgjengelig</string> - <string name="payment_completed_dialog_message">30 dager ble lagt til kontoen din.</string> - <string name="payment_completed_dialog_title">Tid ble lagt til</string> <string name="payment_obfuscation_id_error_dialog_message">Vi kunne ikke starte betalingsprosessen. Prøv igjen senere.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad-tjenester utilgjengelig</string> - <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> - <string name="payment_status_pending">Google Play-betaling venter</string> + <string name="payment_status_pending_short">Google Play-betaling venter</string> <string name="please_enter_a_valid_ip_address">Skriv inn en gyldig IPv4- eller IPv6-adresse</string> <string name="please_enter_a_valid_remote_server_port">Skriv inn en gyldig ekstern server-port</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml index cbf90e2fc7..1499e4b26e 100644 --- a/android/lib/resource/src/main/res/values-nl/strings.xml +++ b/android/lib/resource/src/main/res/values-nl/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Toont herinneringen wanneer de accounttijd op het punt staat te verlopen</string> <string name="account_time_notification_channel_name">Accounttijdherinneringen</string> <string name="add">Toevoegen</string> - <string name="add_30_days_time">30 dagen tijd toevoegen</string> <string name="add_30_days_time_x">30 dagen tijd toevoegen (%1$s)</string> <string name="add_a_server">Server toevoegen</string> <string name="add_dns_server_dialog_title">DNS-server toevoegen</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Niet al onze servers zijn geschikt voor %1$s. Daarom gebruiken we automatisch multihop om %1$s in te schakelen bij elke server.</string> <string name="daita_info">Als u \"%1$s\" inschakelt, moet u handmatig een server selecteren die %2$s ondersteunt. Hierdoor kunt u in een geblokkeerde toestand terechtkomen totdat u een compatibele server hebt geselecteerd in het dialoogvenster \"Locatie selecteren\".</string> <string name="daita_multihop">%1$s: multihop</string> + <string name="days_were_added_30">Er zijn 30 dagen toegevoegd aan uw account.</string> <string name="delete">Verwijderen</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" verwijderen?</string> <string name="delete_custom_list_message">\"%1$s\" is verwijderd</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Aanmelden mislukt</string> <string name="login_title">Aanmelden</string> <string name="malware_info">Waarschuwing: de malwareblocker is geen antivirus en mag niet als zodanig behandeld worden. Dit is slechts een extra beschermingslaag.</string> - <string name="manage_account">Account beheren</string> <string name="manage_devices">Apparaten beheren</string> <string name="manage_devices_confirm_removal_description_line1">%1$s verwijderen?</string> <string name="manage_devices_confirm_removal_description_line2">Het apparaat wordt uit de lijst verwijderd en wordt uitgelogd.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Om de app te gebruiken, moet u eerst tijd toevoegen aan uw account.</string> <string name="payment_billing_error_dialog_message">We kunnen het betalingsproces niet starten. Controleer of u de nieuwste versie van Google Play hebt.</string> <string name="payment_billing_error_dialog_title">Google Play niet beschikbaar</string> - <string name="payment_completed_dialog_message">Er zijn 30 dagen toegevoegd aan uw account.</string> - <string name="payment_completed_dialog_title">Tijd is toegevoegd</string> <string name="payment_obfuscation_id_error_dialog_message">We kunnen het betalingsproces niet starten, probeer het later opnieuw.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad-diensten niet beschikbaar</string> - <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> - <string name="payment_status_pending">Google Play-betaling in behandeling</string> + <string name="payment_status_pending_short">Google Play-betaling in behandeling</string> <string name="please_enter_a_valid_ip_address">Voer een geldig IPv4- of IPv6-adres in</string> <string name="please_enter_a_valid_remote_server_port">Voer een geldige poort op de externe server in</string> <string name="port">Poort</string> diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml index 13c1a24c16..57de2c4691 100644 --- a/android/lib/resource/src/main/res/values-pl/strings.xml +++ b/android/lib/resource/src/main/res/values-pl/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Pokazuje przypomnienia, gdy kończy się czas na koncie</string> <string name="account_time_notification_channel_name">Przypomnienia o czasie na koncie</string> <string name="add">Dodaj</string> - <string name="add_30_days_time">Dodaj 30 dni</string> <string name="add_30_days_time_x">Dodaj 30 dni (%1$s)</string> <string name="add_a_server">Dodaj serwer</string> <string name="add_dns_server_dialog_title">Dodaj serwer DNS</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Nie wszystkie nasze serwery obsługują %1$s. Dlatego automatycznie używamy funkcji wielokrotnego przeskoku, aby umożliwić działanie %1$s z dowolnym serwerem.</string> <string name="daita_info">Po włączeniu opcji „%1$s” trzeba ręcznie wybrać serwer, który obsługuje %2$s. Może to skutkować zablokowaniem, dopóki nie wybierzesz zgodnego serwera w widoku „Wybierz lokalizację”.</string> <string name="daita_multihop">%1$s: wielokrotny przeskok</string> + <string name="days_were_added_30">Do konta dodano 30 dni.</string> <string name="delete">Usuń</string> <string name="delete_custom_list_confirmation_description">Usunąć „%1$s”?</string> <string name="delete_custom_list_message">Usunięto „%1$s”</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Błąd logowania</string> <string name="login_title">Logowanie</string> <string name="malware_info">Ostrzeżenie: funkcja blokowania złośliwego oprogramowania nie jest programem antywirusowym i nie należy jej tak traktować. To jedynie dodatkowa warstwa zabezpieczeń.</string> - <string name="manage_account">Zarządzaj kontem</string> <string name="manage_devices">Zarządzaj urządzeniami</string> <string name="manage_devices_confirm_removal_description_line1">Usunąć %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">Urządzenie zostanie usunięte z listy i wylogowane.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Aby rozpocząć korzystanie z aplikacji, musisz najpierw dodać czas do swojego konta.</string> <string name="payment_billing_error_dialog_message">Nie mogliśmy rozpocząć procesu płatności. Upewnij się, że masz najnowszą wersję aplikacji Google Play.</string> <string name="payment_billing_error_dialog_title">Sklep Google Play jest niedostępny</string> - <string name="payment_completed_dialog_message">Do konta dodano 30 dni.</string> - <string name="payment_completed_dialog_title">Dodano czas</string> <string name="payment_obfuscation_id_error_dialog_message">Nie mogliśmy rozpocząć procesu płatności. Spróbuj ponownie później.</string> <string name="payment_obfuscation_id_error_dialog_title">Usługi Mullvad są niedostępne</string> - <string name="payment_pending_dialog_message">Weryfikujemy zakup. Może to zająć trochę czasu. Jeśli weryfikacja powiedzie się, czas zostanie dodany.</string> - <string name="payment_status_pending">Oczekiwanie na płatność Google Play</string> + <string name="payment_status_pending_short">Oczekiwanie na płatność Google Play</string> <string name="please_enter_a_valid_ip_address">Wprowadź prawidłowy adres IPv4 lub IPv6</string> <string name="please_enter_a_valid_remote_server_port">Wprowadź prawidłowy port serwera zdalnego</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml index 43fddb76ad..603b10c382 100644 --- a/android/lib/resource/src/main/res/values-pt/strings.xml +++ b/android/lib/resource/src/main/res/values-pt/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Mostra lembretes quando o tempo da conta está prestes a expirar</string> <string name="account_time_notification_channel_name">Lembretes de tempo da conta</string> <string name="add">Adicionar</string> - <string name="add_30_days_time">Adicionar 30 dias</string> <string name="add_30_days_time_x">Adicionar 30 dias (%1$s)</string> <string name="add_a_server">Adicionar um servidor</string> <string name="add_dns_server_dialog_title">Adicionar servidor DNS</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Nem todos os servidores suportam %1$s. Por isso, utilizamos multihop automaticamente para ativar %1$s em qualquer servidor.</string> <string name="daita_info">Ao ativar “%1$s”, terá de selecionar manualmente um servidor que tenha %2$s ativada, o que pode fazer com que fique num estado bloqueado até selecionar um servidor compatível na vista \"Selecionar localização\".</string> <string name="daita_multihop">%1$s: multihop</string> + <string name="days_were_added_30">30 dias adicionados à sua conta.</string> <string name="delete">Eliminar</string> <string name="delete_custom_list_confirmation_description">Eliminar \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" foi eliminada</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Erro ao iniciar sessão</string> <string name="login_title">Iniciar sessão</string> <string name="malware_info">Aviso: o bloqueador de malware não é um antivírus e não deve ser tratado como tal, é apenas uma camada extra de proteção.</string> - <string name="manage_account">Gerir conta</string> <string name="manage_devices">Gerir dispositivos</string> <string name="manage_devices_confirm_removal_description_line1">Remover %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">O dispositivo será removido da lista e terminará a sessão.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Para começar a utilizar a aplicação, primeiro tem de adicionar tempo à sua conta.</string> <string name="payment_billing_error_dialog_message">Não foi possível iniciar o processo de pagamento. Verifique se tem a versão mais recente do Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play indisponível</string> - <string name="payment_completed_dialog_message">30 dias adicionados à sua conta.</string> - <string name="payment_completed_dialog_title">Tempo adicionado com sucesso</string> <string name="payment_obfuscation_id_error_dialog_message">Não foi possível iniciar o processo de pagamento, tente novamente mais tarde.</string> <string name="payment_obfuscation_id_error_dialog_title">Serviços Mullvad indisponíveis</string> - <string name="payment_pending_dialog_message">Estamos atualmente a verificar a sua compra, o que poderá demorar algum tempo. O seu tempo será adicionado se a verificação for bem sucedida.</string> - <string name="payment_status_pending">Pagamento Google Play pendente</string> + <string name="payment_status_pending_short">Pagamento Google Play pendente</string> <string name="please_enter_a_valid_ip_address">Introduza um endereço IPv4 ou IPv6 válido</string> <string name="please_enter_a_valid_remote_server_port">Introduza uma porta de servidor remoto válida</string> <string name="port">Porta</string> diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml index a78c8f83f4..e54c2d71f2 100644 --- a/android/lib/resource/src/main/res/values-ru/strings.xml +++ b/android/lib/resource/src/main/res/values-ru/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Показывает уведомления, когда время на учетной записи скоро закончится</string> <string name="account_time_notification_channel_name">Напоминания о времени на учетной записи</string> <string name="add">Добавить</string> - <string name="add_30_days_time">Добавить 30 дней</string> <string name="add_30_days_time_x">Добавить 30 дней (%1$s)</string> <string name="add_a_server">Добавить сервер</string> <string name="add_dns_server_dialog_title">Добавить DNS-сервер</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">%1$s поддерживается не на всех серверах. Поэтому, чтобы функция %1$s работала с любым сервером, мы автоматически используем многократный переход.</string> <string name="daita_info">После включения параметра «%1$s» вы должны будете вручную выбрать сервер, который поддерживает %2$s. В результате вы можете оказаться заблокированы, пока не выберете совместимый сервер в окне выбора местоположения.</string> <string name="daita_multihop">%1$s: многократный переход</string> + <string name="days_were_added_30">На учетную запись добавлено 30 дней.</string> <string name="delete">Удалить</string> <string name="delete_custom_list_confirmation_description">Удалить список «%1$s»?</string> <string name="delete_custom_list_message">Список «%1$s» удален</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Ошибка входа</string> <string name="login_title">Вход</string> <string name="malware_info">Внимание! Блокировщик вредоносного ПО — это просто дополнительный уровень защиты, а не антивирус.</string> - <string name="manage_account">Управление учетной записью</string> <string name="manage_devices">Управление устройствами</string> <string name="manage_devices_confirm_removal_description_line1">Удалить устройство «%1$s»?</string> <string name="manage_devices_confirm_removal_description_line2">Устройство будет удалено из списка. На нем будет выполнен выход из системы.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Чтобы пользоваться приложением, нужно добавить время на учетную запись.</string> <string name="payment_billing_error_dialog_message">Не удалось начать процесс оплаты — убедитесь, что у вас установлена последняя версия Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play недоступен</string> - <string name="payment_completed_dialog_message">На учетную запись добавлено 30 дней.</string> - <string name="payment_completed_dialog_title">Время добавлено</string> <string name="payment_obfuscation_id_error_dialog_message">Не удалось начать процесс оплаты. Повторите попытку позже.</string> <string name="payment_obfuscation_id_error_dialog_title">Службы Mullvad недоступны</string> - <string name="payment_pending_dialog_message">Сейчас мы проверяем, прошла ли оплата; нужно немного подождать. Если проверка завершится успешно, мы добавим оплаченное время.</string> - <string name="payment_status_pending">Ожидается оплата в Google Play</string> + <string name="payment_status_pending_short">Ожидается оплата в Google Play</string> <string name="please_enter_a_valid_ip_address">Введите действительный адрес IPv4 или IPv6</string> <string name="please_enter_a_valid_remote_server_port">Введите действительный порт удаленного сервера</string> <string name="port">Порт</string> diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml index ee71d70e7e..d7472ba1bd 100644 --- a/android/lib/resource/src/main/res/values-sv/strings.xml +++ b/android/lib/resource/src/main/res/values-sv/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Visar påminnelser när kontots tidsgräns uppnås</string> <string name="account_time_notification_channel_name">Påminnelser om kontotid</string> <string name="add">Lägg till</string> - <string name="add_30_days_time">Lägg till 30 dagar</string> <string name="add_30_days_time_x">Lägg till 30 dagar (%1$s)</string> <string name="add_a_server">Lägg till en server</string> <string name="add_dns_server_dialog_title">Lägg till DNS-server</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">Det är inte alla våra servrar som är %1$s-aktiverade. Därför använder vi multihopp automatiskt för att aktivera %1$s med alla servrar.</string> <string name="daita_info">Om du aktiverar \"%1$s\" måste du manuellt välja en server som är %2$s-aktiverad. Det kan leda till ett blockerat tillstånd tills du väljer en kompatibel server i \"Välj plats\"-vyn.</string> <string name="daita_multihop">%1$s: Multihopp</string> + <string name="days_were_added_30">30 dagar har lagts till i ditt konto.</string> <string name="delete">Ta bort</string> <string name="delete_custom_list_confirmation_description">Ta bort \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" har tagits bort</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Inloggningen misslyckades</string> <string name="login_title">Logga in</string> <string name="malware_info">Varning! Blockering av skadlig kod är inte ett antivirusprogram och bör inte behandlas som ett. Det här är bara ett extra skyddslager.</string> - <string name="manage_account">Hantera konto</string> <string name="manage_devices">Hantera enheter</string> <string name="manage_devices_confirm_removal_description_line1">Ta bort %1$s?</string> <string name="manage_devices_confirm_removal_description_line2">Enheten kommer att tas bort från listan och loggas ut.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Om du vill börja använda appen måste du först lägga till tid i ditt konto.</string> <string name="payment_billing_error_dialog_message">Vi kunde inte starta betalningsprocessen. Se till att du har den senaste versionen av Google Play.</string> <string name="payment_billing_error_dialog_title">Google Play är inte tillgängligt</string> - <string name="payment_completed_dialog_message">30 dagar har lagts till i ditt konto.</string> - <string name="payment_completed_dialog_title">Tid har lagts till</string> <string name="payment_obfuscation_id_error_dialog_message">Vi kunde inte starta betalningsprocessen, försök igen senare.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad-tjänster är inte tillgängliga</string> - <string name="payment_pending_dialog_message">Vi verifierar ditt köp just nu och det kan ta en stund. Din tid läggs till om verifieringen lyckas.</string> - <string name="payment_status_pending">Google Play-betalning väntar</string> + <string name="payment_status_pending_short">Google Play-betalning väntar</string> <string name="please_enter_a_valid_ip_address">Ange en giltig IPv4- eller IPv6-adress</string> <string name="please_enter_a_valid_remote_server_port">Ange en giltig fjärrserverport</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml index b83d785055..d93414e153 100644 --- a/android/lib/resource/src/main/res/values-th/strings.xml +++ b/android/lib/resource/src/main/res/values-th/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">แสดงการแจ้งเตือน ในขณะที่เวลาบัญชีใกล้หมดอายุ</string> <string name="account_time_notification_channel_name">การแจ้งเตือนเวลาบัญชี</string> <string name="add">เพิ่ม</string> - <string name="add_30_days_time">เพิ่มเวลา 30 วัน</string> <string name="add_30_days_time_x">เพิ่มเวลา 30 วัน (%1$s)</string> <string name="add_a_server">เพิ่มเซิร์ฟเวอร์</string> <string name="add_dns_server_dialog_title">เพิ่มเซิร์ฟเวอร์ DNS</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">ไม่ใช่ทุกเซิร์ฟเวอร์ของเราที่เปิดใช้งาน %1$s ด้วยเหตุนี้เอง เราจึงใช้การมัลติฮอปอัตโนมัติ เพื่อเปิดใช้งาน %1$s กับทุกเซิร์ฟเวอร์</string> <string name="daita_info">โดยการเปิดใช้งาน “%1$s” คุณจะต้องเลือกเซิร์ฟเวอร์ที่เปิดใช้งาน %2$s ด้วยตนเอง ซึ่งอาจทำให้คุณอยู่ในสถานะถูกบล็อก จนกว่าคุณจะเลือกเซิร์ฟเวอร์ที่เข้ากันได้ในมุมมอง \"เลือกตำแหน่งที่ตั้ง\"</string> <string name="daita_multihop">%1$s: Multihop</string> + <string name="days_were_added_30">30 วัน ถูกเพิ่มลงในบัญชีของคุณแล้ว</string> <string name="delete">ลบ</string> <string name="delete_custom_list_confirmation_description">ลบ \"%1$s\" หรือไม่</string> <string name="delete_custom_list_message">\"%1$s\" ถูกลบแล้ว</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">การเข้าสู่ระบบล้มเหลว</string> <string name="login_title">เข้าสู่ระบบ</string> <string name="malware_info">คำเตือน: ตัวบล็อกมัลแวร์ไม่ใช่แอนตี้ไวรัส และไม่ควรนำมาใช้ในรูปแบบดังกล่าว นี่เป็นเพียงชั้นการป้องกันเพิ่มเติมเท่านั้น</string> - <string name="manage_account">จัดการบัญชี</string> <string name="manage_devices">จัดการอุปกรณ์</string> <string name="manage_devices_confirm_removal_description_line1">ลบ %1$s หรือไม่</string> <string name="manage_devices_confirm_removal_description_line2">อุปกรณ์จะถูกลบออกจากรายการและออกจากระบบ</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">คุณจำเป็นต้องเพิ่มเวลาไปยังบัญชีของคุณก่อน เพื่อที่จะเริ่มใช้งานแอป</string> <string name="payment_billing_error_dialog_message">เราไม่สามารถเริ่มกระบวนการชำระเงินได้ โปรดตรวจสอบให้แน่ใจว่า คุณมี Google Play เวอร์ชันล่าสุด </string> <string name="payment_billing_error_dialog_title">Google Play ไม่พร้อมใช้งาน</string> - <string name="payment_completed_dialog_message">30 วัน ถูกเพิ่มลงในบัญชีของคุณแล้ว</string> - <string name="payment_completed_dialog_title">เพิ่มเวลาสำเร็จแล้ว</string> <string name="payment_obfuscation_id_error_dialog_message">เราไม่สามารถเริ่มกระบวนการชำระเงินได้ โปรดลองอีกครั้งในภายหลัง</string> <string name="payment_obfuscation_id_error_dialog_title">บริการ Mullavad ไม่พร้อมใช้งาน</string> - <string name="payment_pending_dialog_message">เรากำลังตรวจสอบยืนยันการซื้อของคุณ ซึ่งอาจใช้เวลาสักครู่ คุณจะได้รับเวลาเพิ่ม หากการตรวจสอบยืนยันสำเร็จ</string> - <string name="payment_status_pending">กำลังชำระเงิน Google Play</string> + <string name="payment_status_pending_short">กำลังชำระเงิน Google Play</string> <string name="please_enter_a_valid_ip_address">โปรดป้อนที่อยู่ IPv4 หรือ IPv6 ที่ถูกต้อง</string> <string name="please_enter_a_valid_remote_server_port">โปรดป้อนพอร์ตเซิร์ฟเวอร์ระยะไกลที่ถูกต้อง</string> <string name="port">พอร์ต</string> diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml index 37f2b7c405..ed11675184 100644 --- a/android/lib/resource/src/main/res/values-tr/strings.xml +++ b/android/lib/resource/src/main/res/values-tr/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">Hesap süresinin dolmak üzere olduğunu bildiren hatırlatıcıları gösterir</string> <string name="account_time_notification_channel_name">Hesap süresi hatırlatıcıları</string> <string name="add">Ekle</string> - <string name="add_30_days_time">30 gün süre ekleyin</string> <string name="add_30_days_time_x">30 gün süre ekleyin (%1$s)</string> <string name="add_a_server">Sunucu ekle</string> <string name="add_dns_server_dialog_title">DNS sunucusu ekle</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">%1$s, tüm sunucularımızda etkin değildir. Bu nedenle, %1$s özelliğini herhangi bir sunucuda etkinleştirmek için otomatik olarak çoklu geçişi kullanırız.</string> <string name="daita_info">\"%1$s\" seçeneğini etkinleştirdiğinizde %2$s özellikli bir sunucuyu manuel olarak seçmeniz gerekir. Bu, \"Konum seç\" görünümünde uyumlu bir sunucu seçilene kadar engellenmiş durumda kalmanıza neden olabilir.</string> <string name="daita_multihop">%1$s: Çoklu geçiş</string> + <string name="days_were_added_30">Hesabınıza 30gün eklendi.</string> <string name="delete">Sil</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" silinsin mi\"?</string> <string name="delete_custom_list_message">\"%1$s\" silindi</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">Oturum açma başarısız</string> <string name="login_title">Oturum Aç</string> <string name="malware_info">Uyarı: Kötü amaçlı yazılım engelleyici, virüsten koruma yazılımı değildir ve bu şekilde değerlendirilmemelidir. Sadece ek bir koruma seviyesi sağlamaktadır.</string> - <string name="manage_account">Hesabı yönet</string> <string name="manage_devices">Cihazları yönet</string> <string name="manage_devices_confirm_removal_description_line1">%1$s kaldırılsın mı?</string> <string name="manage_devices_confirm_removal_description_line2">Cihaz listeden kaldırılacak ve oturum kapatılacak.</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">Uygulamayı kullanmaya başlamak için önce hesabınıza süre eklemeniz gerekir.</string> <string name="payment_billing_error_dialog_message">Ödeme işlemini başlatamadık. Lütfen Google Play\'in en son sürümüne sahip olduğunuzdan emin olun.</string> <string name="payment_billing_error_dialog_title">Google Play kullanılamıyor</string> - <string name="payment_completed_dialog_message">Hesabınıza 30gün eklendi.</string> - <string name="payment_completed_dialog_title">Süre başarıyla eklendi</string> <string name="payment_obfuscation_id_error_dialog_message">Ödeme işlemini başlatamadık, lütfen daha sonra tekrar deneyin.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad hizmetleri kullanılamıyor</string> - <string name="payment_pending_dialog_message">Şu anda satın alma işleminizi doğruluyoruz. Bu işlem biraz zaman alabilir. Süreniz, doğrulama işleminin başarılı olması durumunda eklenecektir.</string> - <string name="payment_status_pending">Google Play ödemesi bekleniyor</string> + <string name="payment_status_pending_short">Google Play ödemesi bekleniyor</string> <string name="please_enter_a_valid_ip_address">Lütfen geçerli bir IPv4 veya IPv6 adresi girin</string> <string name="please_enter_a_valid_remote_server_port">Lütfen geçerli bir uzak sunucu portu girin</string> <string name="port">Port</string> diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml index d6b900fa6e..ffceb72bde 100644 --- a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml +++ b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">在帐户时间即将到期时显示提醒</string> <string name="account_time_notification_channel_name">帐户时间提醒</string> <string name="add">添加</string> - <string name="add_30_days_time">增加 30 天</string> <string name="add_30_days_time_x">增加 30 天 (%1$s)</string> <string name="add_a_server">添加服务器</string> <string name="add_dns_server_dialog_title">添加 DNS 服务器</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">我们的部分服务器未启用 %1$s。因此，我们使用多跳自动为任何服务器启用 %1$s。</string> <string name="daita_info">启用“%1$s”后，您需要手动选择启用了 %2$s 的服务器。这可能导致您在“选择位置”视图中选择兼容服务器之前处于阻止状态。</string> <string name="daita_multihop">%1$s：多跳</string> + <string name="days_were_added_30">已向您的帐户增加 30 天。</string> <string name="delete">删除</string> <string name="delete_custom_list_confirmation_description">删除“%1$s”？</string> <string name="delete_custom_list_message">“%1$s”已被删除</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">登录失败</string> <string name="login_title">登录</string> <string name="malware_info">警告：恶意软件阻止程序不是防病毒软件，也不应被视为防病毒软件，这只是提供了一层额外的保护。</string> - <string name="manage_account">管理帐户</string> <string name="manage_devices">管理设备</string> <string name="manage_devices_confirm_removal_description_line1">是否移除“%1$s”？</string> <string name="manage_devices_confirm_removal_description_line2">该设备将从列表中移除并退出登录。</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">要开始使用本应用，您首先需要向帐户中充入时间。</string> <string name="payment_billing_error_dialog_message">我们无法启动付款流程，请确保拥有最新版本的 Google Play。</string> <string name="payment_billing_error_dialog_title">Google Play 不可用</string> - <string name="payment_completed_dialog_message">已向您的帐户增加 30 天。</string> - <string name="payment_completed_dialog_title">时间已成功添加</string> <string name="payment_obfuscation_id_error_dialog_message">我们无法启动付款流程，请稍后再试。</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad 服务不可用</string> - <string name="payment_pending_dialog_message">我们目前正在验证您的购买，这可能需要一些时间。如果验证成功，您的时间将增加。</string> - <string name="payment_status_pending">Google Play 付款待处理</string> + <string name="payment_status_pending_short">Google Play 付款待处理</string> <string name="please_enter_a_valid_ip_address">请输入有效的 IPv4 或 IPv6 地址</string> <string name="please_enter_a_valid_remote_server_port">请输入有效的远程服务器端口</string> <string name="port">端口</string> diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml index f0b503cac4..6b2c417d9d 100644 --- a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml +++ b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml @@ -7,7 +7,6 @@ <string name="account_time_notification_channel_description">在帳戶時間即將到期時顯示提醒</string> <string name="account_time_notification_channel_name">帳戶時間提醒</string> <string name="add">新增</string> - <string name="add_30_days_time">增加 30 天時間</string> <string name="add_30_days_time_x">增加 30 天時間 (%1$s)</string> <string name="add_a_server">新增伺服器</string> <string name="add_dns_server_dialog_title">新增 DNS 伺服器</string> @@ -118,6 +117,7 @@ <string name="daita_description_slide_2_third_paragraph">我們有些伺服器並未啟用 %1$s。因此，我們使用多點跳躍自動來為任意伺服器啟用 %1$s 。</string> <string name="daita_info">啟用「%1$s」後，您必須手動選取已啟用 %2$s 的伺服器。這有可能導致您後來處於封鎖狀態，直到您在「選取位置」檢視圖中選到相容的伺服器為止。</string> <string name="daita_multihop">%1$s：多點跳躍</string> + <string name="days_were_added_30">已為您的帳戶新增 30 天。</string> <string name="delete">刪除</string> <string name="delete_custom_list_confirmation_description">要刪除「%1$s」嗎？</string> <string name="delete_custom_list_message">「%1$s」已刪除</string> @@ -235,7 +235,6 @@ <string name="login_fail_title">登入失敗</string> <string name="login_title">登入</string> <string name="malware_info">警告：惡意軟體封鎖程式並非防毒軟體，只是提供了一層額外保護，不應將其視為防毒軟體。</string> - <string name="manage_account">管理帳戶</string> <string name="manage_devices">管理裝置</string> <string name="manage_devices_confirm_removal_description_line1">是否移除 %1$s？</string> <string name="manage_devices_confirm_removal_description_line2">裝置將從清單中移除並登出。</string> @@ -282,12 +281,9 @@ <string name="pay_to_start_using">需先在帳戶中加時，才能開始使用本應用程式。</string> <string name="payment_billing_error_dialog_message">我們無法啟動付款流程，請確認您是否擁有最新版本的 Google Play。</string> <string name="payment_billing_error_dialog_title">Google Play 無法使用</string> - <string name="payment_completed_dialog_message">已為您的帳戶新增 30 天。</string> - <string name="payment_completed_dialog_title">已成功新增時間</string> <string name="payment_obfuscation_id_error_dialog_message">我們無法啟動付款流程，請稍後再試一次。</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad 服務無法使用</string> - <string name="payment_pending_dialog_message">我們目前正在驗證您的購買，這可能需要一些時間。如果驗證成功，您的時間就會增加。</string> - <string name="payment_status_pending">Google Play 付款尚待處理</string> + <string name="payment_status_pending_short">Google Play 付款尚待處理</string> <string name="please_enter_a_valid_ip_address">請輸入有效的 IPv4 或 IPv6 位址。</string> <string name="please_enter_a_valid_remote_server_port">請輸入有效的遠端伺服器連接埠</string> <string name="port">連接埠</string> diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index e7405020d0..bc27d3b396 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -198,7 +198,6 @@ <string name="custom_dns_disable_mode_subtitle">Disable all \"%s\" above to activate this setting.</string> <string name="settings_changes_effect_warning_short">DNS settings might not go into effect immediately</string> <string name="settings_changes_effect_warning_content_blocker">Changes to DNS related settings might not go into effect immediately due to cached results.</string> - <string name="manage_account">Manage account</string> <string name="obfuscation_title">WireGuard obfuscation</string> <string name="obfuscation_info">Obfuscation hides the WireGuard traffic inside another protocol. It can be used to help circumvent censorship and other types of filtering, where a plain WireGuard connection would be blocked.</string> <string name="automatic">Automatic</string> @@ -230,17 +229,15 @@ <string name="top_bar_time_left">Time left: %s</string> <string name="top_bar_device_name">Device name: %s</string> <string name="add_30_days_time_x">Add 30 days time (%s)</string> - <string name="add_30_days_time">Add 30 days time</string> - <string name="payment_completed_dialog_title">Time was successfully added</string> - <string name="payment_completed_dialog_message">30 days was added to your account.</string> <string name="got_it">Got it!</string> <string name="payment_billing_error_dialog_title">Google Play unavailable</string> <string name="payment_billing_error_dialog_message">We were unable to start the payment process, please make sure you have the latest version of Google Play.</string> <string name="payment_obfuscation_id_error_dialog_title">Mullvad services unavailable</string> <string name="payment_obfuscation_id_error_dialog_message">We were unable to start the payment process, please try again later.</string> - <string name="payment_status_pending">Google Play payment pending</string> + <string name="payment_status_pending_long">Google Play payment pending, this might take some time</string> + <string name="payment_status_pending_short">Google Play payment pending</string> <string name="verifying_purchase">Verifying purchase</string> - <string name="payment_pending_dialog_message">We are currently verifying your purchase, this might take some time. Your time will be added if the verification is successful.</string> + <string name="payment_pending_dialog_message">We are still verifying your purchase, this might take some time. Your time will be added if the verification is successful.</string> <string name="connecting">Connecting...</string> <string name="loading_verifying">Verifying purchase...</string> <string name="copied_logs_to_clipboard">Copied logs to clipboard</string> @@ -419,4 +416,14 @@ <string name="vpn_settings_not_available">VPN Settings not available on device</string> <string name="wireguard_port_is_not_supported">The selected %s port is not supported, please change it under</string> <string name="wireguard_settings">%s settings.</string> + <string name="add_90_days_time_x">Add 90 days time (%s)</string> + <string name="add_time">Add time</string> + <string name="loading_products">Loading products</string> + <string name="failed_to_load_products">Failed to load products, please try again</string> + <string name="retry">Retry</string> + <string name="days_were_added_30">30 days was added to your account.</string> + <string name="days_were_added_90">90 days was added to your account.</string> + <string name="time_added">Time added</string> + <string name="app_is_blocking_internet">The app is blocking internet, please disconnect first</string> + <string name="in_app_products_unavailable">In-app products unavailable, please make sure you have the latest version of Google Play.</string> </resources> diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt index e7e38534ba..1fff17afb4 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt @@ -8,6 +8,7 @@ data class Dimensions( val accountRowSpacing: Dp = 24.dp, val addIconSize: Dp = 24.dp, val bigIconSize: Dp = 40.dp, + val borderWidth: Dp = 2.dp, val bottomPadding: Dp = 4.dp, val buttonHeight: Dp = 44.dp, val buttonSpacing: Dp = 8.dp, @@ -52,6 +53,8 @@ data class Dimensions( val notificationIconPadding: Dp = 10.dp, val notificationStatusIconSize: Dp = 10.dp, val obfuscationNavigationBoxWidth: Dp = 80.dp, + val outLineButtonBorderWidth: Dp = 1.dp, + val payIconHeight: Dp = 20.dp, val privacyPolicyIconSize: Dp = 16.dp, val problemReportIconToTitlePadding: Dp = 60.dp, val reconnectButtonMinInteractiveComponentSize: Dp = 40.dp, @@ -75,6 +78,7 @@ data class Dimensions( val successIconVerticalPadding: Dp = 26.dp, val switchIconSize: Dp = 24.dp, val switchLocationRetryMinWidth: Dp = 48.dp, + val thinBorderWidth: Dp = 1.dp, val tinyPadding: Dp = 4.dp, val titleIconSize: Dp = 48.dp, val tvDrawerHeaderStartPadding: Dp = 12.dp, |