diff --git a/app/src/main/java/org/tasks/compose/Subscription.kt b/app/src/main/java/org/tasks/compose/Subscription.kt index e2ef6fa6a..5791846d1 100644 --- a/app/src/main/java/org/tasks/compose/Subscription.kt +++ b/app/src/main/java/org/tasks/compose/Subscription.kt @@ -99,12 +99,6 @@ object PurchaseText { R.drawable.ic_outline_computer_24px, R.string.upgrade_desktop_access_description ), - CarouselItem( - R.string.gtasks_GPr_header, - R.drawable.ic_google, - R.string.upgrade_google_tasks, - false - ), CarouselItem( R.string.davx5, R.drawable.ic_davx5_icon_green_bg, diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt index 20da26acf..1be752997 100644 --- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt +++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt @@ -19,7 +19,6 @@ import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.Strings.isNullOrEmpty import org.tasks.analytics.Firebase -import org.tasks.billing.Inventory import org.tasks.data.* import org.tasks.data.dao.AlarmDao import org.tasks.data.dao.CaldavDao @@ -60,7 +59,6 @@ class GoogleTaskSynchronizer @Inject constructor( private val permissionChecker: PermissionChecker, private val googleAccountManager: GoogleAccountManager, private val localBroadcastManager: LocalBroadcastManager, - private val inventory: Inventory, private val taskDeleter: TaskDeleter, private val invokers: InvokerFactory, private val alarmDao: AlarmDao, @@ -68,11 +66,7 @@ class GoogleTaskSynchronizer @Inject constructor( suspend fun sync(account: CaldavAccount, i: Int) { Timber.d("%s: start sync", account) try { - if (i == 0 || inventory.hasPro) { - synchronize(account) - } else { - account.error = CaldavAccount.ERROR_PAYMENT_REQUIRED - } + synchronize(account) } catch (e: SocketTimeoutException) { Timber.e(e) account.error = e.message diff --git a/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt b/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt index e338ccb0a..f42bfa9ad 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt @@ -1,37 +1,20 @@ package org.tasks.preferences.fragments -import android.content.BroadcastReceiver -import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.lifecycle.lifecycleScope import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R -import org.tasks.billing.Inventory import org.tasks.data.entity.CaldavAccount -import org.tasks.data.entity.CaldavAccount.Companion.isPaymentRequired import org.tasks.preferences.IconPreference import javax.inject.Inject @AndroidEntryPoint class GoogleTasksAccount : BaseAccountPreference() { - @Inject lateinit var inventory: Inventory @Inject lateinit var localBroadcastManager: LocalBroadcastManager - private val purchaseReceiver = object : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - lifecycleScope.launch { - if (inventory.subscription.value != null && account.error.isPaymentRequired()) { - caldavDao.update(account.copy(error = null)) - } - } - } - } - override fun getPreferenceXml() = R.xml.preferences_google_tasks override suspend fun setupPreferences(savedInstanceState: Bundle?) { @@ -41,18 +24,6 @@ class GoogleTasksAccount : BaseAccountPreference() { .setOnPreferenceClickListener { requestLogin() } } - override fun onResume() { - super.onResume() - localBroadcastManager.registerPurchaseReceiver(purchaseReceiver) - localBroadcastManager.registerRefreshListReceiver(purchaseReceiver) - } - - override fun onPause() { - super.onPause() - - localBroadcastManager.unregisterReceiver(purchaseReceiver) - } - override suspend fun refreshUi(account: CaldavAccount) { (findPreference(R.string.sign_in_with_google) as IconPreference).apply { if (account.error.isNullOrBlank()) { @@ -61,11 +32,6 @@ class GoogleTasksAccount : BaseAccountPreference() { } isVisible = true when { - account.error.isPaymentRequired() -> { - setOnPreferenceClickListener { showPurchaseDialog() } - setTitle(R.string.name_your_price) - setSummary(R.string.requires_pro_subscription) - } account.error.isUnauthorized() -> { setTitle(R.string.sign_in_with_google) setSummary(R.string.authentication_required) diff --git a/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt b/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt index 4e06cf668..3dbfd2940 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt @@ -1,18 +1,11 @@ package org.tasks.preferences.fragments -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent import android.os.Bundle import androidx.fragment.app.viewModels -import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R -import org.tasks.billing.Inventory import org.tasks.data.entity.CaldavAccount -import org.tasks.data.entity.CaldavAccount.Companion.isPaymentRequired import org.tasks.preferences.IconPreference import org.tasks.sync.microsoft.MicrosoftSignInViewModel import javax.inject.Inject @@ -20,21 +13,10 @@ import javax.inject.Inject @AndroidEntryPoint class MicrosoftAccount : BaseAccountPreference() { - @Inject lateinit var inventory: Inventory @Inject lateinit var localBroadcastManager: LocalBroadcastManager private val microsoftVM: MicrosoftSignInViewModel by viewModels() - private val purchaseReceiver = object : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - lifecycleScope.launch { - if (inventory.subscription.value != null && account.error.isPaymentRequired()) { - caldavDao.update(account.copy(error = null)) - } - } - } - } - override fun getPreferenceXml() = R.xml.preferences_google_tasks override suspend fun setupPreferences(savedInstanceState: Bundle?) { @@ -44,18 +26,6 @@ class MicrosoftAccount : BaseAccountPreference() { .setOnPreferenceClickListener { requestLogin() } } - override fun onResume() { - super.onResume() - localBroadcastManager.registerPurchaseReceiver(purchaseReceiver) - localBroadcastManager.registerRefreshListReceiver(purchaseReceiver) - } - - override fun onPause() { - super.onPause() - - localBroadcastManager.unregisterReceiver(purchaseReceiver) - } - override suspend fun refreshUi(account: CaldavAccount) { (findPreference(R.string.sign_in_with_google) as IconPreference).apply { if (account.error.isNullOrBlank()) { @@ -64,11 +34,6 @@ class MicrosoftAccount : BaseAccountPreference() { } isVisible = true when { - account.error.isPaymentRequired() -> { - setOnPreferenceClickListener { showPurchaseDialog() } - setTitle(R.string.name_your_price) - setSummary(R.string.requires_pro_subscription) - } account.error.isUnauthorized() -> { setTitle(R.string.sign_in) setSummary(R.string.authentication_required) diff --git a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftSynchronizer.kt b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftSynchronizer.kt index 02972cf94..21125e72e 100644 --- a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftSynchronizer.kt +++ b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftSynchronizer.kt @@ -13,10 +13,8 @@ import io.ktor.http.isSuccess import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.tasks.LocalBroadcastManager -import org.tasks.R import org.tasks.Strings.isNullOrEmpty import org.tasks.analytics.Firebase -import org.tasks.billing.Inventory import org.tasks.caldav.VtodoCache import org.tasks.data.dao.CaldavDao import org.tasks.data.dao.TagDao @@ -55,7 +53,6 @@ class MicrosoftSynchronizer @Inject constructor( private val taskDao: TaskDao, private val localBroadcastManager: LocalBroadcastManager, private val taskDeleter: TaskDeleter, - private val inventory: Inventory, private val firebase: Firebase, private val taskCreator: TaskCreator, private val httpClientFactory: HttpClientFactory, @@ -67,10 +64,6 @@ class MicrosoftSynchronizer @Inject constructor( suspend fun sync(account: CaldavAccount) { Thread.currentThread().contextClassLoader = context.classLoader - if (!inventory.hasPro) { - setError(account, context.getString(R.string.requires_pro_subscription)) - return - } if (isNullOrEmpty(account.password)) { setError(account, ERROR_UNAUTHORIZED) return diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 810922e7a..95244052a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -476,7 +476,6 @@ قم بالمزامنة مع برامج الجهات الخارجية مثل Outlook و Apple Reminders الوصول إلى سطح المكتب قم بالمزامنة مع Tasks.org وتعاون مع مستخدمين آخرين - مزامنة حسابات متعددة افتح جميع الثيمات والألوان والرموز المزيد من التخصيص يحصل المشتركون الجدد على نسخة تجريبية مجانية مدتها 7 أيام. تلغى في أي وقت diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 52880156f..b2027e33e 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -628,7 +628,6 @@ Поверителност Абонати на Google Play Отключване на всички теми, цветове и пиктограми - Синхронизиране на няколко профила Задачата е завършена Споделяне на списък Свиване на лентата на приложението diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ab2925fd4..df2253958 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -621,7 +621,6 @@ Synchronizujte klienty třetích stran jako Outlook a Apple Remminders Přístup z počítače Synchronizujte s Tasks.org a spolupracujte s ostatními uživateli - Synchronizovat vícero účtů Odemknout všechny vzhledy, barvy a ikony Další přizpůsobení Noví předplatitelé dostanou 7 dnů na vyzkoušení zdarma. Předplatné je možné kdykoli zrušit diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ba13bc732..36fbccc09 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -567,7 +567,6 @@ Synkronisering med tredjepartsklienter som Outlook og Apple Reminders Adgang til skrivebordet Synkroniser med Tasks.org, og samarbejd med andre brugere - Synkroniser flere konti Låse alle temaer, farver og ikoner op Mere tilpasning Nye abonnenter får en gratis prøveperiode på 7 dage. Du kan til enhver tid annullere diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2fc4f868d..bf575f982 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -605,7 +605,6 @@ Synchronisierung mit Drittanbieter-Clients wie Outlook und Apple Reminders Zugriff zur Arbeitoberfläche Synchronisiere mit Tasks.org und arbeite mit anderen Benutzern zusammen - Synchronisiere mehrere Konten Schalte alle Themen, Farben und Symbole frei Mehr Anpassungsmöglichkeiten Neue Abonnenten erhalten eine 7-tägige kostenlose Testversion. Jederzeit abbrechen diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 0eb2f2616..eded02309 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -641,7 +641,6 @@ Transmetas taskojn Laste uzata: %s Bezonas konton de Tasks.org - Sinkronigi plurajn kontojn Pasvorto de programeto Pasvortoj de programeto Sinkronigi viajn taskojn kaj kalendarojn kun labortablaj kaj poŝtelefonaj programoj de ekstera liveranto. Tuŝetu ĉi tien por pli da informo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8040aa609..30f265fcd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -631,7 +631,6 @@ Sincronización con clientes de terceros como Outlook y Apple Reminders Acceso al escritorio Sincronizar con Tasks.org y colaborar con otros usuarios - Sincronizar varias cuentas Desbloquea todos los temas, colores e iconos Más personalización Los suscriptores nuevos reciben una prueba gratuita de 7 días, cancelable en cualquier momento diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 8cf624beb..348c9d404 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -506,7 +506,6 @@ Ei ole sisse logitud Viimati kasutatud: %s Kutse ootab vastust - Süngi mitu kontot Esita lõpetamise heli Vidina ID: %d Pregune tellimus:%s diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index a62d8a62a..862474397 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -609,7 +609,6 @@ Outlook eta Apple Reminders bezalako hirugarrenen bezeroekin sinkronizatu Mahaigaineko sarbidea Sinkronizatu Tasks.org-ekin eta lankidetu beste erabiltzaile batzuekin - Hainbat kontu sinkronizatu Desblokeatu gai, kolore eta ikono guztiak Pertsonalizazio gehiago Harpidedun berriek 7 eguneko doako proba jasotzen dute. Ezeztatu edozein unetan diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 05aa26bb2..937558627 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -509,7 +509,6 @@ Synkronoi kolmansien osapuolten, kuten Outlookin ja Applen muistutusten, kanssa Työpöydän käyttöoikeus Synkronoi Tasks.orgin kanssa ja tee yhteistyötä muiden käyttäjien kanssa - Synkronoi useita tilejä Avaa kaikki teemat, värit ja kuvakkeet Lisää räätälöintiä Uudet tilaajat saavat 7 päivän ilmaisen kokeilujakson. Peruuta milloin tahansa diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 92a685b6e..4145ee51d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -632,7 +632,6 @@ Accès au bureau Synchronisez avec « Tasks.org » et collaborez avec les autres utilisateurs Déverrouillez tous les thèmes, couleurs et icônes - Synchronisez plusieurs comptes Plus de personnalisation Les nouveaux abonnés bénéficient d\'un essai gratuit de 7 jours. Annulez à tout moment Dimanche prochain diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 86314115e..bf99a2598 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -164,7 +164,6 @@ Sinkroniziraj s klijentima trećih strana poput Outlook i Apple Reminders Desktop pristup Sinkroniziraj s Tasks.org i surađuj s drugim korisnicima - Sinkroniziraj račune Otključaj sve teme, boje i ikone Više prilagođavanja Novi pretplatnici dobivaju 7-dnevno besplatno probno razdoblje. Otkaži bilo kada diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 076d8541b..2a4b44e7e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -609,7 +609,6 @@ Szinkronizálás harmadik fél megoldásaival, mint az Outlook vagy az Apple Emlékeztetők Desktop hozzáférés Tasks.org szinkronizáció és együttműködés más felhasználókkal - Több fiók szinkronizálása Az összes téma, szín és ikon feloldása Még nagyobb testreszabhatóság Az új előfizetők 7 napos ingyenes kipróbálási lehetőséget kapnak. Az előfizetés bármikor lemondható diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 2d4919acc..a4ed01282 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -590,7 +590,6 @@ Sinkronkan dengan klien pihak-ketiga seperti Outlook dan Apple Reminders Akses dekstop Sinkronkan dengan Tasks.org dan kolaborasi dengan pengguna lain - Sinkronisasikan berbagai akun secara bersamaan Buka semua tema, warna, dan ikon Lebih banyak kostumisasi Pelanggan baru menerima percobaan aplikasi gratis selama 7-hari. Batalkan kapan saja diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index eb8094612..f16dbb09c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -623,7 +623,6 @@ Sincronizza con client di terze parti come Outlook e Apple Reminders Accesso desktop Sincronizza con Tasks.org e collabora con altri utenti - Sincronizza più account Sblocca tutti i temi, i colori e le icone Maggiore personalizzazione I nuovi abbonati ricevono 7 giorni di prova gratuita. Puoi recedere in qualsiasi momento diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 15c0ae521..71911f721 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -616,7 +616,6 @@ סינכרון עם לקוחות צד שלישי כגון תזכורות Outlook ו- Apple גישה לשולחן העבודה סינכרון עם Tasks.org ושיתוף פעולה עם משתמשים אחרים - סינכרון חשבונות מרובים ביטול נעילה של כל ערכות הנושא, הצבעים והסמלים התאמה אישית נוספת מנויים חדשים מקבלים תקופת ניסיון ללא תשלום למשך 7 ימים. ביטול בכל עת diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8c37503e5..bf025f1b5 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -586,7 +586,6 @@ 時間選択の方法 %1$s は %2$s にアクセスできなくなります 応答待ちの招待 - 複数のアカウントを同期可能 リマインダーを有効にする ファイルベースによる同期 優先度 なし diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index bcdf70096..e1870e495 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -568,7 +568,6 @@ Outlook, Apple Reminders 등 타사 클라이언트와 동기화 데스크탑 접속 Tasks.org와 동기화 및 다른 사용자와 협업 - 여러 계정 동기화 모든 테마, 색상, 아이콘 사용 더 다양한 맞춤설정 새 구독자는 7일간 무료 체험이 가능합니다. 언제라도 취소할 수 있습니다 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 03ca846a3..601bdd02a 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -497,7 +497,6 @@ Tekstas Naujiems prenumeratoriams suteikiamas 7 dienų nemokamas bandomasis laikotarpis. Atšaukite bet kuriuo metu Daugiau tinkinimo - Sinchronizuoti kelias paskyras Sinchronizuokite su Tasks.org ir bendradarbiaukite su kitais naudotojais Paskyra niekada diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 034c8d4fb..736bdfbc7 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -606,7 +606,6 @@ Synkronisere med tredjepartsklienter som Outlook og Apple-påminnelser Tilgang til skrivebordet Synkronisere med Tasks.org og samarbeide med andre brukere - Synkronisere flere kontoer Lås opp alle temaer, farger og ikoner Mer tilpasning Nye abonnenter får en 7-dagers gratis prøveperiode. Avbryt når som helst diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a47d9feb8..a39d1a538 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -611,7 +611,6 @@ Met toepassingen van derden als Outlook en Apple Herinneringen synchroniseren Desktop-toegang Synchroniseren met Tasks.org en samenwerken met andere gebruikers - Meerdere accounts synchroniseren Nieuwe abonnees krijgen een gratis proefperiode van 7 dagen. Annuleren kan op elk moment Volgende zaterdag Volgende vrijdag diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0e9cacbf3..5ffb83ff0 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -615,7 +615,6 @@ Synchronizacja z aplikacjami innych firm, takimi jak Outlook i Apple Reminders Dostęp z aplikacji desktopowych Synchronizuj z Tasks.org oraz współpracuj z innymi użytkownikami - Synchronizuj wiele kont Odblokuj wszystkie motywy, kolory oraz ikony Więcej możliwości konfiguracji Nowi subskrybenci otrzymują 7-dniowy, darmowy okres próbny. Można anulować w dowolnym momencie diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7db72a0cf..b2e70ac8d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -565,7 +565,6 @@ Sincronização com clientes de terceiros, como Outlook e Apple Reminders Acesso para a versão Desktop Sincronize com Tasks.org e colabore com outros usuários - Sincronize várias contas Desbloqueie todos os temas, cores e ícones Mais customização Novos assinantes recebem 7 dias de teste grátis. Cancele a qualquer momento diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9d9d05f9a..2bfe52d49 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -540,7 +540,6 @@ Sincronize com clientes terceiros, como Outlook e Apple Reminders Acesso desktop Sincronize com o Tasks.org e colabore com outros utilizadores - Sincronize várias contas Desbloqueie todos os temas, cores e ícones Mais personalizações Os novos subscritores recebem 7 dias de teste grátis. Cancele a qualquer momento diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ca5842f7c..2a727b2db 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -21,7 +21,6 @@ Sincronizare cu clienți terți, cum ar fi Outlook și Apple Reminders Acces la desktop Sincronizează cu Tasks.org și colaborează cu alți utilizatori - Sincronizarea mai multor conturi Deblochează toate temele, culorile și pictogramele Mai multă personalizare Noii abonați beneficiază de o perioadă de încercare gratuită de 7 zile. Anulare în orice moment diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2845e1e4b..3044a2883 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -619,7 +619,6 @@ Ваша подписка поддерживает непрерывное развитие Синхронизация со сторонними клиентами, такими как Outlook и Apple Reminders Синхронизируйтесь с Tasks.org и сотрудничайте с другими пользователями - Синхронизировать несколько аккаунтов Разблокировать все темы, цвета и иконки Больше настроек Новые подписчики получают 7-дневный бесплатный пробный период. Отмена возможна в любое время diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 05ee47a69..e6af5d66f 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -63,7 +63,6 @@ Outlook සහ Apple Reminders වැනි තෙවන පාර්ශවීය සේවාදායකයින් සමඟ සමමුහුර්ත කරන්න ඩෙස්ක්ටොප් ප්‍රවේශය Tasks.org සමඟ සමමුහුර්ත කර අනෙකුත් පරිශීලකයින් සමඟ සහයෝගයෙන් කටයුතු කරන්න - ගිණුම් කිහිපයක් සමමුහුර්ත කරන්න සියලුම තේමාවන්, වර්ණ සහ අයිකන අගුළු ඇරීම තවත් අභිරුචිකරණය නව ග්‍රාහකයින්ට දින 7 ක නොමිලේ අත්හදා බැලීම් කාලයක් ලැබේ. ඕනෑම වේලාවක අවලංගු කරන්න diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e33a7f6d5..46328e219 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -444,7 +444,6 @@ Synkronisera med tredjepartsklienter som Outlook och Apple Reminders Tillgång till skrivbordet Synkronisera med Tasks.org och samarbeta med andra användare - Synkronisera flera konton Lås upp alla teman, färger och ikoner Mer anpassning Nya prenumeranter får en gratis provperiod på 7 dagar. Avbryt när som helst diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0d67379a6..59eff065c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -40,7 +40,6 @@ ตัวเลือกเพิ่มเติม การเข้าถึงเดสก์ท็อป ซิงค์กับ Tasks.org และทํางานร่วมกับผู้ใช้รายอื่น - ประสานหลายบัญชี ข้อความ นาฬิกา ปฏิทิน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cdf0c0904..3015efc9d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -610,7 +610,6 @@ Tüm gövdeler, renkler ve simgeler kullanılabilir Masaüstü erişimi Tasks.org ile eşzamanla ve diğer kullanıcılarla ortak çalış - Çoklu hesapları eşzamanla Daha çok özelleştirme Yeni aboneler 7 günlük sınama süresi kazanır. İstendiğinde iptal edilir Metin diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5c812ecc9..3ecadc729 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -634,7 +634,6 @@ Синхронізація зі сторонніми клієнтами, наприклад Outlook і Apple Нагадування Доступ до комп\'ютера Синхронізація з Tasks.org та співпраця з іншими користувачами - Синхронізація кількох облікових записів Розблокування всіх тем, кольорів і піктограм Більше налаштувань Нові передплатники отримують 7-денну безплатну пробну версію. Скасувати її можна в будь-який час diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 54a0e3248..8cce3e816 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -63,7 +63,6 @@ Đồng bộ bằng các ứng dụng khách bên thứ ba như Outlook và Apple Reminders Truy cập từ máy tính Đồng bộ bằng Tasks.org và hợp tác với những người dùng khác - Đồng bộ hoá nhiều tài khoản Mở khoá tất cả chủ đề, màu sắc, và biểu tượng Nhiều tuỳ biến hơn Những người đăng ký mới sẽ nhận khoảng thời gian dùng thử 7 ngày miễn phí. Huỷ vào bất kỳ lúc nào diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 391f3ce78..fcbf185f8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -603,7 +603,6 @@ 与 Outlook 和 Apple Reminders 等第三方客户端同步 桌面访问 与 Tasks.org 同步并与其他用户协作 - 同步多个账户 解锁所有主题、颜色和图标 更多自定义 新订户将获得 7 天的免费试用期。可随时取消订阅 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 654b4fb2f..9f6eb4a85 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -642,7 +642,6 @@ 加入 #tasks 的 Libera Chat 頻道 使用第三方桌面和移動應用程式同步您的任務和行事曆。點擊此處了解更多資訊 並不包含「隨意價格」訂閱 - 同步多個帳戶 到期後 %s 新訂閱者享有 7 天免費試用。隨時取消 底部 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3b8084c8..56ca5de85 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -686,7 +686,6 @@ File %1$s contained %2$s.\n\n New subscribers receive a 7-day free trial. Cancel at any time More customization Unlock all themes, colors, and icons - Synchronize multiple accounts Sync with Tasks.org and collaborate with other users Desktop access Sync with third-party clients like Outlook and Apple Reminders