diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 3f561e98c..ab8560915 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -508,7 +508,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private fun addHolidays() { val items = getHolidayRadioItems() RadioGroupDialog(this, items) { selectedHoliday -> - SetRemindersDialog(this) { + SetRemindersDialog(this, OTHER_EVENT) { val reminders = it toast(R.string.importing) ensureBackgroundThread { @@ -534,7 +534,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private fun tryAddBirthdays() { handlePermission(PERMISSION_READ_CONTACTS) { if (it) { - SetRemindersDialog(this) { + SetRemindersDialog(this, BIRTHDAY_EVENT) { val reminders = it val privateCursor = getMyContactsCursor(false, false)?.loadInBackground() @@ -564,7 +564,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private fun tryAddAnniversaries() { handlePermission(PERMISSION_READ_CONTACTS) { if (it) { - SetRemindersDialog(this) { + SetRemindersDialog(this, ANNIVERSARY_EVENT) { val reminders = it val privateCursor = getMyContactsCursor(false, false)?.loadInBackground() @@ -592,18 +592,17 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun addBirthdaysAnniversariesAtStart() { - if (!hasPermission(PERMISSION_READ_CONTACTS)) { + if ((!config.addBirthdaysAutomatically && !config.addAnniversariesAutomatically) || !hasPermission(PERMISSION_READ_CONTACTS)) { return } - val reminders = arrayListOf(REMINDER_OFF, REMINDER_OFF, REMINDER_OFF) val privateCursor = getMyContactsCursor(false, false)?.loadInBackground() ensureBackgroundThread { val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) if (config.addBirthdaysAutomatically) { - addPrivateEvents(true, privateContacts, reminders) { eventsFound, eventsAdded -> - addContactEvents(true, reminders, eventsFound, eventsAdded) { + addPrivateEvents(true, privateContacts, config.birthdayReminders) { eventsFound, eventsAdded -> + addContactEvents(true, config.birthdayReminders, eventsFound, eventsAdded) { if (it > 0) { toast(R.string.birthdays_added) updateViewPager() @@ -613,8 +612,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } } if (config.addAnniversariesAutomatically) { - addPrivateEvents(false, privateContacts, reminders) { eventsFound, eventsAdded -> - addContactEvents(false, reminders, eventsFound, eventsAdded) { + addPrivateEvents(false, privateContacts, config.anniversaryReminders) { eventsFound, eventsAdded -> + addContactEvents(false, config.anniversaryReminders, eventsFound, eventsAdded) { if (it > 0) { toast(R.string.anniversaries_added) updateViewPager() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt index c9523e1c2..b3f3c8747 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt @@ -81,8 +81,6 @@ class SettingsActivity : SimpleActivity() { setupViewToOpenFromListWidget() setupDimEvents() setupAllowChangingTimeZones() - setupAddBirthdaysAutomatically() - setupAddAnniversariesAutomatically() updateTextColors(settings_holder) checkPrimaryColor() setupSectionColors() @@ -623,34 +621,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupAddBirthdaysAutomatically() { - settings_add_birthdays_automatically.isChecked = config.addBirthdaysAutomatically - settings_add_birthdays_automatically_holder.setOnClickListener { - handlePermission(PERMISSION_READ_CONTACTS) { - if (it) { - settings_add_birthdays_automatically.toggle() - config.addBirthdaysAutomatically = settings_add_birthdays_automatically.isChecked - } else { - toast(R.string.no_contacts_permission) - } - } - } - } - - private fun setupAddAnniversariesAutomatically() { - settings_add_anniversaries_automatically.isChecked = config.addAnniversariesAutomatically - settings_add_anniversaries_automatically_holder.setOnClickListener { - handlePermission(PERMISSION_READ_CONTACTS) { - if (it) { - settings_add_anniversaries_automatically.toggle() - config.addAnniversariesAutomatically = settings_add_anniversaries_automatically.isChecked - } else { - toast(R.string.no_contacts_permission) - } - } - } - } - private fun setupDefaultStartTime() { updateDefaultStartTimeText() settings_default_start_time_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt index 71ed89f10..b28c13ae8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt @@ -1,17 +1,22 @@ package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity +import android.view.View import androidx.appcompat.app.AlertDialog import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.ANNIVERSARY_EVENT +import com.simplemobiletools.calendar.pro.helpers.BIRTHDAY_EVENT +import com.simplemobiletools.calendar.pro.helpers.OTHER_EVENT import com.simplemobiletools.calendar.pro.helpers.REMINDER_OFF import com.simplemobiletools.commons.extensions.* import kotlinx.android.synthetic.main.dialog_set_reminders.view.* -class SetRemindersDialog(val activity: Activity, val callback: (reminders: ArrayList) -> Unit) { +class SetRemindersDialog(val activity: Activity, val eventType: Int, val callback: (reminders: ArrayList) -> Unit) { private var mReminder1Minutes = REMINDER_OFF private var mReminder2Minutes = REMINDER_OFF private var mReminder3Minutes = REMINDER_OFF + private var isAutomatic = false init { val view = activity.layoutInflater.inflate(R.layout.dialog_set_reminders, null).apply { @@ -46,6 +51,22 @@ class SetRemindersDialog(val activity: Activity, val callback: (reminders: Array set_reminders_3.text = activity.getFormattedMinutes(mReminder3Minutes) } } + + add_event_automatically_checkbox.apply { + visibility = if (eventType == OTHER_EVENT) View.GONE else View.VISIBLE + text = when (eventType) { + BIRTHDAY_EVENT -> activity.getString(R.string.add_birthdays_automatically) + ANNIVERSARY_EVENT -> activity.getString(R.string.add_anniversaries_automatically) + else -> "" + } + isChecked = when (eventType) { + BIRTHDAY_EVENT -> activity.config.addBirthdaysAutomatically + ANNIVERSARY_EVENT -> activity.config.addAnniversariesAutomatically + else -> false + } + isAutomatic = isChecked + setOnCheckedChangeListener { _, isChecked -> isAutomatic = isChecked} + } } AlertDialog.Builder(activity) @@ -63,6 +84,14 @@ class SetRemindersDialog(val activity: Activity, val callback: (reminders: Array tempReminders.getOrNull(1) ?: REMINDER_OFF, tempReminders.getOrNull(2) ?: REMINDER_OFF ) + if (eventType == BIRTHDAY_EVENT) { + activity.config.addBirthdaysAutomatically = isAutomatic + activity.config.birthdayReminders = reminders + } + if (eventType == ANNIVERSARY_EVENT) { + activity.config.addAnniversariesAutomatically = isAutomatic + activity.config.anniversaryReminders = reminders + } callback(reminders) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt index 7a84abbc8..3c306110f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt @@ -201,6 +201,14 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(ADD_ANNIVERSARIES_AUTOMATICALLY, false) set(addAnniversariesAutomatically) = prefs.edit().putBoolean(ADD_ANNIVERSARIES_AUTOMATICALLY, addAnniversariesAutomatically).apply() + var birthdayReminders: ArrayList + get() = prefs.getString(BIRTHDAY_REMINDERS, REMINDER_DEFAULT_VALUE)!!.split(",").map { it.toInt() }.toMutableList() as ArrayList + set(birthdayReminders) = prefs.edit().putString(BIRTHDAY_REMINDERS, birthdayReminders.joinToString(",")).apply() + + var anniversaryReminders: ArrayList + get() = prefs.getString(ANNIVERSARY_REMINDERS, REMINDER_DEFAULT_VALUE)!!.split(",").map { it.toInt() }.toMutableList() as ArrayList + set(anniversaryReminders) = prefs.edit().putString(ANNIVERSARY_REMINDERS, anniversaryReminders.joinToString(",")).apply() + var lastExportPath: String get() = prefs.getString(LAST_EXPORT_PATH, "")!! set(lastExportPath) = prefs.edit().putString(LAST_EXPORT_PATH, lastExportPath).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt index ff8714549..6aafa0cb0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt @@ -29,6 +29,11 @@ const val LAST_VIEW = 6 const val MONTHLY_DAILY_VIEW = 7 const val REMINDER_OFF = -1 +const val REMINDER_DEFAULT_VALUE = "${REMINDER_OFF},${REMINDER_OFF},${REMINDER_OFF}" + +const val OTHER_EVENT = 0 +const val BIRTHDAY_EVENT = 1 +const val ANNIVERSARY_EVENT = 2 const val ITEM_EVENT = 0 const val ITEM_EVENT_SIMPLE = 1 @@ -82,6 +87,8 @@ const val DEFAULT_EVENT_TYPE_ID = "default_event_type_id" const val ALLOW_CHANGING_TIME_ZONES = "allow_changing_time_zones" const val ADD_BIRTHDAYS_AUTOMATICALLY = "add_birthdays_automatically" const val ADD_ANNIVERSARIES_AUTOMATICALLY = "add_anniversaries_automatically" +const val BIRTHDAY_REMINDERS = "birthday_reminders" +const val ANNIVERSARY_REMINDERS = "anniversary_reminders" const val LAST_EXPORT_PATH = "last_export_path" const val EXPORT_PAST_EVENTS = "export_past_events" const val WEEKLY_VIEW_ITEM_HEIGHT_MULTIPLIER = "weekly_view_item_height_multiplier" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 4cdcd9e1b..898c4a696 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1027,48 +1027,6 @@ - - - - - - - - - - - - + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 270f421b8..36ef9e5d7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -92,6 +92,7 @@ لم يتم إيجاد تواريخ ميلاد لم يتم العثور على تواريخ ميلاد جديدة تمت إضافة تواريخ الميلاد بنجاح + Add new birthdays automatically المناسبات @@ -99,6 +100,7 @@ لم يتم العثور على مناسبات سنوية لم يتم العثور على مناسبات سنوية تمت إضافة المناسبات + Add new anniversaries automatically تذكير @@ -202,8 +204,6 @@ ظلل نهايات الأسبوع في بعض العروض Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index f6bd4ea60..f7b68c814 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -92,6 +92,7 @@ Heç bir ad günü tapılmadı No new birthdays have been found Ad günləri uğurla əlavə edildi + Add new birthdays automatically İl dönümləri @@ -99,6 +100,7 @@ Heç bir il dönümü tapılmadı No new anniversaries have been found İl dönümləri uğurla əlavə edildi + Add new anniversaries automatically Xatırladıcı @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 2afb30c23..863b861b2 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -96,6 +96,7 @@ কোন জন্মদিন পাওয়া যায় নি কোন নতুন জন্মদিন পাওয়া যায় নি জন্মদিন সফলভাবে যোগ হয়েছে + Add new birthdays automatically বার্ষিকী @@ -103,6 +104,7 @@ কোন বার্ষিকী পাওয়া যায় নি কোন নতুন বার্ষিকী পাওয়া যায় নি বার্ষিকী সফলভাবে যোগ হয়েছে + Add new anniversaries automatically রিমাইন্ডার @@ -206,8 +208,6 @@ কিছু ভিউতে সাপ্তাহিক ছুটি হাইলাইট করুন ইভেন্টের টাইম জোন পরিবর্তন করার অনুমতি দিন Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index a7506898f..692064ec4 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -92,6 +92,7 @@ N\'eus ket kavet deiz-ha-bloaz bet No new birthdays have been found Ouzhpennet an deizioù-ha-bloaz gant berzh + Add new birthdays automatically Anniversaries @@ -99,6 +100,7 @@ No anniversaries have been found No new anniversaries have been found Anniversaries added successfully + Add new anniversaries automatically Adc\'halv @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 03b4376c9..711bbda01 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -92,6 +92,7 @@ Nenalezeny žádné narozeniny Nenalezeny žádné nové narozeniny Narozeniny byly úspěšně přidány + Add new birthdays automatically Výročí @@ -99,6 +100,7 @@ Nenalezeno žádné výročí Nenalezena žádná nová výročí Výročí byla úspěšně přidána + Add new anniversaries automatically Připomínka @@ -202,8 +204,6 @@ Zvýraznit víkendy na některých pohledech Povolit změny časových pásem událostí Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 57b830376..7a5630b47 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -92,6 +92,7 @@ Der blev ikke fundet nogen fødselsdage Der blev ikke fundet nogen nye fødselsdage Fødselsdage tilføjet + Add new birthdays automatically Mærkedage @@ -99,6 +100,7 @@ Der blev ikke fundet nogen mærkedage Der blev ikke fundet nogen nye mærkedage Mærkedage tilføjet + Add new anniversaries automatically Påmindelse @@ -202,8 +204,6 @@ Fremhæv weekender i visse visninger Tillad ændring af en begivenheds tidszone Håndter begivenhedstyper med hurtigt filter - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4812685e7..a30bc230a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -92,6 +92,7 @@ Keine Geburtstage gefunden Keine neuen Geburtstage gefunden Geburtstage erfolgreich hinzugefügt + Add new birthdays automatically Jahrestage @@ -99,6 +100,7 @@ Es wurden keine Jahrestage gefunden Keine neuen Jahrestage gefunden Jahrestage erfolgreich hinzugefügt + Add new anniversaries automatically Erinnerung @@ -202,8 +204,6 @@ Wochenenden in einigen Ansichten hervorheben Zeitzone kann geändert werden Termintypen zur schnellen Filterung verwalten - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 391f2da97..ce54ba581 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -92,6 +92,7 @@ Δεν βρέθηκαν γενέθλια Δεν έχουν βρεθεί νέα γενέθλια Τα γενέθλια προστέθηκαν με επιτυχία + Add new birthdays automatically Επέτειοι @@ -99,6 +100,7 @@ Δεν έχουν βρεθεί επέτειοι Δεν έχουν βρεθεί νέοι επέτειοι Οι επέτειοι προστέθηκαν με επιτυχία + Add new anniversaries automatically Υπενθύμιση @@ -202,8 +204,6 @@ Επισήμανση Σαββατοκύριακων σε ορισμένες προβολές Να επιτρέπεται η αλλαγή ζωνών ώρας συμβάντος Διαχείριση γρήγορου φίλτρου τύπων συμβάντων - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 64a514cb3..ec5dfbf8e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -92,6 +92,7 @@ No se han encontrado cumpleaños No se han encontrado nuevos cumpleaños Los cumpleaños se han añadido correctamente + Add new birthdays automatically Aniversarios @@ -99,6 +100,7 @@ No se han encontrado aniversarios No se han encontrado nuevos aniversarios Los aniversarios se han añadido correctamente + Add new anniversaries automatically Recordatorio @@ -202,8 +204,6 @@ Destacar los fines de semana en algunas vistas Permitir cambiar zona horaria del evento Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 9ae16cb42..bb210f1d5 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -92,6 +92,7 @@ Urtebetetzerik ez da aurkitu Urtebetetze berririk ez da aurkitu Urtebetetzeak ondo gehitu dira + Add new birthdays automatically Urteurrenak @@ -99,6 +100,7 @@ Urteurrenik ez da aurkitu Urteurren berririk ez da aurkitu Urteurrenak ondo gehitu dira + Add new anniversaries automatically Abisua @@ -202,8 +204,6 @@ Nabarmendu asteburuak ikuspegi batzuetan Baimendu gertaeren ordu-zonak aldatzea Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index bf74b4dbe..5b6411116 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -92,6 +92,7 @@ Syntymäpäiviä ei löytynyt Uusia syntymäpäiviä ei löytynyt Syntymäpäivät lisättiin onnistunesti + Add new birthdays automatically Vuosipäivät @@ -99,6 +100,7 @@ Vuosipäiviä ei löytynyt Uusia vuosipäiviä ei löytynyt Vuosipäivät lisättiin onnistuneesti + Add new anniversaries automatically Muistutus @@ -202,8 +204,6 @@ Korosta viikonloppuja joistakin näkymistä Salli tapahtumien aikavyöhykkeiden muuttaminen Hallitse pikasuodatuksen tapahtumatyyppejä - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index deb46b5c7..d1d7e803a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -93,6 +93,7 @@ Aucun anniversaire n\’a été trouvé Aucun nouvel anniversaire n’a été trouvé Anniversaires ajoutés avec succès + Add new birthdays automatically Dates mémo @@ -100,6 +101,7 @@ Aucune date mémo n\’a été trouvée Aucun nouvelle date mémo n’a été trouvée Dates mémo ajoutées avec succès + Add new anniversaries automatically Rappel @@ -203,8 +205,6 @@ Mettre les week-ends en surbrillance Autoriser la modification des fuseaux horaires des événements Gérer les filtres selon le type d\'événement - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 7b3f5302e..f74b6b64e 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -92,6 +92,7 @@ Non se atoparon aniversarios Non se atoparon novos aniversarios Engadíronse correctamente os aniversarios + Add new birthdays automatically Celebracións @@ -99,6 +100,7 @@ Non se atoparon celebracións Non se atoparon novas celebracións Engadíronse correctamente as celebracións + Add new anniversaries automatically Recordatorio @@ -202,8 +204,6 @@ Resaltar fins de semana nalgunhas vistas Permitir cambiar as zonas horarias do evento Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 48d12ddde..ad3aeb220 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -92,6 +92,7 @@ לא נמצאו ימי הולדת לא נמצאו ימי הולדת חדשים ימי הולדת הוספו בהצלחה + Add new birthdays automatically ימי שנה @@ -99,6 +100,7 @@ לא נמצאו ימי שנה לא נמצאו ימי שנה חדשים ימי שנה הוספו בהצלחה + Add new anniversaries automatically תזכורת @@ -202,8 +204,6 @@ הדגש סופי שבוע בחלק מהתצוגות Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 540b5adea..ca6d9f9cc 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -92,6 +92,7 @@ No birthdays have been found No new birthdays have been found Birthdays added successfully + Add new birthdays automatically Anniversaries @@ -99,6 +100,7 @@ No anniversaries have been found No new anniversaries have been found Anniversaries added successfully + Add new anniversaries automatically रिमाइंडर @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1ff18a808..d66741b23 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -92,6 +92,7 @@ Nisu pronađeni rođendani No new birthdays have been found Rođendani su uspješno dodani + Add new birthdays automatically Obljetnice @@ -99,6 +100,7 @@ Nisu pronađene obljetnice No new anniversaries have been found Obljetnice uspješno dodane + Add new anniversaries automatically Podsjetnik @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 69684ef0a..7cc84ae09 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -92,6 +92,7 @@ No birthdays have been found No new birthdays have been found Birthdays added successfully + Add new birthdays automatically Anniversaries @@ -99,6 +100,7 @@ No anniversaries have been found No new anniversaries have been found Anniversaries added successfully + Add new anniversaries automatically Emlékeztető @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 8815bc75d..27ab94576 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -92,6 +92,7 @@ Tidak ada ulang tahun yang ditemukan Tidak ada ulang tahun baru yang ditemukan Ulang tahun berhasil ditambahkan + Add new birthdays automatically Hari Jadi @@ -99,6 +100,7 @@ Tidak ada hari jadi yang ditemukan Tidak ada hari jadi baru yang ditemukan Hari jadi berhasil ditambahkan + Add new anniversaries automatically Pengingat @@ -202,8 +204,6 @@ Sorot akhir pekan pada beberapa tampilan Izinkan mengubah zona waktu acara Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8815bc75d..27ab94576 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -92,6 +92,7 @@ Tidak ada ulang tahun yang ditemukan Tidak ada ulang tahun baru yang ditemukan Ulang tahun berhasil ditambahkan + Add new birthdays automatically Hari Jadi @@ -99,6 +100,7 @@ Tidak ada hari jadi yang ditemukan Tidak ada hari jadi baru yang ditemukan Hari jadi berhasil ditambahkan + Add new anniversaries automatically Pengingat @@ -202,8 +204,6 @@ Sorot akhir pekan pada beberapa tampilan Izinkan mengubah zona waktu acara Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index afd37c559..95251cefb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -92,6 +92,7 @@ Nessun compleanno trovato Nessun nuovo compleanno trovato Compleanni aggiunti con successo + Add new birthdays automatically Anniversari @@ -99,6 +100,7 @@ Nessun anniversario trovato Nessun nuovo anniversario trovato Anniversari aggiunti con successo + Add new anniversaries automatically Promemoria @@ -202,8 +204,6 @@ Evidenzia il fine-settimana in alcune viste Abilita il cambio del fuso orario negli eventi Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index d082b45b1..6bd0bb07f 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -92,6 +92,7 @@ לא נמצאו ימי הולדת לא נמצאו ימי הולדת חדשים ימי הולדת הוספו בהצלחה + Add new birthdays automatically ימי שנה @@ -99,6 +100,7 @@ לא נמצאו ימי שנה לא נמצאו ימי שנה חדשים ימי שנה הוספו בהצלחה + Add new anniversaries automatically תזכורת @@ -202,8 +204,6 @@ הדגש סופי שבוע בחלק מהתצוגות Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 33e3cc5d2..4eb5c732a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -92,6 +92,7 @@ 誕生日は見つかりませんでした 新しい誕生日は見つかりませんでした 誕生日が正常に追加されました + Add new birthdays automatically 記念日 @@ -99,6 +100,7 @@ 記念日は見つかりませんでした 新しい記念日は見つかりませんでした 記念日が正常に追加されました + Add new anniversaries automatically リマインダー @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7af671a90..177243bbe 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -92,6 +92,7 @@ 조회된 생일이 없음 조회된 새로운 생일이 없음 생일 추가 완료 + Add new birthdays automatically 기념일 @@ -99,6 +100,7 @@ 조회된 기념일 없음 조회된 새로운 기념일 없음 기념일 추가 완료 + Add new anniversaries automatically 알림 @@ -202,8 +204,6 @@ 화면에서 주말 표시 이벤트 시간대 변경 허용 Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 4f3542954..8553891b7 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -92,6 +92,7 @@ Nerasta gimtadienių No new birthdays have been found Gimtadieniai įtraukti sėkmingai + Add new birthdays automatically Sukaktys @@ -99,6 +100,7 @@ Sukakčių nerasta No new anniversaries have been found Sukaktys įtrauktos sėkmingai + Add new anniversaries automatically Priminimas @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index e695bbcff..dc40c1a6b 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -92,6 +92,7 @@ Dzimšanas dienas nav atrastas Jaunas dzimšanas dienas nav atrastas Dzimšanas dienas veiksmīgi pievienotas + Add new birthdays automatically Jubilejas/gadadienas @@ -99,6 +100,7 @@ Jubilejas nav atrastas Jaunas jubilejas nav atrastas Jubilejas veiksmīgi pievienotas + Add new anniversaries automatically Atgādinājums @@ -202,8 +204,6 @@ Iezīmēt/izcelt nedēļas nogales dažos skatos/režīmos Atļaut mainīt notikuma laika joslu Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 24dfbdcd5..a0a5ece41 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -92,6 +92,7 @@ Ingen bursdager er funnet Ingen nye bursdager er funnet Bursdager vellykket lagt til + Add new birthdays automatically Jubileer @@ -99,6 +100,7 @@ Ingen jubileer er funnet Ingen nye jubileer er funnet Jubileer vellykket lagt til + Add new anniversaries automatically Påminnelse @@ -202,8 +204,6 @@ Fremhev helger på noen visninger Tillat å endre tidssoner for hendelser Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c00bb11a8..63ea3390d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -92,6 +92,7 @@ Geen verjaardagen gevonden Geen nieuwe verjaardagen gevonden Verjaardagen toegevoegd + Add new birthdays automatically Feestdagen @@ -99,6 +100,7 @@ Geen feestdagen gevonden Geen nieuwe feestdagen gevonden Feestdagen toegevoegd + Add new anniversaries automatically Herinnering @@ -202,8 +204,6 @@ Weekends markeren Bewerken van tijdzone voor afspraken toestaan Snelfilter gebeurtenistypes beheren - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 5b6387d3c..24fc217da 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -92,6 +92,7 @@ Ingen bursdager er funnet No new birthdays have been found Bursdager vellykket lagt til + Add new birthdays automatically Jubileer @@ -99,6 +100,7 @@ Ingen jubileer er funnet No new anniversaries have been found Jubileer vellykket lagt til + Add new anniversaries automatically Påminnelse @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ed1aedb02..839e9fbf4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -92,6 +92,7 @@ Nie znaleziono żadnych urodzin Nie znaleziono nowych urodzin Urodziny zostały dodane + Automatycznie dodawaj nowe urodziny Rocznice @@ -99,6 +100,7 @@ Nie znaleziono żadnych rocznic Nie znaleziono nowych rocznic Rocznice zostały dodane + Automatycznie dodawaj nowe rocznice Przypomnienie @@ -202,8 +204,6 @@ Wyróżniaj weekendy w niektórych widokach Zezwalaj na zmienianie stref czasowych wydarzeń Zarządzaj szybkim filtrowaniem typów wydarzeń - Automatycznie dodawaj nowe urodziny - Automatycznie dodawaj nowe rocznice CalDAV diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 74e6498e7..47cfcf3a6 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -92,6 +92,7 @@ Nenhum aniversário foi encontrado Nenhum novo aniversário foi encontrado Aniversários adicionados com sucesso + Add new birthdays automatically Aniversários @@ -99,6 +100,7 @@ Nenhum aniversário foi encontrado Nenhum novo aniversário foi encontrado Aniversários adicionados com sucesso + Add new anniversaries automatically Lembrete @@ -202,8 +204,6 @@ Destacar os finais de semana em algumas vistas Permitir a alteração de fuso horário do evento Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 05161b0a4..3ab74476e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -92,6 +92,7 @@ Não foram encontradas datas de nascimento Não foram encontradas novas datas de nascimento Datas de nascimento adicionadas com sucesso + Add new birthdays automatically Aniversários @@ -99,6 +100,7 @@ Não foram encontrados aniversários Não foram encontrados novos aniversários Aniversários adicionados com sucesso + Add new anniversaries automatically Lembrete @@ -202,8 +204,6 @@ Destacar fim de semana em algumas vistas Permitir alteração do fuso horário dos eventos Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ac22b853c..4e4fa5582 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -92,6 +92,7 @@ Nu s-au găsit zile de naștere Nu s-au găsit zile de naștere nou Zile de naștere adăugate cu succes + Add new birthdays automatically Aniversări @@ -99,6 +100,7 @@ Nu s-au găsit aniversări Nu s-au găsit aniversări noi Aniversări adăugate cu succes + Add new anniversaries automatically Reamintire @@ -202,8 +204,6 @@ Evidențiază weekend-urile în anumite vizualizări Permite modificarea zonele orare ale evenimentului Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 37ae4c16e..d01542f76 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -92,6 +92,7 @@ Дни рождения не найдены Новых дней рождения не найдено Дни рождения успешно добавлены + Add new birthdays automatically Годовщины @@ -99,6 +100,7 @@ Годовщины не найдены Новых годовщин не найдено Годовщины успешно добавлены + Add new anniversaries automatically Напоминание @@ -202,8 +204,6 @@ Выделять выходные дни в соответствующих режимах Разрешить изменение часового пояса событий Управление типами событий быстрого фильтра - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 114bb5bc5..ccdb9af00 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -92,6 +92,7 @@ Nenašli sa žiadne narodeniny Nenašli sa žiadne nové narodeniny Narodeniny boli úspešne pridané + Add new birthdays automatically Výročia @@ -99,6 +100,7 @@ Nenašli sa žiadne výročia Nenašli sa žiadne nové výročia Výročia boli úspešne pridané + Add new anniversaries automatically Pripomenka @@ -202,8 +204,6 @@ Zvýrazniť víkendy na niektorých pohľadoch Povoliť zmenu časových pásem udalostí Spravovať typy udalostí v rýchlom filtrovaní - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1a62eecac..d94a52e8f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -92,6 +92,7 @@ Inga födelsedagar hittades Inga nya födelsedagar hittades Födelsedagarna har lagts till + Add new birthdays automatically Årsdagar @@ -99,6 +100,7 @@ Inga årsdagar hittades Inga nya årsdagar hittades Årsdagarna har lagts till + Add new anniversaries automatically Påminnelse @@ -202,8 +204,6 @@ Markera veckoslut i vissa vyer Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index eff63eade..59e2a69e8 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -92,6 +92,7 @@ Hiçbir doğum günü bulunamadı Yeni doğum günü bulunamadı Doğum günleri başarıyla eklendi + Add new birthdays automatically Yıldönümleri @@ -99,6 +100,7 @@ Yıldönümleri bulunamadı Yeni yıldönümleri bulunamadı Yıldönümleri başarıyla eklendi + Add new anniversaries automatically Hatırlatma @@ -202,8 +204,6 @@ Bazı görünümlerde hafta sonlarını vurgula Etkinlik saat dilimlerini değiştirmeye izin ver Hızlı filtre etkinlik türlerini yönet - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8e00415eb..b35e814c9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -92,6 +92,7 @@ Дні народжень не знайдено Не знайдено нових днів народжень Дні народжень успішно додано + Add new birthdays automatically Річниці @@ -99,6 +100,7 @@ Річниці не знайдено Нових річниць не знайдено Річниці успішно додано + Add new anniversaries automatically Нагадування @@ -202,8 +204,6 @@ Виділяти вихідні дні на деяких переглядах Дозволити змінювати часові пояси подій Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c2ec2ebca..47e082f36 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -92,6 +92,7 @@     未发现生日 未发现新的生日     生日添加成功 + Add new birthdays automatically          纪念日 @@ -99,6 +100,7 @@     未发现纪念日 未发现新的纪念日     纪念日添加成功 + Add new anniversaries automatically          提醒 @@ -204,8 +206,6 @@ 在部分视图高亮周末 允许更改活动时区 Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically          CalDAV diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ea37f2c64..2a4b4daed 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -92,6 +92,7 @@ 未發現生日 No new birthdays have been found 生日添加成功 + Add new birthdays automatically 紀念日 @@ -99,6 +100,7 @@ 未發現紀念日 No new anniversaries have been found 紀念日添加成功 + Add new anniversaries automatically 提醒 @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6e4c88387..c884279b4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -92,6 +92,7 @@ 未發現生日 未發現新的生日 生日添加成功 + Add new birthdays automatically 紀念日 @@ -99,6 +100,7 @@ 未發現紀念日 未發現新的紀念日 紀念日添加成功 + Add new anniversaries automatically 提醒 @@ -202,8 +204,6 @@ 在檢視畫面突顯假日 允許改變活動的時區 Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4bcb7a4f2..c5cb0135b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,6 +92,7 @@ No birthdays have been found No new birthdays have been found Birthdays added successfully + Add new birthdays automatically Anniversaries @@ -99,6 +100,7 @@ No anniversaries have been found No new anniversaries have been found Anniversaries added successfully + Add new anniversaries automatically Reminder @@ -202,8 +204,6 @@ Highlight weekends on some views Allow changing event time zones Manage quick filter event types - Add new birthdays automatically - Add new anniversaries automatically CalDAV