From c8008a09e70c9e27eba1587eabfd358546f17c59 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Mon, 15 Aug 2016 16:57:30 -0500
Subject: [PATCH] Move string arrays to arrays.xml

---
 src/main/res/values-ar/strings.xml     |  68 +++++--------
 src/main/res/values-bg-rBG/strings.xml |  80 ++++++----------
 src/main/res/values-ca/strings.xml     |  20 +---
 src/main/res/values-cs/strings.xml     |  80 ++++++----------
 src/main/res/values-da/strings.xml     |  27 +-----
 src/main/res/values-de/strings.xml     |  80 ++++++----------
 src/main/res/values-el/strings.xml     |  80 ++++++----------
 src/main/res/values-es/strings.xml     |  80 ++++++----------
 src/main/res/values-fa/strings.xml     |  80 ++++++----------
 src/main/res/values-fr/strings.xml     |  79 ++++++---------
 src/main/res/values-hu/strings.xml     |  30 ++----
 src/main/res/values-it/strings.xml     |  80 ++++++----------
 src/main/res/values-iw/strings.xml     |  80 ++++++----------
 src/main/res/values-ja/strings.xml     |  80 ++++++----------
 src/main/res/values-ko/strings.xml     |  80 ++++++----------
 src/main/res/values-nb/strings.xml     |  16 ----
 src/main/res/values-nl/strings.xml     |  80 ++++++----------
 src/main/res/values-pl/strings.xml     |  80 ++++++----------
 src/main/res/values-pt-rBR/strings.xml |  80 ++++++----------
 src/main/res/values-pt/strings.xml     |  80 ++++++----------
 src/main/res/values-ru/strings.xml     |  80 ++++++----------
 src/main/res/values-sk/strings.xml     |  80 ++++++----------
 src/main/res/values-sl-rSI/strings.xml |  80 ++++++----------
 src/main/res/values-sv/strings.xml     |  80 ++++++----------
 src/main/res/values-th/strings.xml     |  16 ----
 src/main/res/values-tr/strings.xml     |  80 ++++++----------
 src/main/res/values-uk/strings.xml     |  80 ++++++----------
 src/main/res/values-zh-rCN/strings.xml |  80 ++++++----------
 src/main/res/values-zh-rTW/strings.xml |  80 ++++++----------
 src/main/res/values/arrays.xml         |  58 +++++++++++
 src/main/res/values/strings.xml        | 127 +++++++++----------------
 31 files changed, 803 insertions(+), 1398 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 4f2f237e6..c9b9c31cc 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -68,13 +68,8 @@
 	<string name="EPr_default_reminders_title">منبهات افتراضية</string>
 	<string name="EPr_default_addtocalendar_title">أضف إلى التقويم بشكل افتراضي</string>
 	<string name="EPr_default_reminders_mode_title">نوع رنين/اهتزاز افتراضي</string>
-	<string-array name="EPr_default_urgency">
-		<item>No deadline</item>
-		<item>اليوم</item>
-		<item>غدا</item>
-		<item>بعد غد</item>
-		<item>الأسبوع القادم</item>
-	</string-array>
+	<string name="day_after_tomorrow">بعد غد</string>
+	<string name="next_week">الأسبوع القادم</string>
 	<string name="dont_hide">لا تُخبئ</string>
 	<string name="BFE_Active">مهامي</string>
 	<string name="BFE_Recent">ما تم تعديله مؤخرا</string>
@@ -83,15 +78,7 @@
 	<string name="CFA_type_subtract">ليس</string>
 	<string name="CFA_type_intersect">أيضا</string>
 	<string name="CFA_context_delete">حذف الصف</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>No Due Date</item>
-		<item>أمس</item>
-		<item>اليوم</item>
-		<item>غدا</item>
-		<item>Day After Tomorrow</item>
-		<item>الإسبوع القادم</item>
-		<item>الشهر القادم</item>
-	</string-array>
+	<string name="next_month">الشهر القادم</string>
 	<string name="CFC_title_contains_name">العنوان يحتوي على..</string>
 	<string name="gtasks_GTA_clear_completed">انتهاء الحذف</string>
 	<string name="gtasks_GLA_noaccounts">لا يوجد حساب قوقل للتزامن مع.</string>
@@ -101,41 +88,32 @@
 	<string name="premium_remove_file_confirm">هل أنت متأكد؟ لن تستطيع العودة</string>
 	<string name="audio_recording_title">تسجيل صوت</string>
 	<string name="audio_stop_recording">توقف عن التسجيل</string>
-	<string-array name="TEA_reminder_random">
-		<item>ساعه</item>
-		<item>يوم</item>
-		<item>اسبوع</item>
-		<item>خلال إسبوعين</item>
-		<item>شهر</item>
-		<item>خلال شهرين</item>
-	</string-array>
+	<string name="random_reminder_hour">ساعه</string>
+	<string name="random_reminder_day">يوم</string>
+	<string name="random_reminder_week">اسبوع</string>
+	<string name="random_reminder_two_weeks">خلال إسبوعين</string>
+	<string name="random_reminder_month">شهر</string>
+	<string name="random_reminder_two_months">خلال شهرين</string>
 	<string name="rmd_NoA_done">اكمل</string>
 	<string name="rmd_NoA_snooze">غفوة</string>
 	<string name="rmd_EPr_quiet_hours_start_title">ابتداء ساعات الهدوء</string>
 	<string name="rmd_EPr_quiet_hours_end_title">إنتهاء ساعات الهدوء</string>
 	<string name="rmd_EPr_rmd_time_title">منبه افتراضي</string>
 	<string name="rmd_EPr_defaultRemind_title">منبه عشوائي</string>
-	<string-array name="EPr_reminder_random">
-		<item>إعطال</item>
-		<item>hourly</item>
-		<item>يومي</item>
-		<item>اسبوعي</item>
-		<item>مرتين في الاسبوع</item>
-		<item>شهري</item>
-		<item>مرتين في الشهر</item>
-	</string-array>
-	<string-array name="repeat_interval">
-		<item>أيام</item>
-		<item>أسابيع</item>
-		<item>أشهُر</item>
-		<item>ساعات</item>
-		<item>دقائق</item>
-		<item>سنين</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>من تاريخ الموعد</item>
-		<item>من تاريخ الاتمام</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">إعطال</string>
+	<string name="default_random_reminder_daily">يومي</string>
+	<string name="default_random_reminder_weekly">اسبوعي</string>
+	<string name="default_random_reminder_bi_weekly">مرتين في الاسبوع</string>
+	<string name="default_random_reminder_monthly">شهري</string>
+	<string name="default_random_reminder_bi_monthly">مرتين في الشهر</string>
+	<string name="repeat_interval_day">أيام</string>
+	<string name="repeat_interval_week">أسابيع</string>
+	<string name="repeat_interval_month">أشهُر</string>
+	<string name="repeat_interval_hour">ساعات</string>
+	<string name="repeat_interval_minute">دقائق</string>
+	<string name="repeat_interval_year">سنين</string>
+	<string name="repeat_type_due">من تاريخ الموعد</string>
+	<string name="repeat_type_completion">من تاريخ الاتمام</string>
 	<string name="tag_FEx_untagged">غير مصنف</string>
 	<string name="TEA_timer_controls">مؤقت</string>
 	<string name="TEA_timer_comment_started">بدء هذه المهمة:</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 9fb91486f..da6ddfc9d 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -134,20 +134,13 @@
 	<string name="priority_high">Висок</string>
 	<string name="priority_medium">Среден</string>
 	<string name="priority_low">Нисък</string>
-	<string-array name="EPr_default_urgency">
-		<item>Без краен срок</item>
-		<item>Днес</item>
-		<item>Утре</item>
-		<item>Ден след утрешния</item>
-		<item>Следваща седмица</item>
-	</string-array>
+	<string name="no_deadline">Без краен срок</string>
+	<string name="day_after_tomorrow">Ден след утрешния</string>
+	<string name="next_week">Следваща седмица</string>
 	<string name="dont_hide">Не скривай</string>
-	<string-array name="EPr_default_reminders">
-		<item>Няма напомняния за краен срок</item>
-		<item>При краен срок</item>
-		<item>Когато е просрочено</item>
-		<item>При крайния срок или просрочване</item>
-	</string-array>
+	<string name="no_deadline_reminder">Няма напомняния за краен срок</string>
+	<string name="at_deadline">При краен срок</string>
+	<string name="at_deadline_or_overdue">При крайния срок или просрочване</string>
 	<string name="BFE_Active">Моите задачи</string>
 	<string name="BFE_Recent">Наскоро променени</string>
 	<string name="CFA_universe_all">Активни Задачи</string>
@@ -160,15 +153,8 @@
 	<string name="CFA_button_add">Добави Критерий</string>
 	<string name="CFC_dueBefore_text">Краен срок: ?</string>
 	<string name="CFC_dueBefore_name">Краен срок...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Без крайна дата</item>
-		<item>Вчера</item>
-		<item>Днес</item>
-		<item>Утре</item>
-		<item>Ден след утрешния</item>
-		<item>Следваща седмица</item>
-		<item>Следващия месец</item>
-	</string-array>
+	<string name="no_due_date">Без крайна дата</string>
+	<string name="next_month">Следващия месец</string>
 	<string name="CFC_importance_text">С приоритет поне ?</string>
 	<string name="CFC_importance_name">Приоритет</string>
 	<string name="CFC_tag_text">Таг: ?</string>
@@ -199,14 +185,12 @@
 	<string name="ring_once">Звънене веднъж</string>
 	<string name="ring_five_times">Звънене пет пъти</string>
 	<string name="ring_nonstop">Звънене без спиране</string>
-	<string-array name="TEA_reminder_random">
-		<item>час</item>
-		<item>ден</item>
-		<item>седмица</item>
-		<item>за две седмици</item>
-		<item>месец</item>
-		<item>за два месеца</item>
-	</string-array>
+	<string name="random_reminder_hour">час</string>
+	<string name="random_reminder_day">ден</string>
+	<string name="random_reminder_week">седмица</string>
+	<string name="random_reminder_two_weeks">за две седмици</string>
+	<string name="random_reminder_month">месец</string>
+	<string name="random_reminder_two_months">за два месеца</string>
 	<string name="rmd_NoA_done">Завършен</string>
 	<string name="rmd_NoA_snooze">Отложи</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Тихи часове начало</string>
@@ -218,30 +202,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Максимизирай нивото на звука при няколкократни напомняния</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks ще максимизира нивото на звука при няколкократни напомняния</string>
 	<string name="rmd_EPr_defaultRemind_title">Случайни напомняния</string>
-	<string-array name="EPr_reminder_random">
-		<item>изключено</item>
-		<item>всеки час</item>
-		<item>дневно</item>
-		<item>седмично</item>
-		<item>два пъти седмично</item>
-		<item>месечно</item>
-		<item>на два месеца</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">изключено</string>
+	<string name="default_random_reminder_hourly">всеки час</string>
+	<string name="default_random_reminder_daily">дневно</string>
+	<string name="default_random_reminder_weekly">седмично</string>
+	<string name="default_random_reminder_bi_weekly">два пъти седмично</string>
+	<string name="default_random_reminder_monthly">месечно</string>
+	<string name="default_random_reminder_bi_monthly">на два месеца</string>
 	<string name="repeat_every">Всеки %d</string>
 	<string name="repeat_interval_prompt">Интервал на повторение</string>
 	<string name="repeat_never">Без повторение</string>
-	<string-array name="repeat_interval">
-		<item>Ден(дни)</item>
-		<item>Седмица(и)</item>
-		<item>Месец(и)</item>
-		<item>Час(ове)</item>
-		<item>Минута(и)</item>
-		<item>Година(и)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>от краен срок</item>
-		<item>от датата на завършване</item>
-	</string-array>
+	<string name="repeat_interval_day">Ден(дни)</string>
+	<string name="repeat_interval_week">Седмица(и)</string>
+	<string name="repeat_interval_month">Месец(и)</string>
+	<string name="repeat_interval_hour">Час(ове)</string>
+	<string name="repeat_interval_minute">Минута(и)</string>
+	<string name="repeat_interval_year">Година(и)</string>
+	<string name="repeat_type_due">от краен срок</string>
+	<string name="repeat_type_completion">от датата на завършване</string>
 	<string name="repeat_detail_duedate">Всеки %s</string>
 	<string name="repeat_detail_duedate_until">Всеки %1$s\nдо %2$s</string>
 	<string name="repeat_forever">Повтаряй завинаги</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 6ac2e2815..a4ebba346 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -68,13 +68,8 @@
 	<string name="EPr_manage_delete_completed_message">Segur que voleu suprimir totes les tasques completades?</string>
 	<string name="EPr_manage_delete_completed_status">S\'han suprimit %d tasques</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Segur que voleu suprimir els esdeveniments de calendari de les tasques completades?</string>
-	<string-array name="EPr_default_urgency">
-		<item>No deadline</item>
-		<item>Avui</item>
-		<item>Demà</item>
-		<item>Demà passat</item>
-		<item>La setmana que ve</item>
-	</string-array>
+	<string name="day_after_tomorrow">Demà passat</string>
+	<string name="next_week">La setmana que ve</string>
 	<string name="BFE_Active">Tasques actives</string>
 	<string name="BFE_Recent">Modificades fa poc</string>
 	<string name="CFA_universe_all">Tasques actives</string>
@@ -86,15 +81,8 @@
 	<string name="CFA_button_add">Afegeix criteris</string>
 	<string name="CFC_dueBefore_text">Vençuda per: ?</string>
 	<string name="CFC_dueBefore_name">Venciment per...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Sense data de venciment</item>
-		<item>Ahir</item>
-		<item>Avui</item>
-		<item>Demà</item>
-		<item>Demà passat</item>
-		<item>La setmana que ve</item>
-		<item>El mes que ve</item>
-	</string-array>
+	<string name="no_due_date">Sense data de venciment</string>
+	<string name="next_month">El mes que ve</string>
 	<string name="CFC_importance_text">Per menys important?</string>
 	<string name="CFC_importance_name">Importància...</string>
 	<string name="CFC_title_contains_name">El títol conté...</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index d3446b8d7..1b8e7ca82 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -106,20 +106,13 @@
 	<string name="EPr_default_reminders_title">Výchozí připomenutí</string>
 	<string name="EPr_default_addtocalendar_title">Výchozí přidání do kalendáře</string>
 	<string name="EPr_default_reminders_mode_title">Výchozí vyzvánění / vybrace</string>
-	<string-array name="EPr_default_urgency">
-		<item>Žádný termín</item>
-		<item>Dnes</item>
-		<item>Zítra</item>
-		<item>Pozítří</item>
-		<item>Příští týden</item>
-	</string-array>
+	<string name="no_deadline">Žádný termín</string>
+	<string name="day_after_tomorrow">Pozítří</string>
+	<string name="next_week">Příští týden</string>
 	<string name="dont_hide">Neskrývat</string>
-	<string-array name="EPr_default_reminders">
-		<item>Žádné upomínky v termínu</item>
-		<item>V termínu</item>
-		<item>Po termínu</item>
-		<item>V termínu nebo po něm</item>
-	</string-array>
+	<string name="no_deadline_reminder">Žádné upomínky v termínu</string>
+	<string name="at_deadline">V termínu</string>
+	<string name="at_deadline_or_overdue">V termínu nebo po něm</string>
 	<string name="BFE_Active">Aktivní úkoly</string>
 	<string name="BFE_Recent">Nedávno upravené</string>
 	<string name="CFA_universe_all">Aktivní úkoly</string>
@@ -132,15 +125,8 @@
 	<string name="CFA_button_add">Přidat podmínku</string>
 	<string name="CFC_dueBefore_text">Podle termínu: ?</string>
 	<string name="CFC_dueBefore_name">Podle termínu...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Žádný termín</item>
-		<item>Včera</item>
-		<item>Dnes</item>
-		<item>Zítra</item>
-		<item>Pozítří</item>
-		<item>Příští týden</item>
-		<item>Příští měsíc</item>
-	</string-array>
+	<string name="no_due_date">Žádný termín</string>
+	<string name="next_month">Příští měsíc</string>
 	<string name="CFC_importance_text">Alespoň důležitost?</string>
 	<string name="CFC_importance_name">Důležitost...</string>
 	<string name="CFC_title_contains_name">Název obsahuje...</string>
@@ -163,14 +149,12 @@
 	<string name="audio_stop_recording">Ukončit záznam</string>
 	<string name="file_type_unhandled">Pro tento typ souborů nebyla nalezena žádná aplikace.</string>
 	<string name="file_err_copy">Chyba při kopírování souboru jako přílohy</string>
-	<string-array name="TEA_reminder_random">
-		<item>hodina</item>
-		<item>den</item>
-		<item>týden</item>
-		<item>za dva týdny</item>
-		<item>měsíc</item>
-		<item>za dva měsíce</item>
-	</string-array>
+	<string name="random_reminder_hour">hodina</string>
+	<string name="random_reminder_day">den</string>
+	<string name="random_reminder_week">týden</string>
+	<string name="random_reminder_two_weeks">za dva týdny</string>
+	<string name="random_reminder_month">měsíc</string>
+	<string name="random_reminder_two_months">za dva měsíce</string>
 	<string name="rmd_NoA_done">Dokončeno!</string>
 	<string name="rmd_NoA_snooze">Později...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Nerušit od</string>
@@ -179,30 +163,24 @@
 	<string name="rmd_EPr_rmd_time_desc">Upozornění na úkoly bez času dokončení se objeví v %s</string>
 	<string name="rmd_EPr_multiple_maxvolume_title">Nejvyšší hlasitost pro opakované zvonění upomínky</string>
 	<string name="rmd_EPr_defaultRemind_title">Náhodná upozornění</string>
-	<string-array name="EPr_reminder_random">
-		<item>zakázáno</item>
-		<item>každou hodinu</item>
-		<item>denně</item>
-		<item>týdně</item>
-		<item>každých ctrnáct dní</item>
-		<item>měsíčně</item>
-		<item>každý druhý měsíc</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">zakázáno</string>
+	<string name="default_random_reminder_hourly">každou hodinu</string>
+	<string name="default_random_reminder_daily">denně</string>
+	<string name="default_random_reminder_weekly">týdně</string>
+	<string name="default_random_reminder_bi_weekly">každých ctrnáct dní</string>
+	<string name="default_random_reminder_monthly">měsíčně</string>
+	<string name="default_random_reminder_bi_monthly">každý druhý měsíc</string>
 	<string name="repeat_every">Každý %d</string>
 	<string name="repeat_interval_prompt">Opakovací interval</string>
 	<string name="repeat_never">Bez opakování</string>
