From eda9cd0c97212cfad46d5ae42dc1a1f3862f4a32 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 14 Jan 2022 23:47:37 -0600 Subject: [PATCH] Remove 'show completed temporarily' --- .../com/todoroo/astrid/core/SortHelper.java | 6 +++--- app/src/main/java/org/tasks/db/QueryUtils.kt | 12 ------------ .../java/org/tasks/preferences/Preferences.kt | 3 --- .../org/tasks/preferences/QueryPreferences.kt | 2 -- .../org/tasks/scheduling/RefreshScheduler.kt | 18 ++++++------------ .../org/tasks/widget/WidgetPreferences.java | 13 ++++++------- app/src/main/res/values-ar/strings.xml | 3 --- app/src/main/res/values-bg-rBG/strings.xml | 3 --- app/src/main/res/values-ca/strings.xml | 3 --- app/src/main/res/values-cs/strings.xml | 3 --- app/src/main/res/values-da/strings.xml | 3 --- app/src/main/res/values-de/strings.xml | 3 --- app/src/main/res/values-es/strings.xml | 3 --- app/src/main/res/values-eu/strings.xml | 3 --- app/src/main/res/values-fi/strings.xml | 3 --- app/src/main/res/values-fr/strings.xml | 3 --- app/src/main/res/values-hr/strings.xml | 3 --- app/src/main/res/values-hu/strings.xml | 3 --- app/src/main/res/values-id/strings.xml | 3 --- app/src/main/res/values-it/strings.xml | 3 --- app/src/main/res/values-iw/strings.xml | 3 --- app/src/main/res/values-ja/strings.xml | 3 --- app/src/main/res/values-ko/strings.xml | 3 --- app/src/main/res/values-lt/strings.xml | 3 --- app/src/main/res/values-nb/strings.xml | 3 --- app/src/main/res/values-nl/strings.xml | 3 --- app/src/main/res/values-pl/strings.xml | 3 --- app/src/main/res/values-pt-rBR/strings.xml | 3 --- app/src/main/res/values-pt/strings.xml | 3 --- app/src/main/res/values-ro/strings.xml | 3 --- app/src/main/res/values-ru/strings.xml | 3 --- app/src/main/res/values-si/strings.xml | 3 --- app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 3 --- app/src/main/res/values-ta/strings.xml | 3 --- app/src/main/res/values-th/strings.xml | 3 --- app/src/main/res/values-tr/strings.xml | 3 --- app/src/main/res/values-uk/strings.xml | 3 --- app/src/main/res/values-ur/strings.xml | 3 --- app/src/main/res/values-vi/strings.xml | 3 --- app/src/main/res/values-zh-rCN/strings.xml | 3 --- app/src/main/res/values-zh-rTW/strings.xml | 3 --- app/src/main/res/values/keys.xml | 1 - app/src/main/res/values/strings.xml | 3 --- .../main/res/xml/preferences_look_and_feel.xml | 8 -------- 45 files changed, 15 insertions(+), 157 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java index 768415573..c298076e1 100644 --- a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java @@ -8,13 +8,15 @@ package com.todoroo.astrid.core; import static org.tasks.db.QueryUtils.showCompleted; import static org.tasks.db.QueryUtils.showHidden; -import static org.tasks.db.QueryUtils.showRecentlyCompleted; import android.annotation.SuppressLint; + import androidx.annotation.Nullable; + import com.todoroo.andlib.sql.Functions; import com.todoroo.andlib.sql.Order; import com.todoroo.astrid.data.Task; + import org.tasks.preferences.QueryPreferences; /** @@ -70,8 +72,6 @@ public class SortHelper { // flags if (preferences.getShowCompleted()) { adjustedSql = showCompleted(adjustedSql); - } else if (preferences.getShowCompletedTemporarily()) { - adjustedSql = showRecentlyCompleted(adjustedSql); } if (preferences.getShowHidden()) { adjustedSql = showHidden(adjustedSql); diff --git a/app/src/main/java/org/tasks/db/QueryUtils.kt b/app/src/main/java/org/tasks/db/QueryUtils.kt index 040d2b07b..3cc3b30c5 100644 --- a/app/src/main/java/org/tasks/db/QueryUtils.kt +++ b/app/src/main/java/org/tasks/db/QueryUtils.kt @@ -1,8 +1,5 @@ package org.tasks.db -import com.todoroo.andlib.sql.Criterion.Companion.or -import com.todoroo.andlib.utility.DateUtilities -import com.todoroo.astrid.data.Task import java.util.regex.Pattern object QueryUtils { @@ -19,14 +16,5 @@ object QueryUtils { @JvmStatic fun showHiddenAndCompleted(query: String): String = showCompleted(showHidden(query)) - @JvmStatic - fun showRecentlyCompleted(query: String): String = UNCOMPLETED - .matcher(query) - .replaceAll( - or( - Task.COMPLETION_DATE.lte(0), - Task.COMPLETION_DATE.gte(DateUtilities.now() - 59999)) - .toString()) - fun removeOrder(query: String): String = ORDER.matcher(query).replaceAll("") } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 7c803d4cb..cd52a6db0 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -355,9 +355,6 @@ class Preferences @JvmOverloads constructor( get() = getBoolean(R.string.p_show_completed_tasks, false) set(value) { setBoolean(R.string.p_show_completed_tasks, value) } - override val showCompletedTemporarily: Boolean - get() = getBoolean(R.string.p_temporarily_show_completed_tasks, false) - override var alwaysDisplayFullDate: Boolean get() = getBoolean(R.string.p_always_display_full_date, false) set(value) { setBoolean(R.string.p_always_display_full_date, value)} diff --git a/app/src/main/java/org/tasks/preferences/QueryPreferences.kt b/app/src/main/java/org/tasks/preferences/QueryPreferences.kt index 1c1b2b661..d5ab46900 100644 --- a/app/src/main/java/org/tasks/preferences/QueryPreferences.kt +++ b/app/src/main/java/org/tasks/preferences/QueryPreferences.kt @@ -13,8 +13,6 @@ interface QueryPreferences { val showCompleted: Boolean - val showCompletedTemporarily: Boolean - var alwaysDisplayFullDate: Boolean fun usePagedQueries(): Boolean diff --git a/app/src/main/java/org/tasks/scheduling/RefreshScheduler.kt b/app/src/main/java/org/tasks/scheduling/RefreshScheduler.kt index 5e8b84bff..78b132604 100644 --- a/app/src/main/java/org/tasks/scheduling/RefreshScheduler.kt +++ b/app/src/main/java/org/tasks/scheduling/RefreshScheduler.kt @@ -1,12 +1,9 @@ package org.tasks.scheduling -import com.todoroo.andlib.utility.DateUtilities import com.todoroo.astrid.data.Task import kotlinx.collections.immutable.toImmutableList -import org.tasks.R import org.tasks.data.TaskDao import org.tasks.jobs.WorkManager -import org.tasks.preferences.Preferences import org.tasks.time.DateTimeUtils import java.util.* import javax.inject.Inject @@ -14,9 +11,9 @@ import javax.inject.Singleton @Singleton class RefreshScheduler @Inject internal constructor( - private val preferences: Preferences, private val workManager: WorkManager, - private val taskDao: TaskDao) { + private val taskDao: TaskDao, +) { private val jobs: SortedSet = TreeSet() @@ -28,11 +25,8 @@ class RefreshScheduler @Inject internal constructor( } @Synchronized - suspend fun scheduleRefresh(task: Task) { - if (task.isCompleted - && preferences.getBoolean(R.string.p_temporarily_show_completed_tasks, false)) { - scheduleRefresh(task.completionDate + DateUtilities.ONE_MINUTE) - } else if (task.hasDueDate()) { + fun scheduleRefresh(task: Task) { + if (task.hasDueDate()) { scheduleRefresh(task.dueDate) } if (task.hasStartDate()) { @@ -41,7 +35,7 @@ class RefreshScheduler @Inject internal constructor( } @Synchronized - suspend fun scheduleNext() { + fun scheduleNext() { val lapsed = jobs.headSet(DateTimeUtils.currentTimeMillis() + 1).toImmutableList() jobs.removeAll(lapsed) if (!jobs.isEmpty()) { @@ -49,7 +43,7 @@ class RefreshScheduler @Inject internal constructor( } } - private suspend fun scheduleRefresh(timestamp: Long) { + private fun scheduleRefresh(timestamp: Long) { val now = DateTimeUtils.currentTimeMillis() if (now < timestamp) { val upcoming = jobs.tailSet(now) diff --git a/app/src/main/java/org/tasks/widget/WidgetPreferences.java b/app/src/main/java/org/tasks/widget/WidgetPreferences.java index 6799d4a12..5afda284e 100644 --- a/app/src/main/java/org/tasks/widget/WidgetPreferences.java +++ b/app/src/main/java/org/tasks/widget/WidgetPreferences.java @@ -1,15 +1,19 @@ package org.tasks.widget; import android.content.Context; + import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.service.Upgrader; -import java.util.HashSet; + import org.tasks.R; import org.tasks.Strings; -import org.tasks.preferences.QueryPreferences; import org.tasks.preferences.Preferences; +import org.tasks.preferences.QueryPreferences; + +import java.util.HashSet; + import timber.log.Timber; public class WidgetPreferences implements QueryPreferences { @@ -277,11 +281,6 @@ public class WidgetPreferences implements QueryPreferences { return getBoolean(R.string.p_widget_show_completed, false); } - @Override - public boolean getShowCompletedTemporarily() { - return preferences.getShowCompletedTemporarily(); - } - @Override public boolean getAlwaysDisplayFullDate() { return preferences.getAlwaysDisplayFullDate(); } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 954f74902..9fe54a839 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -157,9 +157,6 @@ اللون قراءة المهمة %d… سيتم حذف جميع المهام بشكل دائم - ستختفي المهام فورًا من القائمة بعد الانتهاء - ستظل المهام مرئية مؤقتًا في القائمة بعد الانتهاء - عرض المهام مؤقتًا عند الانتهاء أضف روابط لمواقع، عناوين، أو أرقام هواتف عرض الإعدادات المتقدمة عرض الروابط diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index bca6a1051..5e060ebc0 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -479,9 +479,6 @@ Автоматични резервни копия Е-поща Цяла дата - Задачите остават временно видими след завършването им - Задачите изчезват веднага след завършването им - Временно показване на задачите при завършване Начална дата По време на създаване По начална дата diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 675ab59a7..b0affbceb 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -137,9 +137,6 @@ Les preferències es restabliran als valors predeterminats Reinicia les preferències Mostra la data completa - Les tasques desapareixeran immediatament de la llista després de completar-les - Les tasques continuaran essent visibles temporalment a la llista després de completar-les - Mostra temporalment les tasques en finalitzar Inicia els esdeveniments del calendari en el moment oportú Finalitza els esdeveniments del calendari a la data de venciment Hora d\'esdeveniment del calendari diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9f62a7d7e..c41391f11 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -317,9 +317,6 @@ %d roky %d let - Dočasně zobrazit dokončené úkoly - Po dokončení zůstanou úkoly dočasně viditelné - Úkoly po dokončení okamžitě zmizí ze seznamu %d podúkol %d podúkoly diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 9676e32c5..068ae0117 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -92,7 +92,6 @@ Stopper efter På Google Huskelisten… Kontoen %s ikke fundet. Prøv at logge ud og logge ind igen gennem Google Huskeliste-indstillingerne. - Vis udførte opgaver midlertidigt Vis kommentarer i opgaveredigering Vis hele opgavetitlen Astrids manuelle sortering @@ -534,8 +533,6 @@ Slet opgavedata Dine præferencer vil blive nulstillet til standardindstillingerne Gendan standardindstillinger - Opgaver forsvinder fra listen, umiddelbart efter de er udført - Opgaver forbliver midlertidigt synlige på listen, efter de er udført Kalenderbegivenhed starter ved frist-tid Kalenderbegivenhed slutter ved frist-tid Tid for kalenderbegivenhed diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7bade69a6..46b4db189 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -441,9 +441,6 @@ Nennen Sie Ihren Preis Eigene Sortierung Server behandelt wiederkehrende Aufgaben - Aufgaben nach Erledigung temporär anzeigen - Aufgaben bleiben nach Erledigung noch für eine kurze Zeit sichtbar - Aufgaben verschwinden sofort nach Erledigung Datum ganz anzeigen %d Teilaufgabe diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b258fafee..4793fe9d1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -441,9 +441,6 @@ Precio flexible Mi orden El servidor se encarga de las tareas recurrentes - Mostrar temporalmente las tareas ya completadas - Las tareas permanecerán temporalmente visibles en la lista una vez completadas - Las tareas desaparecerán inmediatamente de la lista una vez completadas %d subtarea %d subtareas diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index f25ef7a20..86fb37302 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -441,9 +441,6 @@ Errorea: %s Nire eskaria Zerbitzariari kudeatzen ditu zeregin errepikakorrak - Erakutsi denbora batez zereginak burutu eta gero - Zereginak denbora batez zerrendan ikusgai geratuko dira burutu eta gero - Zereginak berehala desagertuko dira zerrendatik behin burututa Azpi-zeregin %d %d azpi-zeregin diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ead9ce2ff..8bdf284f0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -472,9 +472,6 @@ Ei muistutuksia Oletusetäisyys Oletussijaintimuistutukset - Tehtävät häviävät listata välittömästi valmistuttuaan - Tehtävät jäävät listaan näkyviin vielä hetkeksi valmistuttuaankin - Näytä tehtävät hetkellisesti valmistuttuaan Sijainti Lisää alitehtävä Oma järjestys diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 65a3775eb..f408efe25 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -436,9 +436,6 @@ Erreur : %s Mon tri Le serveur gère les tâches récurrentes - Afficher temporairement les tâches une fois terminées - Les tâches resteront temporairement visibles dans la liste une fois terminées - Les tâches disparaîtront immédiatement de la liste après complétion %d sous-tâche %d sous-tâches diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index f7d3fb76f..adb4bb62f 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -547,9 +547,6 @@ Standardni prioritet Stvarno želiš izbrisati sve tvoje događaje za zadatke\? Izbriši kalendarske događaje za zadatke - Zadaci će odmah nestati iz popisa nakon što se obave - Zadaci će privremeno biti vidljivi u popisu nakon što se obave - Privremeno pokaži zadatke nakon što se obave Počni kalendarske događaje u vrijeme roka Završi kalendarske događaje u vrijeme roka Vrijeme kalendarskog događaja diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c09c5da92..1caeb5e12 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -439,9 +439,6 @@ Egyéni sorrend Hiba: %s A szerver kezeli az ismétlődő feladatokat - Feladatok ideiglenes láthatósága készre állításkor - A feladatok a készre állítás után ideiglenesen láthatóak maradnak a listában - A feladatok a készre állítás után azonnal eltűnnek a listából %d részfeladat %d részfeladat diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 00d8fee11..a7cb9e26f 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -456,7 +456,6 @@ Klik untuk mengatur Batal Oke - Tampilkan tugas untuk sementara setelah selesai Tindakan Item: %s Tugas akan mengingatkan Anda tentang acara kalender mendatang dan menyarankan Anda untuk bersiap-siap untuk hal tersebut Mungkin setelahnya @@ -639,8 +638,6 @@ Tanggal jatuh tempo bawaan Tanggal mulai bawaan Tampilkan tanggal penuh - Tugas akan segera menghilang pada tugas setelah selesai - Tugas akan tetap terlihat sementara pada tugas setelah selesai Tampilkan judul Gunakan Tema Aplikasi Akun Tasks.org Dibutuhkan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e7adccad8..d3764f9b9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -427,10 +427,8 @@ Apri mappa Scegli nuova posizione Nome visualizzato - Le attività rimarranno temporaneamente visibili nella lista dopo il completamento Aggiungi attività secondaria Personalizzato - Le attività spariranno immediatamente dalla lista dopo il completamento Riduci saturazione colori Condividi Seleziona tutto @@ -491,7 +489,6 @@ %d attività secondaria %d attività secondarie - Mostra temporaneamente le attività dopo il completamento Crea «%s» Google Tasks non supporta attività secondarie su più livelli Espandi attività secondarie diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index a8f20c6ba..7388abf5b 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -524,8 +524,6 @@ תתי משימות הצג חוצצים הצג תפריט - המשימות יישארו גלויות ברשימה, באופן זמני, לאחר השלמתן - הצג באופן זמני משימות עם השלמתם הוסף משימת משנה לפי זמן היצירה ההזמנה שלי @@ -556,7 +554,6 @@ מחר היום ברשימה… - המשימות תיעלמנה מיידית מהרשימה עם השלמתן שם תצוגה רשימות פתיחת הרשימה האחרונה שנצפתה diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 300c08b18..dfdf39f21 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -494,9 +494,6 @@ デフォルトの開始日 デフォルトの場所 デフォルトの期限 - タスクが完了しても一時的にリストに表示されます - タスクが完了するとすぐにリストから消えます - 完了したタスクを一時的に表示する サブタスクである サブタスクの有無 サブタスクを折りたたむ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 23022077a..9d2d03f56 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -437,9 +437,6 @@ 구독 금액 정하기 순서 직접 정렬 서버가 반복 할일 처리 - 할일 완료 시 잠깐 표시 - 할일을 완료 처리하는 순간 목록에서 바로 사라지지 않고 잠깐 남아있습니다 - 할일을 완료 처리하는 순간 목록에서 바로 사라집니다 %d 하위할일 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index ca28b706e..190974c4b 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -535,9 +535,6 @@ Pradėti iki: \? Numatytoji vieta Numatytoji pradžios data - Užduotys iš karto išnyks iš sąrašo jas užbaigus - Užduotys laikinai išliks matomos sąraše po užbaigimo - Laikinai rodyti užduotis, po jų pabaigos Pridėti antrinę užduotį Astrid rankinis rūšiavimas Atšaukti diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 5d394e8cc..94fd5fa3e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -441,9 +441,6 @@ Feil: %s Min bestilling Tjeneren håndterer gjentagende gjøremål - Vis gjøremål midlertidig ved fullførelse - Gjøremål vil midlertidig forbli synlige i listen etter fullførelse - Gjøremål vil fjernes umiddelbart fra listen etter fullførelse %d gjøremålssteg %d gjøremålssteg diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9ab7ee4c5..6cc53ff03 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -436,9 +436,6 @@ Mijn volgorde Fout: %s Server plant terugkerende taken in - Laat voltooide taken tijdelijk nog zien - Taken blijven tijdelijk zichtbaar in de lijst na voltooiing - Taken verdwijnen onmiddellijk uit de lijst na voltooiing %d deeltaak %d deeltaken diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b3b79f529..0af21f145 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -451,9 +451,6 @@ Nazwij swoją cenę Ręczne Serwer obsługuje powtarzające się zadania - Tymczasowo pokazuj zadania po zakończeniu - Zadania będą tymczasowo widoczne na liście po zakończeniu - Zadania natychmiast znikną z listy po zakończeniu %d podzadanie %d podzadania diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c043c26f5..7451b4d68 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -527,9 +527,6 @@ %d sub-tarefas Na lista… - Tarefas desaparecerão da listagem imediatamente após serem concluídas - Tarefas continuarão temporariamente visíveis na listagem após serem completas - Temporariamente mostrar tarefas quando completas Est. %s Adicionar subtarefa Por hora de criação diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8adf267ba..32775639e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -548,9 +548,6 @@ %d subtarefa %d subtarefas - Quando terminadas, as tarefas desaparecerão imediatamente da lista - As tarefas terminadas continuarão temporariamente visíveis na lista - Mostrar temporariamente as tarefas terminadas O servidor lida com tarefas recorrentes Minha ordem Dê o seu valor diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a9e1c0d4e..9d724ea29 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -459,9 +459,6 @@ Data de începere implicită Prioritate implicită Eliminați toate evenimentele din calendar pentru aceste sarcini - Sarcinile vor dispărea imediat din listă după finalizare - Sarcinile vor rămâne temporar vizibile în listă după finalizare - Afișați temporar sarcinile la finalizare Începeți evenimentele din calendar la timpul util Încheiați evenimentele din calendar la timpul util Ora evenimentului din calendar diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 371aa3b2a..bae858788 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -452,9 +452,6 @@ ", " Генерация уведомлений Мой порядок - Временно показывать задачи после завершения - Задачи будут временно видны в списке после завершения - Задачи сразу же исчезнут из списка после завершения %d подзадача %d подзадачи diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index e56a572ad..f55dae3c5 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -464,9 +464,6 @@ අවසාන වනුයේ… අවසාන වනුයේ: \? සම්පූර්ණ දිනය පෙන්වන්න - කාර්යයන් අවසන් වූ වහාම ලැයිස්තුවෙන් ඉවත් වේ - කාර්යයන් අවසන් වූ පසු ලැයිස්තුවේ තාවකාලිකව දැකිය හැකිය - කාර්යයන් අවසන් වූ පසු තාවකාලිකව ඒ ගැන පෙන්වන්න කැලැන්ඩරයේ සිදුවීම් නියමිත වේලාවට අවසන් කරන්න දින දර්ශන සිදුවීම් වේලාව කාර්ය ලැයිස්තු විකල්ප diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 225700345..ec00e73cc 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -429,7 +429,6 @@ Zvoliť novú polohu Licencie tretích strán Verzia %s - Dočasne Zobraziť úlohy po dokončení Pridať podúlohu Vlastné poradie E-mail diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b155a7b2f..82c9a1cc8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -489,7 +489,6 @@ Kräver ett konto hos EteSync.com eller en egen värdserver Kräver ett konto hos en CalDAV-tjänsteleverantör eller en egen server. Hitta en tjänsteleverantör genom att besöka tasks.org/caldav Ta bort ändringar - Uppgifterna försvinner omedelbart från listan när de är slutförda Aktivera Astrids manuella sorteringsläge för \"Mina uppgifter\", \"Idag\" och taggar. Detta sorteringsläge kommer att ersättas av \"Min ordning\" i en framtida uppdatering Aktivera Markdown i titel och beskrivning Prissänkning @@ -691,8 +690,6 @@ Standardförfallodag Standard startdatum Visa hela datumet - Aktiviteter visas tillfälligt i listan när de har slutförts - Visa uppgifter tillfälligt när de är färdiga Startdatum Lägg till deluppgift Vid skapelsetidpunkten diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 10bdb7b13..2663e44c5 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -19,9 +19,6 @@ பணி தரவை நீக்கு முன்னுரிமைகள் இயல்புநிலை மதிப்புகளுக்கு மீட்டமைக்கப்படும் விருப்பங்களை மீட்டமைக்கவும் - பணிகள் முடிந்ததும் பட்டியலில் இருந்து உடனடியாக மறைந்துவிடும் - பணிகள் முடிந்தபின் பட்டியலில் தற்காலிகமாகத் தெரியும் - பணிகள் முடிந்ததும் தற்காலிகமாகக் காட்டு சரியான நேரத்தில் நாள்காட்டி நிகழ்வுகளைத் தொடங்கவும் நாள்காட்டி நிகழ்வுகளை உரிய நேரத்தில் முடிக்கவும் நாள்காட்டி நிகழ்வு நேரம் diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 42fcbe8dc..b7c320b83 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -606,9 +606,6 @@ การกําหนดลักษณะจะถูกรีเซ็ตเป็นค่าเริ่มต้น รีเซ็ตการกําหนดลักษณะ แสดงวันที่เต็ม - งานจะหายไปจากรายการทันทีหลังจากเสร็จสิ้น - งานจะยังคงปรากฏอยู่ในรายการชั่วคราวหลังจากเสร็จสิ้น - แสดงงานชั่วคราวเมื่อเสร็จสมบูรณ์ เริ่มกิจกรรมในปฏิทินเมื่อถึงกําหนด สิ้นสุดกิจกรรมในปฏิทินเมื่อถึงกําหนด เวลากิจกรรมในปฏิทิน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 05d8cff1c..f88c78751 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -441,9 +441,6 @@ Fiyat belirle Düzenim Sunucu, yineleyen görevleri halleder - Tamamlandıklarında görevleri geçici olarak göster - Görevler, tamamlandıktan sonra listede geçici olarak görünecek - Görevler, tamamlandıktan sonra listeden hemen kaybolacak %d alt görev %d alt görev diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e3fce0cbf..18a0a607c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -455,9 +455,6 @@ Піктограма Скасувати зміни Підзавдання - Завдання негайно зникатимуть зі списку після їх завершення - Завдання тимчасово залишатимуться видимими у списку після їх завершення - Тимчасово показувати завдання після їх завершення Додати підзавдання Мій порядок Показувана назва diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 2f2d76748..41be286d4 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -97,9 +97,6 @@ ترجیحات کو ڈیفالٹ پر دوبارہ ترتیب دیا جائے گا ترجیحات کو دوبارہ ترتیب دیں پوری تاریخ دکھائیں - کام مکمل ہونے کے بعد فورا. فہرست سے غائب ہوجائیں گے - ٹاسک مکمل ہونے کے بعد فہرست میں عارضی طور پر نظر آئیں گے - تکمیل کے بعد عارضی طور پر ٹاسک دکھائیں مقررہ وقت پر کیلنڈر ایونٹس شروع کریں مقررہ وقت پر کیلنڈر ایونٹس ختم کریں کیلنڈر ایونٹ کا وقت diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d20460cd5..7a4d3a819 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -667,9 +667,6 @@ Các cài đặt sẽ được đặt lại về giá trị mặc định Đặt lại các cài đặt Hiện ngày tháng đầy đủ - Các công việc sẽ biến mất ngay lập tức khỏi danh sách sau khi hoàn thành - Các công việc vẫn sẽ còn tạm thời nhìn thấy được trong danh sách sau khi hoàn thành - Tạm thời hiện các công việc khi hoàn thành Bắt đầu các sự kiện trong lịch khi đến hạn Kết thúc các sự kiện trong lịch khi đến hạn Thời gian sự kiện trong lịch diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4b254b119..86a035689 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -432,9 +432,6 @@ 错误：%s 我的顺序 服务器处理重复任务 - 完成时短暂显示任务 - 任务完成后将暂时展示在列表中 - 任务完成后将立刻从列表中消失 %d 个子任务 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 72af234a6..10df3d336 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -205,9 +205,6 @@ 刪除工作數據 所有工作將永久刪除 我的排序 - 工作完成後短暫顯示工作表 - 工作完成後短暫留在工作表 - 工作完成後立刻從工作表刪除 加入副工作 通話 顯示名稱 diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index b3965ef2c..234f8bee8 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -275,7 +275,6 @@ TEA_ctrl_gtask show_hidden_tasks show_completed_tasks - temporarily_show_completed_tasks reverse_sort manual_sort astrid_sort diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 16337c119..d34a993e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,9 +88,6 @@ File %1$s contained %2$s.\n\n Calendar event time End calendar events at due time Start calendar events at due time - Temporarily show tasks upon completion - Tasks will remain temporarily visible in the list after completion - Tasks will immediately disappear from the list after completion Show full date Reset preferences Preferences will be reset to default values diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml index 3f74b4292..05bc41bfd 100644 --- a/app/src/main/res/xml/preferences_look_and_feel.xml +++ b/app/src/main/res/xml/preferences_look_and_feel.xml @@ -101,14 +101,6 @@ android:summary="@string/linkify_description" android:title="@string/linkify" /> - -