From 480bd27c12ecb4a501d8e6c91b54d24aac25bcac Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 7 May 2017 17:35:20 +0200
Subject: [PATCH] update some monthly repetition related strings

---
 .../calendar/activities/EventActivity.kt           | 14 +++++++++++++-
 app/src/main/res/values-de/strings.xml             |  8 ++++++--
 app/src/main/res/values-es/strings.xml             |  8 ++++++--
 app/src/main/res/values-fr/strings.xml             |  8 ++++++--
 app/src/main/res/values-hi-rIN/strings.xml         |  8 ++++++--
 app/src/main/res/values-hu/strings.xml             |  8 ++++++--
 app/src/main/res/values-it/strings.xml             |  8 ++++++--
 app/src/main/res/values-iw/strings.xml             |  8 ++++++--
 app/src/main/res/values-ja/strings.xml             |  8 ++++++--
 app/src/main/res/values-pt-rBR/strings.xml         |  8 ++++++--
 app/src/main/res/values-pt/strings.xml             |  8 ++++++--
 app/src/main/res/values-ru/strings.xml             |  8 ++++++--
 app/src/main/res/values-sk/strings.xml             |  8 ++++++--
 app/src/main/res/values-sv/strings.xml             |  8 ++++++--
 app/src/main/res/values/strings.xml                |  8 ++++++--
 15 files changed, 97 insertions(+), 29 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 4b9612beb..22925f29c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -167,6 +167,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
 
         if (isXWeeklyRepetition()) {
             setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt())
+        } else if (isXMonthlyRepetition()) {
+            setRepeatRule(REPEAT_MONTH_SAME_DAY)
         }
     }
 
@@ -223,7 +225,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
         if (isXWeeklyRepetition()) {
             event_repetition_rule.text = if (mRepeatRule == EVERY_DAY) getString(R.string.every_day) else getSelectedDaysString()
         } else if (isXMonthlyRepetition()) {
-
+            event_repetition_rule.text = getMonthlyRepetitionRuleText()
         }
     }
 
@@ -247,6 +249,16 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
         return days.trim().trimEnd(',')
     }
 
+    private fun getMonthlyRepetitionRuleText(): String {
+        return when (mRepeatRule) {
+            REPEAT_MONTH_SAME_DAY -> getString(R.string.the_same_day)
+            REPEAT_MONTH_LAST_DAY -> getString(R.string.the_last_day)
+            else -> {
+                ""
+            }
+        }
+    }
+
     private fun showEventTypeDialog() {
         hideKeyboard()
         SelectEventTypeDialog(this, mEventTypeId) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 606689f07..5cdc19883 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Täglich</string>
     <string name="selected_days">an ausgewählten Tagen</string>
-    <string name="on_the_same_day">jeden Monat am selben Tag</string>
-    <string name="on_the_last_day">am letzten Tag des Monat</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">jeden</string>
     <string name="first_m">ersten</string>
     <string name="second_m">zweiten</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Jeden</string>
     <string name="first_f">ersten</string>
     <string name="second_f">zweiten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c5c58f42d..c5d82a6d1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 38c01c584..6750923b8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 37bcd449a..89a070f41 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2a5d2cd2a..e631f7393 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 76ca5c17e..ddabc2f5c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 6da492055..cd1366198 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fb580c115..bee5a3145 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6023d72ce..3787f2d61 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repetir</string>
     <string name="every_day">Todo dia</string>
     <string name="selected_days">Em dias selecionados</string>
-    <string name="on_the_same_day">No mesmo dia todo mês</string>
-    <string name="on_the_last_day">No último dia do mês</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">A cada</string>
     <string name="first_m">primeiro</string>
     <string name="second_m">segundo</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 71e3b181c..adb238ac4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repetir em</string>
     <string name="every_day">Todos os dias</string>
     <string name="selected_days">Nos dias selecionados</string>
-    <string name="on_the_same_day">No mesmo dia de cada mês</string>
-    <string name="on_the_last_day">No último dia do mês</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">A cada</string>
     <string name="first_m">primeira</string>
     <string name="second_m">segunda</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">A cada</string>
     <string name="first_f">primeiro</string>
     <string name="second_f">segundo</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 160a75b50..7a4646075 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Каждый день</string>
     <string name="selected_days">В выбранные дни</string>
-    <string name="on_the_same_day">В тот же день каждый месяц</string>
-    <string name="on_the_last_day">В последний день месяца</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index bea7b5b4e..d165db3ef 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Opakovať v</string>
     <string name="every_day">Každý deň</string>
     <string name="selected_days">Vo vybraných dňoch</string>
-    <string name="on_the_same_day">Každý mesiac v rovnaký deň</string>
-    <string name="on_the_last_day">Posledný deň v mesiaci</string>
+    <string name="the_same_day">Rovnaký deň</string>
+    <string name="the_last_day">Posledný deň</string>
+    <string name="repeat_on_the_same_day">Opakovať každý mesiac v rovnaký deň</string>
+    <string name="repeat_on_the_last_day">Opakovať posledný deň v mesiaci</string>
+    <string name="repeat_every_m">Opakovať každý</string>
     <string name="every_m">Každý</string>
     <string name="first_m">prvý</string>
     <string name="second_m">druhý</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Opakovať každú</string>
     <string name="every_f">Každú</string>
     <string name="first_f">prvú</string>
     <string name="second_f">druhú</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 5398833d2..b0f3fcc16 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c087b180..4e7e0dc14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,8 +53,11 @@
     <string name="repeat_on">Repeat on</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
-    <string name="on_the_same_day">On the same day every month</string>
-    <string name="on_the_last_day">On the last day of the month</string>
+    <string name="the_same_day">The same day</string>
+    <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day">Repeat on the same day each month</string>
+    <string name="repeat_on_the_last_day">Repeat on the last day of the month</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -64,6 +67,7 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
+    <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
     <string name="second_f">second</string>