-	<string-array name="repeat_interval">
-		<item>Dnů</item>
-		<item>Týdnů</item>
-		<item>Měsíců</item>
-		<item>Hodin</item>
-		<item>Minuta(-y)</item>
-		<item>Rok(y)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>od data splnění</item>
-		<item>od data dokončení</item>
-	</string-array>
+	<string name="repeat_interval_day">Dnů</string>
+	<string name="repeat_interval_week">Týdnů</string>
+	<string name="repeat_interval_month">Měsíců</string>
+	<string name="repeat_interval_hour">Hodin</string>
+	<string name="repeat_interval_minute">Minuta(-y)</string>
+	<string name="repeat_interval_year">Rok(y)</string>
+	<string name="repeat_type_due">od data splnění</string>
+	<string name="repeat_type_completion">od data dokončení</string>
 	<string name="repeat_detail_duedate">Každý %s</string>
 	<string name="repeat_detail_duedate_until">Každý %1$s\n až do %2$s</string>
 	<string name="repeat_forever">Opakovat stále</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 899a79886..de7c3bd3a 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -55,13 +55,6 @@
 	<string name="EPr_default_importance_title">Standard Vigtighed</string>
 	<string name="EPr_default_hideUntil_title">Standard Skjul Indtil</string>
 	<string name="EPr_default_reminders_title">Standardpåmindelser</string>
-	<string-array name="EPr_default_urgency">
-		<item>No deadline</item>
-		<item>I dag</item>
-		<item>I morgen</item>
-		<item>Day after tomorrow</item>
-		<item>Next week</item>
-	</string-array>
 	<string name="BFE_Active">Aktive opgaver</string>
 	<string name="BFE_Recent">Senest ændrede</string>
 	<string name="CFA_universe_all">Aktive opgaver</string>
@@ -74,15 +67,6 @@
 	<string name="CFA_button_add">Tilføj kriterier</string>
 	<string name="CFC_dueBefore_text">Deadline: ?</string>
 	<string name="CFC_dueBefore_name">Deadline...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>No Due Date</item>
-		<item>I går</item>
-		<item>I dag</item>
-		<item>I morgen</item>
-		<item>Day After Tomorrow</item>
-		<item>Next Week</item>
-		<item>Next Month</item>
-	</string-array>
 	<string name="CFC_importance_text">Vigtighed mindst ?</string>
 	<string name="CFC_importance_name">Vigtighed...</string>
 	<string name="CFC_title_contains_name">Titel indeholder...</string>
@@ -92,14 +76,9 @@
 	<string name="gcal_TEA_showCalendar_label">Åbn kalender-begivenhed</string>
 	<string name="gcal_completed_title">%s (fuldført)</string>
 	<string name="gtasks_GPr_header">Google Tasks (beta!)</string>
-	<string-array name="TEA_reminder_random">
-		<item>en time</item>
-		<item>en dag</item>
-		<item>en uge</item>
-		<item>in two weeks</item>
-		<item>a month</item>
-		<item>in two months</item>
-	</string-array>
+	<string name="random_reminder_hour">en time</string>
+	<string name="random_reminder_day">en dag</string>
+	<string name="random_reminder_week">en uge</string>
 	<string name="rmd_NoA_done">Allerede udført!</string>
 	<string name="rmd_NoA_snooze">Slumrefunktion...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stille timer start</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c48d7d82f..74c15361d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -129,20 +129,13 @@
 	<string name="priority_high">Hoch</string>
 	<string name="priority_medium">Mittel</string>
 	<string name="priority_low">Niedrig</string>
-	<string-array name="EPr_default_urgency">
-		<item>Keine Fälligkeit</item>
-		<item>Heute</item>
-		<item>Morgen</item>
-		<item>Übermorgen</item>
-		<item>Nächste Woche</item>
-	</string-array>
+	<string name="no_deadline">Keine Fälligkeit</string>
+	<string name="day_after_tomorrow">Übermorgen</string>
+	<string name="next_week">Nächste Woche</string>
 	<string name="dont_hide">Nicht verstecken</string>
-	<string-array name="EPr_default_reminders">
-		<item>Keine Fälligkeits-Erinnerungen</item>
-		<item>Am Stichtag</item>
-		<item>Wenn überfällig</item>
-		<item>Am Stichtag oder überfällig</item>
-	</string-array>
+	<string name="no_deadline_reminder">Keine Fälligkeits-Erinnerungen</string>
+	<string name="at_deadline">Am Stichtag</string>
+	<string name="at_deadline_or_overdue">Am Stichtag oder überfällig</string>
 	<string name="BFE_Active">Meine Aufgaben</string>
 	<string name="BFE_Recent">Kürzlich bearbeitet</string>
 	<string name="CFA_universe_all">Aktuelle Aufgaben</string>
@@ -155,15 +148,8 @@
 	<string name="CFA_button_add">Kriterien hinzufügen</string>
 	<string name="CFC_dueBefore_text">Fällig am: ?</string>
 	<string name="CFC_dueBefore_name">Fällig am …</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Kein Fälligkeitsdatum</item>
-		<item>Gestern</item>
-		<item>Heute</item>
-		<item>Morgen</item>
-		<item>Übermorgen</item>
-		<item>Nächste Woche</item>
-		<item>Nächster Monat</item>
-	</string-array>
+	<string name="no_due_date">Kein Fälligkeitsdatum</string>
+	<string name="next_month">Nächster Monat</string>
 	<string name="CFC_importance_text">Mindestpriorität ?</string>
 	<string name="CFC_importance_name">Priorität...</string>
 	<string name="CFC_tag_contains_name">Tag-Name enthält...</string>
@@ -192,14 +178,12 @@
 	<string name="ring_once">Einmal klingeln</string>
 	<string name="ring_five_times">Fünfmal klingeln</string>
 	<string name="ring_nonstop">Ununterbrochen klingeln</string>
-	<string-array name="TEA_reminder_random">
-		<item>einer Stunde</item>
-		<item>einem Tag</item>
-		<item>einer Woche</item>
-		<item>2 Wochen</item>
-		<item>einem Monat</item>
-		<item>in 2 Monaten</item>
-	</string-array>
+	<string name="random_reminder_hour">einer Stunde</string>
+	<string name="random_reminder_day">einem Tag</string>
+	<string name="random_reminder_week">einer Woche</string>
+	<string name="random_reminder_two_weeks">2 Wochen</string>
+	<string name="random_reminder_month">einem Monat</string>
+	<string name="random_reminder_two_months">in 2 Monaten</string>
 	<string name="rmd_NoA_done">Abgeschlossen</string>
 	<string name="rmd_NoA_snooze">Schlummern</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stille Stunden beginnen.</string>
@@ -211,30 +195,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Maximale Lautstärke für mehrfachläutende Erinnerungen</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks wird die Lautstärke für mehrfachläutende Erinnerungen maximalisieren</string>
 	<string name="rmd_EPr_defaultRemind_title">Zufällige Erinnerungen</string>
-	<string-array name="EPr_reminder_random">
-		<item>deaktiviert</item>
-		<item>stündlich</item>
-		<item>täglich</item>
-		<item>wöchentlich</item>
-		<item>vierzehntägig</item>
-		<item>monatlich</item>
-		<item>alle zwei Monate</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">deaktiviert</string>
+	<string name="default_random_reminder_hourly">stündlich</string>
+	<string name="default_random_reminder_daily">täglich</string>
+	<string name="default_random_reminder_weekly">wöchentlich</string>
+	<string name="default_random_reminder_bi_weekly">vierzehntägig</string>
+	<string name="default_random_reminder_monthly">monatlich</string>
+	<string name="default_random_reminder_bi_monthly">alle zwei Monate</string>
 	<string name="repeat_every">Jeden %d</string>
 	<string name="repeat_interval_prompt">Wiederholungsintervall</string>
 	<string name="repeat_never">Nicht wiederholen</string>
-	<string-array name="repeat_interval">
-		<item>Tag(e)</item>
-		<item>Woche(n)</item>
-		<item>Monat(e)</item>
-		<item>Stunde(n)</item>
-		<item>Minute(n)</item>
-		<item>Jahr(e)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>bei Fälligkeit</item>
-		<item>bei Erledigung</item>
-	</string-array>
+	<string name="repeat_interval_day">Tag(e)</string>
+	<string name="repeat_interval_week">Woche(n)</string>
+	<string name="repeat_interval_month">Monat(e)</string>
+	<string name="repeat_interval_hour">Stunde(n)</string>
+	<string name="repeat_interval_minute">Minute(n)</string>
+	<string name="repeat_interval_year">Jahr(e)</string>
+	<string name="repeat_type_due">bei Fälligkeit</string>
+	<string name="repeat_type_completion">bei Erledigung</string>
 	<string name="repeat_detail_duedate">Jede(n) %s</string>
 	<string name="repeat_detail_duedate_until">Jede(n) %1$s\nbis %2$s</string>
 	<string name="repeat_forever">Endlos wiederholen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 5d658850f..3699a1fff 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -107,20 +107,13 @@
 	<string name="EPr_default_reminders_title">Προκαθορισμένες υπενθυμίσεις</string>
 	<string name="EPr_default_addtocalendar_title">Προκαθορισμένη προσθήκη σε ημερολόγιο</string>
 	<string name="EPr_default_reminders_mode_title">Προκαθορισμένος ήχος/τύπος δόνησης</string>
-	<string-array name="EPr_default_urgency">
-		<item>Χωρίς προθεσμία</item>
-		<item>Σήμερα</item>
-		<item>Αύριο</item>
-		<item>Μεθαύριο</item>
-		<item>Επόμενη εβδομάδα</item>
-	</string-array>
+	<string name="no_deadline">Χωρίς προθεσμία</string>
+	<string name="day_after_tomorrow">Μεθαύριο</string>
+	<string name="next_week">Επόμενη εβδομάδα</string>
 	<string name="dont_hide">Μη απόκρυψη</string>
-	<string-array name="EPr_default_reminders">
-		<item>Όχι υπενθυμίσεις προθεσμίας</item>
-		<item>Στην προθεσμία</item>
-		<item>Όταν λήξει</item>
-		<item>Στην λήξη η και μετά</item>
-	</string-array>
+	<string name="no_deadline_reminder">Όχι υπενθυμίσεις προθεσμίας</string>
+	<string name="at_deadline">Στην προθεσμία</string>
+	<string name="at_deadline_or_overdue">Στην λήξη η και μετά</string>
 	<string name="CFA_type_add">ή</string>
 	<string name="CFA_type_subtract">μή</string>
 	<string name="CFA_type_intersect">επίσης</string>
@@ -130,15 +123,8 @@
 	<string name="CFA_button_add">Προσθέστε κριτήριο</string>
 	<string name="CFC_dueBefore_text">Λήγει στίς: ?</string>
 	<string name="CFC_dueBefore_name">Λήγει στίς...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Χωρίς ημερομηνία λήξης</item>
-		<item>Εχθές</item>
-		<item>Σήμερα</item>
-		<item>Αύριο</item>
-		<item>Μεθαύριο</item>
-		<item>Επόμενη εβδομάδα</item>
-		<item>Επόμενος μήνας</item>
-	</string-array>
+	<string name="no_due_date">Χωρίς ημερομηνία λήξης</string>
+	<string name="next_month">Επόμενος μήνας</string>
 	<string name="CFC_importance_text">Προτεραιότητα τουλάχιστον ?</string>
 	<string name="CFC_importance_name">Προτεραιότητα..</string>
 	<string name="CFC_title_contains_name">Ο τίτλος περιέχει...</string>
@@ -161,14 +147,12 @@
 	<string name="audio_stop_recording">Σταμάτημα εγγραφής</string>
 	<string name="file_type_unhandled">Συγγνώμη! Δεν βρέθηκε εφαρμογή που να χειρίζεται τέτοιο τύπο αρχείου</string>
 	<string name="file_err_copy">Σφάλμα αντιγραφής αρχείου προς επισύναψη</string>
-	<string-array name="TEA_reminder_random">
-		<item>μια ώρα</item>
-		<item>μια μέρα</item>
-		<item>μια εβδομάδα</item>
-		<item>σε δύο εβδομάδες</item>
-		<item>εναν μήνα</item>
-		<item>σε δύο μήνες</item>
-	</string-array>
+	<string name="random_reminder_hour">μια ώρα</string>
+	<string name="random_reminder_day">μια μέρα</string>
+	<string name="random_reminder_week">μια εβδομάδα</string>
+	<string name="random_reminder_two_weeks">σε δύο εβδομάδες</string>
+	<string name="random_reminder_month">εναν μήνα</string>
+	<string name="random_reminder_two_months">σε δύο μήνες</string>
 	<string name="rmd_NoA_done">Ολοκληρωμένο</string>
 	<string name="rmd_NoA_snooze">Αναβολή</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Ξεκίνησε η ώρα ησυχίας </string>
@@ -177,30 +161,24 @@
 	<string name="rmd_EPr_rmd_time_desc">Ειδοποιήσεις για εργασίες χωρίς ώρα λήξης θα φαίνονται στις %s</string>
 	<string name="rmd_EPr_multiple_maxvolume_title">Μέγιστος ήχος για πολλαπλούς ήχους υπενθυμίσεων</string>
 	<string name="rmd_EPr_defaultRemind_title">Τυχαίες υπενθυμίσεις</string>
-	<string-array name="EPr_reminder_random">
-		<item>απενεργοποιημένο</item>
-		<item>ωριαία</item>
-		<item>καθημερινά</item>
-		<item>Εβδομαδιαία</item>
-		<item>κάθε δυο εβδομάδες</item>
-		<item>μηνιαία</item>
-		<item>διμηνιαία</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">απενεργοποιημένο</string>
+	<string name="default_random_reminder_hourly">ωριαία</string>
+	<string name="default_random_reminder_daily">καθημερινά</string>
+	<string name="default_random_reminder_weekly">Εβδομαδιαία</string>
+	<string name="default_random_reminder_bi_weekly">κάθε δυο εβδομάδες</string>
+	<string name="default_random_reminder_monthly">μηνιαία</string>
+	<string name="default_random_reminder_bi_monthly">διμηνιαία</string>
 	<string name="repeat_every">Κάθε %d</string>
 	<string name="repeat_interval_prompt">Διάστημα επανάληψης</string>
 	<string name="repeat_never">Μή επαναλαμβανόμενα</string>
-	<string-array name="repeat_interval">
-		<item>Μέρα(ες)</item>
-		<item>Εβδομαδα(ές)</item>
-		<item>Μήνας(ές)</item>
-		<item>Ώρα(ές)</item>
-		<item>Λεπτό(ά)</item>
-		<item>Χρόνος(ια)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>απο την ημερομηνία λήξης</item>
-		<item>απο την ημερομηνία ολοκλήρωσης </item>
-	</string-array>
+	<string name="repeat_interval_day">Μέρα(ες)</string>
+	<string name="repeat_interval_week">Εβδομαδα(ές)</string>
+	<string name="repeat_interval_month">Μήνας(ές)</string>
+	<string name="repeat_interval_hour">Ώρα(ές)</string>
+	<string name="repeat_interval_minute">Λεπτό(ά)</string>
+	<string name="repeat_interval_year">Χρόνος(ια)</string>
+	<string name="repeat_type_due">απο την ημερομηνία λήξης</string>
+	<string name="repeat_type_completion">απο την ημερομηνία ολοκλήρωσης </string>
 	<string name="repeat_detail_duedate">Κάθε %s</string>
 	<string name="repeat_detail_duedate_until">Κάθε %1$s\nμέχρι %2$s</string>
 	<string name="repeat_forever">Επανάληψη επ\'αορίστου</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index b44e29ce2..d43d73ec3 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -130,20 +130,13 @@
 	<string name="priority_high">Alta</string>
 	<string name="priority_medium">Media</string>
 	<string name="priority_low">Baja</string>
-	<string-array name="EPr_default_urgency">
-		<item>Sin vencimiento</item>
-		<item>Hoy</item>
-		<item>Mañana</item>
-		<item>Pasado mañana</item>
-		<item>Semana siguiente</item>
-	</string-array>
+	<string name="no_deadline">Sin vencimiento</string>
+	<string name="day_after_tomorrow">Pasado mañana</string>
+	<string name="next_week">Semana siguiente</string>
 	<string name="dont_hide">No ocultar</string>
-	<string-array name="EPr_default_reminders">
-		<item>Sin recordatorios del vencimiento</item>
-		<item>En la fecha de vencimiento</item>
-		<item>Cuando esté vencida</item>
-		<item>En la fecha de vencimiento o ya vencida</item>
-	</string-array>
+	<string name="no_deadline_reminder">Sin recordatorios del vencimiento</string>
+	<string name="at_deadline">En la fecha de vencimiento</string>
+	<string name="at_deadline_or_overdue">En la fecha de vencimiento o ya vencida</string>
 	<string name="BFE_Active">Mis Tareas</string>
 	<string name="BFE_Recent">Recién modificadas</string>
 	<string name="CFA_universe_all">Tareas activas</string>
@@ -156,15 +149,8 @@
 	<string name="CFA_button_add">Añadir Criterio</string>
 	<string name="CFC_dueBefore_text">Vence el: ?</string>
 	<string name="CFC_dueBefore_name">Vence el...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Sin fecha de vencimiento</item>
-		<item>Ayer</item>
-		<item>Hoy</item>
-		<item>Mañana</item>
-		<item>Pasado mañana</item>
-		<item>Próxima semana</item>
-		<item>Próximo mes</item>
-	</string-array>
+	<string name="no_due_date">Sin fecha de vencimiento</string>
+	<string name="next_month">Próximo mes</string>
 	<string name="CFC_importance_text">¿Prioridad mínima?</string>
 	<string name="CFC_importance_name">Prioridad...</string>
 	<string name="CFC_tag_text">Etiqueta: ?</string>
@@ -195,14 +181,12 @@
 	<string name="ring_once">Sonar una vez</string>
 	<string name="ring_five_times">Sonar cinco veces</string>
 	<string name="ring_nonstop">Sonar sin parar</string>
-	<string-array name="TEA_reminder_random">
-		<item>una hora</item>
-		<item>un día</item>
-		<item>una semana</item>
-		<item>en dos semanas</item>
-		<item>un mes</item>
-		<item>en dos meses</item>
-	</string-array>
+	<string name="random_reminder_hour">una hora</string>
+	<string name="random_reminder_day">un día</string>
+	<string name="random_reminder_week">una semana</string>
+	<string name="random_reminder_two_weeks">en dos semanas</string>
+	<string name="random_reminder_month">un mes</string>
+	<string name="random_reminder_two_months">en dos meses</string>
 	<string name="rmd_NoA_done">Terminada</string>
 	<string name="rmd_NoA_snooze">Posponer</string>
 	<string name="rmd_EPr_quiet_hours_start_title">El horario en silencio empieza</string>
