diff --git a/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt b/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt index addd3bc3..b5bfd513 100644 --- a/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt +++ b/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt @@ -17,6 +17,8 @@ interface UpgradeRepo { val isPro: Boolean val upgradedAt: Instant? + + val error: Throwable? } enum class Type { diff --git a/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt b/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt index 7d666378..4edac72e 100644 --- a/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt +++ b/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt @@ -64,6 +64,7 @@ class UpgradeControlFoss @Inject constructor( override val isPro: Boolean = false, override val upgradedAt: Instant? = null, val upgradeReason: FossUpgrade.Reason? = null, + override val error: Throwable? = null, ) : UpgradeRepo.Info { override val type: UpgradeRepo.Type = UpgradeRepo.Type.FOSS } diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt index a84e3566..b6602bc0 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt +++ b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt @@ -2,6 +2,7 @@ package eu.darken.capod.common.upgrade.core import android.app.Activity import android.widget.Toast +import com.android.billingclient.api.BillingResult import com.google.android.material.dialog.MaterialAlertDialogBuilder import eu.darken.capod.R import eu.darken.capod.common.coroutine.AppScope @@ -13,13 +14,15 @@ import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.error.asErrorDialogBuilder import eu.darken.capod.common.flow.replayingShare import eu.darken.capod.common.upgrade.UpgradeRepo +import eu.darken.capod.common.upgrade.core.client.BillingResultException import eu.darken.capod.common.upgrade.core.data.BillingData import eu.darken.capod.common.upgrade.core.data.BillingDataRepo import eu.darken.capod.common.upgrade.core.data.PurchasedSku import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.retryWhen import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.time.Instant @@ -49,25 +52,28 @@ class UpgradeRepoGplay @Inject constructor( lastProStateAt = now Info(billingData = data) } + (now - lastProStateAt) < 6 * 60 * 60 * 1000L -> { // 6 hours log(TAG, VERBOSE) { "We are not pro, but were recently, did GPlay try annoy us again?" } Info(gracePeriod = true, billingData = null) } + else -> { Info(billingData = data) } } } - .catch { - // Ignore Google Play errors if the last pro state was recent + .retryWhen { error, count -> val now = System.currentTimeMillis() - log(TAG) { "now=$now, lastProStateAt=$lastProStateAt, error=$it" } + log(TAG) { "now=$now, lastProStateAt=$lastProStateAt, error=$error" } if ((now - lastProStateAt) < 24 * 60 * 60 * 1000L) { // 24 hours log(TAG, VERBOSE) { "We are not pro, but were recently, and just and an error, what is GPlay doing???" } emit(Info(gracePeriod = true, billingData = null)) } else { - throw it + emit(Info(billingData = null, error = if (count == 0L) error else null)) } + delay(count * 60 * 1000L) + true } .replayingShare(scope) @@ -117,6 +123,7 @@ class UpgradeRepoGplay @Inject constructor( data class Info( private val gracePeriod: Boolean = false, private val billingData: BillingData?, + override val error: Throwable? = null, ) : UpgradeRepo.Info { override val type: UpgradeRepo.Type diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingException.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingException.kt index 5bda58fa..ef9bf890 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingException.kt +++ b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingException.kt @@ -1,3 +1,15 @@ package eu.darken.capod.common.upgrade.core.client -open class BillingException(override val message: String) : Exception() \ No newline at end of file +import android.content.Context +import eu.darken.capod.R +import eu.darken.capod.common.error.HasLocalizedError +import eu.darken.capod.common.error.LocalizedError + +open class BillingException(override val message: String) : Exception(), HasLocalizedError { + + override fun getLocalizedError(context: Context): LocalizedError = LocalizedError( + throwable = this, + label = context.getString(R.string.upgrades_gplay_billing_error_label), + description = context.getString(R.string.upgrades_gplay_billing_error_description, message) + ) +} \ No newline at end of file diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingResultException.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingResultException.kt index 88cb9d1f..3d5c9b52 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingResultException.kt +++ b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingResultException.kt @@ -1,9 +1,18 @@ package eu.darken.capod.common.upgrade.core.client +import android.content.Context import com.android.billingclient.api.BillingResult +import eu.darken.capod.R +import eu.darken.capod.common.error.LocalizedError class BillingResultException(val result: BillingResult) : BillingException(result.debugMessage) { override fun toString(): String = "BillingResultException(code=${result.responseCode}, message=${result.debugMessage})" + + override fun getLocalizedError(context: Context): LocalizedError = LocalizedError( + throwable = this, + label = context.getString(R.string.upgrades_gplay_billing_result_error_label), + description = context.getString(R.string.upgrades_gplay_billing_result_error_description, result) + ) } \ No newline at end of file diff --git a/app/src/gplay/res/values-af-rZA/strings.xml b/app/src/gplay/res/values-af-rZA/strings.xml index 201f7afa..d075bd53 100644 --- a/app/src/gplay/res/values-af-rZA/strings.xml +++ b/app/src/gplay/res/values-af-rZA/strings.xml @@ -2,4 +2,8 @@ Google Play-dienste is nie beskikbaar nie. Geen aankope gevind nie. Gebruik jy die regte rekening? + Google Play-fout + Daar was \'n fout in Google Play. Probeer asseblief later weer of herbegin jou foon.\n\nFout: %s + Google Play-faktureringsfout + Daar was \'n fout toe Google Play vir jou aankoopbesonderhede gevra is. Maak Google Play-kas skoon en herbegin jou foon.\n\nFout %s diff --git a/app/src/gplay/res/values-am/strings.xml b/app/src/gplay/res/values-am/strings.xml index bff2bb97..e4d6866c 100644 --- a/app/src/gplay/res/values-am/strings.xml +++ b/app/src/gplay/res/values-am/strings.xml @@ -2,4 +2,8 @@ የGoogle Play አገልግሎቶች አይገኙም። ምንም ግዢዎች አልተገኙም። ትክክለኛውን መለያ እየተጠቀሙ ነው? + Google Play ስህተት + በGoogle Play ላይ ስህተት ተከስቷል። እባክዎ በኋላ ይሞክሩ ወይም ስልክዎን እንደገና ያስጀምሩ።\n\nስህተት፡ %s + Google Play ክፍያ ስህተት + Google Play የግዢ ዝርዝሮችዎን ሲጠይቅ ስህተት ተከስቷል። Google Play መሸጎጫ ያጽዱ እና ስልክዎን እንደገና ያስጀምሩ።\n\nስህተት %s diff --git a/app/src/gplay/res/values-ar/strings.xml b/app/src/gplay/res/values-ar/strings.xml index 7829cce5..f6c68a4d 100644 --- a/app/src/gplay/res/values-ar/strings.xml +++ b/app/src/gplay/res/values-ar/strings.xml @@ -2,4 +2,8 @@ خدمات Google Play غير متاحة. لم يتم العثور على أي مشتريات. هل تستخدم الحساب الصحيح؟ + خطأ في Google Play + حدث خطأ في Google Play. يرجى المحاولة مرة أخرى لاحقاً أو إعادة تشغيل هاتفك.\n\nالخطأ: %s + خطأ في فوترة Google Play + حدث خطأ عند طلب تفاصيل الشراء من Google Play. امسح ذاكرة التخزين المؤقت لـ Google Play وأعد تشغيل هاتفك.\n\nالخطأ %s diff --git a/app/src/gplay/res/values-az/strings.xml b/app/src/gplay/res/values-az/strings.xml index b22d9d90..a8204908 100644 --- a/app/src/gplay/res/values-az/strings.xml +++ b/app/src/gplay/res/values-az/strings.xml @@ -2,4 +2,8 @@ Google Play xidmətləri əlçatmazdır. Heç bir satın alma tapılmadı. Doğru hesabı istifadə edirsiniz? + Google Play Xətası + Google Play-də xəta baş verdi. Zəhmət olmasa daha sonra yenidən cəhd edin və ya telefonunuzu yenidən başladın.\n\nXəta: %s + Google Play Ödəniş Xətası + Google Play-dən satın alma məlumatlarınızı istəyərkən xəta baş verdi. Google Play keşini təmizləyin və telefonunuzu yenidən başladın.\n\nXəta %s diff --git a/app/src/gplay/res/values-be/strings.xml b/app/src/gplay/res/values-be/strings.xml index 66f1c877..b0c6c9b6 100644 --- a/app/src/gplay/res/values-be/strings.xml +++ b/app/src/gplay/res/values-be/strings.xml @@ -2,4 +2,8 @@ Службы Google Play недаступныя. Пакупак не знойдзена. Вы выкарыстоўваеце правільны ўліковы запіс? + Памылка Google Play + У Google Play адбылася памылка. Калі ласка, паспрабуйце пазней або перазагрузіце тэлефон.\n\nПамылка: %s + Памылка аплаты Google Play + Памылка пры запыце дэталяў пакупкі ад Google Play. Ачысціце кэш Google Play і перазагрузіце тэлефон.\n\nПамылка %s diff --git a/app/src/gplay/res/values-bg/strings.xml b/app/src/gplay/res/values-bg/strings.xml index 25861318..e45e13ac 100644 --- a/app/src/gplay/res/values-bg/strings.xml +++ b/app/src/gplay/res/values-bg/strings.xml @@ -2,4 +2,8 @@ Услугите на Google Play не са налични. Няма намерени покупки. Правилния акаунт ли използвате? + Грешка в Google Play + Имаше грешка в Google Play. Моля, опитайте отново по-късно или рестартирайте телефона си.\n\nГрешка: %s + Грешка при фактуриране в Google Play + Имаше грешка при заявката към Google Play за данни за покупката. Изчистете кеша на Google Play и рестартирайте телефона си.\n\nГрешка %s diff --git a/app/src/gplay/res/values-bn-rBD/strings.xml b/app/src/gplay/res/values-bn-rBD/strings.xml index 704d534f..f11d40c3 100644 --- a/app/src/gplay/res/values-bn-rBD/strings.xml +++ b/app/src/gplay/res/values-bn-rBD/strings.xml @@ -2,4 +2,8 @@ Google Play পরিষেবাগুলি উপলব্ধ নেই৷ কোনও কেনাকাটা খুঁজে পাওয়া যায়নি। আপনি কি সঠিক অ্যাকাউন্ট ব্যবহার করছেন? + Google Play ত্রুটি + Google Play-এ একটি ত্রুটি হয়েছে। অনুগ্রহ করে পরে আবার চেষ্টা করুন বা আপনার ফোন রিবুট করুন।\n\nত্রুটি: %s + Google Play বিলিং ত্রুটি + Google Play কে আপনার ক্রয়ের বিবরণ জিজ্ঞাসা করার সময় একটি ত্রুটি হয়েছে। Google Play ক্যাশে সাফ করুন এবং আপনার ফোন রিবুট করুন।\n\nত্রুটি %s diff --git a/app/src/gplay/res/values-ca/strings.xml b/app/src/gplay/res/values-ca/strings.xml index 40d1a46d..2095665a 100644 --- a/app/src/gplay/res/values-ca/strings.xml +++ b/app/src/gplay/res/values-ca/strings.xml @@ -2,4 +2,8 @@ Els serveis de Google Play no estan disponibles. No s\'ha trobat cap compra. Esteu utilitzant el compte correcte? + Error de Google Play + S\'ha produït un error a Google Play. Si us plau, torneu-ho a provar més tard o reinicieu el telèfon.\n\nError: %s + Error de facturació de Google Play + S\'ha produït un error en demanar a Google Play els detalls de la vostra compra. Esborreu la memòria cau de Google Play i reinicieu el telèfon.\n\nError %s diff --git a/app/src/gplay/res/values-cs/strings.xml b/app/src/gplay/res/values-cs/strings.xml index 561087f5..dd083987 100644 --- a/app/src/gplay/res/values-cs/strings.xml +++ b/app/src/gplay/res/values-cs/strings.xml @@ -2,4 +2,8 @@ Služby Google Play nejsou k dispozici. Nebyly nalezeny žádné nákupy. Používáte správný účet? + Chyba Google Play + V Google Play došlo k chybě. Zkuste to prosím později nebo restartujte telefon.\n\nChyba: %s + Chyba fakturace Google Play + Při žádosti o podrobnosti nákupu od Google Play došlo k chybě. Vymažte mezipaměť Google Play a restartujte telefon.\n\nChyba %s diff --git a/app/src/gplay/res/values-da/strings.xml b/app/src/gplay/res/values-da/strings.xml index 3d91a60f..da24d39a 100644 --- a/app/src/gplay/res/values-da/strings.xml +++ b/app/src/gplay/res/values-da/strings.xml @@ -2,4 +2,8 @@ Google Play-tjenester er ikke tilgængelige. Ingen køb fundet. Bruger du den rigtige konto? + Google Play-fejl + Der var en fejl i Google Play. Prøv venligst igen senere eller genstart din telefon.\n\nFejl: %s + Google Play-faktureringsfejl + Der opstod en fejl ved forespørgsel om dine købsoplysninger fra Google Play. Ryd Google Play-cachen og genstart din telefon.\n\nFejl %s diff --git a/app/src/gplay/res/values-de/strings.xml b/app/src/gplay/res/values-de/strings.xml index 341c17da..375e15bc 100644 --- a/app/src/gplay/res/values-de/strings.xml +++ b/app/src/gplay/res/values-de/strings.xml @@ -2,4 +2,8 @@ Google Play-Dienste sind nicht verfügbar. Keine Käufe gefunden. Verwenden Sie das richtige Konto? + Google Play Fehler + Es ist ein Fehler bei Google Play aufgetreten. Bitte versuchen Sie es später erneut oder starten Sie Ihr Telefon neu.\n\nFehler: %s + Google Play Abrechnungsfehler + Es ist ein Fehler aufgetreten, als Google Play nach Ihren Kaufdetails gefragt wurde. Löschen Sie den Google Play Cache und starten Sie Ihr Telefon neu.\n\nFehler %s diff --git a/app/src/gplay/res/values-el/strings.xml b/app/src/gplay/res/values-el/strings.xml index c6a2c612..9ce31edc 100644 --- a/app/src/gplay/res/values-el/strings.xml +++ b/app/src/gplay/res/values-el/strings.xml @@ -2,4 +2,8 @@ Οι υπηρεσίες Google Play δεν είναι διαθέσιμες. Δε βρέθηκαν αγορές. Χρησιμοποιείτε τον σωστό λογαριασμό; + Σφάλμα Google Play + Παρουσιάστηκε σφάλμα στο Google Play. Παρακαλώ δοκιμάστε ξανά αργότερα ή επανεκκινήστε το τηλέφωνό σας.\n\nΣφάλμα: %s + Σφάλμα Χρέωσης Google Play + Παρουσιάστηκε σφάλμα όταν ζητήθηκαν από το Google Play τα στοιχεία της αγοράς σας. Καθαρίστε την προσωρινή μνήμη του Google Play και επανεκκινήστε το τηλέφωνό σας.\n\nΣφάλμα %s diff --git a/app/src/gplay/res/values-es-rAR/strings.xml b/app/src/gplay/res/values-es-rAR/strings.xml index ca57df78..a1e07c73 100644 --- a/app/src/gplay/res/values-es-rAR/strings.xml +++ b/app/src/gplay/res/values-es-rAR/strings.xml @@ -2,4 +2,8 @@ Los servicios de Google Play no están disponibles. No se encontraron compras. ¿Está usando la cuenta correcta? + Error de Google Play + Hubo un error en Google Play. Por favor, intentá de nuevo más tarde o reiniciá tu teléfono.\n\nError: %s + Error de facturación de Google Play + Hubo un error al solicitar a Google Play los detalles de tu compra. Limpiá el caché de Google Play y reiniciá tu teléfono.\n\nError %s diff --git a/app/src/gplay/res/values-es-rMX/strings.xml b/app/src/gplay/res/values-es-rMX/strings.xml index 895349a1..f9995ee6 100644 --- a/app/src/gplay/res/values-es-rMX/strings.xml +++ b/app/src/gplay/res/values-es-rMX/strings.xml @@ -2,4 +2,8 @@ Los servicios de Google Play no están disponibles. No se han encontrado compras. ¿Estás usando la cuenta correcta? + Error de Google Play + Hubo un error en Google Play. Por favor, intenta de nuevo más tarde o reinicia tu teléfono.\n\nError: %s + Error de facturación de Google Play + Hubo un error al solicitar a Google Play los detalles de tu compra. Limpia el caché de Google Play y reinicia tu teléfono.\n\nError %s diff --git a/app/src/gplay/res/values-es/strings.xml b/app/src/gplay/res/values-es/strings.xml index ca57df78..f7413d70 100644 --- a/app/src/gplay/res/values-es/strings.xml +++ b/app/src/gplay/res/values-es/strings.xml @@ -2,4 +2,8 @@ Los servicios de Google Play no están disponibles. No se encontraron compras. ¿Está usando la cuenta correcta? + Error de Google Play + Se produjo un error en Google Play. Por favor, inténtelo de nuevo más tarde o reinicie su teléfono.\n\nError: %s + Error de facturación de Google Play + Se produjo un error al solicitar a Google Play los detalles de su compra. Limpie el caché de Google Play y reinicie su teléfono.\n\nError %s diff --git a/app/src/gplay/res/values-et-rEE/strings.xml b/app/src/gplay/res/values-et-rEE/strings.xml index 7ff0442e..3f4c37c6 100644 --- a/app/src/gplay/res/values-et-rEE/strings.xml +++ b/app/src/gplay/res/values-et-rEE/strings.xml @@ -2,4 +2,8 @@ Google Play teenused pole saadaval. Ühtki ostu ei leitud. Kasutate õiget kontot? + Google Play viga + Google Play\'s tekkis viga. Palun proovige hiljem uuesti või taaskäivitage telefon.\n\nViga: %s + Google Play arvelduse viga + Google Play\'lt ostu üksikasjade küsimisel tekkis viga. Tühjendage Google Play vahemälu ja taaskäivitage telefon.\n\nViga %s diff --git a/app/src/gplay/res/values-eu-rES/strings.xml b/app/src/gplay/res/values-eu-rES/strings.xml index f9305d35..d5cccb2e 100644 --- a/app/src/gplay/res/values-eu-rES/strings.xml +++ b/app/src/gplay/res/values-eu-rES/strings.xml @@ -2,4 +2,8 @@ Google Play zerbitzuak ez daude erabilgarri. Ez da erosketarik aurkitu. Kontu egokia erabiltzen ari zara? + Google Play errorea + Errore bat gertatu da Google Play-n. Mesedez, saiatu berriro beranduago edo berrabiarazi telefonoa.\n\nErrorea: %s + Google Play fakturazio errorea + Errore bat gertatu da Google Play-ri erosketaren xehetasunak eskatzean. Garbitu Google Play-ren cachea eta berrabiarazi telefonoa.\n\nErrorea %s diff --git a/app/src/gplay/res/values-fa/strings.xml b/app/src/gplay/res/values-fa/strings.xml index ce9111f9..577c1499 100644 --- a/app/src/gplay/res/values-fa/strings.xml +++ b/app/src/gplay/res/values-fa/strings.xml @@ -2,4 +2,8 @@ سرویس‌های Google Play در دسترس نیستند. خریدی یافت نشد. آیا از حساب درستی استفاده می‌کنید؟ + خطای Google Play + در Google Play خطایی رخ داد. لطفاً بعداً دوباره تلاش کنید یا تلفن خود را راه‌اندازی مجدد کنید.\n\nخطا: %s + خطای صورتحساب Google Play + هنگام درخواست جزئیات خرید شما از Google Play خطایی رخ داد. حافظه نهان Google Play را پاک کنید و تلفن خود را راه‌اندازی مجدد کنید.\n\nخطا %s diff --git a/app/src/gplay/res/values-fi/strings.xml b/app/src/gplay/res/values-fi/strings.xml index 29158d47..f6fbb4fb 100644 --- a/app/src/gplay/res/values-fi/strings.xml +++ b/app/src/gplay/res/values-fi/strings.xml @@ -2,4 +2,8 @@ Google Play -palvelut eivät ole käytettävissä. Ostoksia ei löytynyt. Käytätkö oikeaa tiliä? + Google Play -virhe + Google Playssa tapahtui virhe. Yritä uudelleen myöhemmin tai käynnistä puhelimesi uudelleen.\n\nVirhe: %s + Google Play -laskutusvirhe + Google Playltä ostotietoja pyydettäessä tapahtui virhe. Tyhjennä Google Playn välimuisti ja käynnistä puhelimesi uudelleen.\n\nVirhe %s diff --git a/app/src/gplay/res/values-fil/strings.xml b/app/src/gplay/res/values-fil/strings.xml index 1442cf9f..7a7a4d3d 100644 --- a/app/src/gplay/res/values-fil/strings.xml +++ b/app/src/gplay/res/values-fil/strings.xml @@ -2,4 +2,8 @@ Hindi available ang mga serbisyo ng Google Play. Walang nakitang binili. Tamang account ba ang gamit mo? + Error sa Google Play + May error sa Google Play. Mangyaring subukan muli mamaya o i-reboot ang iyong telepono.\n\nError: %s + Error sa Pagsingil ng Google Play + May error nang hingin sa Google Play ang mga detalye ng iyong pagbili. I-clear ang cache ng Google Play at i-reboot ang iyong telepono.\n\nError %s diff --git a/app/src/gplay/res/values-fr/strings.xml b/app/src/gplay/res/values-fr/strings.xml index 3bd2aaed..06decf15 100644 --- a/app/src/gplay/res/values-fr/strings.xml +++ b/app/src/gplay/res/values-fr/strings.xml @@ -2,4 +2,8 @@ Les services Google Play ne sont pas accessibles. Aucun achat n’a été trouvé. Utilisez-vous le bon compte ? + Erreur Google Play + Une erreur s\'est produite dans Google Play. Veuillez réessayer plus tard ou redémarrer votre téléphone.\n\nErreur : %s + Erreur de facturation Google Play + Une erreur s\'est produite lors de la demande des détails de votre achat à Google Play. Effacez le cache de Google Play et redémarrez votre téléphone.\n\nErreur %s diff --git a/app/src/gplay/res/values-gl-rES/strings.xml b/app/src/gplay/res/values-gl-rES/strings.xml index 4f5390fc..3c95e5b1 100644 --- a/app/src/gplay/res/values-gl-rES/strings.xml +++ b/app/src/gplay/res/values-gl-rES/strings.xml @@ -2,4 +2,8 @@ Os servizos de Google Play non están dispoñibles. Non se atoparon compras. Estás a usar a conta correcta? + Erro de Google Play + Produciuse un erro en Google Play. Téntao de novo máis tarde ou reinicia o teu teléfono.\n\nErro: %s + Erro de facturación de Google Play + Produciuse un erro ao solicitar a Google Play os detalles da túa compra. Borra a caché de Google Play e reinicia o teu teléfono.\n\nErro %s diff --git a/app/src/gplay/res/values-hi-rIN/strings.xml b/app/src/gplay/res/values-hi-rIN/strings.xml index 3ee37e4f..f711a06c 100644 --- a/app/src/gplay/res/values-hi-rIN/strings.xml +++ b/app/src/gplay/res/values-hi-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play सेवाएं अनुपलब्ध हैं। कोई खरीदारी नहीं मिली, क्या आप सही खाते का उपयोग कर रहे हैं? + Google Play त्रुटि + Google Play में कोई त्रुटि हुई थी। कृपया बाद में पुनः प्रयास करें या अपना फ़ोन रीबूट करें।\n\nत्रुटि: %s + Google Play बिलिंग त्रुटि + Google Play से आपकी खरीदारी का विवरण मांगते समय कोई त्रुटि हुई थी। Google Play कैश साफ़ करें और अपना फ़ोन रीबूट करें।\n\nत्रुटि %s diff --git a/app/src/gplay/res/values-hr/strings.xml b/app/src/gplay/res/values-hr/strings.xml index aed3febe..6dd8af72 100644 --- a/app/src/gplay/res/values-hr/strings.xml +++ b/app/src/gplay/res/values-hr/strings.xml @@ -2,4 +2,8 @@ Usluge Google Playa nisu dostupne. Nisu pronađene kupnje. Koristite li pravi račun? + Google Play pogreška + Dogodila se pogreška u Google Playu. Pokušajte ponovno kasnije ili ponovno pokrenite telefon.\n\nPogreška: %s + Google Play pogreška naplaćivanja + Dogodila se pogreška prilikom traženja detalja vaše kupnje od Google Playa. Očistite predmemoriju Google Playa i ponovno pokrenite telefon.\n\nPogreška %s diff --git a/app/src/gplay/res/values-hu/strings.xml b/app/src/gplay/res/values-hu/strings.xml index ba8780eb..4c784329 100644 --- a/app/src/gplay/res/values-hu/strings.xml +++ b/app/src/gplay/res/values-hu/strings.xml @@ -2,4 +2,8 @@ A Google Play szolgáltatások nem érhetők el. Nem található vásárlás. A megfelelő fiókot használja? + Google Play hiba + Hiba történt a Google Play-ben. Próbálja újra később, vagy indítsa újra a telefont.\n\nHiba: %s + Google Play számlázási hiba + Hiba történt a vásárlási adatok lekérdezésekor a Google Play-től. Törölje a Google Play gyorsítótárát és indítsa újra a telefont.\n\nHiba %s diff --git a/app/src/gplay/res/values-hy-rAM/strings.xml b/app/src/gplay/res/values-hy-rAM/strings.xml index 9e911229..622579b9 100644 --- a/app/src/gplay/res/values-hy-rAM/strings.xml +++ b/app/src/gplay/res/values-hy-rAM/strings.xml @@ -2,4 +2,8 @@ Google Play ծառայությունները հասանելի չեն: Գնումներ չեն գտնվել: Արդյո՞ք ճիշտ հաշիվն եք օգտագործում: + Google Play սխալ + Google Play-ում սխալ է տեղի ունեցել: Խնդրում ենք փորձել ավելի ուշ կամ վերագործարկել հեռախոսը:\n\nՍխալ՝ %s + Google Play վճարման սխալ + Google Play-ից ձեր գնումների մանրամասները հարցնելիս սխալ է տեղի ունեցել: Մաքրեք Google Play-ի քեշը և վերագործարկեք հեռախոսը:\n\nՍխալ %s diff --git a/app/src/gplay/res/values-in/strings.xml b/app/src/gplay/res/values-in/strings.xml index bdce9520..4f1a08ca 100644 --- a/app/src/gplay/res/values-in/strings.xml +++ b/app/src/gplay/res/values-in/strings.xml @@ -2,4 +2,8 @@ Layanan Google Play tidak tersedia. Tidak ada pembelian yang ditemukan. Apakah Anda menggunakan akun yang benar? + Kesalahan Google Play + Terjadi kesalahan di Google Play. Silakan coba lagi nanti atau mulai ulang ponsel Anda.\n\nKesalahan: %s + Kesalahan Penagihan Google Play + Terjadi kesalahan saat meminta detail pembelian Anda dari Google Play. Hapus cache Google Play dan mulai ulang ponsel Anda.\n\nKesalahan %s diff --git a/app/src/gplay/res/values-is/strings.xml b/app/src/gplay/res/values-is/strings.xml index 25e2f512..57263ee0 100644 --- a/app/src/gplay/res/values-is/strings.xml +++ b/app/src/gplay/res/values-is/strings.xml @@ -2,4 +2,8 @@ Google Play þjónustur eru ekki tiltækar. Engin kaup fundust. Ertu að nota réttan aðgang? + Google Play villa + Villa kom upp í Google Play. Vinsamlegast reyndu aftur síðar eða endurræstu símann.\n\nVilla: %s + Google Play reikningsvilla + Villa kom upp við að sækja kaupupplýsingar frá Google Play. Hreinsaðu Google Play skyndiminni og endurræstu símann.\n\nVilla %s diff --git a/app/src/gplay/res/values-it/strings.xml b/app/src/gplay/res/values-it/strings.xml index 5b2a1a9e..4553ee4d 100644 --- a/app/src/gplay/res/values-it/strings.xml +++ b/app/src/gplay/res/values-it/strings.xml @@ -2,4 +2,8 @@ I servizi di Google Play non sono disponibili. Nessun acquisto trovato. Stai usando l\'account giusto? + Errore Google Play + Si è verificato un errore in Google Play. Riprova più tardi o riavvia il telefono.\n\nErrore: %s + Errore di fatturazione Google Play + Si è verificato un errore durante la richiesta dei dettagli dell\'acquisto a Google Play. Cancella la cache di Google Play e riavvia il telefono.\n\nErrore %s diff --git a/app/src/gplay/res/values-iw/strings.xml b/app/src/gplay/res/values-iw/strings.xml index 1bd58760..43ad774b 100644 --- a/app/src/gplay/res/values-iw/strings.xml +++ b/app/src/gplay/res/values-iw/strings.xml @@ -2,4 +2,8 @@ שירותי Google Play אינם זמינים. לא נמצאו רכישות. האם אתה משתמש בחשבון הנכון? + שגיאת Google Play + אירעה שגיאה ב-Google Play. אנא נסה שוב מאוחר יותר או הפעל מחדש את הטלפון.\n\nשגיאה: %s + שגיאת חיוב Google Play + אירעה שגיאה בעת בקשת פרטי הרכישה מ-Google Play. נקה את המטמון של Google Play והפעל מחדש את הטלפון.\n\nשגיאה %s diff --git a/app/src/gplay/res/values-ja/strings.xml b/app/src/gplay/res/values-ja/strings.xml index 68f41d86..26381b96 100644 --- a/app/src/gplay/res/values-ja/strings.xml +++ b/app/src/gplay/res/values-ja/strings.xml @@ -2,4 +2,8 @@ Google Playサービスが利用できません。 購入履歴がありません。正しいアカウントを使用していますか？ + Google Playエラー + Google Playでエラーが発生しました。しばらくしてから再度お試しいただくか、携帯電話を再起動してください。\n\nエラー: %s + Google Play請求エラー + Google Playに購入詳細を問い合わせる際にエラーが発生しました。Google Playのキャッシュをクリアして、携帯電話を再起動してください。\n\nエラー %s diff --git a/app/src/gplay/res/values-ka-rGE/strings.xml b/app/src/gplay/res/values-ka-rGE/strings.xml index 9d02e8a9..32a1afda 100644 --- a/app/src/gplay/res/values-ka-rGE/strings.xml +++ b/app/src/gplay/res/values-ka-rGE/strings.xml @@ -2,4 +2,8 @@ Google Play სერვისები მიუწვდომელია. შენაძენები ვერ მოიძებნა. იყენებთ სწორ ანგარიშს? + Google Play შეცდომა + Google Play-ში შეცდომა მოხდა. გთხოვთ სცადოთ მოგვიანებით ან გადატვირთეთ თელეფონი.\n\nშეცდომა: %s + Google Play გადახდის შეცდომა + Google Play-ს თქვენი შეძენის დეტალების კითხვისას შეცდომა მოხდა. გაასუფთავეთ Google Play-ის ქეში და გადატვირთეთ თელეფონი.\n\nშეცდომა %s diff --git a/app/src/gplay/res/values-km-rKH/strings.xml b/app/src/gplay/res/values-km-rKH/strings.xml index caf590a9..ebb6ac22 100644 --- a/app/src/gplay/res/values-km-rKH/strings.xml +++ b/app/src/gplay/res/values-km-rKH/strings.xml @@ -2,4 +2,8 @@ សេវាកម្ម Google Play មិនអាចប្រើបានទេ រកមិនឃើញការទិញទេ។ តើអ្នកកំពុងប្រើគណនីត្រឹមត្រូវទេ? + កំហុស Google Play + មានកំហុសនៅក្នុង Google Play។ សូមព្យាយាមម្តងទៀតពេលក្រោយ ឬចាប់ផ្តើមទូរស័ព្ទរបស់អ្នកឡើងវិញ។\n\nកំហុស: %s + កំហុសការគិតថ្លៃ Google Play + មានកំហុសនៅពេលសួរ Google Play អំពីព័ត៌មានលម្អិតនៃការទិញរបស់អ្នក។ សម្អាតឯកសារ គាំងស្ទុះ Google Play ហើយចាប់ផ្តើមទូរស័ព្ទរបស់អ្នកឡើងវិញ។\n\nកំហុស %s diff --git a/app/src/gplay/res/values-kmr-rTR/strings.xml b/app/src/gplay/res/values-kmr-rTR/strings.xml index a1bee133..88ac474a 100644 --- a/app/src/gplay/res/values-kmr-rTR/strings.xml +++ b/app/src/gplay/res/values-kmr-rTR/strings.xml @@ -2,4 +2,8 @@ Xizmetên Google Play ne berdest in. Kirîn nehatin dîtin. Hûn hesabê rast bikar tînin? + Çewtiya Google Play + Li Google Play çewtiyek çêbû. Ji kerema xwe paşê dîsa biceribînin an telefona xwe ji nû ve bidin destpekirin.\n\nÇewtî: %s + Çewtiya Fatureykirina Google Play + Dema ku ji Google Play hurgiliyên kirîna we hat xwestin çewtiyek çêbû. Cache\'ya Google Play pak bikin û telefona xwe ji nû ve bidin destpekirin.\n\nÇewtî %s diff --git a/app/src/gplay/res/values-kn-rIN/strings.xml b/app/src/gplay/res/values-kn-rIN/strings.xml index 60d95772..0e9e7735 100644 --- a/app/src/gplay/res/values-kn-rIN/strings.xml +++ b/app/src/gplay/res/values-kn-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play ಸೇವೆಗಳು ಲಭ್ಯವಿಲ್ಲ. ಯಾವುದೇ ಖರೀದಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ. ನೀವು ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಬಳಸುತ್ತಿದ್ದೀರಾ? + Google Play ದೋಷ + Google Playನಲ್ಲಿ ದೋಷವಾಗಿದೆ. ದಯವಿಟ್ಟು ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ನಿಮ್ಮ ಫೋನ್ ರೀಬೂಟ್ ಮಾಡಿ.\n\nದೋಷ: %s + Google Play ಬಿಲ್ಲಿಂಗ್ ದೋಷ + Google Playಗೆ ನಿಮ್ಮ ಖರೀದಿ ವಿವರಗಳನ್ನು ಕೇಳುವಾಗ ದೋಷವಾಗಿದೆ. Google Play ಕ್ಯಾಶ್ ಕ್ಲಿಯರ್ ಮಾಡಿ ನಿಮ್ಮ ಫೋನ್ ರೀಬೂಟ್ ಮಾಡಿ.\n\nದೋಷ %s diff --git a/app/src/gplay/res/values-ko/strings.xml b/app/src/gplay/res/values-ko/strings.xml index c43a9a73..fb2ca803 100644 --- a/app/src/gplay/res/values-ko/strings.xml +++ b/app/src/gplay/res/values-ko/strings.xml @@ -2,4 +2,8 @@ Google Play 서비스를 사용할 수 없습니다. 구매 내역을 찾지 못했습니다. 결제했던 계정이 맞나요? + Google Play 오류 + Google Play에서 오류가 발생했습니다. 나중에 다시 시도하거나 휴대폰을 재부팅해 주세요.\n\n오류: %s + Google Play 결제 오류 + Google Play에 구매 세부 정보를 요청하는 중 오류가 발생했습니다. Google Play 캐시를 지우고 휴대폰을 재부팅해 주세요.\n\n오류 %s diff --git a/app/src/gplay/res/values-ky-rKG/strings.xml b/app/src/gplay/res/values-ky-rKG/strings.xml index 063f3f4c..f39cd551 100644 --- a/app/src/gplay/res/values-ky-rKG/strings.xml +++ b/app/src/gplay/res/values-ky-rKG/strings.xml @@ -2,4 +2,8 @@ Google Play кызматтары жеткиликсиз. Эч кандай сатып алуулар табылган жок. Туура каттоо эсебин колдонуп жатасызбы? + Google Play катасы + Google Playде ката кетти. Сураныч, кийинчереек кайра аракет кылыңыз же телефонуңузду өчүрүп күйгүзүңүз.\n\nКата: %s + Google Play төлөм катасы + Google Playден сатып алуу маалыматын сураганда ката кетти. Google Play кэшин тазалап, телефонуңузду өчүрүп күйгүзүңүз.\n\nКата %s diff --git a/app/src/gplay/res/values-lo-rLA/strings.xml b/app/src/gplay/res/values-lo-rLA/strings.xml index 355304bb..7eef2000 100644 --- a/app/src/gplay/res/values-lo-rLA/strings.xml +++ b/app/src/gplay/res/values-lo-rLA/strings.xml @@ -2,4 +2,8 @@ ບໍລິການ Google Play ບໍ່ສາມາດໃຊ້ໄດ້. ບໍ່ພົບການຊື້. ທ່ານກຳລັງໃຊ້ບັນຊີທີ່ຖືກຕ້ອງບໍ? + ຂໍ້ຜິດພາດ Google Play + ເກີດຂໍ້ຜິດພາດໃນ Google Play. ກະລຸນາລອງໃໝ່ອີກຄັ້ງພາຍຫຼັງ ຫຼື ຣີບູດໂທລະສັບຂອງທ່ານ.\n\nຂໍ້ຜິດພາດ: %s + ຂໍ້ຜິດພາດການເກັບເງິນ Google Play + ເກີດຂໍ້ຜິດພາດໃນຂະນະຖາມ Google Play ເພື່ອຂໍລາຍລະອຽດການຊື້ຂອງທ່ານ. ລ້າງກາກເກັບ Google Play ແລະຣີບູດໂທລະສັບຂອງທ່ານ.\n\nຂໍ້ຜິດພາດ %s diff --git a/app/src/gplay/res/values-lt/strings.xml b/app/src/gplay/res/values-lt/strings.xml index 84a0bcd2..5c808ead 100644 --- a/app/src/gplay/res/values-lt/strings.xml +++ b/app/src/gplay/res/values-lt/strings.xml @@ -2,4 +2,8 @@ „Google Play“ paslaugos nepasiekiamos. Nerasta jokių pirkinių. Ar naudojate tinkamą paskyrą? + „Google Play“ klaida + „Google Play“ įvyko klaida. Prašome pabandyti vėliau arba paleisti telefoną iš naujo.\n\nKlaida: %s + „Google Play“ atsiskaitymo klaida + Klausiant „Google Play“ apie jūsų pirkimo informaciją įvyko klaida. Išvalykite „Google Play“ podėlį ir paleiskite telefoną iš naujo.\n\nKlaida %s diff --git a/app/src/gplay/res/values-lv/strings.xml b/app/src/gplay/res/values-lv/strings.xml index 5d6e7124..a916b2b9 100644 --- a/app/src/gplay/res/values-lv/strings.xml +++ b/app/src/gplay/res/values-lv/strings.xml @@ -2,4 +2,8 @@ Google Play pakalpojumi nav pieejami. Nav atrasts neviens pirkums. Vai izmantojat pareizo kontu? + Google Play kļūda + Google Play radās kļūda. Lūdzu, mēģiniet vēlreiz vēlāk vai resteartējiet tālruni.\n\nKļūda: %s + Google Play norēķinu kļūda + Radās kļūda, jautājot Google Play par jūsu pirkuma informāciju. Notīriet Google Play kešatmiņu un resteartējiet tālruni.\n\nKļūda %s diff --git a/app/src/gplay/res/values-mk-rMK/strings.xml b/app/src/gplay/res/values-mk-rMK/strings.xml index 500c097f..472e4452 100644 --- a/app/src/gplay/res/values-mk-rMK/strings.xml +++ b/app/src/gplay/res/values-mk-rMK/strings.xml @@ -2,4 +2,8 @@ Услугите на Google Play не се достапни. Не се пронајдени купувања. Дали ја користите вистинската сметка? + Грешка на Google Play + Се појави грешка во Google Play. Обидете се повторно подоцна или рестартирајте го телефонот.\n\nГрешка: %s + Грешка при наплата на Google Play + Се појави грешка при барањето детали за вашата купувачка од Google Play. Исчистете ја кеш меморијата на Google Play и рестартирајте го телефонот.\n\nГрешка %s diff --git a/app/src/gplay/res/values-ml-rIN/strings.xml b/app/src/gplay/res/values-ml-rIN/strings.xml index f2f94f8b..8074bf19 100644 --- a/app/src/gplay/res/values-ml-rIN/strings.xml +++ b/app/src/gplay/res/values-ml-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play സേവനങ്ങൾ ലഭ്യമല്ല. വാങ്ങലുകളൊന്നും കണ്ടെത്തിയില്ല. നിങ്ങൾ ശരിയായ അക്കൗണ്ട് ആണോ ഉപയോഗിക്കുന്നത്? + Google Play പിഴവ് + Google Play-യിൽ ഒരു പിഴവ് സംഭവിച്ചു. ദയവായി പിന്നീട് ശ്രമിക്കുക അല്ലെങ്കിൽ നിങ്ങളുടെ ഫോൺ റീബൂട്ട് ചെയ്യുക.\n\nപിഴവ്: %s + Google Play ബില്ലിംഗ് പിഴവ് + നിങ്ങളുടെ വാങ്ങൽ വിശദാംശങ്ങൾക്കായി Google Play-യോട് ചോദിക്കുമ്പോൾ ഒരു പിഴവ് സംഭവിച്ചു. Google Play ക്യാഷ് ക്ലിയർ ചെയ്ത് നിങ്ങളുടെ ഫോൺ റീബൂട്ട് ചെയ്യുക.\n\nപിഴവ് %s diff --git a/app/src/gplay/res/values-mn-rMN/strings.xml b/app/src/gplay/res/values-mn-rMN/strings.xml index 5a230ed3..d0e1c934 100644 --- a/app/src/gplay/res/values-mn-rMN/strings.xml +++ b/app/src/gplay/res/values-mn-rMN/strings.xml @@ -2,4 +2,8 @@ Google Play үйлчилгээ боломжгүй байна. Худалдан авалт олдсонгүй. Та зөв бүртгэл ашиглаж байна уу? + Google Play алдаа + Google Play-д алдаа гарлаа. Дараа дахин оролдож үзнэ үү эсвэл утсаа дахин асаана уу.\n\nАлдаа: %s + Google Play төлбөрийн алдаа + Таны худалдан авалтын дэлгэрэнгүй мэдээллийг Google Play-ээс асуухад алдаа гарсан. Google Play-н кэшийг цэвэрлээд утсаа дахин асаана уу.\n\nАлдаа %s diff --git a/app/src/gplay/res/values-mr-rIN/strings.xml b/app/src/gplay/res/values-mr-rIN/strings.xml index 38b02e4e..30e4b329 100644 --- a/app/src/gplay/res/values-mr-rIN/strings.xml +++ b/app/src/gplay/res/values-mr-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play सेवा अनुपलब्ध आहेत. कोणतीही खरेदी आढळली नाही. तुम्ही योग्य खाते वापरत आहात का? + Google Play त्रुटी + Google Play मध्ये त्रुटी झाली. कृपया नंतर पुन्हा प्रयत्न करा किंवा तुमचा फोन रीबूट करा.\n\nत्रुटी: %s + Google Play बिलिंग त्रुटी + तुमच्या खरेदी तपशीलांसाठी Google Play ला विचारताना त्रुटी झाली. Google Play कॅश साफ करा आणि तुमचा फोन रीबूट करा.\n\nत्रुटी %s diff --git a/app/src/gplay/res/values-ms/strings.xml b/app/src/gplay/res/values-ms/strings.xml index c24623b2..a4a3e48d 100644 --- a/app/src/gplay/res/values-ms/strings.xml +++ b/app/src/gplay/res/values-ms/strings.xml @@ -2,4 +2,8 @@ Perkhidmatan Google Play tidak tersedia. Tiada pembelian ditemui. Adakah anda menggunakan akaun yang betul? + Ralat Google Play + Terdapat ralat dalam Google Play. Sila cuba lagi kemudian atau boot semula telefon anda.\n\nRalat: %s + Ralat Pengebilan Google Play + Terdapat ralat semasa meminta butiran pembelian anda daripada Google Play. Kosongkan cache Google Play dan boot semula telefon anda.\n\nRalat %s diff --git a/app/src/gplay/res/values-my-rMM/strings.xml b/app/src/gplay/res/values-my-rMM/strings.xml index 40527c77..644047a7 100644 --- a/app/src/gplay/res/values-my-rMM/strings.xml +++ b/app/src/gplay/res/values-my-rMM/strings.xml @@ -2,4 +2,8 @@ Google Play ဝန်ဆောင်မှုများ မရရှိနိုင်ပါ။ ဝယ်ယူမှုများ မတွေ့ပါ။ သင်အသုံးပြုနေသော အကောင့်မှန်ကန်ပါသလား။ - + Google Play အမှား + Google Play တွင် အမှားတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။ ကျေးဇူးပြု၍ နောင်မှ ထပ်ကြိုးစားပါ သို့မဟုတ် သင့်ဖုန်းကို ပြန်လည်စတင်ပါ။\n\nအမှား- %s + Google Play ငွေတောင်းမှု အမှား + သင့်ဝယ်ယူမှု အသေးစိတ်များကို Google Play ထံမှ မေးမြန်းစဥ် အမှားတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။ Google Play cache ကို ရှင်းလင်းပြီး သင့်ဖုန်းကို ပြန်လည်စတင်ပါ။\n\nအမှား %s + \ No newline at end of file diff --git a/app/src/gplay/res/values-nb/strings.xml b/app/src/gplay/res/values-nb/strings.xml index 80a262b2..2f600d9a 100644 --- a/app/src/gplay/res/values-nb/strings.xml +++ b/app/src/gplay/res/values-nb/strings.xml @@ -2,4 +2,8 @@ Google Play-tjenester er utilgjengelige. Ingen kjøp funnet. Bruker du riktig konto? + Google Play-feil + Det oppstod en feil i Google Play. Vennligst prøv igjen senere eller start telefonen på nytt.\n\nFeil: %s + Google Play-faktureringsfeil + Det oppstod en feil da Google Play ble spurt om kjøpsdetaljene dine. Tøm Google Play-hurtigbufferen og start telefonen på nytt.\n\nFeil %s diff --git a/app/src/gplay/res/values-ne-rNP/strings.xml b/app/src/gplay/res/values-ne-rNP/strings.xml index 7f3286e7..a31e5ed5 100644 --- a/app/src/gplay/res/values-ne-rNP/strings.xml +++ b/app/src/gplay/res/values-ne-rNP/strings.xml @@ -2,4 +2,8 @@ Google Play सेवाहरू अनुपलब्ध छन्। कुनै खरिदहरू फेला परेनन्। के तपाईंले सही खाता प्रयोग गरिरहनुभएको छ? + Google Play त्रुटि + Google Play मा एक त्रुटि भयो। कृपया पछि फेरि प्रयास गर्नुहोस् वा आफ्नो फोन पुनः सुरु गर्नुहोस्।\n\nत्रुटि: %s + Google Play बिलिङ त्रुटि + तपाईंको खरिद विवरणका लागि Google Play लाई सोध्दा एक त्रुटि भयो। Google Play क्यास सफा गर्नुहोस् र आफ्नो फोन पुनः सुरु गर्नुहोस्।\n\nत्रुटि %s diff --git a/app/src/gplay/res/values-nl/strings.xml b/app/src/gplay/res/values-nl/strings.xml index 86a03102..7f6ddd1e 100644 --- a/app/src/gplay/res/values-nl/strings.xml +++ b/app/src/gplay/res/values-nl/strings.xml @@ -2,4 +2,8 @@ De Google Play-diensten zijn niet beschikbaar. Geen aankopen gevonden. Gebruikt u de juiste rekening? + Google Play-fout + Er is een fout opgetreden in Google Play. Probeer het later opnieuw of start uw telefoon opnieuw op.\n\nFout: %s + Google Play-factureringsfout + Er is een fout opgetreden bij het opvragen van uw aankoopgegevens bij Google Play. Wis de Google Play-cache en start uw telefoon opnieuw op.\n\nFout %s diff --git a/app/src/gplay/res/values-pl/strings.xml b/app/src/gplay/res/values-pl/strings.xml index 052f4e41..509325d0 100644 --- a/app/src/gplay/res/values-pl/strings.xml +++ b/app/src/gplay/res/values-pl/strings.xml @@ -2,4 +2,8 @@ Usługi Google Play nie są dostępne. Nie znaleziono zakupu. Czy na pewno korzystasz z poprawnego konta? + Błąd Google Play + Wystąpił błąd w Google Play. Spróbuj ponownie później lub uruchom ponownie telefon.\n\nBłąd: %s + Błąd rozliczenia Google Play + Wystąpił błąd podczas pobierania szczegółów zakupu z Google Play. Wyczyść pamięć podręczną Google Play i uruchom ponownie telefon.\n\nBłąd %s diff --git a/app/src/gplay/res/values-pt-rBR/strings.xml b/app/src/gplay/res/values-pt-rBR/strings.xml index 4b70c97a..e376a56b 100644 --- a/app/src/gplay/res/values-pt-rBR/strings.xml +++ b/app/src/gplay/res/values-pt-rBR/strings.xml @@ -2,4 +2,8 @@ Os serviços do Google Play não estão disponíveis. Nenhuma compra encontrada. Você está usando a conta certa? + Erro do Google Play + Ocorreu um erro no Google Play. Tente novamente mais tarde ou reinicie seu telefone.\n\nErro: %s + Erro de Faturamento do Google Play + Ocorreu um erro ao solicitar os detalhes da sua compra ao Google Play. Limpe o cache do Google Play e reinicie seu telefone.\n\nErro %s diff --git a/app/src/gplay/res/values-pt/strings.xml b/app/src/gplay/res/values-pt/strings.xml index 355743d5..9b75a30b 100644 --- a/app/src/gplay/res/values-pt/strings.xml +++ b/app/src/gplay/res/values-pt/strings.xml @@ -2,4 +2,8 @@ Os serviços do Google Play estão indisponíveis. Nenhuma compra encontrada. Está a usar a conta correta? + Erro do Google Play + Ocorreu um erro no Google Play. Tente novamente mais tarde ou reinicie o seu telemóvel.\n\nErro: %s + Erro de Faturamento do Google Play + Ocorreu um erro ao solicitar os detalhes da sua compra ao Google Play. Limpe a cache do Google Play e reinicie o seu telemóvel.\n\nErro %s diff --git a/app/src/gplay/res/values-ro/strings.xml b/app/src/gplay/res/values-ro/strings.xml index bb5830de..565f9303 100644 --- a/app/src/gplay/res/values-ro/strings.xml +++ b/app/src/gplay/res/values-ro/strings.xml @@ -2,4 +2,8 @@ Serviciile Google Play nu sunt disponibile. Nu s-au găsit achiziții. Folosești contul corect? + Eroare Google Play + A apărut o eroare în Google Play. Încearcă din nou mai târziu sau repornește telefonul.\n\nEroare: %s + Eroare de facturare Google Play + A apărut o eroare la solicitarea detaliilor achiziției de la Google Play. Șterge cache-ul Google Play și repornește telefonul.\n\nEroare %s diff --git a/app/src/gplay/res/values-ru/strings.xml b/app/src/gplay/res/values-ru/strings.xml index 8c99011a..2dbd474b 100644 --- a/app/src/gplay/res/values-ru/strings.xml +++ b/app/src/gplay/res/values-ru/strings.xml @@ -2,4 +2,8 @@ Сервисы Google Play недоступны. Покупки не найдены. Вы используете правильный аккаунт? + Ошибка Google Play + Произошла ошибка в Google Play. Повторите попытку позже или перезагрузите телефон.\n\nОшибка: %s + Ошибка оплаты Google Play + Произошла ошибка при запросе деталей покупки в Google Play. Очистите кэш Google Play и перезагрузите телефон.\n\nОшибка %s diff --git a/app/src/gplay/res/values-sc-rIT/strings.xml b/app/src/gplay/res/values-sc-rIT/strings.xml index 04ce7b51..7d603cc8 100644 --- a/app/src/gplay/res/values-sc-rIT/strings.xml +++ b/app/src/gplay/res/values-sc-rIT/strings.xml @@ -2,4 +2,8 @@ Servìtzios Google Play non sunt disponìbiles. Perunu achistu agatadu. Ses usende su contu giustu? + Errore Google Play + B\'est istadu un\'errore in Google Play. Prova torra prus tardu o torra a allui su telèfonu.\n\nErrore: %s + Errore de faturatzione Google Play + B\'est istadu un\'errore pedende sos detallios de s\'achistu tuo a Google Play. Lìmpia sa cache de Google Play e torra a allui su telèfonu.\n\nErrore %s diff --git a/app/src/gplay/res/values-si-rLK/strings.xml b/app/src/gplay/res/values-si-rLK/strings.xml index 8838b2ed..be55a4cf 100644 --- a/app/src/gplay/res/values-si-rLK/strings.xml +++ b/app/src/gplay/res/values-si-rLK/strings.xml @@ -2,4 +2,8 @@ ගූගල් ප්ලේ සේවා නොතිබේ. කිසිදු මිලදී ගැනීමක් හමු නොවීය. ඔබ ትክክለኛ ගිණුම භාවිතා කරනවාද? + Google Play දෝෂය + Google Play හි දෝෂයක් සිදු විය. කරුණාකර නැවත උත්සාහ කරන්න හෝ ඔබගේ දුරකථනය නැවත ආරම්භ කරන්න.\n\nදෝෂය: %s + Google Play බිල් කිරීමේ දෝෂය + Google Play වෙතින් ඔබගේ මිලදී ගැනීමේ විස්තර ඉල්ලීමේදී දෝෂයක් සිදු විය. Google Play cache හිස් කර ඔබගේ දුරකථනය නැවත ආරම්භ කරන්න.\n\nදෝෂය %s diff --git a/app/src/gplay/res/values-sk/strings.xml b/app/src/gplay/res/values-sk/strings.xml index 4427b2b8..850802e8 100644 --- a/app/src/gplay/res/values-sk/strings.xml +++ b/app/src/gplay/res/values-sk/strings.xml @@ -2,4 +2,8 @@ Služby Google Play nie sú k dispozícii. Nenašli sa žiadne nákupy. Používate správny účet? + Chyba Google Play + V Google Play sa vyskytla chyba. Skúste to neskôr alebo reštartujte telefón.\n\nChyba: %s + Chyba fakturácie Google Play + Pri vyžiadaní podrobností o vašom nákupe z Google Play sa vyskytla chyba. Vymažte vyrovnávaciu pamäť Google Play a reštartujte telefón.\n\nChyba %s diff --git a/app/src/gplay/res/values-sl/strings.xml b/app/src/gplay/res/values-sl/strings.xml index 035ab5c5..dc6b94c6 100644 --- a/app/src/gplay/res/values-sl/strings.xml +++ b/app/src/gplay/res/values-sl/strings.xml @@ -2,4 +2,8 @@ Storitve Google Play niso na voljo. Ni najdenih nakupov. Ali uporabljate pravi račun? + Napaka Google Play + Prišlo je do napake v Google Play. Poskusite znova pozneje ali ponovno zaženite telefon.\n\nNapaka: %s + Napaka obračunavanja Google Play + Prišlo je do napake pri zahtevanju podrobnosti vašega nakupa iz Google Play. Počistite predpomnilnik Google Play in ponovno zaženite telefon.\n\nNapaka %s diff --git a/app/src/gplay/res/values-sq-rAL/strings.xml b/app/src/gplay/res/values-sq-rAL/strings.xml index 3efafbfa..1712aec1 100644 --- a/app/src/gplay/res/values-sq-rAL/strings.xml +++ b/app/src/gplay/res/values-sq-rAL/strings.xml @@ -2,4 +2,8 @@ Shërbimet e Google Play nuk janë të disponueshme. Nuk u gjetën blerje. Po përdorni llogarinë e duhur? + Gabim Google Play + Ndodhi një gabim në Google Play. Ju lutemi provoni përsëri më vonë ose rindizni telefonin tuaj.\n\nGabim: %s + Gabim faturimi Google Play + Ndodhi një gabim gjatë kërkimit të detajeve të blerjes suaj nga Google Play. Pastroni cache-n e Google Play dhe rindizni telefonin tuaj.\n\nGabim %s diff --git a/app/src/gplay/res/values-sr/strings.xml b/app/src/gplay/res/values-sr/strings.xml index 20d883cf..3516cedc 100644 --- a/app/src/gplay/res/values-sr/strings.xml +++ b/app/src/gplay/res/values-sr/strings.xml @@ -2,4 +2,8 @@ Google Play услуге нису доступне. Није пронађена ниједна куповина. Да ли користите прави налог? + Google Play грешка + Дошло је до грешке у Google Play-у. Покушајте поново касније или рестартујте телефон.\n\nГрешка: %s + Грешка наплате Google Play + Дошло је до грешке приликом захтевања детаља ваше куповине од Google Play-а. Очистите кеш Google Play-а и рестартујте телефон.\n\nГрешка %s diff --git a/app/src/gplay/res/values-sv/strings.xml b/app/src/gplay/res/values-sv/strings.xml index 47eb3f66..7b41d187 100644 --- a/app/src/gplay/res/values-sv/strings.xml +++ b/app/src/gplay/res/values-sv/strings.xml @@ -2,4 +2,8 @@ Google Play-tjänster är inte tillgängliga. Inga köp hittades. Använder du rätt konto? + Google Play-fel + Det uppstod ett fel i Google Play. Försök igen senare eller starta om telefonen.\n\nFel: %s + Google Play faktureringsfel + Det uppstod ett fel när Google Play tillfrågades om dina köpdetaljer. Rensa Google Play-cache och starta om telefonen.\n\nFel %s diff --git a/app/src/gplay/res/values-sw/strings.xml b/app/src/gplay/res/values-sw/strings.xml index bcae18f3..0dfb6bd3 100644 --- a/app/src/gplay/res/values-sw/strings.xml +++ b/app/src/gplay/res/values-sw/strings.xml @@ -2,4 +2,8 @@ Huduma za Google Play hazipatikani. Hakuna manunuzi yaliyopatikana. Je, unatumia akaunti sahihi? + Hitilafu ya Google Play + Kulikuwa na hitilafu katika Google Play. Tafadhali jaribu tena baadaye au anzisha upya simu yako.\n\nHitilafu: %s + Hitilafu ya Malipo ya Google Play + Kulikuwa na hitilafu wakati wa kuuliza Google Play maelezo ya ununuzi wako. Futa cache ya Google Play na uanzishe upya simu yako.\n\nHitilafu %s diff --git a/app/src/gplay/res/values-ta-rIN/strings.xml b/app/src/gplay/res/values-ta-rIN/strings.xml index 70adf4fa..df0f668c 100644 --- a/app/src/gplay/res/values-ta-rIN/strings.xml +++ b/app/src/gplay/res/values-ta-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play சேவைகள் கிடைக்கவில்லை. வாங்குதல்கள் எதுவும் இல்லை. நீங்கள் சரியான கணக்கைப் பயன்படுத்துகிறீர்களா? + Google Play பிழை + Google Play இல் பிழை ஏற்பட்டது. பின்னர் மீண்டும் முயற்சிக்கவும் அல்லது உங்கள் தொலைபேசியை மறுதொடக்கம் செய்யவும்.\n\nபிழை: %s + Google Play பில்லிங் பிழை + உங்கள் கொள்முதல் விவரங்களை Google Play இடம் கேட்கும்போது பிழை ஏற்பட்டது. Google Play தற்காலிக சேமிப்பை அழித்து உங்கள் தொலைபேசியை மறுதொடக்கம் செய்யவும்.\n\nபிழை %s diff --git a/app/src/gplay/res/values-te-rIN/strings.xml b/app/src/gplay/res/values-te-rIN/strings.xml index b68d8bc8..30ad25b4 100644 --- a/app/src/gplay/res/values-te-rIN/strings.xml +++ b/app/src/gplay/res/values-te-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play సేవలు అందుబాటులో లేవు. కొనుగోళ్లు ఏవీ కనుగొనబడలేదు. మీరు సరైన ఖాతాను ఉపయోగిస్తున్నారా? + Google Play లోపం + Google Play లో లోపం ఉంది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి లేదా మీ ఫోన్ను రీబూట్ చేయండి.\n\nలోపం: %s + Google Play బిల్లింగ్ లోపం + మీ కొనుగోలు వివరాల కోసం Google Play ని అడగగానే లోపం ఉంది. Google Play క్యాషేను క్లియర్ చేసి మీ ఫోన్ను రీబూట్ చేయండి.\n\nలోపం %s diff --git a/app/src/gplay/res/values-th/strings.xml b/app/src/gplay/res/values-th/strings.xml index 52bbedd0..6dad63d0 100644 --- a/app/src/gplay/res/values-th/strings.xml +++ b/app/src/gplay/res/values-th/strings.xml @@ -2,4 +2,8 @@ บริการ Google Play ไม่พร้อมใช้งาน ไม่พบการสั่งซื้อ คุณใช้บัญชีที่ถูกต้องหรือไม่ + ข้อผิดพลาด Google Play + เกิดข้อผิดพลาดใน Google Play โปรดลองอีกครั้งในภายหลังหรือรีบูตโทรศัพท์ของคุณ\n\nข้อผิดพลาด: %s + ข้อผิดพลาดการเรียกเก็บเงิน Google Play + เกิดข้อผิดพลาดเมื่อขอรายละเอียดการซื้อของคุณจาก Google Play ล้างแคช Google Play และรีบูตโทรศัพท์ของคุณ\n\nข้อผิดพลาด %s diff --git a/app/src/gplay/res/values-tr/strings.xml b/app/src/gplay/res/values-tr/strings.xml index f741bcf3..599cdea1 100644 --- a/app/src/gplay/res/values-tr/strings.xml +++ b/app/src/gplay/res/values-tr/strings.xml @@ -2,4 +2,8 @@ Google Play hizmetleri kullanılamıyor. Satın alma bulunamadı. Doğru hesabı mı kullanıyorsunuz? + Google Play Hatası + Google Play\'de bir hata oluştu. Lütfen daha sonra tekrar deneyin veya telefonunuzu yeniden başlatın.\n\nHata: %s + Google Play Faturalama Hatası + Google Play\'den satın alma ayrıntılarınızı alırken bir hata oluştu. Google Play önbelleğini temizleyin ve telefonunuzu yeniden başlatın.\n\nHata %s diff --git a/app/src/gplay/res/values-uk/strings.xml b/app/src/gplay/res/values-uk/strings.xml index 433a6bde..455130dd 100644 --- a/app/src/gplay/res/values-uk/strings.xml +++ b/app/src/gplay/res/values-uk/strings.xml @@ -2,4 +2,8 @@ Сервіси Google Play недоступні. Покупок не знайдено. Ви справді використовуєте правильний обліковий запис? + Помилка Google Play + Сталася помилка в Google Play. Будь ласка, спробуйте пізніше або перезавантажте телефон.\n\nПомилка: %s + Помилка розрахунків Google Play + Сталася помилка при запиті даних про покупки у Google Play. Очистіть кеш Google Play та перезавантажте телефон.\n\nПомилка %s diff --git a/app/src/gplay/res/values-ur-rIN/strings.xml b/app/src/gplay/res/values-ur-rIN/strings.xml index 930c7b35..d991dcd7 100644 --- a/app/src/gplay/res/values-ur-rIN/strings.xml +++ b/app/src/gplay/res/values-ur-rIN/strings.xml @@ -2,4 +2,8 @@ Google Play کی سروسز دستیاب نہیں ہیں۔ کوئی خریداری نہیں ملی۔ کیا آپ درست اکاؤنٹ استعمال کر رہے ہیں؟ + Google Play کی خرابی + Google Play میں خرابی تھی۔ برائے مہربانی بعد میں دوبارہ کوشش کریں یا اپنا فون ری بوٹ کریں۔\n\nخرابی: %s + Google Play بلنگ کی خرابی + Google Play سے آپ کی خریداری کی تفصیلات مانگتے وقت خرابی ہوئی۔ Google Play کیش صاف کریں اور اپنا فون ری بوٹ کریں۔\n\nخرابی %s diff --git a/app/src/gplay/res/values-uz/strings.xml b/app/src/gplay/res/values-uz/strings.xml index c6681041..8998606a 100644 --- a/app/src/gplay/res/values-uz/strings.xml +++ b/app/src/gplay/res/values-uz/strings.xml @@ -2,4 +2,8 @@ Google Play xizmatlari mavjud emas. Xaridlar topilmadi. To‘g‘ri hisobdan foydalanayapsizmi? + Google Play xatosi + Google Play da xatolik yuz berdi. Iltimos, keyinroq qayta urinib ko\'ring yoki telefoningizni qayta ishga tushiring.\n\nXato: %s + Google Play to\'lov xatosi + Google Play dan xaridingiz tafsilotlarini so\'rashda xatolik yuz berdi. Google Play keshini tozalang va telefoningizni qayta ishga tushiring.\n\nXato %s diff --git a/app/src/gplay/res/values-vi/strings.xml b/app/src/gplay/res/values-vi/strings.xml index d3fc74bb..bc94e91e 100644 --- a/app/src/gplay/res/values-vi/strings.xml +++ b/app/src/gplay/res/values-vi/strings.xml @@ -2,4 +2,8 @@ Các dịch vụ của Google Play không khả dụng. Không tìm thấy giao dịch mua nào. Bạn có đang sử dụng đúng tài khoản không? + Lỗi Google Play + Đã xảy ra lỗi trong Google Play. Vui lòng thử lại sau hoặc khởi động lại điện thoại của bạn.\n\nLỗi: %s + Lỗi thanh toán Google Play + Đã xảy ra lỗi khi yêu cầu Google Play cung cấp chi tiết giao dịch mua của bạn. Xóa bộ nhớ đệm Google Play và khởi động lại điện thoại.\n\nLỗi %s diff --git a/app/src/gplay/res/values-zh-rCN/strings.xml b/app/src/gplay/res/values-zh-rCN/strings.xml index e6a038bc..dc2a0d11 100644 --- a/app/src/gplay/res/values-zh-rCN/strings.xml +++ b/app/src/gplay/res/values-zh-rCN/strings.xml @@ -2,4 +2,8 @@ Google Play 服务不可用 未找到购买记录，您使用的帐户正确吗？ + Google Play 错误 + Google Play 出现错误。请稍后再试或重启您的手机。\n\n错误：%s + Google Play 计费错误 + 向 Google Play 请求您的购买详情时出现错误。清除 Google Play 缓存并重启您的手机。\n\n错误 %s diff --git a/app/src/gplay/res/values-zh-rHK/strings.xml b/app/src/gplay/res/values-zh-rHK/strings.xml index bc4147c0..b4d30480 100644 --- a/app/src/gplay/res/values-zh-rHK/strings.xml +++ b/app/src/gplay/res/values-zh-rHK/strings.xml @@ -2,4 +2,8 @@ Google Play 服務無法使用。 未找到訂單，確定帳戶無誤？ + Google Play 錯誤 + Google Play 出現錯誤。請稍後再試或重新啟動您的手機。\n\n錯誤：%s + Google Play 計費錯誤 + 向 Google Play 請求您的購買詳情時出現錯誤。清除 Google Play 快取並重新啟動您的手機。\n\n錯誤 %s diff --git a/app/src/gplay/res/values-zh-rTW/strings.xml b/app/src/gplay/res/values-zh-rTW/strings.xml index bc4147c0..b4d30480 100644 --- a/app/src/gplay/res/values-zh-rTW/strings.xml +++ b/app/src/gplay/res/values-zh-rTW/strings.xml @@ -2,4 +2,8 @@ Google Play 服務無法使用。 未找到訂單，確定帳戶無誤？ + Google Play 錯誤 + Google Play 出現錯誤。請稍後再試或重新啟動您的手機。\n\n錯誤：%s + Google Play 計費錯誤 + 向 Google Play 請求您的購買詳情時出現錯誤。清除 Google Play 快取並重新啟動您的手機。\n\n錯誤 %s diff --git a/app/src/gplay/res/values-zu/strings.xml b/app/src/gplay/res/values-zu/strings.xml index c7edaf4a..a4993e5e 100644 --- a/app/src/gplay/res/values-zu/strings.xml +++ b/app/src/gplay/res/values-zu/strings.xml @@ -2,4 +2,8 @@ Amasevisi e-Google Play awakutholakali. Akukho ukuthenga okutholakele. Ingabe usebenzisa i-akhawunti efanele? + Iphutha le-Google Play + Kube nephutha ku-Google Play. Sicela uzame futhi emuva kwesikhathi noma uqale kabusha ifoni yakho.\n\nIphutha: %s + Iphutha lokukhokha le-Google Play + Kube nephutha lapho sicela imininingwane yokuthenga kwakho ku-Google Play. Sula inqolobane ye-Google Play futhi uqale kabusha ifoni yakho.\n\nIphutha %s diff --git a/app/src/gplay/res/values/strings.xml b/app/src/gplay/res/values/strings.xml index 5b397640..fab2eaea 100644 --- a/app/src/gplay/res/values/strings.xml +++ b/app/src/gplay/res/values/strings.xml @@ -2,4 +2,8 @@ Google Play services are unavailable. No purchases found. Are you using the right account? + Google Play Error + There was an error in Google Play. Please try again later or reboot your phone.\n\nError: %s + Google Play Billing Error + There was an error when asking Google Play for your purchase details. Clear Google Play cache and reboot your phone.\n\nError %s \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt index b7ea6900..d83ab6d3 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt @@ -29,7 +29,14 @@ import eu.darken.capod.pods.core.DualPodDevice import eu.darken.capod.pods.core.PodDevice import eu.darken.capod.pods.core.SinglePodDevice import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.channelFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.isActive import java.time.Instant import javax.inject.Inject @@ -53,7 +60,13 @@ class OverviewFragmentVM @Inject constructor( } } - val upgradeState = upgradeRepo.upgradeInfo.asLiveData2() + val upgradeState = upgradeRepo.upgradeInfo + .onEach { + if (!it.isPro && it.error != null) { + errorEvents.postValue(it.error) + } + } + .asLiveData2() val launchUpgradeFlow = SingleLiveEvent<(Activity) -> Unit>() private val updateTicker = channelFlow {