From 2a5544b66fd05142a927cc21d877bb2fefd24bae Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 15 Mar 2025 10:46:07 -0500 Subject: [PATCH] Remove 'Start of week' preference --- .../org/tasks/dialogs/BaseDateTimePicker.kt | 4 - .../java/org/tasks/preferences/Preferences.kt | 6 -- .../preferences/fragments/DateAndTime.kt | 86 ++++++------------- app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-bg-rBG/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-eo/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-et/strings.xml | 2 - app/src/main/res/values-eu/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-gl/strings.xml | 2 - app/src/main/res/values-hr/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-id/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-iw/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-lt/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-or/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-si/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-ta/strings.xml | 2 - app/src/main/res/values-th/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-ur/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/arrays.xml | 11 --- app/src/main/res/values/keys.xml | 1 - app/src/main/res/values/strings.xml | 2 - .../res/xml/preferences_date_and_time.xml | 6 -- 47 files changed, 26 insertions(+), 168 deletions(-) diff --git a/app/src/main/java/org/tasks/dialogs/BaseDateTimePicker.kt b/app/src/main/java/org/tasks/dialogs/BaseDateTimePicker.kt index df87dfbbd..9bb36c1d3 100644 --- a/app/src/main/java/org/tasks/dialogs/BaseDateTimePicker.kt +++ b/app/src/main/java/org/tasks/dialogs/BaseDateTimePicker.kt @@ -134,10 +134,6 @@ abstract class BaseDateTimePicker : BottomSheetDialogFragment() { afternoonButton.text = getTimeString(now.withMillisOfDay(afternoon), is24HourFormat) eveningButton.text = getTimeString(now.withMillisOfDay(evening), is24HourFormat) nightButton.text = getTimeString(now.withMillisOfDay(night), is24HourFormat) - val firstDayOfWeek = preferences.firstDayOfWeek - if (firstDayOfWeek in 1..7) { - calendarView.firstDayOfWeek = firstDayOfWeek - } } protected abstract val calendarView: CalendarView diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 3e7a9134e..dea7f8310 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -170,12 +170,6 @@ class Preferences @JvmOverloads constructor( val defaultCalendar: String? get() = getStringValue(R.string.gcal_p_default) - val firstDayOfWeek: Int - get() { - val firstDayOfWeek = getIntegerFromString(R.string.p_start_of_week, 0) - return if (firstDayOfWeek < 1 || firstDayOfWeek > 7) 0 else firstDayOfWeek - } - val showEditScreenWithoutUnlock: Boolean get() = getBoolean(R.string.p_show_edit_screen_without_unlock, false) diff --git a/app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt b/app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt index f1daf9c10..488eab547 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt @@ -32,16 +32,10 @@ class DateAndTime : InjectingPreferenceFragment(), Preference.OnPreferenceChange override fun getPreferenceXml() = R.xml.preferences_date_and_time override suspend fun setupPreferences(savedInstanceState: Bundle?) { - val startOfWeekPreference: ListPreference = getStartOfWeekPreference() - startOfWeekPreference.entries = getWeekdayEntries() - startOfWeekPreference.onPreferenceChangeListener = this - initializeTimePreference(getMorningPreference(), REQUEST_MORNING) initializeTimePreference(getAfternoonPreference(), REQUEST_AFTERNOON) initializeTimePreference(getEveningPreference(), REQUEST_EVENING) initializeTimePreference(getNightPreference(), REQUEST_NIGHT) - - updateStartOfWeek(preferences.getStringValue(R.string.p_start_of_week)!!) } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -77,36 +71,32 @@ class DateAndTime : InjectingPreferenceFragment(), Preference.OnPreferenceChange } override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { - if (preference == getStartOfWeekPreference()) { - updateStartOfWeek(newValue.toString()) - } else { - val millisOfDay = newValue as Int - if (preference == getMorningPreference()) { - if (millisOfDay >= getAfternoonPreference().millisOfDay) { - mustComeBefore(R.string.date_shortcut_morning, R.string.date_shortcut_afternoon) - return false - } - } else if (preference == getAfternoonPreference()) { - if (millisOfDay <= getMorningPreference().millisOfDay) { - mustComeAfter(R.string.date_shortcut_afternoon, R.string.date_shortcut_morning) - return false - } else if (millisOfDay >= getEveningPreference().millisOfDay) { - mustComeBefore(R.string.date_shortcut_afternoon, R.string.date_shortcut_evening) - return false - } - } else if (preference == getEveningPreference()) { - if (millisOfDay <= getAfternoonPreference().millisOfDay) { - mustComeAfter(R.string.date_shortcut_evening, R.string.date_shortcut_afternoon) - return false - } else if (millisOfDay >= getNightPreference().millisOfDay) { - mustComeBefore(R.string.date_shortcut_evening, R.string.date_shortcut_night) - return false - } - } else if (preference == getNightPreference()) { - if (millisOfDay <= getEveningPreference().millisOfDay) { - mustComeAfter(R.string.date_shortcut_night, R.string.date_shortcut_evening) - return false - } + val millisOfDay = newValue as Int + if (preference == getMorningPreference()) { + if (millisOfDay >= getAfternoonPreference().millisOfDay) { + mustComeBefore(R.string.date_shortcut_morning, R.string.date_shortcut_afternoon) + return false + } + } else if (preference == getAfternoonPreference()) { + if (millisOfDay <= getMorningPreference().millisOfDay) { + mustComeAfter(R.string.date_shortcut_afternoon, R.string.date_shortcut_morning) + return false + } else if (millisOfDay >= getEveningPreference().millisOfDay) { + mustComeBefore(R.string.date_shortcut_afternoon, R.string.date_shortcut_evening) + return false + } + } else if (preference == getEveningPreference()) { + if (millisOfDay <= getAfternoonPreference().millisOfDay) { + mustComeAfter(R.string.date_shortcut_evening, R.string.date_shortcut_afternoon) + return false + } else if (millisOfDay >= getNightPreference().millisOfDay) { + mustComeBefore(R.string.date_shortcut_evening, R.string.date_shortcut_night) + return false + } + } else if (preference == getNightPreference()) { + if (millisOfDay <= getEveningPreference().millisOfDay) { + mustComeAfter(R.string.date_shortcut_night, R.string.date_shortcut_evening) + return false } } return true @@ -123,19 +113,6 @@ class DateAndTime : InjectingPreferenceFragment(), Preference.OnPreferenceChange private fun invalidSetting(errorResId: Int, settingResId: Int, relativeResId: Int) = context?.toast(errorResId, getString(settingResId), getString(relativeResId)) - private fun updateStartOfWeek(value: String) { - val preference = getStartOfWeekPreference() - val index = preference.findIndexOfValue(value) - val summary: String? = getWeekdayEntries()[index] - preference.summary = summary - } - - private fun getStartOfWeekPreference(): ListPreference = - findPreference(R.string.p_start_of_week) as ListPreference - - private fun getWeekdayDisplayName(dayOfWeek: DayOfWeek): String = - dayOfWeek.getDisplayName(TextStyle.FULL, locale) - private fun getMorningPreference(): TimePreference = getTimePreference(R.string.p_date_shortcut_morning) @@ -150,15 +127,4 @@ class DateAndTime : InjectingPreferenceFragment(), Preference.OnPreferenceChange private fun getTimePreference(resId: Int): TimePreference = findPreference(resId) as TimePreference - - private fun getWeekdayEntries(): Array = arrayOf( - getString(R.string.use_locale_default), - getWeekdayDisplayName(DayOfWeek.SUNDAY), - getWeekdayDisplayName(DayOfWeek.MONDAY), - getWeekdayDisplayName(DayOfWeek.TUESDAY), - getWeekdayDisplayName(DayOfWeek.WEDNESDAY), - getWeekdayDisplayName(DayOfWeek.THURSDAY), - getWeekdayDisplayName(DayOfWeek.FRIDAY), - getWeekdayDisplayName(DayOfWeek.SATURDAY) - ) } \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 35aee5577..908618c43 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -168,7 +168,6 @@ زر الموقع مهمة جديدة مساعدة - بداية أسبوع التقط صورة سنويًّا شهريًّا @@ -540,7 +539,6 @@ أعده %1$s عند %2$s أعده %s حزمة الاشعارات - استخدم الإعدادات المحلية الافتراضية أزل المهام المتممة؟ مطلوب دعم الأجهزة أعد تشغيل التطبيق ليأخذ هذا التغيير تأثيره diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index d21003a1d..4f203f498 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -309,8 +309,6 @@ Изтриване на избраните задачи? Копиране на избраните задачи? Дата и час - Начало на седмицата - По подразбиране от езика Добавяне на профил Потребител Парола diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 760da1aa3..a55b1e173 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -347,7 +347,6 @@ Escollir una nova ubicació Es necessiten els permisos de ubicació per trobar la teva ubicació actual Noves tasques a sobre - Inici de la setmana Ajuda Silenci Vibracions diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index cf9aefaa6..4b42e314f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -322,8 +322,6 @@ Smazat vybrané úkoly\? Zkopírovat vybrané úkoly\? Datum a čas - Začátek týdne - Použít výchozí nastavení pro váš jazyk Přidat účet Uživatel Heslo diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3d74783e3..104ecfe7a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -230,8 +230,6 @@ Kodeord Bruger Tilføj konto - Brug systemindstilling - Ugen begynder Dato og tidspunkt Slet de markerede opgaver\? Kopiér de markerede opgaver\? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index db2df9519..e32c5eb53 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -299,8 +299,6 @@ Ausgewählte Aufgaben löschen? Ausgewählte Aufgaben kopieren? Datum und Uhrzeit - Beginn der Woche - Aus Systemeinstellungen Konto hinzufügen Benutzer Passwort diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 373ee5dd9..d4d0d4a77 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -197,7 +197,6 @@ Pasvorto Uzanto Aldoni konton - Komenco de semajno Dato kaj tempo Ĉu kopii elektitajn taskojn\? Ĉu forigi elektitajn taskojn\? @@ -558,7 +557,6 @@ Ripetiĝas %1$s, finiĝos %2$s Komprenite! Ignori avertojn pri savkopioj se vi ne bezonas savkopiojn aŭ jam havas propran savkopian solvon - Uzi defaŭlton de lokaĵaro Eraro: %s Ĉiu de la datumo de ĉi tiu konto foriĝos el via aparato Por trovi vian aktualan lokon bezonas permesoj pri loko diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 79f493902..eb231f657 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -321,8 +321,6 @@ ¿Borrar tareas seleccionadas? ¿Copiar tareas seleccionadas? Fecha y hora - Inicio de semana - Usar configuración regional Añadir cuenta Usuario Contraseña diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 901771190..986a117f0 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -203,7 +203,6 @@ Kas kustutame valitud ülesanded? Kas kopeerime valitud ülesanded? Kuupäev ja kellaaeg - Nädala algus Lisa konto Kasutaja Salasõna @@ -464,7 +463,6 @@ Rakenduse salasõna Jälgi @tasks_org Loomise kuupäev - Kasuta vaikelokaati Igal teisel nädalal Järgmine R Reavahe diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 89b8f0ad6..89f4ec764 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -310,8 +310,6 @@ Ezabatu hautatutako zereginak\? Kopiatu hautatutako zereginak\? Data eta ordua - Astearen hasiera - Erabili hizkuntzak lehenetsitakoa Gehitu kontua Erabiltzailea Pasahitza diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index da8ac4b1f..8032297f6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -286,8 +286,6 @@ Poistetaanko valitut tehtävät? Kopioi valitut tehtävät? Päivä ja aika - Viikon alku - Käytä paikallista oletusta Akun optimointi voi viivästyttää ilmoituksia Niputa ilmoitukset Merkit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e16938249..08a631860 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -307,8 +307,6 @@ Supprimer les tâches sélectionnées \? Copier les tâches sélectionnées \? Date et heure - Début de la semaine - Utiliser les paramètres de langue par défaut Ajouter un compte Utilisateur Mot de passe diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 103dfa86a..dd376fac5 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -239,7 +239,6 @@ Sen prioridade data de fin Radio - Usar predefinido do sistema Engadir conta Erro: %s por ano @@ -266,7 +265,6 @@ Opacidade da cabeceira Despois do título Por debaixo do título - Comezo da semana Os optimizadores da batería poden retrasar as notificacións Contadores Lista diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1249600c5..4db434458 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -319,8 +319,6 @@ Lozinka Korisnik Dodaj račun - Koristi standard jezičnog područja - Početak tjedna Kopirati odabrane zadatke\? Izbrisati odabrane zadatke\? %s kopirano diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 96d0e576b..10a41550e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -303,8 +303,6 @@ Kiválasztott feladatok törlése? Kiválasztott feladatok másolása? Dátum és időpont - Hét kezdőnapja - Beállított nyelv alapján Felhasználói fiók hozzáadása Felhasználónév Jelszó diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index ccab01114..62970b895 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -240,8 +240,6 @@ Hapus tugas yang dipilih\? Salin tugas yang dipilih\? Tanggal dan waktu - Awal minggu - Gunakan bahasa bawaan Tambah akun Pengguna Kata sandi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 549cf4f9b..e66efeb36 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -318,8 +318,6 @@ Eliminare le attività selezionate\? Copio le attività selezionate\? Data e ora - Inizio della settimana - Usa il valore predefinito della lingua corrente Aggiungi account Utente L\'ottimizzazione della batteria può ritardare le notifiche diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index dad185e6e..7acd6b1d7 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -340,8 +340,6 @@ למחוק משימות? להעתיק משימות? תאריך וושעה - תחילת השבוע - השתמש באזור גיאוגרפי ברירת מחדל הוסף חשבון משתמש סיסמא diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1923fe14c..d341ca448 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -305,8 +305,6 @@ 選択したタスクを削除しますか? 選択したタスクをコピーしますか? 日付と時刻 - 週の始まり - ロケールのデフォルトを使用する アカウントを追加 ユーザー パスワード diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e4c7fac6b..6236d37ec 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -302,8 +302,6 @@ 선택한 할일을 삭제할까요? 선택한 할일을 복사할까요? 날짜와 시간 - 한 주의 시작 - 기본으로 설정된 언어 사용하기 계정 추가 사용자 비밀번호 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 91dfbba20..5961de45a 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -328,8 +328,6 @@ Ištrinti pažymėtas užduotis? Nukopijuoti pažymėtas užduotis? Data ir laikas - Savaitės pradžia - Naudoti numatytą vietovę Pridėti paskyrą Vartotojas Slaptažodis diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 8e02cf71c..277444983 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -328,8 +328,6 @@ Slett valgte gjøremål\? Kopier valgte gjøremål\? Dato og tid - Ukestart - Bruk forvalgt lokalitet Legg til konto Bruker Passord diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7cf06d76d..94b3f2059 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -298,8 +298,6 @@ Geselecteerde taken wissen\? Geselecteerde taken kopiëren\? Datum en tijd - Begin van de week - Gebruik locale standaard Account toevoegen Gebruiker Wachtwoord diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml index 1c3b8afc2..c9eb4baeb 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -91,7 +91,6 @@ ଗାଢ଼ ଦିନ/ରାତି ତାରିଖ ଓ ସମୟ - ସପ୍ତାହ ଆରମ୍ଭ ଉପଭୋକ୍ତା ପାସ୍‍ୱର୍ଡ଼ URL diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6486e0f33..8f3e29ccb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -318,8 +318,6 @@ Usunąć zaznaczone zadania? Skopiować zaznaczone zadania? Data i czas - Początek tygodnia - Użyj domyślnych Dodaj konto Użytkownik Hasło diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 1b9b72a4d..9b53c0515 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -316,8 +316,6 @@ Excluir tarefas selecionadas? Copiar tarefas selecionadas? Hora e data - Início da semana - Usar o idioma padrão Adicionar conta Usuário Senha diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8899f4ff8..6c9553454 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -287,8 +287,6 @@ Eliminar as tarefas selecionadas\? Copiar as tarefas selecionadas? Data e hora - Início da semana - Usar o idioma predefinido As otimizações da bateria podem atrasar as notificações Agrupar notificações Lista diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 8bf2a5e3d..1ad5bb9d0 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -139,8 +139,6 @@ Parolă Utilizator Adaugă un cont - Utilizează valoarea implicită a configurației locale - Începutul săptămânii Data și ora Copiezi sarcinile selectate\? Ștergi sarcinile selectate\? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e0964e182..2f6c4e83d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -320,8 +320,6 @@ Удалить выделенную(-ые) задачу(-и)? Скопировать выделенные задачи? Дата и время - Начало недели - Как в системе Добавить учётную запись Пользователь Пароль diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 01881860e..b6664ecee 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -30,7 +30,6 @@ \'මගේ කාර්යයන්\', \'අද\' සහ ටැග් සඳහා Astrid හි අතින් වර්ග කිරීමේ මාදිලිය සක්‍රීය කරන්න. මෙම වර්ග කිරීමේ මාදිලිය අනාගත යාවත්කාලීනයකදී \'මාගේ පිලිවෙල\' මගින් ප්‍රතිස්ථාපනය වනු ඇත දෝෂය: %s - ස්ථාන පෙරනිමිය භාවිතා කරන්න සඟවන්න මාතෘකාවට පහළින් මාතෘකාවෙන් පසු @@ -168,7 +167,6 @@ මුරපදය පරිශීලක ගිණුම එක් කරන්න - සතියේ ආරම්භය දිනය සහ වේලාව තෝරාගත් කාර්යයන් පිටපත් කරන්නද\? තෝරාගත් කාර්යයන් මකාදමන්න ද\? diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 00c62e764..798894efc 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -323,8 +323,6 @@ Vymazať vybrané úlohy? Kopírovať vybrané úlohy? Dátum a čas - Začiatok týždňa - Použi miestne predvolené nastavenia Pridať účet Užívateľ Heslo diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4ede4e93e..793e37a2d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -308,8 +308,6 @@ Ta bort valda uppgifter\? Kopiera valda uppgifter\? Datum och tid - Början på veckan - Använd lokala inställningar Lägg till konto Användare Lösenord diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 704faa6b1..7e9414016 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -275,8 +275,6 @@ கடவுச்சொல் பயனர் கணக்கு சேர்க்க - இருப்பிட இயல்புநிலையைப் பயன்படுத்தவும் - வாரத்தின் ஆரம்பம் தேதி மற்றும் நேரம் தேர்ந்தெடுக்கப்பட்ட பணிகளை நகலெடுக்கவா\? தேர்ந்தெடுக்கப்பட்ட பணிகளை நீக்கவா\? diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 287b3f97a..36063d748 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -258,8 +258,6 @@ รหัสผ่าน ผู้ใช้ เพิ่มบัญชี - ใช้ค่าเริ่มต้นของสถานที่ - ต้นสัปดาห์ วันที่และเวลา คัดลอกงานที่เลือกหรือไม่\? ลบงานที่เลือก\? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f73ef5e5d..66f734c2c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -309,8 +309,6 @@ Seçili görevleri sil? Seçili görevleri kopyala? Tarih ve zaman - Hafta başlangıcı - Yerel öntanımlısını kullan Hesap ekle Kullanıcı Parola diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 084918926..8437e50f0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -320,8 +320,6 @@ Видалити вибрані завдання? Копіювати вибрані завдання? Дата й час - Початок тижня - Типово для локалі Додати обліковий запис Користувач Пароль diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 41e5fa383..e3455c7c1 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -362,8 +362,6 @@ پاسورڈ صارف اکاؤنٹ داخل کریں - لوکل ڈیفالٹ استعمال کریں - ہفتے کا آغاز وقت اور تاریخ منتخب ٹاسکس کاپی کریں؟ منتخب ٹاسکس ڈٰیلیٹ کریں؟ diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c617bd4f9..ce3acb93c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -309,8 +309,6 @@ Mật khẩu Người dùng Thêm tài khoản - Sử dụng mặc định ngôn ngữ - Đầu tuần Ngày và thời gian Sao chép các công việc đã chọn\? Xoá các công việc đã chọn\? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8a460e8ce..d480ec48e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -290,8 +290,6 @@ 删除已选的任务? 复制已选的任务? 日期和时间 - 每周始于 - 设备默认值 添加帐号 用户名 密码 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 310434fb7..ca696745d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -412,8 +412,6 @@ 密碼 使用者名稱 新增帳號 - 使用當地預設 - 一週之始 日期與時間 複製選擇的工作? 刪除所選工作? diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index bdf1761a3..5ee37b74b 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -101,17 +101,6 @@ 1 - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - @string/no_reminders @string/default_location_reminder_on_arrival diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index f91718259..3210fe186 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -364,7 +364,6 @@ default_recurrence_from Debug - start_of_week bundle_notifications strict_mode_vm strict_mode_thread diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a2324d34..843dbdba8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -415,8 +415,6 @@ File %1$s contained %2$s.\n\n Delete selected tasks? Copy selected tasks? Date and time - Start of week - Use locale default Add account User Password diff --git a/app/src/main/res/xml/preferences_date_and_time.xml b/app/src/main/res/xml/preferences_date_and_time.xml index 1e31c80fa..c089ee8d2 100644 --- a/app/src/main/res/xml/preferences_date_and_time.xml +++ b/app/src/main/res/xml/preferences_date_and_time.xml @@ -3,12 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:key="@string/preference_screen"> - -