@@ -214,30 +198,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Máximo volumen para recordatorios con tonos múltiples</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks fijará el volumen máximo para avisos con tonos múltiples</string>
 	<string name="rmd_EPr_defaultRemind_title">Recordatorios aleatorios</string>
-	<string-array name="EPr_reminder_random">
-		<item>deshabilitado</item>
-		<item>cada hora</item>
-		<item>diariamente</item>
-		<item>semanalmente</item>
-		<item>quincenalmente</item>
-		<item>mensualmente</item>
-		<item>bimensualmente</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">deshabilitado</string>
+	<string name="default_random_reminder_hourly">cada hora</string>
+	<string name="default_random_reminder_daily">diariamente</string>
+	<string name="default_random_reminder_weekly">semanalmente</string>
+	<string name="default_random_reminder_bi_weekly">quincenalmente</string>
+	<string name="default_random_reminder_monthly">mensualmente</string>
+	<string name="default_random_reminder_bi_monthly">bimensualmente</string>
 	<string name="repeat_every">Cada %d</string>
 	<string name="repeat_interval_prompt">Intervalo de repetición</string>
 	<string name="repeat_never">Sin repetir</string>
-	<string-array name="repeat_interval">
-		<item>Día(s)</item>
-		<item>Semana(s)</item>
-		<item>Mes(es)</item>
-		<item>Hora(s)</item>
-		<item>Minuto(s)</item>
-		<item>Año(s)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>desde la fecha de vencimiento</item>
-		<item>Desde la fecha de finalización</item>
-	</string-array>
+	<string name="repeat_interval_day">Día(s)</string>
+	<string name="repeat_interval_week">Semana(s)</string>
+	<string name="repeat_interval_month">Mes(es)</string>
+	<string name="repeat_interval_hour">Hora(s)</string>
+	<string name="repeat_interval_minute">Minuto(s)</string>
+	<string name="repeat_interval_year">Año(s)</string>
+	<string name="repeat_type_due">desde la fecha de vencimiento</string>
+	<string name="repeat_type_completion">Desde la fecha de finalización</string>
 	<string name="repeat_detail_duedate">Cada %s</string>
 	<string name="repeat_detail_duedate_until">Cada %1$s\nhasta %2$s</string>
 	<string name="repeat_forever">Repetir por siempre</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 37ddf771c..085149f3a 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -87,20 +87,13 @@
 	<string name="priority_high">زیاد</string>
 	<string name="priority_medium">متوسط</string>
 	<string name="priority_low">کم</string>
-	<string-array name="EPr_default_urgency">
-		<item>بدون موعود</item>
-		<item>امروز</item>
-		<item>فردا</item>
-		<item>پس فردا</item>
-		<item>هفته بعد</item>
-	</string-array>
+	<string name="no_deadline">بدون موعود</string>
+	<string name="day_after_tomorrow">پس فردا</string>
+	<string name="next_week">هفته بعد</string>
 	<string name="dont_hide">مخفی نکن</string>
-	<string-array name="EPr_default_reminders">
-		<item>بدون یادآور موعود</item>
-		<item>روز موعود</item>
-		<item>پس از موعود</item>
-		<item>در روز موعد یا پس از موعود</item>
-	</string-array>
+	<string name="no_deadline_reminder">بدون یادآور موعود</string>
+	<string name="at_deadline">روز موعود</string>
+	<string name="at_deadline_or_overdue">در روز موعد یا پس از موعود</string>
 	<string name="BFE_Active">وظایف من</string>
 	<string name="BFE_Recent">اخیرا ویرایش شده</string>
 	<string name="CFA_universe_all">وظایف فعال</string>
@@ -111,15 +104,8 @@
 	<string name="CFA_help">لمس طولانی روی انتخاب برای گزینه های بیشتر</string>
 	<string name="CFA_button_add">اضافه کردن محتوا</string>
 	<string name="CFC_dueBefore_name">موعود بر اساس</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>بدون موعود</item>
-		<item>دیروز</item>
-		<item>امروز</item>
-		<item>فردا</item>
-		<item>پس فردا</item>
-		<item>هفته بعد</item>
-		<item>ماه بعد</item>
-	</string-array>
+	<string name="no_due_date">بدون موعود</string>
+	<string name="next_month">ماه بعد</string>
 	<string name="CFC_importance_text">اولویت در آخر؟</string>
 	<string name="CFC_importance_name">اولویت</string>
 	<string name="CFC_tag_name">تگ...</string>
@@ -141,42 +127,34 @@
 	<string name="ring_once">یک بار زنگ بزن</string>
 	<string name="ring_five_times">پنج بار زنگ بزن</string>
 	<string name="ring_nonstop">بدون توقف زنگ بزن</string>
-	<string-array name="TEA_reminder_random">
-		<item>یک ساعت</item>
-		<item>یک روز</item>
-		<item>یک هفته</item>
-		<item>دو هفته آینده</item>
-		<item>یک ماه</item>
-		<item>در دو ماه</item>
-	</string-array>
+	<string name="random_reminder_hour">یک ساعت</string>
+	<string name="random_reminder_day">یک روز</string>
+	<string name="random_reminder_week">یک هفته</string>
+	<string name="random_reminder_two_weeks">دو هفته آینده</string>
+	<string name="random_reminder_month">یک ماه</string>
+	<string name="random_reminder_two_months">در دو ماه</string>
 	<string name="rmd_NoA_done">کامل</string>
 	<string name="rmd_EPr_quiet_hours_start_title">شروع ساعات خلوتی</string>
 	<string name="rmd_EPr_quiet_hours_end_title">پایان ساعات خلوتی</string>
 	<string name="rmd_EPr_rmd_time_title">یادآور پیش فرض</string>
 	<string name="rmd_EPr_defaultRemind_title">یادآوری های تصادفی</string>
-	<string-array name="EPr_reminder_random">
-		<item>غیرفعال شده</item>
-		<item>هر ساعت</item>
-		<item>هر روز</item>
-		<item>هر هفته</item>
-		<item>یک هفته در میان</item>
-		<item>هر ماه</item>
-		<item>یک ماه درمیان</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">غیرفعال شده</string>
+	<string name="default_random_reminder_hourly">هر ساعت</string>
+	<string name="default_random_reminder_daily">هر روز</string>
+	<string name="default_random_reminder_weekly">هر هفته</string>
+	<string name="default_random_reminder_bi_weekly">یک هفته در میان</string>
+	<string name="default_random_reminder_monthly">هر ماه</string>
+	<string name="default_random_reminder_bi_monthly">یک ماه درمیان</string>
 	<string name="repeat_interval_prompt">دوره تکرار</string>
 	<string name="repeat_never">بدون تکرار</string>
-	<string-array name="repeat_interval">
-		<item>روز(ها)</item>
-		<item>هفته(ها)</item>
-		<item>ماه(ها)</item>
-		<item>ساعت(ها)</item>
-		<item>دقیقه(ها)</item>
-		<item>سال(ها)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>از روز موعود</item>
-		<item>از تاریخ اتمام</item>
-	</string-array>
+	<string name="repeat_interval_day">روز(ها)</string>
+	<string name="repeat_interval_week">هفته(ها)</string>
+	<string name="repeat_interval_month">ماه(ها)</string>
+	<string name="repeat_interval_hour">ساعت(ها)</string>
+	<string name="repeat_interval_minute">دقیقه(ها)</string>
+	<string name="repeat_interval_year">سال(ها)</string>
+	<string name="repeat_type_due">از روز موعود</string>
+	<string name="repeat_type_completion">از تاریخ اتمام</string>
 	<string name="repeat_forever">تکرار بینهایت</string>
 	<string name="new_tag">ایجاد تگ جدید</string>
 	<string name="tag_FEx_untagged">دسته بندی نشده</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 41d053e23..04fcc89ec 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -129,20 +129,13 @@
 	<string name="priority_high">Haute</string>
 	<string name="priority_medium">Moyenne</string>
 	<string name="priority_low">Faible</string>
-	<string-array name="EPr_default_urgency">
-		<item>Aucune échéance</item>
-		<item>Aujourd\'hui</item>
-		<item>Demain</item>
-		<item>Après-demain</item>
-		<item>La semaine prochaine</item>
-	</string-array>
+	<string name="no_deadline">Aucune échéance</string>
+	<string name="day_after_tomorrow">Après-demain</string>
+	<string name="next_week">La semaine prochaine</string>
 	<string name="dont_hide">Ne pas masquer</string>
-	<string-array name="EPr_default_reminders">
-		<item>Pas de rappel de date limite</item>
-		<item>À la date limite</item>
-		<item>En cas de retard</item>
-		<item>À la date limite ou après</item>
-	</string-array>
+	<string name="no_deadline_reminder">Pas de rappel de date limite</string>
+	<string name="at_deadline">À la date limite</string>
+	<string name="at_deadline_or_overdue">À la date limite ou après</string>
 	<string name="BFE_Active">Mes tâches</string>
 	<string name="BFE_Recent">Récemment modifié</string>
 	<string name="CFA_universe_all">Tâches actives</string>
@@ -155,15 +148,8 @@
 	<string name="CFA_button_add">Ajouter un critère</string>
 	<string name="CFC_dueBefore_text">Échoue le: ?</string>
 	<string name="CFC_dueBefore_name">Échoue le..</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Aucune date d\'échéance</item>
-		<item>Hier</item>
-		<item>Aujourd\'hui</item>
-		<item>Demain</item>
-		<item>Après-demain</item>
-		<item>Semaine prochaine</item>
-		<item>Mois suivant</item>
-	</string-array>
+	<string name="no_due_date">Aucune date d\'échéance</string>
+	<string name="next_month">Mois suivant</string>
 	<string name="CFC_importance_text">Priorité au dernier ?</string>
 	<string name="CFC_importance_name">Priorité...</string>
 	<string name="CFC_tag_contains_name">Le nom du tag contient ...</string>
@@ -192,14 +178,12 @@
 	<string name="ring_once">Sonner une fois</string>
 	<string name="ring_five_times">Sonner cinq fois</string>
 	<string name="ring_nonstop">Sonner en continu</string>
-	<string-array name="TEA_reminder_random">
-		<item>Une heure</item>
-		<item>Un jour</item>
-		<item>Une semaine</item>
-		<item>Dans deux semaines</item>
-		<item>Un mois</item>
-		<item>Dans deux mois</item>
-	</string-array>
+	<string name="random_reminder_hour">Une heure</string>
+	<string name="random_reminder_day">Un jour</string>
+	<string name="random_reminder_week">Une semaine</string>
+	<string name="random_reminder_two_weeks">Dans deux semaines</string>
+	<string name="random_reminder_month">Un mois</string>
+	<string name="random_reminder_two_months">Dans deux mois</string>
 	<string name="rmd_NoA_done">Déjà fait !</string>
 	<string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Début des heures de repos</string>
@@ -211,30 +195,23 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume maximum pour les rappels multi sonneries</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks va maximiser le volume de multiples sonneries de rappels</string>
 	<string name="rmd_EPr_defaultRemind_title">Rappels aléatoires</string>
-	<string-array name="EPr_reminder_random">
-		<item>désactivé</item>
-		<item>chaque heure</item>
-		<item>chaque jour</item>
-		<item>hebdomadaire</item>
-		<item>bi-hebdomadaire</item>
-		<item>mensuel</item>
-		<item>bi-mensuel</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">désactivé</string>
+	<string name="default_random_reminder_hourly">chaque heure</string>
+	<string name="default_random_reminder_daily">chaque jour</string>
+	<string name="default_random_reminder_weekly">hebdomadaire</string>
+	<string name="default_random_reminder_bi_weekly">bi-hebdomadaire</string>
+	<string name="default_random_reminder_monthly">mensuel</string>
+	<string name="default_random_reminder_bi_monthly">bi-mensuel</string>
 	<string name="repeat_every">Tous les %d</string>
 	<string name="repeat_interval_prompt">Interval de répétition</string>
 	<string name="repeat_never">Pas de répétition</string>
-	<string-array name="repeat_interval">
-		<item>Jour(s)</item>
-		<item>Semaine(s)</item>
-		<item>Mois</item>
-		<item>Heure(s)</item>
-		<item>Minute(s)</item>
-		<item>Année(s)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>à partir de la date due</item>
-		<item>à partir de la date d\'achèvement</item>
-	</string-array>
+	<string name="repeat_interval_day">Jour(s)</string>
+	<string name="repeat_interval_week">Semaine(s)</string>
+	<string name="repeat_interval_month">Mois</string>
+	<string name="repeat_interval_hour">Heure(s)</string>
+	<string name="repeat_interval_year">Année(s)</string>
+	<string name="repeat_type_due">à partir de la date due</string>
+	<string name="repeat_type_completion">à partir de la date d\'achèvement</string>
 	<string name="repeat_detail_duedate">Tous les %s</string>
 	<string name="repeat_detail_duedate_until">Tous les %1$s jusqu\'à %2$s</string>
 	<string name="repeat_forever">Répéter indéfiniment</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index d3e4c471f..f9c4638ca 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -35,13 +35,9 @@
 	<string name="MCA_return_call">Hívás most</string>
 	<string name="MCA_add_task">Hívás később</string>
 	<string name="missed_calls">Nem fogadott hívások</string>
-	<string-array name="EPr_default_urgency">
-		<item>Nincs határidő</item>
-		<item>Ma</item>
-		<item>Holnap</item>
-		<item>Holnapután</item>
-		<item>Következő hét</item>
-	</string-array>
+	<string name="no_deadline">Nincs határidő</string>
+	<string name="day_after_tomorrow">Holnapután</string>
+	<string name="next_week">Következő hét</string>
 	<string name="BFE_Recent">Nemrég módosítva</string>
 	<string name="CFA_universe_all">Aktív feladatok</string>
 	<string name="CFA_type_add">vagy</string>
@@ -53,15 +49,7 @@
 	<string name="CFA_button_add">Kritérium hozzáadása</string>
 	<string name="CFC_dueBefore_text">Határidő: ?</string>
 	<string name="CFC_dueBefore_name">Határidő</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>No Due Date</item>
-		<item>Yesterday</item>
-		<item>Today</item>
-		<item>Tomorrow</item>
-		<item>Holnapután</item>
-		<item>Jövő hét</item>
-		<item>Következő hónap</item>
-	</string-array>
+	<string name="next_month">Következő hónap</string>
 	<string name="CFC_importance_text">Prioritás legalább ?</string>
 	<string name="CFC_importance_name">Prioritás...</string>
 	<string name="CFC_title_contains_name">A név tartalmazza ezt..</string>
@@ -77,14 +65,8 @@
 	<string name="gtasks_error_accountNotFound">%s fiók nem található -- kérlek, jelentkezz ki, és vissza a Google Tasks beállításokban.</string>
 	<string name="premium_record_audio">Jegyzet rögzítése</string>
 	<string name="audio_recording_title">Hang rögzítése</string>
-	<string-array name="TEA_reminder_random">
-		<item>egy óra</item>
-		<item>egy nap</item>
-		<item>a week</item>
-		<item>in two weeks</item>
-		<item>a month</item>
-		<item>in two months</item>
-	</string-array>
+	<string name="random_reminder_hour">egy óra</string>
+	<string name="random_reminder_day">egy nap</string>
 	<string name="rmd_NoA_done">Befejezve</string>
 	<string name="rmd_NoA_snooze">Szundi</string>
 	<string name="rmd_EPr_defaultRemind_title">Véletlenszerű emlékeztetők</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index adaf67a87..5f6759a94 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -131,20 +131,13 @@
 	<string name="priority_high">Alta</string>
 	<string name="priority_medium">Media</string>
 	<string name="priority_low">Bassa</string>
-	<string-array name="EPr_default_urgency">
-		<item>Nessun Termine</item>
-		<item>Oggi</item>
-		<item>Domani</item>
-		<item>Dopodomani</item>
-		<item>Settimana successiva</item>
-	</string-array>
+	<string name="no_deadline">Nessun Termine</string>
+	<string name="day_after_tomorrow">Dopodomani</string>
+	<string name="next_week">Settimana successiva</string>
 	<string name="dont_hide">Non nascondere</string>
-	<string-array name="EPr_default_reminders">
-		<item>Nessun promemoria scadenza</item>
-		<item>Alla scadenza</item>
-		<item>Quando è scaduta</item>
-		<item>Alla scadenza o quando scaduto</item>
-	</string-array>
+	<string name="no_deadline_reminder">Nessun promemoria scadenza</string>
+	<string name="at_deadline">Alla scadenza</string>
+	<string name="at_deadline_or_overdue">Alla scadenza o già scaduta</string>
 	<string name="BFE_Active">Le mie attività</string>
 	<string name="BFE_Recent">Modificate di recente</string>
 	<string name="CFA_universe_all">Attività in corso</string>
@@ -157,15 +150,8 @@
 	<string name="CFA_button_add">Aggiungi Criteri</string>
 	<string name="CFC_dueBefore_text">Entro: ?</string>
 	<string name="CFC_dueBefore_name">Entro...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Nessuna data di scadenza</item>
-		<item>Ieri</item>
-		<item>Oggi</item>
-		<item>Domani</item>
-		<item>Dopodomani</item>
-		<item>Prossima Settimana</item>
-		<item>Mese successivo</item>
-	</string-array>
+	<string name="no_due_date">Nessuna data di scadenza</string>
+	<string name="next_month">Mese successivo</string>
 	<string name="CFC_importance_text">Almeno per priorità ?</string>
 	<string name="CFC_importance_name">Priorità...</string>
 	<string name="CFC_tag_text">Etichetta: ?</string>
@@ -197,14 +183,12 @@
 	<string name="ring_once">Suona una volta</string>
 	<string name="ring_five_times">Suona cinque volte</string>
 	<string name="ring_nonstop">Suono continuo</string>
-	<string-array name="TEA_reminder_random">
-		<item>un\'ora</item>
-		<item>ogni giorno</item>
-		<item>ogni settimana</item>
-		<item>ogni due settimane</item>
-		<item>ogni mese</item>
-		<item>ogni due mesi</item>
-	</string-array>
+	<string name="random_reminder_hour">un\'ora</string>
+	<string name="random_reminder_day">ogni giorno</string>
+	<string name="random_reminder_week">ogni settimana</string>
+	<string name="random_reminder_two_weeks">ogni due settimane</string>
+	<string name="random_reminder_month">ogni mese</string>
+	<string name="random_reminder_two_months">ogni due mesi</string>
 	<string name="rmd_NoA_done">Completata</string>
 	<string name="rmd_NoA_snooze">Rimanda...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Ora inizio silenzio</string>
