diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index c4c8350d1..fc9e97751 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -172,6 +172,12 @@ 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 488eab547..f1daf9c10 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt @@ -32,10 +32,16 @@ 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?) { @@ -71,32 +77,36 @@ class DateAndTime : InjectingPreferenceFragment(), Preference.OnPreferenceChange } override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { - 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 + 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 + } } } return true @@ -113,6 +123,19 @@ 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) @@ -127,4 +150,15 @@ 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 f5ef8bf5a..790ec3706 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -168,6 +168,7 @@ زر الموقع مهمة جديدة مساعدة + بداية أسبوع التقط صورة سنويًّا شهريًّا @@ -534,6 +535,7 @@ أعده %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 ae5d71afc..ee86494be 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -309,6 +309,8 @@ Изтриване на избраните задачи? Копиране на избраните задачи? Дата и час + Начало на седмицата + По подразбиране от езика Добавяне на профил Потребител Парола diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index a55b1e173..760da1aa3 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -347,6 +347,7 @@ 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 7f3c64910..7fbad725b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -322,6 +322,8 @@ 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 b56da972e..4c7415c23 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -230,6 +230,8 @@ 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 13877be68..ed9eab998 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -299,6 +299,8 @@ 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 b30afe468..804372127 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -197,6 +197,7 @@ Pasvorto Uzanto Aldoni konton + Komenco de semajno Dato kaj tempo Ĉu kopii elektitajn taskojn\? Ĉu forigi elektitajn taskojn\? @@ -554,6 +555,7 @@ 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 004b06565..118d11d6d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -321,6 +321,8 @@ ¿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 be7707366..0e1e562d1 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -203,6 +203,7 @@ Kas kustutame valitud ülesanded? Kas kopeerime valitud ülesanded? Kuupäev ja kellaaeg + Nädala algus Lisa konto Kasutaja Salasõna @@ -460,6 +461,7 @@ 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 41aa426c1..c37ae9636 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -310,6 +310,8 @@ 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 f7056a13a..0ed13e9f6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -286,6 +286,8 @@ 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 c9ee9e9f2..5083cafd4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -307,6 +307,8 @@ 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 ef0b86a4f..014a379e4 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -239,6 +239,7 @@ Sen prioridade data de fin Radio + Usar predefinido do sistema Engadir conta Erro: %s por ano @@ -265,6 +266,7 @@ 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 0dbe9df8a..53749048a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -314,6 +314,8 @@ 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 0986dc7c9..fd6b12610 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -303,6 +303,8 @@ 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 ee276cbb9..faee61d31 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -240,6 +240,8 @@ 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 81e979e07..79680e057 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -318,6 +318,8 @@ 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 89b550401..3c07730db 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -340,6 +340,8 @@ למחוק משימות? להעתיק משימות? תאריך וושעה + תחילת השבוע + השתמש באזור גיאוגרפי ברירת מחדל הוסף חשבון משתמש סיסמא diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a29aa110f..cc7282940 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -305,6 +305,8 @@ 選択したタスクを削除しますか? 選択したタスクをコピーしますか? 日付と時刻 + 週の始まり + ロケールのデフォルトを使用する アカウントを追加 ユーザー パスワード diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 022af3efc..c7588888e 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -302,6 +302,8 @@ 선택한 할일을 삭제할까요? 선택한 할일을 복사할까요? 날짜와 시간 + 한 주의 시작 + 기본으로 설정된 언어 사용하기 계정 추가 사용자 비밀번호 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5026ecd29..90cd940be 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -328,6 +328,8 @@ 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 6500540ee..d721ded33 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -328,6 +328,8 @@ 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 45daf4ca5..eaf241b31 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -298,6 +298,8 @@ 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 1fa2e2c75..e9aa328ed 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -91,6 +91,7 @@ ଗାଢ଼ ଦିନ/ରାତି ତାରିଖ ଓ ସମୟ + ସପ୍ତାହ ଆରମ୍ଭ ଉପଭୋକ୍ତା ପାସ୍‍ୱର୍ଡ଼ URL diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3a1f76afa..46bce31f4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -318,6 +318,8 @@ 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 3e5ae873b..3d57abe38 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -316,6 +316,8 @@ 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 3115027ad..a2222c422 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -287,6 +287,8 @@ 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 328ded5da..e0155bff3 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -134,6 +134,8 @@ 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 16eb7d136..4ad9d6ae5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -320,6 +320,8 @@ Удалить выделенную(-ые) задачу(-и)? Скопировать выделенные задачи? Дата и время + Начало недели + Как в системе Добавить учётную запись Пользователь Пароль diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 45410413f..41393efd3 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -29,6 +29,7 @@ \'මගේ කාර්යයන්\', \'අද\' සහ ටැග් සඳහා Astrid හි අතින් වර්ග කිරීමේ මාදිලිය සක්‍රීය කරන්න. මෙම වර්ග කිරීමේ මාදිලිය අනාගත යාවත්කාලීනයකදී \'මාගේ පිලිවෙල\' මගින් ප්‍රතිස්ථාපනය වනු ඇත දෝෂය: %s + ස්ථාන පෙරනිමිය භාවිතා කරන්න සඟවන්න මාතෘකාවට පහළින් මාතෘකාවෙන් පසු @@ -163,6 +164,7 @@ මුරපදය පරිශීලක ගිණුම එක් කරන්න + සතියේ ආරම්භය දිනය සහ වේලාව තෝරාගත් කාර්යයන් පිටපත් කරන්නද\? තෝරාගත් කාර්යයන් මකාදමන්න ද\? diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 5cc2fbe03..b899a191c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -323,6 +323,8 @@ 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 b0a130f2e..9b3e244c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -308,6 +308,8 @@ 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 7e9414016..704faa6b1 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -275,6 +275,8 @@ கடவுச்சொல் பயனர் கணக்கு சேர்க்க + இருப்பிட இயல்புநிலையைப் பயன்படுத்தவும் + வாரத்தின் ஆரம்பம் தேதி மற்றும் நேரம் தேர்ந்தெடுக்கப்பட்ட பணிகளை நகலெடுக்கவா\? தேர்ந்தெடுக்கப்பட்ட பணிகளை நீக்கவா\? diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a740f6cf8..d131ad122 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -253,6 +253,8 @@ รหัสผ่าน ผู้ใช้ เพิ่มบัญชี + ใช้ค่าเริ่มต้นของสถานที่ + ต้นสัปดาห์ วันที่และเวลา คัดลอกงานที่เลือกหรือไม่\? ลบงานที่เลือก\? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 71be44e03..093715c24 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -309,6 +309,8 @@ 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 9e9585dbc..a1f83be6a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -320,6 +320,8 @@ Видалити вибрані завдання? Копіювати вибрані завдання? Дата й час + Початок тижня + Типово для локалі Додати обліковий запис Користувач Пароль diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index e3455c7c1..41e5fa383 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -362,6 +362,8 @@ پاسورڈ صارف اکاؤنٹ داخل کریں + لوکل ڈیفالٹ استعمال کریں + ہفتے کا آغاز وقت اور تاریخ منتخب ٹاسکس کاپی کریں؟ منتخب ٹاسکس ڈٰیلیٹ کریں؟ diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 67194a376..8dd395656 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -304,6 +304,8 @@ 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 ae2080c0b..1987fa027 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -290,6 +290,8 @@ 删除已选的任务? 复制已选的任务? 日期和时间 + 每周始于 + 设备默认值 添加帐号 用户名 密码 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1bb99038a..d6791b30e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -412,6 +412,8 @@ 密碼 使用者名稱 新增帳號 + 使用當地預設 + 一週之始 日期與時間 複製選擇的工作? 刪除所選工作? diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 2b37df7b3..78e7cdca9 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -101,6 +101,17 @@ 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 161f7505d..616ff8101 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -364,6 +364,7 @@ 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 644e86c66..23e84142e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -415,6 +415,8 @@ 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 4d5137512..39522e703 100644 --- a/app/src/main/res/xml/preferences_date_and_time.xml +++ b/app/src/main/res/xml/preferences_date_and_time.xml @@ -3,6 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:key="@string/preference_screen"> + +