@@ -216,30 +200,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume massimo per promemoria \"ring-multipli\"</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks metterà il volume al massimo per i promemoria \"ring-multipli\"</string>
 	<string name="rmd_EPr_defaultRemind_title">Promemoria Casuali</string>
-	<string-array name="EPr_reminder_random">
-		<item>disabilitato</item>
-		<item>ogni ora</item>
-		<item>quotidianamente</item>
-		<item>settimanalmente</item>
-		<item>bi-settimanalmente</item>
-		<item>mensilmente</item>
-		<item>bi-mensilmente</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">disabilitato</string>
+	<string name="default_random_reminder_hourly">ogni ora</string>
+	<string name="default_random_reminder_daily">quotidianamente</string>
+	<string name="default_random_reminder_weekly">settimanalmente</string>
+	<string name="default_random_reminder_bi_weekly">bi-settimanalmente</string>
+	<string name="default_random_reminder_monthly">mensilmente</string>
+	<string name="default_random_reminder_bi_monthly">bi-mensilmente</string>
 	<string name="repeat_every">Ogni %d</string>
 	<string name="repeat_interval_prompt">Intervallo di ripetizione</string>
 	<string name="repeat_never">Non ricorrente</string>
-	<string-array name="repeat_interval">
-		<item>Giorno(i)</item>
-		<item>Settimana(e)</item>
-		<item>Mese(i)</item>
-		<item>Ora(e)</item>
-		<item>Minuto(i)</item>
-		<item>Anno(i)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>dalla data di scadenza</item>
-		<item>dalla data di completamento</item>
-	</string-array>
+	<string name="repeat_interval_day">Giorno(i)</string>
+	<string name="repeat_interval_week">Settimana(e)</string>
+	<string name="repeat_interval_month">Mese(i)</string>
+	<string name="repeat_interval_hour">Ora(e)</string>
+	<string name="repeat_interval_minute">Minuto(i)</string>
+	<string name="repeat_interval_year">Anno(i)</string>
+	<string name="repeat_type_due">dalla data di scadenza</string>
+	<string name="repeat_type_completion">dalla data di completamento</string>
 	<string name="repeat_detail_duedate">Ogni %s</string>
 	<string name="repeat_detail_duedate_until">Ogni %1$s\nfino %2$s</string>
 	<string name="repeat_forever">Ripeti all\'infinito</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 8afd82640..6d4d7609c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -131,20 +131,13 @@
 	<string name="priority_high">גבוה</string>
 	<string name="priority_medium">בינוני</string>
 	<string name="priority_low">נמוך</string>
-	<string-array name="EPr_default_urgency">
-		<item>ללא מועד סף</item>
-		<item>היום</item>
-		<item>מחר</item>
-		<item>מחרתיים</item>
-		<item>בשבוע הבא</item>
-	</string-array>
+	<string name="no_deadline">ללא מועד סף</string>
+	<string name="day_after_tomorrow">מחרתיים</string>
+	<string name="next_week">בשבוע הבא</string>
 	<string name="dont_hide">אל תסתיר</string>
-	<string-array name="EPr_default_reminders">
-		<item>ללא תזכורות במועד הסף</item>
-		<item>במועד הסף</item>
-		<item>אחרי מועד היעד</item>
-		<item>במועד היעד או לאחריו</item>
-	</string-array>
+	<string name="no_deadline_reminder">ללא תזכורות במועד הסף</string>
+	<string name="at_deadline">במועד הסף</string>
+	<string name="at_deadline_or_overdue">במועד היעד או לאחריו</string>
 	<string name="BFE_Active">המשימות שלי</string>
 	<string name="BFE_Recent">עודכנו לאחרונה</string>
 	<string name="CFA_universe_all">משימות פעילות</string>
@@ -157,15 +150,8 @@
 	<string name="CFA_button_add">הוסף קריטריון</string>
 	<string name="CFC_dueBefore_text">תאריך יעד: ?</string>
 	<string name="CFC_dueBefore_name">מועד יעד...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>ללא תאריך יעד</item>
-		<item>אתמול</item>
-		<item>היום</item>
-		<item>מחר</item>
-		<item>מחרתיים</item>
-		<item>בשבוע הבא</item>
-		<item>בחודש הבא</item>
-	</string-array>
+	<string name="no_due_date">ללא תאריך יעד</string>
+	<string name="next_month">בחודש הבא</string>
 	<string name="CFC_importance_text">עדיפות לפחות?</string>
 	<string name="CFC_importance_name">עדיפות...</string>
 	<string name="CFC_tag_text">תג: ?</string>
@@ -197,14 +183,12 @@
 	<string name="ring_once">צלצל פעם אחת</string>
 	<string name="ring_five_times">צלצל חמש פעמים</string>
 	<string name="ring_nonstop">צלצל ללא הפסקה</string>
-	<string-array name="TEA_reminder_random">
-		<item>שעה</item>
-		<item>יום</item>
-		<item>שבוע</item>
-		<item>שבועיים</item>
-		<item>חודש</item>
-		<item>חדשיים</item>
-	</string-array>
+	<string name="random_reminder_hour">שעה</string>
+	<string name="random_reminder_day">יום</string>
+	<string name="random_reminder_week">שבוע</string>
+	<string name="random_reminder_two_weeks">שבועיים</string>
+	<string name="random_reminder_month">חודש</string>
+	<string name="random_reminder_two_months">חדשיים</string>
 	<string name="rmd_NoA_done">בוצעה</string>
 	<string name="rmd_NoA_snooze">נודניק</string>
 	<string name="rmd_EPr_quiet_hours_start_title">תחילת שעות השקט</string>
@@ -216,30 +200,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">עוצמת קול מירבית לתזכורות מרובות צילצולים</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">אסטריד תשתמש בעוצמת קול מירבית לתזכורות רבות צלצולים</string>
 	<string name="rmd_EPr_defaultRemind_title">תזכורות אקראיות</string>
-	<string-array name="EPr_reminder_random">
-		<item>לא זמין</item>
-		<item>שעתי</item>
-		<item>יומי</item>
-		<item>שבועי</item>
-		<item>דו שבועי</item>
-		<item>חודשי</item>
-		<item>דו חודשי</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">לא זמין</string>
+	<string name="default_random_reminder_hourly">שעתי</string>
+	<string name="default_random_reminder_daily">יומי</string>
+	<string name="default_random_reminder_weekly">שבועי</string>
+	<string name="default_random_reminder_bi_weekly">דו שבועי</string>
+	<string name="default_random_reminder_monthly">חודשי</string>
+	<string name="default_random_reminder_bi_monthly">דו חודשי</string>
 	<string name="repeat_every">כל %d</string>
 	<string name="repeat_interval_prompt">תדירות חזרה</string>
 	<string name="repeat_never">ללא חזרה</string>
-	<string-array name="repeat_interval">
-		<item>יום/ימים</item>
-		<item>שבוע/(ות)</item>
-		<item>חודש/ים</item>
-		<item>שעה/ות</item>
-		<item>דקה/דקות</item>
-		<item>שנה/שנים</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>מתאריך היעד</item>
-		<item>מהיום שהמשימה הושלמה</item>
-	</string-array>
+	<string name="repeat_interval_day">יום/ימים</string>
+	<string name="repeat_interval_week">שבוע/(ות)</string>
+	<string name="repeat_interval_month">חודש/ים</string>
+	<string name="repeat_interval_hour">שעה/ות</string>
+	<string name="repeat_interval_minute">דקה/דקות</string>
+	<string name="repeat_interval_year">שנה/שנים</string>
+	<string name="repeat_type_due">מתאריך היעד</string>
+	<string name="repeat_type_completion">מהיום שהמשימה הושלמה</string>
 	<string name="repeat_detail_duedate">כל %s</string>
 	<string name="repeat_detail_duedate_until">כל %1$s\nעד %2$s</string>
 	<string name="repeat_forever">חזור לנצח</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 500acf141..4739f8eec 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -131,20 +131,13 @@
 	<string name="priority_high">高</string>
 	<string name="priority_medium">中</string>
 	<string name="priority_low">低</string>
-	<string-array name="EPr_default_urgency">
-		<item>期限なし</item>
-		<item>今日</item>
-		<item>明日</item>
-		<item>明後日</item>
-		<item>来週</item>
-	</string-array>
+	<string name="no_deadline">期限なし</string>
+	<string name="day_after_tomorrow">明後日</string>
+	<string name="next_week">来週</string>
 	<string name="dont_hide">常に表示する</string>
-	<string-array name="EPr_default_reminders">
-		<item>期限を通知しない</item>
-		<item>期限に</item>
-		<item>期限を過ぎたとき</item>
-		<item>期限または期限を過ぎて</item>
-	</string-array>
+	<string name="no_deadline_reminder">期限を通知しない</string>
+	<string name="at_deadline">期限に</string>
+	<string name="at_deadline_or_overdue">期限または期限を過ぎて</string>
 	<string name="BFE_Active">マイ タスク</string>
 	<string name="BFE_Recent">最近編集したタスク</string>
 	<string name="CFA_universe_all">進行中のタスク</string>
@@ -157,15 +150,8 @@
 	<string name="CFA_button_add">条件の追加</string>
 	<string name="CFC_dueBefore_text">期限: ?</string>
 	<string name="CFC_dueBefore_name">期限</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>期限日がありません</item>
-		<item>昨日</item>
-		<item>今日</item>
-		<item>明日</item>
-		<item>明後日</item>
-		<item>来週</item>
-		<item>来月</item>
-	</string-array>
+	<string name="no_due_date">期限日がありません</string>
+	<string name="next_month">来月</string>
 	<string name="CFC_importance_text">優先順位は少なくとも ?</string>
 	<string name="CFC_importance_name">優先順位...</string>
 	<string name="CFC_tag_text">タグ: ?</string>
@@ -197,14 +183,12 @@
 	<string name="ring_once">1回通知音を鳴らす</string>
 	<string name="ring_five_times">5回通知音を鳴らす</string>
 	<string name="ring_nonstop">通知音を鳴らし続ける</string>
-	<string-array name="TEA_reminder_random">
-		<item>1時間</item>
-		<item>1日</item>
-		<item>1週間</item>
-		<item>2週間以内</item>
-		<item>1か月</item>
-		<item>2か月以内</item>
-	</string-array>
+	<string name="random_reminder_hour">1時間</string>
+	<string name="random_reminder_day">1日</string>
+	<string name="random_reminder_week">1週間</string>
+	<string name="random_reminder_two_weeks">2週間以内</string>
+	<string name="random_reminder_month">1か月</string>
+	<string name="random_reminder_two_months">2か月以内</string>
 	<string name="rmd_NoA_done">既に完了しています!</string>
 	<string name="rmd_NoA_snooze">スヌーズ</string>
 	<string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
@@ -216,30 +200,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">複数の通知音の最大音量</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks は複数の通知音の最大音量です</string>
 	<string name="rmd_EPr_defaultRemind_title">ランダムな通知</string>
-	<string-array name="EPr_reminder_random">
-		<item>無効</item>
-		<item>1時間毎</item>
-		<item>毎日</item>
-		<item>毎週</item>
-		<item>一週間おき</item>
-		<item>毎月</item>
-		<item>一ヶ月おき</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">無効</string>
+	<string name="default_random_reminder_hourly">1時間毎</string>
+	<string name="default_random_reminder_daily">毎日</string>
+	<string name="default_random_reminder_weekly">毎週</string>
+	<string name="default_random_reminder_bi_weekly">一週間おき</string>
+	<string name="default_random_reminder_monthly">毎月</string>
+	<string name="default_random_reminder_bi_monthly">一ヶ月おき</string>
 	<string name="repeat_every">%d 毎</string>
 	<string name="repeat_interval_prompt">繰り返し間隔</string>
 	<string name="repeat_never">繰り返しなし</string>
-	<string-array name="repeat_interval">
-		<item>日毎</item>
-		<item>週毎</item>
-		<item>か月毎</item>
-		<item>時間毎</item>
-		<item>分</item>
-		<item>年</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>期限から</item>
-		<item>完了日から</item>
-	</string-array>
+	<string name="repeat_interval_day">日毎</string>
+	<string name="repeat_interval_week">週毎</string>
+	<string name="repeat_interval_month">か月毎</string>
+	<string name="repeat_interval_hour">時間毎</string>
+	<string name="repeat_interval_minute">分</string>
+	<string name="repeat_interval_year">年</string>
+	<string name="repeat_type_due">期限から</string>
+	<string name="repeat_type_completion">完了日から</string>
 	<string name="repeat_detail_duedate">%s</string>
 	<string name="repeat_detail_duedate_until">%1$s 毎\n%2$s まで</string>
 	<string name="repeat_forever">永久に繰り返す</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index d87ecf4d4..42338da78 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -133,20 +133,13 @@
 	<string name="priority_high">높음</string>
 	<string name="priority_medium">중간</string>
 	<string name="priority_low">낮음</string>
-	<string-array name="EPr_default_urgency">
-		<item>기한 없음</item>
-		<item>오늘</item>
-		<item>내일</item>
-		<item>모레</item>
-		<item>다음 주</item>
-	</string-array>
+	<string name="no_deadline">기한 없음</string>
+	<string name="day_after_tomorrow">모레</string>
+	<string name="next_week">다음 주</string>
 	<string name="dont_hide">숨기지 않기</string>
-	<string-array name="EPr_default_reminders">
-		<item>기한 알림 없음</item>
-		<item>완료일에</item>
-		<item>마감일 이후</item>
-		<item>마감일이나 그 이후</item>
-	</string-array>
+	<string name="no_deadline_reminder">기한 알림 없음</string>
+	<string name="at_deadline">완료일에</string>
+	<string name="at_deadline_or_overdue">마감일이나 그 이후</string>
 	<string name="BFE_Active">나의 일정</string>
 	<string name="BFE_Recent">최근에 수정한 일정</string>
 	<string name="CFA_universe_all">실행중인 일정</string>
@@ -159,15 +152,8 @@
 	<string name="CFA_button_add">기준 추가</string>
 	<string name="CFC_dueBefore_text">마감일: ?</string>
 	<string name="CFC_dueBefore_name">마감일...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>마감일 없음</item>
-		<item>어제</item>
-		<item>오늘</item>
-		<item>내일</item>
-		<item>모레</item>
-		<item>다음 주</item>
-		<item>다음 달</item>
-	</string-array>
+	<string name="no_due_date">마감일 없음</string>
+	<string name="next_month">다음 달</string>
 	<string name="CFC_importance_text">최소 우선순위?</string>
 	<string name="CFC_importance_name">우선순위...</string>
 	<string name="CFC_tag_text">태그: ?</string>
@@ -199,14 +185,12 @@
 	<string name="ring_once">한번 울림</string>
 	<string name="ring_five_times">다섯번 울림</string>
 	<string name="ring_nonstop">계속 울림</string>
-	<string-array name="TEA_reminder_random">
-		<item>한 시간</item>
-		<item>하루</item>
-		<item>일주일</item>
-		<item>2주일</item>
-		<item>한달</item>
-		<item>두달</item>
-	</string-array>
+	<string name="random_reminder_hour">한 시간</string>
+	<string name="random_reminder_day">하루</string>
+	<string name="random_reminder_week">일주일</string>
+	<string name="random_reminder_two_weeks">2주일</string>
+	<string name="random_reminder_month">한달</string>
+	<string name="random_reminder_two_months">두달</string>
 	<string name="rmd_NoA_done">완료</string>
 	<string name="rmd_NoA_snooze">알림 잠시 미루기</string>
 	<string name="rmd_EPr_quiet_hours_start_title">알림 꺼짐 시작 시간</string>
@@ -218,30 +202,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">다중-링 알림의 최대 볼륨</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks는 다중-링 알림을 최대 볼륨으로 출력합니다</string>
 	<string name="rmd_EPr_defaultRemind_title">랜덤 알림</string>
-	<string-array name="EPr_reminder_random">
-		<item>사용안함</item>
-		<item>매시간</item>
-		<item>매일</item>
-		<item>매주</item>
-		<item>격주로</item>
-		<item>매달</item>
-		<item>격월로</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">사용안함</string>
+	<string name="default_random_reminder_hourly">매시간</string>
+	<string name="default_random_reminder_daily">매일</string>
+	<string name="default_random_reminder_weekly">매주</string>
+	<string name="default_random_reminder_bi_weekly">격주로</string>
+	<string name="default_random_reminder_monthly">매달</string>
+	<string name="default_random_reminder_bi_monthly">격월로</string>
 	<string name="repeat_every">매 %d</string>
 	<string name="repeat_interval_prompt">반복 주기</string>
 	<string name="repeat_never">반복하지 않기</string>
-	<string-array name="repeat_interval">
-		<item>일마다</item>
-		<item>주마다</item>
-		<item>월마다</item>
-		<item>시마다</item>
-		<item>분마다</item>
-		<item>년마다</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>마감일로부터</item>
-		<item>완료일로부터</item>
-	</string-array>
+	<string name="repeat_interval_day">일마다</string>
+	<string name="repeat_interval_week">주마다</string>
+	<string name="repeat_interval_month">월마다</string>
+	<string name="repeat_interval_hour">시마다</string>
+	<string name="repeat_interval_minute">분마다</string>
+	<string name="repeat_interval_year">년마다</string>
+	<string name="repeat_type_due">마감일로부터</string>
+	<string name="repeat_type_completion">완료일로부터</string>
 	<string name="repeat_detail_duedate">매 %s</string>
 	<string name="repeat_detail_duedate_until">매 %1$s 마다\n%2$s 까지</string>
 	<string name="repeat_forever">영원히 반복하기</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index f6f82315c..a41890e97 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -51,13 +51,6 @@
 	<string name="EPr_default_importance_title">Standardviktighet</string>
 	<string name="EPr_default_hideUntil_title">Standard skjul frem til</string>
 	<string name="EPr_default_reminders_title">Standardpåminnelser</string>
-	<string-array name="EPr_default_urgency">
-		<item>No deadline</item>
-		<item>I dag</item>
-		<item>I morgen</item>
-		<item>Day after tomorrow</item>
-		<item>Next week</item>
-	</string-array>
 	<string name="BFE_Active">Aktive oppgaver</string>
 	<string name="BFE_Recent">Nylig endret</string>
 	<string name="CFA_universe_all">Aktive oppgaver</string>
@@ -69,15 +62,6 @@
 	<string name="CFA_button_add">Legg til kriterium</string>
 	<string name="CFC_dueBefore_text">Forfaller innen: ?</string>
 	<string name="CFC_dueBefore_name">Forfaller innen...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>No Due Date</item>
-		<item>I går</item>
-		<item>I dag</item>
-		<item>I morgen</item>
-		<item>Day After Tomorrow</item>
-		<item>Neste uke</item>
-		<item>Next Month</item>
-	</string-array>
 	<string name="CFC_importance_text">Viktighet minst ?</string>
 	<string name="CFC_importance_name">Viktighet...</string>
 	<string name="CFC_title_contains_name">Tittel inneholder...</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f8b2fe77c..5cd8fe8da 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -130,20 +130,13 @@
 	<string name="priority_high">Hoog</string>
 	<string name="priority_medium">Middelmatig</string>
 	<string name="priority_low">Laag</string>
-	<string-array name="EPr_default_urgency">
-		<item>Geen einddatum</item>
-		<item>Vandaag</item>
-		<item>Morgen</item>
-		<item>Overmorgen</item>
-		<item>Volgende week</item>
-	</string-array>
+	<string name="no_deadline">Geen einddatum</string>
+	<string name="day_after_tomorrow">Overmorgen</string>
+	<string name="next_week">Volgende week</string>
 	<string name="dont_hide">Niet verbergen</string>
-	<string-array name="EPr_default_reminders">
-		<item>Herinneringen zonder einddatum</item>
-		<item>Op de einddatum</item>
-		<item>Na de einddatum</item>
-		<item>Op of na de einddatum</item>
-	</string-array>
+	<string name="no_deadline_reminder">Herinneringen zonder einddatum</string>
+	<string name="at_deadline">Op de einddatum</string>
+	<string name="at_deadline_or_overdue">Op of na de einddatum</string>
 	<string name="BFE_Active">Mijn taken</string>
 	<string name="BFE_Recent">Onlangs aangepast</string>
 	<string name="CFA_universe_all">Actieve taken</string>
@@ -156,15 +149,8 @@
 	<string name="CFA_button_add">Criteria toevoegen</string>
 	<string name="CFC_dueBefore_text">Einddatum: ?</string>
 	<string name="CFC_dueBefore_name">Einddatum...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Geen einddatum</item>
-		<item>Gisteren</item>
-		<item>Vandaag</item>
-		<item>Morgen</item>
-		<item>Overmorgen</item>
-		<item>Volgende week</item>
-		<item>Volgende maand</item>
-	</string-array>
+	<string name="no_due_date">Geen einddatum</string>
+	<string name="next_month">Volgende maand</string>
 	<string name="CFC_importance_text">Prioriteit ten minste ?</string>
 	<string name="CFC_importance_name">Prioriteit...</string>
 	<string name="CFC_tag_text">Label: ?</string>
@@ -196,14 +182,12 @@
 	<string name="ring_once">Ring eenmalig</string>
 	<string name="ring_five_times">Ring vijf keer</string>
 	<string name="ring_nonstop">Ring continue</string>
-	<string-array name="TEA_reminder_random">
-		<item>een uur</item>
-		<item>een dag</item>
-		<item>een week</item>
-		<item>over twee weken</item>
-		<item>een maand</item>
-		<item>over twee maanden</item>
-	</string-array>
+	<string name="random_reminder_hour">een uur</string>
+	<string name="random_reminder_day">een dag</string>
+	<string name="random_reminder_week">een week</string>
+	<string name="random_reminder_two_weeks">over twee weken</string>
+	<string name="random_reminder_month">een maand</string>
+	<string name="random_reminder_two_months">over twee maanden</string>
 	<string name="rmd_NoA_done">Reeds voltooid!</string>
 	<string name="rmd_NoA_snooze">Sluimeren...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Rustperiode begint</string>
@@ -215,30 +199,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Max. volume voor multiple-ring herinneringen</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks zal het volume voor multi-ring herinneringen maximaliseren</string>
 	<string name="rmd_EPr_defaultRemind_title">Willekeurige herinneringen</string>
-	<string-array name="EPr_reminder_random">
-		<item>uitgeschakeld</item>
-		<item>uurlijks</item>
-		<item>dagelijks</item>
-		<item>wekelijks</item>
-		<item>tweewekelijks</item>
-		<item>maandelijks</item>
-		<item>tweemaandelijks</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">uitgeschakeld</string>
+	<string name="default_random_reminder_hourly">uurlijks</string>
+	<string name="default_random_reminder_daily">dagelijks</string>
+	<string name="default_random_reminder_weekly">wekelijks</string>
+	<string name="default_random_reminder_bi_weekly">tweewekelijks</string>
+	<string name="default_random_reminder_monthly">maandelijks</string>
+	<string name="default_random_reminder_bi_monthly">tweemaandelijks</string>
 	<string name="repeat_every">Elke %d</string>
 	<string name="repeat_interval_prompt">Herhaal interval</string>
 	<string name="repeat_never">Niet herhalend</string>
-	<string-array name="repeat_interval">
-		<item>Dag(en)</item>
-		<item>week/weken</item>
-		<item>maand(en)</item>
-		<item>uur/uren</item>
-		<item>Minu(u)t(en)</item>
-		<item>Ja(a)r(en)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>vanaf einddatum</item>
-		<item>vanaf datum voltooid</item>
-	</string-array>
+	<string name="repeat_interval_day">Dag(en)</string>
+	<string name="repeat_interval_week">week/weken</string>
+	<string name="repeat_interval_month">maand(en)</string>
+	<string name="repeat_interval_hour">uur/uren</string>
+	<string name="repeat_interval_minute">Minu(u)t(en)</string>
+	<string name="repeat_interval_year">Ja(a)r(en)</string>
+	<string name="repeat_type_due">vanaf einddatum</string>
+	<string name="repeat_type_completion">vanaf datum voltooid</string>
 	<string name="repeat_detail_duedate">Elke %s</string>
 	<string name="repeat_detail_duedate_until">Elke %1$s\ntot %2$s</string>
 	<string name="repeat_forever">Altijd herhalen</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 704a7f1a1..8cc77b150 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -129,20 +129,13 @@
 	<string name="EPr_default_addtocalendar_title">Domyślnie dodawaj do kalendarza</string>
 	<string name="EPr_default_reminders_mode_title">Domyślny dzwonek/wibracja</string>
 	<string name="priority_medium">Średnie</string>
-	<string-array name="EPr_default_urgency">
-		<item>Bez nieprzekraczalnego terminu</item>
-		<item>Dzisiaj</item>
-		<item>Jutro</item>
-		<item>Pojutrze</item>
-		<item>Przyszły tydzień</item>
-	</string-array>
+	<string name="no_deadline">Bez nieprzekraczalnego terminu</string>
+	<string name="day_after_tomorrow">Pojutrze</string>
+	<string name="next_week">Przyszły tydzień</string>
 	<string name="dont_hide">Nie ukrywaj</string>
-	<string-array name="EPr_default_reminders">
-		<item>Brak przypomnień dla terminu nieprzekraczalnego</item>
-		<item>W dniu terminu nieprzekraczalnego</item>
-		<item>Gdy zaległe</item>
-		<item>W nieprzekraczalnym terminie lub gdy zaległe</item>
-	</string-array>
+	<string name="no_deadline_reminder">Brak przypomnień dla terminu nieprzekraczalnego</string>
+	<string name="at_deadline">W dniu terminu nieprzekraczalnego</string>
+	<string name="at_deadline_or_overdue">W nieprzekraczalnym terminie lub gdy zaległe</string>
 	<string name="BFE_Active">Moje zadania</string>
 	<string name="BFE_Recent">Niedawno zmodyfikowane</string>
 	<string name="CFA_universe_all">Aktywne zadania</string>
@@ -155,15 +148,8 @@
 	<string name="CFA_button_add">Dodaj kryterium</string>
 	<string name="CFC_dueBefore_text">Termin wykonania: ?</string>
 	<string name="CFC_dueBefore_name">Termin wykonania...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Bez terminu</item>
-		<item>Wczoraj</item>
-		<item>Dzisiaj</item>
-		<item>Jutro</item>
-		<item>Pojutrze</item>
-		<item>W przyszłym tygodniu</item>
-		<item>Przyszły miesiąc</item>
-	</string-array>
+	<string name="no_due_date">Bez terminu</string>
+	<string name="next_month">Przyszły miesiąc</string>
 	<string name="CFC_importance_text">Priorytet przynajmniej?</string>
 	<string name="CFC_importance_name">Priorytet...</string>
 	<string name="CFC_tag_contains_name">Nazwa taga zawiera...</string>
@@ -193,14 +179,12 @@
 	<string name="ring_once">Dzwoń raz</string>
 	<string name="ring_five_times">Dzwoń pięć razy</string>
 	<string name="ring_nonstop">Dzwoń nonstop</string>
-	<string-array name="TEA_reminder_random">
-		<item>na godzinę</item>
-		<item>dziennie</item>
-		<item>na tydzień</item>
-		<item>na dwa tygodnie</item>
-		<item>na miesiąc</item>
-		<item>na dwa miesiące</item>
-	</string-array>
+	<string name="random_reminder_hour">na godzinę</string>
+	<string name="random_reminder_day">dziennie</string>
+	<string name="random_reminder_week">na tydzień</string>
+	<string name="random_reminder_two_weeks">na dwa tygodnie</string>
+	<string name="random_reminder_month">na miesiąc</string>
+	<string name="random_reminder_two_months">na dwa miesiące</string>
 	<string name="rmd_NoA_done">Już wykonano!</string>
 	<string name="rmd_NoA_snooze">Wstrzymaj...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Początek czasu wyciszenia</string>
@@ -212,30 +196,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Maksymalna głośność dla wielu dzwonków przypomnień</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks ustawi maksymalną głośność dla wielu dzwonków przypomnień</string>
 	<string name="rmd_EPr_defaultRemind_title">Losowe przypomnienia</string>
-	<string-array name="EPr_reminder_random">
-		<item>wyłączone</item>
-		<item>co godzinę</item>
-		<item>raz dziennie</item>
-		<item>raz w tygodniu</item>
-		<item>raz na dwa tygodnie</item>
-		<item>raz w miesiącu</item>
-		<item>raz na dwa miesiące</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">wyłączone</string>
+	<string name="default_random_reminder_hourly">co godzinę</string>
+	<string name="default_random_reminder_daily">raz dziennie</string>
+	<string name="default_random_reminder_weekly">raz w tygodniu</string>
+	<string name="default_random_reminder_bi_weekly">raz na dwa tygodnie</string>
+	<string name="default_random_reminder_monthly">raz w miesiącu</string>
+	<string name="default_random_reminder_bi_monthly">raz na dwa miesiące</string>
 	<string name="repeat_every">Co %d</string>
 	<string name="repeat_interval_prompt">Odstęp powtarzania</string>
 	<string name="repeat_never">Jednorazowo</string>
-	<string-array name="repeat_interval">
-		<item>Dzień/Dni</item>
-		<item>Tydzień/Tygodni(e)</item>
-		<item>Miesiąc/Miesiący(e)</item>
-		<item>Godzinę(y)/Godzin</item>
-		<item>Minut(a/y)</item>
-		<item>Rok/lata</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>od planowanego terminu</item>
-		<item>od daty ukończenia</item>
-	</string-array>
+	<string name="repeat_interval_day">Dzień/Dni</string>
+	<string name="repeat_interval_week">Tydzień/Tygodni(e)</string>
+	<string name="repeat_interval_month">Miesiąc/Miesiący(e)</string>
+	<string name="repeat_interval_hour">Godzinę(y)/Godzin</string>
+	<string name="repeat_interval_minute">Minut(a/y)</string>
+	<string name="repeat_interval_year">Rok/lata</string>
+	<string name="repeat_type_due">od planowanego terminu</string>
+	<string name="repeat_type_completion">od daty ukończenia</string>
 	<string name="repeat_detail_duedate">Każdy %s</string>
 	<string name="repeat_detail_duedate_until">Co %1$s\ndo %2$s</string>
 	<string name="repeat_forever">Powtarzaj bez końca</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 3a9d94fab..8d6dc18c4 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -120,20 +120,13 @@
 	<string name="priority_high">Alta</string>
 	<string name="priority_medium">Média</string>
 	<string name="priority_low">Baixa</string>
-	<string-array name="EPr_default_urgency">
-		<item>Sem prazo</item>
-		<item>Hoje</item>
-		<item>Amanhã</item>
-		<item>Depois de amanhã</item>
-		<item>Próxima semana</item>
-	</string-array>
+	<string name="no_deadline">Sem prazo</string>
+	<string name="day_after_tomorrow">Depois de amanhã</string>
+	<string name="next_week">Próxima semana</string>
 	<string name="dont_hide">Não ocultar</string>
-	<string-array name="EPr_default_reminders">
-		<item>Sem lembretes no vencimento</item>
-		<item>No vencimento</item>
-		<item>Quando vencida</item>
-		<item>No prazo ou vencidas</item>
-	</string-array>
+	<string name="no_deadline_reminder">Sem lembretes no vencimento</string>
+	<string name="at_deadline">No vencimento</string>
+	<string name="at_deadline_or_overdue">No prazo ou vencidas</string>
 	<string name="BFE_Active">Minhas Tarefas</string>
 	<string name="BFE_Recent">Modificadas recentemente</string>
 	<string name="CFA_universe_all">Tarefas ativas</string>
@@ -146,15 +139,8 @@
 	<string name="CFA_button_add">Adicionar critério</string>
 	<string name="CFC_dueBefore_text">Vencimento: ?</string>
 	<string name="CFC_dueBefore_name">Vencimento...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Sem data de vencimento</item>
-		<item>Ontem</item>
-		<item>Hoje</item>
-		<item>Amanhã</item>
-		<item>Depois de amanhã</item>
-		<item>Próxima semana</item>
-		<item>Próximo mês</item>
-	</string-array>
+	<string name="no_due_date">Sem data de vencimento</string>
+	<string name="next_month">Próximo mês</string>
 	<string name="CFC_importance_text">Pelo menos por prioridade?</string>
 	<string name="CFC_importance_name">Prioridade...</string>
 	<string name="CFC_title_contains_name">Título...</string>
@@ -177,14 +163,12 @@
 	<string name="audio_stop_recording">Parar Gravação</string>
 	<string name="file_type_unhandled">Desculpa! Nenhuma aplicação para manipular este tipo de arquivo foi encontrada.</string>
 	<string name="file_err_copy">Erro ao copiar o arquivo para o anexo</string>
-	<string-array name="TEA_reminder_random">
-		<item>por hora</item>
-		<item>por dia</item>
-		<item>por semana</item>
-		<item>a cada duas semanas</item>
-		<item>a cada mês</item>
-		<item>a cada dois meses</item>
-	</string-array>
+	<string name="random_reminder_hour">por hora</string>
+	<string name="random_reminder_day">por dia</string>
+	<string name="random_reminder_week">por semana</string>
+	<string name="random_reminder_two_weeks">a cada duas semanas</string>
+	<string name="random_reminder_month">a cada mês</string>
+	<string name="random_reminder_two_months">a cada dois meses</string>
 	<string name="rmd_NoA_done">Concluída</string>
 	<string name="rmd_NoA_snooze">Adiar</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Começam as horas calmas</string>
@@ -196,30 +180,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com múltiplos sons</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks irá aumentar o volume para alertas com múltiplos sons</string>
 	<string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
-	<string-array name="EPr_reminder_random">
-		<item>desabilitado</item>
-		<item>de hora em hora</item>
-		<item>diariamente</item>
-		<item>semanalmente</item>
-		<item>a cada duas semanas</item>
-		<item>mensalmente</item>
-		<item>a cada dois meses</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">desabilitado</string>
+	<string name="default_random_reminder_hourly">de hora em hora</string>
+	<string name="default_random_reminder_daily">diariamente</string>
+	<string name="default_random_reminder_weekly">semanalmente</string>
+	<string name="default_random_reminder_bi_weekly">a cada duas semanas</string>
+	<string name="default_random_reminder_monthly">mensalmente</string>
+	<string name="default_random_reminder_bi_monthly">a cada dois meses</string>
 	<string name="repeat_every">A cada %d</string>
 	<string name="repeat_interval_prompt">Intervalo de repetição</string>
 	<string name="repeat_never">Não repetir</string>
-	<string-array name="repeat_interval">
-		<item>Dia(s)</item>
-		<item>Semana(s)</item>
-		<item>Mês(es)</item>
-		<item>Hora(s)</item>
-		<item>Minuto(s)</item>
-		<item>Ano(s)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>à partir do dia do prazo final</item>
-		<item>à partir do dia de realização</item>
-	</string-array>
+	<string name="repeat_interval_day">Dia(s)</string>
+	<string name="repeat_interval_week">Semana(s)</string>
+	<string name="repeat_interval_month">Mês(es)</string>
+	<string name="repeat_interval_hour">Hora(s)</string>
+	<string name="repeat_interval_minute">Minuto(s)</string>
+	<string name="repeat_interval_year">Ano(s)</string>
+	<string name="repeat_type_due">à partir do dia do prazo final</string>
+	<string name="repeat_type_completion">à partir do dia de realização</string>
 	<string name="repeat_detail_duedate">a cada %s</string>
 	<string name="repeat_detail_duedate_until">Todo %1$s\naté %2$s</string>
 	<string name="repeat_forever">Repetir para sempre</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index fc676051d..825417e10 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -118,20 +118,13 @@
 	<string name="EPr_default_reminders_title">Lembretes predefinidos</string>
 	<string name="EPr_default_addtocalendar_title">Predefinição ao adicionar ao calendário</string>
 	<string name="EPr_default_reminders_mode_title">Tipo de vibração/toque predefinido</string>
-	<string-array name="EPr_default_urgency">
-		<item>Sem data limite</item>
-		<item>Hoje</item>
-		<item>Amanhã</item>
-		<item>Depois de amanhã</item>
-		<item>Próxima semana</item>
-	</string-array>
+	<string name="no_deadline">Sem data limite</string>
+	<string name="day_after_tomorrow">Depois de amanhã</string>
+	<string name="next_week">Próxima semana</string>
 	<string name="dont_hide">Não ocultar</string>
-	<string-array name="EPr_default_reminders">
-		<item>Sem lembrete de data limite</item>
-		<item>Na data limite</item>
-		<item>Quando ultrapassada</item>
-		<item>Na data limite ou ultrapassada</item>
-	</string-array>
+	<string name="no_deadline_reminder">Sem lembrete de data limite</string>
+	<string name="at_deadline">Na data limite</string>
+	<string name="at_deadline_or_overdue">Na data limite ou ultrapassada</string>
 	<string name="BFE_Active">Minhas tarefas</string>
 	<string name="BFE_Recent">Alteradas recentemente</string>
 	<string name="CFA_universe_all">Tarefas ativas</string>
@@ -144,15 +137,8 @@
 	<string name="CFA_button_add">Adicionar critério</string>
 	<string name="CFC_dueBefore_text">Data limite: ?</string>
 	<string name="CFC_dueBefore_name">Data limite...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Sem data limite</item>
-		<item>Ontem</item>
-		<item>Hoje</item>
-		<item>Amanhã</item>
-		<item>Depois de amanhã</item>
-		<item>Próxima semana</item>
-		<item>Próximo mês</item>
-	</string-array>
+	<string name="no_due_date">Sem data limite</string>
+	<string name="next_month">Próximo mês</string>
 	<string name="CFC_importance_text">Prioridade mínima?</string>
 	<string name="CFC_importance_name">Importância...</string>
 	<string name="CFC_tag_text">Etiqueta: ?</string>
@@ -182,14 +168,12 @@
 	<string name="ring_once">Tocar uma vez</string>
 	<string name="ring_five_times">Tocar 5 vezes</string>
 	<string name="ring_nonstop">Tocar incessantemente</string>
-	<string-array name="TEA_reminder_random">
-		<item>uma hora</item>
-		<item>um dia</item>
-		<item>uma semana</item>
-		<item>em duas semanas</item>
-		<item>um mês</item>
-		<item>em dois meses</item>
-	</string-array>
+	<string name="random_reminder_hour">uma hora</string>
+	<string name="random_reminder_day">um dia</string>
+	<string name="random_reminder_week">uma semana</string>
+	<string name="random_reminder_two_weeks">em duas semanas</string>
+	<string name="random_reminder_month">um mês</string>
+	<string name="random_reminder_two_months">em dois meses</string>
 	<string name="rmd_NoA_done">Terminada</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Início da hora de silêncio</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fim das horas de silêncio</string>
@@ -198,30 +182,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com vários toques</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">O Tasks irá amplificar o volume para lembretes com vários toques</string>
 	<string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
-	<string-array name="EPr_reminder_random">
-		<item>desativado</item>
-		<item>horário</item>
-		<item>diário</item>
-		<item>semanal</item>
-		<item>bissemanal</item>
-		<item>mensal</item>
-		<item>bimensal</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">desativado</string>
+	<string name="default_random_reminder_hourly">horário</string>
+	<string name="default_random_reminder_daily">diário</string>
+	<string name="default_random_reminder_weekly">semanal</string>
+	<string name="default_random_reminder_bi_weekly">bissemanal</string>
+	<string name="default_random_reminder_monthly">mensal</string>
+	<string name="default_random_reminder_bi_monthly">bimensal</string>
 	<string name="repeat_every">Cada %d</string>
 	<string name="repeat_interval_prompt">Intervalo de repetição</string>
 	<string name="repeat_never">Não repete</string>
-	<string-array name="repeat_interval">
-		<item>Dia(s)</item>
-		<item>Semana(s)</item>
-		<item>Mês(es)</item>
-		<item>Hora(s)</item>
-		<item>Minuto(s)</item>
-		<item>Ano(s)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>da data limite</item>
-		<item>desde a data de conclusão</item>
-	</string-array>
+	<string name="repeat_interval_day">Dia(s)</string>
+	<string name="repeat_interval_week">Semana(s)</string>
+	<string name="repeat_interval_month">Mês(es)</string>
+	<string name="repeat_interval_hour">Hora(s)</string>
+	<string name="repeat_interval_minute">Minuto(s)</string>
+	<string name="repeat_interval_year">Ano(s)</string>
+	<string name="repeat_type_due">da data limite</string>
+	<string name="repeat_type_completion">desde a data de conclusão</string>
 	<string name="repeat_detail_duedate">Cada %s</string>
 	<string name="repeat_detail_duedate_until">Cada %1$s\naté %2$s</string>
 	<string name="repeat_forever">Repetir eternamente</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e12015099..1be3e114d 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -131,20 +131,13 @@
 	<string name="priority_high">Высокий</string>
 	<string name="priority_medium">Средний</string>
 	<string name="priority_low">Низкий</string>
-	<string-array name="EPr_default_urgency">
-		<item>Без срока выполнения</item>
-		<item>Сегодня</item>
-		<item>Завтра</item>
-		<item>Через день</item>
-		<item>Следующая неделя</item>
-	</string-array>
+	<string name="no_deadline">Без срока выполнения</string>
+	<string name="day_after_tomorrow">Через день</string>
+	<string name="next_week">Следующая неделя</string>
 	<string name="dont_hide">Не скрывать</string>
-	<string-array name="EPr_default_reminders">
-		<item>Нет напоминаний</item>
-		<item>В срок</item>
-		<item>Когда просрочена</item>
-		<item>Вовремя или просрочена</item>
-	</string-array>
+	<string name="no_deadline_reminder">Нет напоминаний</string>
+	<string name="at_deadline">В срок</string>
+	<string name="at_deadline_or_overdue">Вовремя или просрочена</string>
 	<string name="BFE_Active">Мои задачи</string>
 	<string name="BFE_Recent">Недавно изменённые</string>
 	<string name="CFA_universe_all">Активные задачи</string>
@@ -157,15 +150,8 @@
 	<string name="CFA_button_add">Добавить условие</string>
 	<string name="CFC_dueBefore_text">Конечный срок: ?</string>
 	<string name="CFC_dueBefore_name">Конечный срок…</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Нет даты выполнения задания</item>
-		<item>Вчера</item>
-		<item>Сегодня</item>
-		<item>Завтра</item>
-		<item>Через день</item>
-		<item>Через неделю</item>
-		<item>Через месяц</item>
-	</string-array>
+	<string name="no_due_date">Нет даты выполнения задания</string>
+	<string name="next_month">Через месяц</string>
 	<string name="CFC_importance_text">Приоритет меньшего?</string>
 	<string name="CFC_importance_name">Приоритет...</string>
 	<string name="CFC_tag_text">Тег: ? </string>
@@ -196,14 +182,12 @@
 	<string name="ring_once">1 раз</string>
 	<string name="ring_five_times">5 раз</string>
 	<string name="ring_nonstop">Пока не выкл.</string>
-	<string-array name="TEA_reminder_random">
-		<item>час</item>
-		<item>день</item>
-		<item>неделя</item>
-		<item>в две недели</item>
-		<item>месяц</item>
-		<item>в два месяца</item>
-	</string-array>
+	<string name="random_reminder_hour">час</string>
+	<string name="random_reminder_day">день</string>
+	<string name="random_reminder_week">неделя</string>
+	<string name="random_reminder_two_weeks">в две недели</string>
+	<string name="random_reminder_month">месяц</string>
+	<string name="random_reminder_two_months">в два месяца</string>
 	<string name="rmd_NoA_done">Уже готово!</string>
 	<string name="rmd_NoA_snooze">Повтор</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Начало тихих часов</string>
@@ -215,30 +199,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Максимальная громкость для многоразовых напоминаний</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks будет увеличивать громкость для многоразовых напоминаний</string>
 	<string name="rmd_EPr_defaultRemind_title">Случайные напоминания</string>
-	<string-array name="EPr_reminder_random">
-		<item>отключено</item>
-		<item>ежечасно</item>
-		<item>ежедневно</item>
-		<item>еженедельно</item>
-		<item>каждые две недели</item>
-		<item>ежемесячно</item>
-		<item>каждые два месяца</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">отключено</string>
+	<string name="default_random_reminder_hourly">ежечасно</string>
+	<string name="default_random_reminder_daily">ежедневно</string>
+	<string name="default_random_reminder_weekly">еженедельно</string>
+	<string name="default_random_reminder_bi_weekly">каждые две недели</string>
+	<string name="default_random_reminder_monthly">ежемесячно</string>
+	<string name="default_random_reminder_bi_monthly">каждые два месяца</string>
 	<string name="repeat_every">С интервалом в %d</string>
 	<string name="repeat_interval_prompt">Интервал повтора</string>
 	<string name="repeat_never">Без повторений</string>
-	<string-array name="repeat_interval">
-		<item>День(дней)</item>
-		<item>Неделя(ль)</item>
-		<item>Месяц(ев)</item>
-		<item>Час(ов)</item>
-		<item>Минута(ы)</item>
-		<item>Лет (Года)</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>с намеченного времени</item>
-		<item>со времени завершения</item>
-	</string-array>
+	<string name="repeat_interval_day">День(дней)</string>
+	<string name="repeat_interval_week">Неделя(ль)</string>
+	<string name="repeat_interval_month">Месяц(ев)</string>
+	<string name="repeat_interval_hour">Час(ов)</string>
+	<string name="repeat_interval_minute">Минута(ы)</string>
+	<string name="repeat_interval_year">Лет (Года)</string>
+	<string name="repeat_type_due">с намеченного времени</string>
+	<string name="repeat_type_completion">со времени завершения</string>
 	<string name="repeat_detail_duedate">С интервалом %s</string>
 	<string name="repeat_detail_duedate_until">\"Каждые  %1$s до %2$s\"</string>
 	<string name="repeat_forever">Повторять всегда</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index f3f398991..d020ba65a 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -116,20 +116,13 @@
 	<string name="EPr_default_reminders_title">Predvolené pripomienky</string>
 	<string name="EPr_default_addtocalendar_title">Predvoliť pridanie do kalendára</string>
 	<string name="EPr_default_reminders_mode_title">Východzie vyzváňanie/vybrovanie</string>
-	<string-array name="EPr_default_urgency">
-		<item>Žiaden termín</item>
-		<item>Dnes</item>
-		<item>Zajtra</item>
-		<item>Pozajtra</item>
-		<item>Nasledujúci týždeň</item>
-	</string-array>
+	<string name="no_deadline">Žiaden termín</string>
+	<string name="day_after_tomorrow">Pozajtra</string>
+	<string name="next_week">Nasledujúci týždeň</string>
 	<string name="dont_hide">Neskrývať</string>
-	<string-array name="EPr_default_reminders">
-		<item>Žiadne pripomienky v termíne</item>
-		<item>V termíne</item>
-		<item>Po termíne</item>
-		<item>V termíne alebo po termíne</item>
-	</string-array>
+	<string name="no_deadline_reminder">Žiadne pripomienky v termíne</string>
+	<string name="at_deadline">V termíne</string>
+	<string name="at_deadline_or_overdue">V termíne alebo po termíne</string>
 	<string name="BFE_Active">Moje úlohy</string>
 	<string name="BFE_Recent">Naposledy upravené</string>
 	<string name="CFA_universe_all">Aktívne úlohy</string>
@@ -142,15 +135,8 @@
 	<string name="CFA_button_add">Pridať kritériá</string>
 	<string name="CFC_dueBefore_text">Podľa termínu: ?</string>
 	<string name="CFC_dueBefore_name">Podľa termínu...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Bez termínu</item>
-		<item>Včera</item>
-		<item>Dnes</item>
-		<item>Zajtra</item>
-		<item>Pozajtra</item>
-		<item>Nasledujúci týždeň</item>
-		<item>Nasledujúci mesiac</item>
-	</string-array>
+	<string name="no_due_date">Bez termínu</string>
+	<string name="next_month">Nasledujúci mesiac</string>
 	<string name="CFC_importance_text">Najnižšia priorita ?</string>
 	<string name="CFC_importance_name">Priorita...</string>
 	<string name="CFC_title_contains_name">Názov obsahuje...</string>
@@ -176,14 +162,12 @@
 	<string name="ring_once">Zvoniť raz</string>
 	<string name="ring_five_times">Zvoniť päť krát</string>
 	<string name="ring_nonstop">Zvoniť neustále</string>
-	<string-array name="TEA_reminder_random">
-		<item>hodina</item>
-		<item>deň</item>
-		<item>týždeň</item>
-		<item>v dvoch týždňoch</item>
-		<item>mesiac</item>
-		<item>v dvoch mesiacoch</item>
-	</string-array>
+	<string name="random_reminder_hour">hodina</string>
+	<string name="random_reminder_day">deň</string>
+	<string name="random_reminder_week">týždeň</string>
+	<string name="random_reminder_two_weeks">v dvoch týždňoch</string>
+	<string name="random_reminder_month">mesiac</string>
+	<string name="random_reminder_two_months">v dvoch mesiacoch</string>
 	<string name="rmd_NoA_done">Dokončené</string>
 	<string name="rmd_NoA_snooze">Odložiť</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tiché hodiny začali</string>
@@ -193,30 +177,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Max. hlasitosť pre viacnásobné zvonenie pripomienky</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks bude zvoniť max. hlasitosťou pre viacnásobné pripomienky</string>
 	<string name="rmd_EPr_defaultRemind_title">Náhodné pripomienky</string>
-	<string-array name="EPr_reminder_random">
-		<item>zablokovaný</item>
-		<item>každú hodinu</item>
-		<item>denne</item>
-		<item>týždenne</item>
-		<item>každý druhý týždeň</item>
-		<item>mesačne</item>
-		<item>každý druhý mesiac</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">zablokovaný</string>
+	<string name="default_random_reminder_hourly">každú hodinu</string>
+	<string name="default_random_reminder_daily">denne</string>
+	<string name="default_random_reminder_weekly">týždenne</string>
+	<string name="default_random_reminder_bi_weekly">každý druhý týždeň</string>
+	<string name="default_random_reminder_monthly">mesačne</string>
+	<string name="default_random_reminder_bi_monthly">každý druhý mesiac</string>
 	<string name="repeat_every">Každý %d</string>
 	<string name="repeat_interval_prompt">Interval opakovania</string>
 	<string name="repeat_never">Neopakovať</string>
-	<string-array name="repeat_interval">
-		<item>Deň</item>
-		<item>Týždeň</item>
-		<item>Mesiac</item>
-		<item>Hodina</item>
-		<item>Minúta</item>
-		<item>Rok</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>od dátumu ukončenia</item>
-		<item>od dátumu dokončenia</item>
-	</string-array>
+	<string name="repeat_interval_day">Deň</string>
+	<string name="repeat_interval_week">Týždeň</string>
+	<string name="repeat_interval_month">Mesiac</string>
+	<string name="repeat_interval_hour">Hodina</string>
+	<string name="repeat_interval_minute">Minúta</string>
+	<string name="repeat_interval_year">Rok</string>
+	<string name="repeat_type_due">od dátumu ukončenia</string>
+	<string name="repeat_type_completion">od dátumu dokončenia</string>
 	<string name="repeat_detail_duedate">Každý %s</string>
 	<string name="repeat_detail_duedate_until">Každý %1$s\ndo %2$s</string>
 	<string name="repeat_forever">Opakovať donekonečna</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 922fc5478..23c8ed53b 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -110,20 +110,13 @@
 	<string name="EPr_default_reminders_title">Privzeti opomniki</string>
 	<string name="EPr_default_addtocalendar_title">Privzeto dodati na koledar</string>
 	<string name="EPr_default_reminders_mode_title">Privzeti način zvonenja/vibriranja</string>
-	<string-array name="EPr_default_urgency">
-		<item>Brez dospelosti</item>
-		<item>Danes</item>
-		<item>Jutri</item>
-		<item>Pojutrišnjem</item>
-		<item>Naslednji teden</item>
-	</string-array>
+	<string name="no_deadline">Brez dospelosti</string>
+	<string name="day_after_tomorrow">Pojutrišnjem</string>
+	<string name="next_week">Naslednji teden</string>
 	<string name="dont_hide">Ne skrij</string>
-	<string-array name="EPr_default_reminders">
-		<item>Brez opomnikov o dospelosti</item>
-		<item>Ob dospelosti</item>
-		<item>Po dospelosti</item>
-		<item>Ob dospelosti ali potem</item>
-	</string-array>
+	<string name="no_deadline_reminder">Brez opomnikov o dospelosti</string>
+	<string name="at_deadline">Ob dospelosti</string>
+	<string name="at_deadline_or_overdue">Ob dospelosti ali potem</string>
 	<string name="BFE_Active">Moji Opravki</string>
 	<string name="BFE_Recent">Nedavno spremenjeno</string>
 	<string name="CFA_universe_all">Aktivni Opravki</string>
@@ -136,15 +129,8 @@
 	<string name="CFA_button_add">Dodaj merila</string>
 	<string name="CFC_dueBefore_text">Opraviti do: ?</string>
 	<string name="CFC_dueBefore_name">Opraviti do:</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Brez datuma dospelosti</item>
-		<item>Včeraj</item>
-		<item>Danes</item>
-		<item>Jutri</item>
-		<item>Pojutrišnjem</item>
-		<item>Naslednji teden</item>
-		<item>Naslednji mesec</item>
-	</string-array>
+	<string name="no_due_date">Brez datuma dospelosti</string>
+	<string name="next_month">Naslednji mesec</string>
 	<string name="CFC_importance_text">Prioriteta namanj ?</string>
 	<string name="CFC_importance_name">Prioriteta ...</string>
 	<string name="CFC_title_contains_name">Naslov vsebuje ...</string>
@@ -167,14 +153,12 @@
 	<string name="audio_stop_recording">Prekini snemanje</string>
 	<string name="file_type_unhandled">Žal nobena aplikacija ne ustreza takim datotekam.</string>
 	<string name="file_err_copy">Napaka pri kopiranju datoteke za priponko</string>
-	<string-array name="TEA_reminder_random">
-		<item>na uro</item>
-		<item>dan</item>
-		<item>na teden</item>
-		<item>na dva tedna</item>
-		<item>na mesec</item>
-		<item>na dva meseca</item>
-	</string-array>
+	<string name="random_reminder_hour">na uro</string>
+	<string name="random_reminder_day">dan</string>
+	<string name="random_reminder_week">na teden</string>
+	<string name="random_reminder_two_weeks">na dva tedna</string>
+	<string name="random_reminder_month">na mesec</string>
+	<string name="random_reminder_two_months">na dva meseca</string>
 	<string name="rmd_NoA_done">Končano</string>
 	<string name="rmd_NoA_snooze">Dremež</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tihe ure se začnejo ob</string>
@@ -184,30 +168,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Največja jakost zvoka opomnikov z večkratnim zvonenjem</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Aplikacija Opravki bo izvajala opomnike z večkratnim zvonenjem pri polni jakosti zvoka.</string>
 	<string name="rmd_EPr_defaultRemind_title">Naključni opomniki</string>
-	<string-array name="EPr_reminder_random">
-		<item>onemogočen</item>
-		<item>vsako uro</item>
-		<item>dnevno</item>
-		<item>tedensko</item>
-		<item>vsake dva tedna</item>
-		<item>mesečno</item>
-		<item>vsake dva meseca</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">onemogočen</string>
+	<string name="default_random_reminder_hourly">vsako uro</string>
+	<string name="default_random_reminder_daily">dnevno</string>
+	<string name="default_random_reminder_weekly">tedensko</string>
+	<string name="default_random_reminder_bi_weekly">vsake dva tedna</string>
+	<string name="default_random_reminder_monthly">mesečno</string>
+	<string name="default_random_reminder_bi_monthly">vsake dva meseca</string>
 	<string name="repeat_every">Vsakih %d</string>
 	<string name="repeat_interval_prompt">Pogostost ponovitev</string>
 	<string name="repeat_never">Brez ponovitev</string>
-	<string-array name="repeat_interval">
-		<item>Dan/dni</item>
-		<item>V tednih</item>
-		<item>Mesec/a /e /ev</item>
-		<item>V urah</item>
-		<item>V minutah</item>
-		<item>Let/o /i /a</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>od datuma dospelosti</item>
-		<item>od datuma dokončanja</item>
-	</string-array>
+	<string name="repeat_interval_day">Dan/dni</string>
+	<string name="repeat_interval_week">V tednih</string>
+	<string name="repeat_interval_month">Mesec/a /e /ev</string>
+	<string name="repeat_interval_hour">V urah</string>
+	<string name="repeat_interval_minute">V minutah</string>
+	<string name="repeat_interval_year">Let/o /i /a</string>
+	<string name="repeat_type_due">od datuma dospelosti</string>
+	<string name="repeat_type_completion">od datuma dokončanja</string>
 	<string name="repeat_detail_duedate">Vsak %s</string>
 	<string name="repeat_detail_duedate_until">Vsak %1$s\n do  %2$s</string>
 	<string name="repeat_forever">Ponavljaj do preklica</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 4cf43bed9..0861b2dd0 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -131,20 +131,13 @@
 	<string name="priority_high">Hög</string>
 	<string name="priority_medium">Medel</string>
 	<string name="priority_low">Låg</string>
-	<string-array name="EPr_default_urgency">
-		<item>Ingen frist</item>
-		<item>Idag</item>
-		<item>Imorgon</item>
-		<item>I övermorgon</item>
-		<item>Nästa vecka</item>
-	</string-array>
+	<string name="no_deadline">Ingen frist</string>
+	<string name="day_after_tomorrow">I övermorgon</string>
+	<string name="next_week">Nästa vecka</string>
 	<string name="dont_hide">Dölj inte</string>
-	<string-array name="EPr_default_reminders">
-		<item>Inga varsel om förfall</item>
-		<item>Vid förfallodagen</item>
-		<item>Efter förfallotid</item>
-		<item>Vid eller efter förfallodagen</item>
-	</string-array>
+	<string name="no_deadline_reminder">Inga varsel om förfall</string>
+	<string name="at_deadline">Vid förfallodagen</string>
+	<string name="at_deadline_or_overdue">Vid eller efter förfallodagen</string>
 	<string name="BFE_Active">Mina Uppgifter</string>
 	<string name="BFE_Recent">Nyligen ändrade</string>
 	<string name="CFA_universe_all">Aktiva uppgifter</string>
@@ -157,15 +150,8 @@
 	<string name="CFA_button_add">Lägg till kriterium</string>
 	<string name="CFC_dueBefore_text">Förfaller innan: ?</string>
 	<string name="CFC_dueBefore_name">Förfaller innan...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Inget förfallodatum</item>
-		<item>Igår</item>
-		<item>Idag</item>
-		<item>Imorgon</item>
-		<item>I övermorgon</item>
-		<item>Nästa vecka</item>
-		<item>Nästa månad</item>
-	</string-array>
+	<string name="no_due_date">Inget förfallodatum</string>
+	<string name="next_month">Nästa månad</string>
 	<string name="CFC_importance_text">Prioritet åtminstone ?</string>
 	<string name="CFC_importance_name">Prioritet...</string>
 	<string name="CFC_tag_text">Etikett: ?</string>
@@ -197,14 +183,12 @@
 	<string name="ring_once">Ring en gång</string>
 	<string name="ring_five_times">Ring fem gånger</string>
 	<string name="ring_nonstop">Ring konstant</string>
-	<string-array name="TEA_reminder_random">
-		<item>en timme</item>
-		<item>ett dygn</item>
-		<item>en vecka</item>
-		<item>två veckor</item>
-		<item>en månad</item>
-		<item>två månader</item>
-	</string-array>
+	<string name="random_reminder_hour">en timme</string>
+	<string name="random_reminder_day">ett dygn</string>
+	<string name="random_reminder_week">en vecka</string>
+	<string name="random_reminder_two_weeks">två veckor</string>
+	<string name="random_reminder_month">en månad</string>
+	<string name="random_reminder_two_months">två månader</string>
 	<string name="rmd_NoA_done">Redan klar!</string>
 	<string name="rmd_NoA_snooze">Vänta...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tyst period börjar</string>
@@ -216,30 +200,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Maxvolym för flera ringande påminnelser</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks sätter volymen på max för flera ringande påminnelser</string>
 	<string name="rmd_EPr_defaultRemind_title">Tillfälliga påminnelser</string>
-	<string-array name="EPr_reminder_random">
-		<item>inaktiverad</item>
-		<item>varje timme</item>
-		<item>varje dag</item>
-		<item>varje vecka</item>
-		<item>varannan vecka</item>
-		<item>varje månad</item>
-		<item>varannan månad</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">inaktiverad</string>
+	<string name="default_random_reminder_hourly">varje timme</string>
+	<string name="default_random_reminder_daily">varje dag</string>
+	<string name="default_random_reminder_weekly">varje vecka</string>
+	<string name="default_random_reminder_bi_weekly">varannan vecka</string>
+	<string name="default_random_reminder_monthly">varje månad</string>
+	<string name="default_random_reminder_bi_monthly">varannan månad</string>
 	<string name="repeat_every">Varje %d</string>
 	<string name="repeat_interval_prompt">Upprepningsintervall</string>
 	<string name="repeat_never">Inte upprepande</string>
-	<string-array name="repeat_interval">
-		<item>Dag(ar)</item>
-		<item>Vecka (veckor)</item>
-		<item>Månad(er)</item>
-		<item>Timme (timmar)</item>
-		<item>Minut(er)</item>
-		<item>År</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>från förfallodatumet</item>
-		<item>från avslutningsdatumet</item>
-	</string-array>
+	<string name="repeat_interval_day">Dag(ar)</string>
+	<string name="repeat_interval_week">Vecka (veckor)</string>
+	<string name="repeat_interval_month">Månad(er)</string>
+	<string name="repeat_interval_hour">Timme (timmar)</string>
+	<string name="repeat_interval_minute">Minut(er)</string>
+	<string name="repeat_interval_year">År</string>
+	<string name="repeat_type_due">från förfallodatumet</string>
+	<string name="repeat_type_completion">från avslutningsdatumet</string>
 	<string name="repeat_detail_duedate">Varje %s</string>
 	<string name="repeat_detail_duedate_until">Varje %1$s\ntill %2$s </string>
 	<string name="repeat_forever">Repetera oändligt</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 8d23ecbd7..405f99524 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -26,13 +26,6 @@
 	<string name="TEA_control_importance">ความสำคัญ</string>
 	<string name="TEA_control_notes">บันทึกย่อ</string>
 	<string name="EPr_appearance_header">รูปโฉม</string>
-	<string-array name="EPr_default_urgency">
-		<item>No deadline</item>
-		<item>วันนี้</item>
-		<item>พรุ่งนี้</item>
-		<item>Day after tomorrow</item>
-		<item>Next week</item>
-	</string-array>
 	<string name="BFE_Active">แผนงานตอนนี้</string>
 	<string name="BFE_Recent">เพิ่งถูกแก้ไข</string>
 	<string name="CFA_universe_all">แผนงานตอนนี้</string>
@@ -41,15 +34,6 @@
 	<string name="CFA_type_intersect">รวมถึง</string>
 	<string name="CFA_context_delete">ลบแถว</string>
 	<string name="CFA_button_add">เพิ่มข้อกำหนด</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>No Due Date</item>
-		<item>เมื่อวาน</item>
-		<item>วันนี้</item>
-		<item>พรุ่งนี้</item>
-		<item>Day After Tomorrow</item>
-		<item>Next Week</item>
-		<item>Next Month</item>
-	</string-array>
 	<string name="CFC_importance_text">มีความสำคัญอย่างน้อย ?</string>
 	<string name="CFC_importance_name">ความสำคัญ...</string>
 	<string name="CFC_title_contains_name">ชื่อที่มีคำว่า...</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index d03ba65a9..feae96bea 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -84,20 +84,13 @@
 	<string name="EPr_default_reminders_title">Öntanımlı Hatırlatmalar</string>
 	<string name="EPr_default_addtocalendar_title">Öntanımlı olarak Takvime Ekle</string>
 	<string name="EPr_default_reminders_mode_title">Varsayılan Zil/Titreşim tipi</string>
-	<string-array name="EPr_default_urgency">
-		<item>Son tarih yok</item>
-		<item>Bugün</item>
-		<item>Yarın</item>
-		<item>Yarından Sonra</item>
-		<item>Gelecek Hafta</item>
-	</string-array>
+	<string name="no_deadline">Son tarih yok</string>
+	<string name="day_after_tomorrow">Yarından Sonra</string>
+	<string name="next_week">Gelecek Hafta</string>
 	<string name="dont_hide">Gizleme</string>
-	<string-array name="EPr_default_reminders">
-		<item>Son gün hatırlatması yok</item>
-		<item>Son tarihte</item>
-		<item>Son tarih aşıldığında</item>
-		<item>Son tarihte ya da aşıldığında</item>
-	</string-array>
+	<string name="no_deadline_reminder">Son gün hatırlatması yok</string>
+	<string name="at_deadline">Son tarihte</string>
+	<string name="at_deadline_or_overdue">Son tarihte ya da aşıldığında</string>
 	<string name="BFE_Recent">Yakında Değiştirilenler</string>
 	<string name="CFA_universe_all">Etkin Görevler</string>
 	<string name="CFA_type_add">ya da</string>
@@ -108,15 +101,8 @@
 	<string name="CFA_button_add">Ölçüt Ekle</string>
 	<string name="CFC_dueBefore_text">Şu tarihte: ?</string>
 	<string name="CFC_dueBefore_name">Şu tarihte...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Son Tarih Yok</item>
-		<item>Dün</item>
-		<item>Bugün</item>
-		<item>Yarın</item>
-		<item>Yarından sonra</item>
-		<item>Gelecek Hafta</item>
-		<item>Gelecek Ay</item>
-	</string-array>
+	<string name="no_due_date">Son Tarih Yok</string>
+	<string name="next_month">Gelecek Ay</string>
 	<string name="CFC_title_contains_name">Başlık şunu içersin...</string>
 	<string name="CFC_title_contains_text">Başlık şunu içersin:?</string>
 	<string name="gcal_TEA_error">Takvime görev eklenmesinde hata!</string>
@@ -137,14 +123,12 @@
 	<string name="audio_stop_recording">Kaydı Durdur</string>
 	<string name="file_type_unhandled">Üzgünüm! Bu dosya türünü destekleyen bir uygulama bulunamadı.</string>
 	<string name="file_err_copy">Dosyanın ek olarak kopyalanmasında hata</string>
-	<string-array name="TEA_reminder_random">
-		<item>bir saat</item>
-		<item>bir gün</item>
-		<item>bir hafta</item>
-		<item>iki hafta içinde</item>
-		<item>bir ay</item>
-		<item>iki ay içinde</item>
-	</string-array>
+	<string name="random_reminder_hour">bir saat</string>
+	<string name="random_reminder_day">bir gün</string>
+	<string name="random_reminder_week">bir hafta</string>
+	<string name="random_reminder_two_weeks">iki hafta içinde</string>
+	<string name="random_reminder_month">bir ay</string>
+	<string name="random_reminder_two_months">iki ay içinde</string>
 	<string name="rmd_NoA_done">Tamamlandı</string>
 	<string name="rmd_NoA_snooze">Ertele</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Sessiz saatlerin başlangıcı</string>
@@ -154,29 +138,23 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Çoklu çalan hatırlatmalar için en yüksek ses seviyesi</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Çoklu çalan hatırlatmalar için Tasks ses seviyesini en yükseğe çıkaracaktır</string>
 	<string name="rmd_EPr_defaultRemind_title">Rastgele Hatırlatmalar</string>
-	<string-array name="EPr_reminder_random">
-		<item>devre dışı</item>
-		<item>saat başı</item>
-		<item>her gün</item>
-		<item>her hafta</item>
-		<item>haftada 2 kez</item>
-		<item>ayda bir</item>
-		<item>ayda 2 kez</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">devre dışı</string>
+	<string name="default_random_reminder_hourly">saat başı</string>
+	<string name="default_random_reminder_daily">her gün</string>
+	<string name="default_random_reminder_weekly">her hafta</string>
+	<string name="default_random_reminder_bi_weekly">haftada 2 kez</string>
+	<string name="default_random_reminder_monthly">ayda bir</string>
+	<string name="default_random_reminder_bi_monthly">ayda 2 kez</string>
 	<string name="repeat_every">Her %d</string>
 	<string name="repeat_interval_prompt">Yineleme Aralığı</string>
-	<string-array name="repeat_interval">
-		<item>Gün</item>
-		<item>Hafta</item>
-		<item>Ay</item>
-		<item>Saat</item>
-		<item>Dakika</item>
-		<item>Yıl</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>son tarihten itibaren</item>
-		<item>tamamlanma tarihinden itibaren</item>
-	</string-array>
+	<string name="repeat_interval_day">Gün</string>
+	<string name="repeat_interval_week">Hafta</string>
+	<string name="repeat_interval_month">Ay</string>
+	<string name="repeat_interval_hour">Saat</string>
+	<string name="repeat_interval_minute">Dakika</string>
+	<string name="repeat_interval_year">Yıl</string>
+	<string name="repeat_type_due">son tarihten itibaren</string>
+	<string name="repeat_type_completion">tamamlanma tarihinden itibaren</string>
 	<string name="repeat_detail_duedate">Her %s</string>
 	<string name="repeat_detail_duedate_until">Her %1$s\n%2$s \'e kadar</string>
 	<string name="repeat_forever">Sürekli yinele</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index b65bb9d6d..7933bf798 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -134,20 +134,13 @@
 	<string name="priority_high">Високий</string>
 	<string name="priority_medium">Середній</string>
 	<string name="priority_low">Низький</string>
-	<string-array name="EPr_default_urgency">
-		<item>Немає дедлайну</item>
-		<item>Сьогодні</item>
-		<item>Завтра</item>
-		<item>Післязавтра</item>
-		<item>Наступного тижня</item>
-	</string-array>
+	<string name="no_deadline">Немає дедлайну</string>
+	<string name="day_after_tomorrow">Післязавтра</string>
+	<string name="next_week">Наступного тижня</string>
 	<string name="dont_hide">Не приховувати</string>
-	<string-array name="EPr_default_reminders">
-		<item>Нема нагадувань</item>
-		<item>Під час дедлайну</item>
-		<item>Коли прострочено</item>
-		<item>Вчасно або прострочено</item>
-	</string-array>
+	<string name="no_deadline_reminder">Нема нагадувань</string>
+	<string name="at_deadline">Під час дедлайну</string>
+	<string name="at_deadline_or_overdue">Вчасно або прострочено</string>
 	<string name="BFE_Active">Мої завдання</string>
 	<string name="BFE_Recent">Недавно змінені</string>
 	<string name="CFA_universe_all">Активні завдання</string>
@@ -160,15 +153,8 @@
 	<string name="CFA_button_add">Додати критерій</string>
 	<string name="CFC_dueBefore_text">Кінцевий термін: ?</string>
 	<string name="CFC_dueBefore_name">Кінцевий термін...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>Немає терміну виконання</item>
-		<item>Вчора</item>
-		<item>Сьогодні</item>
-		<item>Завтра</item>
-		<item>Післязавтра</item>
-		<item>Наступного тижня</item>
-		<item>Наступного місяця</item>
-	</string-array>
+	<string name="no_due_date">Немає терміну виконання</string>
+	<string name="next_month">Наступного місяця</string>
 	<string name="CFC_importance_text">Пріоритет щонайменше?</string>
 	<string name="CFC_importance_name">Пріоритет...</string>
 	<string name="CFC_tag_text">Тег: ?</string>
@@ -199,14 +185,12 @@
 	<string name="ring_once">Дзвеніти 1 раз</string>
 	<string name="ring_five_times">Дзвеніти 5 раз</string>
 	<string name="ring_nonstop">Дзвеніти безперервно</string>
-	<string-array name="TEA_reminder_random">
-		<item>година</item>
-		<item>дня</item>
-		<item>тижня</item>
-		<item>На протязі 2-х тижнів</item>
-		<item>місяця</item>
-		<item>на проязі 2-х місяців</item>
-	</string-array>
+	<string name="random_reminder_hour">година</string>
+	<string name="random_reminder_day">дня</string>
+	<string name="random_reminder_week">тижня</string>
+	<string name="random_reminder_two_weeks">На протязі 2-х тижнів</string>
+	<string name="random_reminder_month">місяця</string>
+	<string name="random_reminder_two_months">на проязі 2-х місяців</string>
 	<string name="rmd_NoA_done">Виконано</string>
 	<string name="rmd_NoA_snooze">Відкласти</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Тихі години стартують</string>
@@ -218,30 +202,24 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Максимальна гучність для багаторазових нагадувань</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks буде максимізувати гучність для багаторазових нагадувань</string>
 	<string name="rmd_EPr_defaultRemind_title">Випадкові нагадування</string>
-	<string-array name="EPr_reminder_random">
-		<item>вимкнено</item>
-		<item>щогодинно</item>
-		<item>щоденно</item>
-		<item>щотижня</item>
-		<item>два рази на тиждень</item>
-		<item>щомісяця</item>
-		<item>два рази на місяць</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">вимкнено</string>
+	<string name="default_random_reminder_hourly">щогодинно</string>
+	<string name="default_random_reminder_daily">щоденно</string>
+	<string name="default_random_reminder_weekly">щотижня</string>
+	<string name="default_random_reminder_bi_weekly">два рази на тиждень</string>
+	<string name="default_random_reminder_monthly">щомісяця</string>
+	<string name="default_random_reminder_bi_monthly">два рази на місяць</string>
 	<string name="repeat_every">Кожні %d</string>
 	<string name="repeat_interval_prompt">Інтервал повторення</string>
 	<string name="repeat_never">Не повторювати</string>
-	<string-array name="repeat_interval">
-		<item>Днів</item>
-		<item>Тижнів</item>
-		<item>Місяців</item>
-		<item>Годин</item>
-		<item>Хвилин</item>
-		<item>Років</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>з кінцевої дати</item>
-		<item>з дати виконання</item>
-	</string-array>
+	<string name="repeat_interval_day">Днів</string>
+	<string name="repeat_interval_week">Тижнів</string>
+	<string name="repeat_interval_month">Місяців</string>
+	<string name="repeat_interval_hour">Годин</string>
+	<string name="repeat_interval_minute">Хвилин</string>
+	<string name="repeat_interval_year">Років</string>
+	<string name="repeat_type_due">з кінцевої дати</string>
+	<string name="repeat_type_completion">з дати виконання</string>
 	<string name="repeat_detail_duedate">Кожні %s</string>
 	<string name="repeat_detail_duedate_until">Кожні %1$s\до %2$s</string>
 	<string name="repeat_forever">Повторювати завжди</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 22d167946..666c25890 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -80,20 +80,13 @@
 	<string name="EPr_default_reminders_title">默认提醒</string>
 	<string name="EPr_default_addtocalendar_title">默认添加到日历</string>
 	<string name="EPr_default_reminders_mode_title">默认铃声／振动类型</string>
-	<string-array name="EPr_default_urgency">
-		<item>无截止日</item>
-		<item>今天</item>
-		<item>明天</item>
-		<item>后天</item>
-		<item>下周</item>
-	</string-array>
+	<string name="no_deadline">无截止日</string>
+	<string name="day_after_tomorrow">后天</string>
+	<string name="next_week">下周</string>
 	<string name="dont_hide">不隐藏</string>
-	<string-array name="EPr_default_reminders">
-		<item>无截止期限提醒</item>
-		<item>截止期限时</item>
-		<item>过期时</item>
-		<item>截止期限或过期时</item>
-	</string-array>
+	<string name="no_deadline_reminder">无截止期限提醒</string>
+	<string name="at_deadline">截止期限时</string>
+	<string name="at_deadline_or_overdue">截止期限或过期时</string>
 	<string name="BFE_Recent">最近修改过的</string>
 	<string name="CFA_universe_all">进行中的任务</string>
 	<string name="CFA_type_add">或</string>
@@ -104,15 +97,8 @@
 	<string name="CFA_button_add">添加条件</string>
 	<string name="CFC_dueBefore_text">期限: ?</string>
 	<string name="CFC_dueBefore_name">期限...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>无期限</item>
-		<item>昨天</item>
-		<item>今天</item>
-		<item>明天</item>
-		<item>后天</item>
-		<item>下周</item>
-		<item>下个月</item>
-	</string-array>
+	<string name="no_due_date">无期限</string>
+	<string name="next_month">下个月</string>
 	<string name="CFC_title_contains_name">标题含...</string>
 	<string name="CFC_title_contains_text">标题含: ?</string>
 	<string name="gcal_TEA_error">添加任务到日历时失败！</string>
@@ -132,14 +118,12 @@
 	<string name="audio_stop_recording">停止录制</string>
 	<string name="file_type_unhandled">对不起！找不到应用程序处理这种文件类型。</string>
 	<string name="file_err_copy">复制文件添加附件时出错</string>
-	<string-array name="TEA_reminder_random">
-		<item>一个小时</item>
-		<item>一天</item>
-		<item>一个星期</item>
-		<item>两星期内</item>
-		<item>一个月</item>
-		<item>两个月内</item>
-	</string-array>
+	<string name="random_reminder_hour">一个小时</string>
+	<string name="random_reminder_day">一天</string>
+	<string name="random_reminder_week">一个星期</string>
+	<string name="random_reminder_two_weeks">两星期内</string>
+	<string name="random_reminder_month">一个月</string>
+	<string name="random_reminder_two_months">两个月内</string>
 	<string name="rmd_NoA_done">已完成!</string>
 	<string name="rmd_NoA_snooze">晚点提醒...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">静音开始时间</string>
@@ -149,29 +133,23 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">清单小助理将会以最大音量进行多重提醒</string>
 	<string name="rmd_EPr_defaultRemind_title">随机提醒</string>
-	<string-array name="EPr_reminder_random">
-		<item>停用</item>
-		<item>每小时</item>
-		<item>每天</item>
-		<item>每周</item>
-		<item>每两周</item>
-		<item>每月</item>
-		<item>每两个月</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">停用</string>
+	<string name="default_random_reminder_hourly">每小时</string>
+	<string name="default_random_reminder_daily">每天</string>
+	<string name="default_random_reminder_weekly">每周</string>
+	<string name="default_random_reminder_bi_weekly">每两周</string>
+	<string name="default_random_reminder_monthly">每月</string>
+	<string name="default_random_reminder_bi_monthly">每两个月</string>
 	<string name="repeat_every">每 %d</string>
 	<string name="repeat_interval_prompt">重复间隔</string>
-	<string-array name="repeat_interval">
-		<item>日</item>
-		<item>星期</item>
-		<item>月</item>
-		<item>小时</item>
-		<item>分钟</item>
-		<item>年</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>自到期日</item>
-		<item>自完成日</item>
-	</string-array>
+	<string name="repeat_interval_day">日</string>
+	<string name="repeat_interval_week">星期</string>
+	<string name="repeat_interval_month">月</string>
+	<string name="repeat_interval_hour">小时</string>
+	<string name="repeat_interval_minute">分钟</string>
+	<string name="repeat_interval_year">年</string>
+	<string name="repeat_type_due">自到期日</string>
+	<string name="repeat_type_completion">自完成日</string>
 	<string name="repeat_detail_duedate">每隔 %s</string>
 	<string name="repeat_detail_duedate_until">每隔 %1$s\n直到 %2$s</string>
 	<string name="repeat_forever">永远重复</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 236046c38..9d3ce3b61 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -96,20 +96,13 @@
 	<string name="EPr_default_reminders_title">預設提醒</string>
 	<string name="EPr_default_addtocalendar_title">默認添加到日曆</string>
 	<string name="EPr_default_reminders_mode_title">默認鈴聲／振動類型</string>
-	<string-array name="EPr_default_urgency">
-		<item>無截止日</item>
-		<item>今天</item>
-		<item>明天</item>
-		<item>後天</item>
-		<item>下週</item>
-	</string-array>
+	<string name="no_deadline">無截止日</string>
+	<string name="day_after_tomorrow">後天</string>
+	<string name="next_week">下週</string>
 	<string name="dont_hide">不隱藏</string>
-	<string-array name="EPr_default_reminders">
-		<item>無截止期限提醒</item>
-		<item>在截止期限時</item>
-		<item>當過期時</item>
-		<item>在截止期限或過期時</item>
-	</string-array>
+	<string name="no_deadline_reminder">無截止期限提醒</string>
+	<string name="at_deadline">在截止期限時</string>
+	<string name="at_deadline_or_overdue">在截止期限或過期時</string>
 	<string name="BFE_Active">我的工作</string>
 	<string name="BFE_Recent">最近修改過</string>
 	<string name="CFA_universe_all">進行中的工作</string>
@@ -122,15 +115,8 @@
 	<string name="CFA_button_add">加入條件</string>
 	<string name="CFC_dueBefore_text">期限: ?</string>
 	<string name="CFC_dueBefore_name">期限...</string>
-	<string-array name="CFC_dueBefore_entries">
-		<item>無期限</item>
-		<item>昨天</item>
-		<item>今天</item>
-		<item>明天</item>
-		<item>後天</item>
-		<item>下週</item>
-		<item>下個月</item>
-	</string-array>
+	<string name="no_due_date">無期限</string>
+	<string name="next_month">下個月</string>
 	<string name="CFC_title_contains_name">主旨含...</string>
 	<string name="CFC_title_contains_text">主旨含: ?</string>
 	<string name="gcal_TEA_error">工作加入行事曆錯誤</string>
@@ -151,14 +137,12 @@
 	<string name="audio_stop_recording">停止錄製</string>
 	<string name="file_type_unhandled">對不起！找不到應用程序處理這種文件類型。</string>
 	<string name="file_err_copy">複製文件添加附件時出錯</string>
-	<string-array name="TEA_reminder_random">
-		<item>一個小時</item>
-		<item>一天</item>
-		<item>一個星期</item>
-		<item>兩星期內</item>
-		<item>一個月</item>
-		<item>兩個月內</item>
-	</string-array>
+	<string name="random_reminder_hour">一個小時</string>
+	<string name="random_reminder_day">一天</string>
+	<string name="random_reminder_week">一個星期</string>
+	<string name="random_reminder_two_weeks">兩星期內</string>
+	<string name="random_reminder_month">一個月</string>
+	<string name="random_reminder_two_months">兩個月內</string>
 	<string name="rmd_NoA_done">已完成!</string>
 	<string name="rmd_NoA_snooze">晚點提醒...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">無聲開始時間</string>
@@ -168,29 +152,23 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks將會以最大音量進行多重提醒</string>
 	<string name="rmd_EPr_defaultRemind_title">隨機提醒</string>
-	<string-array name="EPr_reminder_random">
-		<item>停用</item>
-		<item>每小時</item>
-		<item>每天</item>
-		<item>每週</item>
-		<item>每2週</item>
-		<item>每月</item>
-		<item>每2個月</item>
-	</string-array>
+	<string name="default_random_reminder_disabled">停用</string>
+	<string name="default_random_reminder_hourly">每小時</string>
+	<string name="default_random_reminder_daily">每天</string>
+	<string name="default_random_reminder_weekly">每週</string>
+	<string name="default_random_reminder_bi_weekly">每2週</string>
+	<string name="default_random_reminder_monthly">每月</string>
+	<string name="default_random_reminder_bi_monthly">每2個月</string>
 	<string name="repeat_every">每 %d</string>
 	<string name="repeat_interval_prompt">重複間隔</string>
-	<string-array name="repeat_interval">
-		<item>日</item>
-		<item>星期</item>
-		<item>月</item>
-		<item>小時</item>
-		<item>分鐘</item>
-		<item>年</item>
-	</string-array>
-	<string-array name="repeat_type">
-		<item>自到期日</item>
-		<item>自完成日</item>
-	</string-array>
+	<string name="repeat_interval_day">日</string>
+	<string name="repeat_interval_week">星期</string>
+	<string name="repeat_interval_month">月</string>
+	<string name="repeat_interval_hour">小時</string>
+	<string name="repeat_interval_minute">分鐘</string>
+	<string name="repeat_interval_year">年</string>
+	<string name="repeat_type_due">自到期日</string>
+	<string name="repeat_type_completion">自完成日</string>
 	<string name="repeat_detail_duedate">每隔 %s</string>
 	<string name="repeat_detail_duedate_until">每隔 %1$s\n直到 %2$s</string>
 	<string name="repeat_forever">永遠重複</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 04f2d1ffb..afe86be5f 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -192,4 +192,62 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <item>@string/no_deadline</item>
+        <item>@string/today</item>
+        <item>@string/tomorrow</item>
+        <item>@string/day_after_tomorrow</item>
+        <item>@string/next_week</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <item>@string/no_deadline_reminder</item>
+        <item>@string/at_deadline</item>
+        <item>@string/when_overdue</item>
+        <item>@string/at_deadline_or_overdue</item>
+    </string-array>
+
+    <string-array name="CFC_dueBefore_entries">
+        <item>@string/no_due_date</item>
+        <item>@string/yesterday</item>
+        <item>@string/today</item>
+        <item>@string/tomorrow</item>
+        <item>@string/day_after_tomorrow</item>
+        <item>@string/next_week</item>
+        <item>@string/next_month</item>
+    </string-array>
+
+    <string-array name="TEA_reminder_random">
+        <item>@string/random_reminder_hour</item>
+        <item>@string/random_reminder_day</item>
+        <item>@string/random_reminder_week</item>
+        <item>@string/random_reminder_two_weeks</item>
+        <item>@string/random_reminder_month</item>
+        <item>@string/random_reminder_two_months</item>
+    </string-array>
+
+    <string-array name="EPr_reminder_random">
+        <item>@string/default_random_reminder_disabled</item>
+        <item>@string/default_random_reminder_hourly</item>
+        <item>@string/default_random_reminder_daily</item>
+        <item>@string/default_random_reminder_weekly</item>
+        <item>@string/default_random_reminder_bi_weekly</item>
+        <item>@string/default_random_reminder_monthly</item>
+        <item>@string/default_random_reminder_bi_monthly</item>
+    </string-array>
+
+    <string-array name="repeat_interval">
+        <item>@string/repeat_interval_day</item>
+        <item>@string/repeat_interval_week</item>
+        <item>@string/repeat_interval_month</item>
+        <item>@string/repeat_interval_hour</item>
+        <item>@string/repeat_interval_minute</item>
+        <item>@string/repeat_interval_year</item>
+    </string-array>
+
+    <string-array name="repeat_type">
+        <item>@string/repeat_type_due</item>
+        <item>@string/repeat_type_completion</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3a6c1fa7e..3b93774f3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -358,32 +358,17 @@ File %1$s contained %2$s.\n\n
   <string name="priority_medium">Medium</string>
   <string name="priority_low">Low</string>
 
-    <string-array name="EPr_default_urgency">
-        <!-- urgency: labels for "Task Defaults" preference item. -->
-        <!-- slide 41a-->
-        <item>No deadline</item>
-        <!-- slide 41b -->
-        <item>Today</item>
-        <!-- slide 41c-->
-        <item>Tomorrow</item>
-        <!-- slide 41d -->
-        <item>Day after tomorrow</item>
-        <!-- slide 41e -->
-        <item>Next week</item>
-    </string-array>
-
-    <string name="dont_hide">Don\'t hide</string>
-
-    <string-array name="EPr_default_reminders">
-        <!-- reminders: labels for "Task Defaults" preference item. -->
-        <item>No deadline reminders</item>
-        <item>At deadline</item>
-        <item>When overdue</item>
-        <item>At deadline or overdue</item>
-    </string-array>
-
-
-    <!-- ================================================= Filter Exposer == -->
+  <string name="no_deadline">No deadline</string>
+  <string name="day_after_tomorrow">Day after tomorrow</string>
+  <string name="next_week">Next week</string>
+
+  <string name="dont_hide">Don\'t hide</string>
+
+  <string name="no_deadline_reminder">No deadline reminders</string>
+  <string name="at_deadline">At deadline</string>
+  <string name="at_deadline_or_overdue">At deadline or overdue</string>
+
+  <!-- ================================================= Filter Exposer == -->
 
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">My Tasks</string>
@@ -423,18 +408,11 @@ File %1$s contained %2$s.\n\n
     <string name="CFC_dueBefore_text">Due By: ?</string>
     <!-- Criteria: due by X - name of criteria -->
     <string name="CFC_dueBefore_name">Due By...</string>
-    <string-array name="CFC_dueBefore_entries">
-        <!-- Criteria: due by X - options -->
-        <item>No Due Date</item>
-        <item>Yesterday</item>
-        <item>Today</item>
-        <item>Tomorrow</item>
-        <item>Day After Tomorrow</item>
-        <item>Next Week</item>
-        <item>Next Month</item>
-    </string-array>
-
-    <!-- Criteria: importance - display text (? -> user input)-->
+
+  <string name="no_due_date">No Due Date</string>
+  <string name="next_month">Next Month</string>
+
+  <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
     <string name="CFC_importance_name">Priority...</string>
@@ -542,17 +520,14 @@ File %1$s contained %2$s.\n\n
     <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
     <string name="ring_nonstop">Ring nonstop</string>
 
-    <string-array name="TEA_reminder_random">
-        <!-- random reminder choices for task edit page. -->
-        <item>an hour</item>
-        <item>a day</item>
-        <item>a week</item>
-        <item>in two weeks</item>
-        <item>a month</item>
-        <item>in two months</item>
-    </string-array>
+  <string name="random_reminder_hour">an hour</string>
+  <string name="random_reminder_day">a day</string>
+  <string name="random_reminder_week">a week</string>
+  <string name="random_reminder_two_weeks">in two weeks</string>
+  <string name="random_reminder_month">a month</string>
+  <string name="random_reminder_two_months">in two months</string>
 
-    <!-- ==================================================== notifications == -->
+  <!-- ==================================================== notifications == -->
 
     <!-- Reminder: Task was already done -->
     <string name="rmd_NoA_done">Complete</string>
@@ -588,24 +563,15 @@ File %1$s contained %2$s.\n\n
 
     <!-- slide 39a: Defaults Title -->
 
-    <string-array name="EPr_reminder_random">
-        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-        <item>disabled</item>
-        <!-- slide 44b -->
-        <item>hourly</item>
-        <!-- slide 44c -->
-        <item>daily</item>
-        <!-- slide 44d-->
-        <item>weekly</item>
-        <!-- slide 44e-->
-        <item>bi-weekly</item>
-        <!-- slide 44f -->
-        <item>monthly</item>
-        <item>bi-monthly</item>
-    </string-array>
-
-
-    <!-- Resources for built-in repeat plug-in -->
+  <string name="default_random_reminder_disabled">disabled</string>
+  <string name="default_random_reminder_hourly">hourly</string>
+  <string name="default_random_reminder_daily">daily</string>
+  <string name="default_random_reminder_weekly">weekly</string>
+  <string name="default_random_reminder_bi_weekly">bi-weekly</string>
+  <string name="default_random_reminder_monthly">monthly</string>
+  <string name="default_random_reminder_bi_monthly">bi-monthly</string>
+
+  <!-- Resources for built-in repeat plug-in -->
 
     <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
     <string name="repeat_every">Every %d</string>
@@ -616,24 +582,17 @@ File %1$s contained %2$s.\n\n
     <!-- slide 19b-->
     <string name="repeat_never">Not repeating</string>
 
-    <string-array name="repeat_interval">
-        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-        <item>Day(s)</item>
-        <item>Week(s)</item>
-        <item>Month(s)</item>
-        <item>Hour(s)</item>
-        <item>Minute(s)</item>
-        <item>Year(s)</item>
-    </string-array>
-
-    <string-array name="repeat_type">
-        <!-- slide 20c: repeat type (date to repeat from) -->
-        <item>from due date</item>
-        <!-- slide 20c -->
-        <item>from completion date</item>
-    </string-array>
-
-    <!-- task detail for repeat from due date (%s -> interval) -->
+  <string name="repeat_interval_day">Day(s)</string>
+  <string name="repeat_interval_week">Week(s)</string>
+  <string name="repeat_interval_month">Month(s)</string>
+  <string name="repeat_interval_hour">Hour(s)</string>
+  <string name="repeat_interval_minute">Minute(s)</string>
+  <string name="repeat_interval_year">Year(s)</string>
+
+  <string name="repeat_type_due">from due date</string>
+  <string name="repeat_type_completion">from completion date</string>
+
+  <!-- task detail for repeat from due date (%s -> interval) -->
     <string name="repeat_detail_duedate">Every %s</string>
 
     <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->