diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 980d518..c9f3a2f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -185,6 +185,9 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".alerts.GlobalDismissManager"
+                  android:exported="false" />
+
         <service android:name=".alerts.AlertService" />
 
         <service android:name=".alerts.DismissAlarmsService" />
diff --git a/res/layout/recurrencepicker.xml b/res/layout/recurrencepicker.xml
index ee022eb..cfe4b6a 100644
--- a/res/layout/recurrencepicker.xml
+++ b/res/layout/recurrencepicker.xml
@@ -179,8 +179,7 @@
                             android:id="@+id/repeatMonthlyByNthDayOfTheWeek"
                             style="@style/TextAppearance.RecurrencePickerStyle"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/recurrence_month_pattern_by_day_of_week" />
+                            android:layout_height="wrap_content" />
                     </RadioGroup>
 
                     <LinearLayout
@@ -271,4 +270,4 @@
                 android:textColor="@color/done_text_color" />
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index a2e4155..b18d182 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"HERHAAL MAANDELIKS"</item>
     <item msgid="8714177874112569158">"HERHAAL JAARLIKS"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"op elke eerste Sondag"</item>
+    <item msgid="2557379346106451363">"op elke tweede Sondag"</item>
+    <item msgid="7622144489915654132">"op elke derde Sondag"</item>
+    <item msgid="527152448137686021">"op elke vierde Sondag"</item>
+    <item msgid="5057483608824759350">"op elke laaste Sondag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"op elke eerste Maandag"</item>
+    <item msgid="4484275849072423978">"op elke tweede Maandag"</item>
+    <item msgid="8956169860824371383">"op elke derde Maandag"</item>
+    <item msgid="6924403357659569326">"op elke vierde Maandag"</item>
+    <item msgid="1379608815263472161">"op elke laaste Maandag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"op elke eerste Dinsdag"</item>
+    <item msgid="9063613547307760928">"op elke tweede Dinsdag"</item>
+    <item msgid="6688603328729208168">"op elke derde Dinsdag"</item>
+    <item msgid="6695206006961533357">"op elke vierde Dinsdag"</item>
+    <item msgid="8619069174889809914">"op elke laaste Dinsdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"op elke eerste Woensdag"</item>
+    <item msgid="5059722045367799217">"op elke tweede Woensdag"</item>
+    <item msgid="7986246648229272275">"op elke derde Woensdag"</item>
+    <item msgid="9068566169348980801">"op elke vierde Woensdag"</item>
+    <item msgid="7976866743069062134">"op elke laaste Woensdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"op elke eerste Donderdag"</item>
+    <item msgid="4857419136007543270">"op elke tweede Donderdag"</item>
+    <item msgid="222044587450564839">"op elke derde Donderdag"</item>
+    <item msgid="6197927556533030945">"op elke vierde Donderdag"</item>
+    <item msgid="1023326923033436905">"op elke laaste Donderdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"op elke eerste Vrydag"</item>
+    <item msgid="1935608297230506940">"op elke tweede Vrydag"</item>
+    <item msgid="4061877662049317599">"op elke derde Vrydag"</item>
+    <item msgid="6856646749131820614">"op elke vierde Vrydag"</item>
+    <item msgid="6533513913914859794">"op elke laaste Vrydag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"op elke eerste Saterdag"</item>
+    <item msgid="9130198690512925355">"op elke tweede Saterdag"</item>
+    <item msgid="4525736070844032405">"op elke derde Saterdag"</item>
+    <item msgid="422053689531707709">"op elke vierde Saterdag"</item>
+    <item msgid="5499975799312474425">"op elke laaste Saterdag"</item>
+  </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2ee2cc7..61b0467 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Weekliks op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Elke <xliff:g id="NUMBER">%1$d</xliff:g> weke op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Maandeliks (elke <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Maandeliks"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Jaarliks"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Maandeliks (op dag <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"op dieselfde dag elke maand"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"op elke <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Vir altyd"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Tot \'n datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Tot <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 3bfe435..ae106c9 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"በየወሩ ድገም"</item>
     <item msgid="8714177874112569158">"በየዓመቱ ድገም"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"በሁሉም የመጀመሪያ እሁድ"</item>
+    <item msgid="2557379346106451363">"በሁሉም ሁለተኛ እሁድ"</item>
+    <item msgid="7622144489915654132">"በሁሉም ሶስተኛ እሁድ"</item>
+    <item msgid="527152448137686021">"በሁሉም አራተኛ እሁድ"</item>
+    <item msgid="5057483608824759350">"በሁሉም የመጨረሻ እሁድ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"በሁሉም የመጀመሪያ ሰኞ"</item>
+    <item msgid="4484275849072423978">"በሁሉም ሁለተኛ ሰኞ"</item>
+    <item msgid="8956169860824371383">"በሁሉም ሶስተኛ ሰኞ"</item>
+    <item msgid="6924403357659569326">"በሁሉም አራተኛ ሰኞ"</item>
+    <item msgid="1379608815263472161">"በሁሉም የመጨረሻ ሰኞ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"በሁሉም የመጀመሪያ ማክሰኞ"</item>
+    <item msgid="9063613547307760928">"በሁሉም ሁለተኛ ማክሰኞ"</item>
+    <item msgid="6688603328729208168">"በሁሉም ሶስተኛ ማክሰኞ"</item>
+    <item msgid="6695206006961533357">"በሁሉም አራተኛ ማክሰኞ"</item>
+    <item msgid="8619069174889809914">"በሁሉም የመጨረሻ ማክሰኞ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"በሁሉም የመጀመሪያ ረቡዕ"</item>
+    <item msgid="5059722045367799217">"በሁሉም ሁለተኛ ረቡዕ"</item>
+    <item msgid="7986246648229272275">"በሁሉም ሶስተኛ ረቡዕ"</item>
+    <item msgid="9068566169348980801">"በሁሉም አራተኛ ረቡዕ"</item>
+    <item msgid="7976866743069062134">"በሁሉም የመጨረሻ ረቡዕ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"በሁሉም የመጀመሪያ ሃሙስ"</item>
+    <item msgid="4857419136007543270">"በሁሉም ሁለተኛ ሃሙስ"</item>
+    <item msgid="222044587450564839">"በሁሉም ሶስተኛ ሃሙስ"</item>
+    <item msgid="6197927556533030945">"በሁሉም አራተኛ ሃሙስ"</item>
+    <item msgid="1023326923033436905">"በሁሉም የመጨረሻ ሃሙስ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"በሁሉም የመጀመሪያ አርብ"</item>
+    <item msgid="1935608297230506940">"በሁሉም ሁለተኛ አርብ"</item>
+    <item msgid="4061877662049317599">"በሁሉም ሶስተኛ አርብ"</item>
+    <item msgid="6856646749131820614">"በሁሉም አራተኛ አርብ"</item>
+    <item msgid="6533513913914859794">"በሁሉም የመጨረሻ አርብ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"በሁሉም የመጀመሪያ ቅዳሜ"</item>
+    <item msgid="9130198690512925355">"በሁሉም ሁለተኛ ቅዳሜ"</item>
+    <item msgid="4525736070844032405">"በሁሉም ሶስተኛ ቅዳሜ"</item>
+    <item msgid="422053689531707709">"በሁሉም አራተኛ ቅዳሜ"</item>
+    <item msgid="5499975799312474425">"በሁሉም የመጨረሻ ቅዳሜ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e979522..c293836 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"በየሳምንቱ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ላይ"</item>
     <item quantity="other" msgid="2857390143157377867">"በየ<xliff:g id="NUMBER">%1$d</xliff:g> ሳምንቱ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ላይ"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"በየወሩ(በእያንዳንዱ<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"ወርሃዊ"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"በየአመቱ"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"በየወሩ(በ<xliff:g id="DAY_OF_MONTH">%s</xliff:g>ቀን)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"በየ<xliff:g id="COUNT">%d</xliff:g> ዓመት"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"በየወሩ በተመሳሳዩ ቀን ላይ"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"በየ<xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"ለዘለዓለም"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"እስከ አንድ ቀን ድረስ"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"እስከ <xliff:g id="DATE">%s</xliff:g> ድረስ"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 0117d71..4d760a0 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"التكرار شهريًا"</item>
     <item msgid="8714177874112569158">"التكرار سنويًا"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"يوم الأحد الأول من كل شهر"</item>
+    <item msgid="2557379346106451363">"يوم الأحد الثاني من كل شهر"</item>
+    <item msgid="7622144489915654132">"يوم الأحد الثالث من كل شهر"</item>
+    <item msgid="527152448137686021">"يوم الأحد الرابع من كل شهر"</item>
+    <item msgid="5057483608824759350">"يوم الأحد الأخير من كل شهر"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"يوم الاثنين الأول من كل شهر"</item>
+    <item msgid="4484275849072423978">"يوم الاثنين الثاني من كل شهر"</item>
+    <item msgid="8956169860824371383">"يوم الاثنين الثالث من كل شهر"</item>
+    <item msgid="6924403357659569326">"يوم الاثنين الرابع من كل شهر"</item>
+    <item msgid="1379608815263472161">"يوم الاثنين الأخير من كل شهر"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"يوم الثلاثاء الأول من كل شهر"</item>
+    <item msgid="9063613547307760928">"يوم الثلاثاء الثاني من كل شهر"</item>
+    <item msgid="6688603328729208168">"يوم الثلاثاء الثالث من كل شهر"</item>
+    <item msgid="6695206006961533357">"يوم الثلاثاء الرابع من كل شهر"</item>
+    <item msgid="8619069174889809914">"يوم الثلاثاء الأخير من كل شهر"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"يوم الأربعاء الأول من كل شهر"</item>
+    <item msgid="5059722045367799217">"يوم الأربعاء الثاني من كل شهر"</item>
+    <item msgid="7986246648229272275">"يوم الأربعاء الثالث من كل شهر"</item>
+    <item msgid="9068566169348980801">"يوم الأربعاء الرابع من كل شهر"</item>
+    <item msgid="7976866743069062134">"يوم الأربعاء الأخير من كل شهر"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"يوم الخميس الأول من كل شهر"</item>
+    <item msgid="4857419136007543270">"يوم الخميس الثاني من كل شهر"</item>
+    <item msgid="222044587450564839">"يوم الخميس الثالث من كل شهر"</item>
+    <item msgid="6197927556533030945">"يوم الخميس الرابع من كل شهر"</item>
+    <item msgid="1023326923033436905">"يوم الخميس الأخير من كل شهر"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"يوم الجمعة الأول من كل شهر"</item>
+    <item msgid="1935608297230506940">"يوم الجمعة الثاني من كل شهر"</item>
+    <item msgid="4061877662049317599">"يوم الجمعة الثالث من كل شهر"</item>
+    <item msgid="6856646749131820614">"يوم الجمعة الرابع من كل شهر"</item>
+    <item msgid="6533513913914859794">"يوم الجمعة الأخير من كل شهر"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"يوم السبت الأول من كل شهر"</item>
+    <item msgid="9130198690512925355">"يوم السبت الثاني من كل شهر"</item>
+    <item msgid="4525736070844032405">"يوم السبت الثالث من كل شهر"</item>
+    <item msgid="422053689531707709">"يوم السبت الرابع من كل شهر"</item>
+    <item msgid="5499975799312474425">"يوم السبت الأخير من كل شهر"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6ad25e0..2a1feb1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"يوم <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> من كل أسبوع"</item>
     <item quantity="other" msgid="2857390143157377867">"يوم <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> من كل <xliff:g id="NUMBER">%1$d</xliff:g> من الأسابيع"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"شهريًا (كل <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"شهريًا"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"سنويًا"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"شهريًا ( يوم <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"كل <xliff:g id="COUNT">%d</xliff:g> عام"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"في اليوم نفسه من كل شهر"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"كل <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"للأبد"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"حتى تاريخ ما"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"حتى <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 6623f42..f7adf0b 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ШТОМЕСЯЧНЫ ПАЎТОР"</item>
     <item msgid="8714177874112569158">"ШТОГАДОВЫ ПАЎТОР"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"кожную першую нядзелю"</item>
+    <item msgid="2557379346106451363">"кожную другую нядзелю"</item>
+    <item msgid="7622144489915654132">"кожную трэцюю нядзелю"</item>
+    <item msgid="527152448137686021">"кожную чацвёртую нядзелю"</item>
+    <item msgid="5057483608824759350">"кожную апошнюю нядзелю"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"кожны першы панядзелак"</item>
+    <item msgid="4484275849072423978">"кожны другі панядзелак"</item>
+    <item msgid="8956169860824371383">"кожны трэці панядзелак"</item>
+    <item msgid="6924403357659569326">"кожны чацвёрты панядзелак"</item>
+    <item msgid="1379608815263472161">"кожны апошні панядзелак"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"кожны першы аўторак"</item>
+    <item msgid="9063613547307760928">"кожны другі аўторак"</item>
+    <item msgid="6688603328729208168">"кожны трэці аўторак"</item>
+    <item msgid="6695206006961533357">"кожны чацвёрты аўторак"</item>
+    <item msgid="8619069174889809914">"кожны апошні аўторак"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"кожную першую сераду"</item>
+    <item msgid="5059722045367799217">"кожную другую сераду"</item>
+    <item msgid="7986246648229272275">"кожную трэцюю сераду"</item>
+    <item msgid="9068566169348980801">"кожную чацвёртую сераду"</item>
+    <item msgid="7976866743069062134">"кожную апошнюю сераду"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"кожны першы чацвер"</item>
+    <item msgid="4857419136007543270">"кожны другі чацвер"</item>
+    <item msgid="222044587450564839">"кожны трэці чацвер"</item>
+    <item msgid="6197927556533030945">"кожны чацвёрты чацвер"</item>
+    <item msgid="1023326923033436905">"кожны апошні чацвер"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"кожную першую пятніцу"</item>
+    <item msgid="1935608297230506940">"кожную другую пятніцу"</item>
+    <item msgid="4061877662049317599">"кожную трэцюю пятніцу"</item>
+    <item msgid="6856646749131820614">"кожную чацвёртую пятніцу"</item>
+    <item msgid="6533513913914859794">"кожную апошнюю пятніцу"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"кожную першую суботу"</item>
+    <item msgid="9130198690512925355">"кожную другую суботу"</item>
+    <item msgid="4525736070844032405">"кожную трэцюю суботу"</item>
+    <item msgid="422053689531707709">"кожную чацвёртую суботу"</item>
+    <item msgid="5499975799312474425">"кожную апошнюю суботу"</item>
+  </string-array>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9ab4cd6..0573b5f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Кожны тыдзень па <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Кожныя <xliff:g id="NUMBER">%1$d</xliff:g> тыд. па <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Штомесяц (кожн. <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> )"</string>
     <string name="monthly" msgid="4587116285383048586">"Штомесяц"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Штогод"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Штомесяц (у дзень <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Кожныя <xliff:g id="COUNT">%d</xliff:g> гадоў"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"у той жа дзень кожнага месяца"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"кожны <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Назаўсёды"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Да даты"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"да <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 3ca1f96..b25776a 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Само при отхвърляне"</item>
     <item msgid="6367412240524984286">"При отхвърляне или липса на отговор"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"ПОВТАРЯНЕ ДНЕВНО"</item>
+    <item msgid="6300824484048337842">"ПОВТАРЯНЕ СЕДМИЧНО"</item>
+    <item msgid="189361731610816256">"ПОВТАРЯНЕ МЕСЕЧНО"</item>
+    <item msgid="8714177874112569158">"ПОВТАРЯНЕ ГОДИШНО"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"всяка първа неделя"</item>
+    <item msgid="2557379346106451363">"всяка втора неделя"</item>
+    <item msgid="7622144489915654132">"всяка трета неделя"</item>
+    <item msgid="527152448137686021">"всяка четвърта неделя"</item>
+    <item msgid="5057483608824759350">"всяка последна неделя"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"всеки първи понеделник"</item>
+    <item msgid="4484275849072423978">"всеки втори понеделник"</item>
+    <item msgid="8956169860824371383">"всеки трети понеделник"</item>
+    <item msgid="6924403357659569326">"всеки четвърти понеделник"</item>
+    <item msgid="1379608815263472161">"всеки последен понеделник"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"всеки първи вторник"</item>
+    <item msgid="9063613547307760928">"всеки втори вторник"</item>
+    <item msgid="6688603328729208168">"всеки трети вторник"</item>
+    <item msgid="6695206006961533357">"всеки четвърти вторник"</item>
+    <item msgid="8619069174889809914">"всеки последен вторник"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"всяка първа сряда"</item>
+    <item msgid="5059722045367799217">"всяка втора сряда"</item>
+    <item msgid="7986246648229272275">"всяка трета сряда"</item>
+    <item msgid="9068566169348980801">"всяка четвърта сряда"</item>
+    <item msgid="7976866743069062134">"всяка последна сряда"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"всеки първи четвъртък"</item>
+    <item msgid="4857419136007543270">"всеки втори четвъртък"</item>
+    <item msgid="222044587450564839">"всеки трети четвъртък"</item>
+    <item msgid="6197927556533030945">"всеки четвърти четвъртък"</item>
+    <item msgid="1023326923033436905">"всеки последен четвъртък"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"всеки първи петък"</item>
+    <item msgid="1935608297230506940">"всеки втори петък"</item>
+    <item msgid="4061877662049317599">"всеки трети петък"</item>
+    <item msgid="6856646749131820614">"всеки четвърти петък"</item>
+    <item msgid="6533513913914859794">"всеки последен петък"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"всяка първа събота"</item>
+    <item msgid="9130198690512925355">"всяка втора събота"</item>
+    <item msgid="4525736070844032405">"всяка трета събота"</item>
+    <item msgid="422053689531707709">"всяка четвърта събота"</item>
+    <item msgid="5499975799312474425">"всяка последна събота"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2bda96e..222020c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Ежеседмично в/ъв <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"На всеки <xliff:g id="NUMBER">%1$d</xliff:g> седмици в/ъв <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Всеки месец (вс. <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Всеки месец"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Всяка година"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Всеки месец (на <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"На <xliff:g id="COUNT">%d</xliff:g> години"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"на същия ден всеки месец"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"всеки <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Винаги"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"До дадена дата"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"За даден брой събития"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> събитие"</item>
+    <item quantity="other" msgid="8779598489398048259">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> събития"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"промяна на крайната дата"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 6e1468f..7e4f1af 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -113,8 +113,57 @@
   </string-array>
   <string-array name="recurrence_freq">
     <item msgid="3388478383574917007">"REPETEIX DIÀRIAMENT"</item>
-    <item msgid="6300824484048337842">"REPEAT SETMANALMENT"</item>
+    <item msgid="6300824484048337842">"REPETEIX SETMANALMENT"</item>
     <item msgid="189361731610816256">"REPETEIX MENSUALMENT"</item>
     <item msgid="8714177874112569158">"REPETEIX ANUALMENT"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"primer diumenge de cada mes"</item>
+    <item msgid="2557379346106451363">"segon diumenge de cada mes"</item>
+    <item msgid="7622144489915654132">"tercer diumenge de cada mes"</item>
+    <item msgid="527152448137686021">"quart diumenge de cada mes"</item>
+    <item msgid="5057483608824759350">"últim diumenge de cada mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"primer dilluns de cada mes"</item>
+    <item msgid="4484275849072423978">"segon dilluns de cada mes"</item>
+    <item msgid="8956169860824371383">"tercer dilluns de cada mes"</item>
+    <item msgid="6924403357659569326">"quart dilluns de cada mes"</item>
+    <item msgid="1379608815263472161">"últim dilluns de cada mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"primer dimarts de cada mes"</item>
+    <item msgid="9063613547307760928">"segon dimarts de cada mes"</item>
+    <item msgid="6688603328729208168">"tercer dimarts de cada mes"</item>
+    <item msgid="6695206006961533357">"quart dimarts de cada mes"</item>
+    <item msgid="8619069174889809914">"últim dimarts de cada mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"primer dimecres de cada mes"</item>
+    <item msgid="5059722045367799217">"segon dimecres de cada mes"</item>
+    <item msgid="7986246648229272275">"tercer dimecres de cada mes"</item>
+    <item msgid="9068566169348980801">"quart dimecres de cada mes"</item>
+    <item msgid="7976866743069062134">"últim dimecres de cada mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"primer dijous de cada mes"</item>
+    <item msgid="4857419136007543270">"segon dijous de cada mes"</item>
+    <item msgid="222044587450564839">"tercer dijous de cada mes"</item>
+    <item msgid="6197927556533030945">"quart dijous de cada mes"</item>
+    <item msgid="1023326923033436905">"últim dijous de cada mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"primer divendres de cada mes"</item>
+    <item msgid="1935608297230506940">"segon divendres de cada mes"</item>
+    <item msgid="4061877662049317599">"tercer divendres de cada mes"</item>
+    <item msgid="6856646749131820614">"quart divendres de cada mes"</item>
+    <item msgid="6533513913914859794">"últim divendres de cada mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"primer dissabte de cada mes"</item>
+    <item msgid="9130198690512925355">"segon dissabte de cada mes"</item>
+    <item msgid="4525736070844032405">"tercer dissabte de cada mes"</item>
+    <item msgid="422053689531707709">"quart dissabte de cada mes"</item>
+    <item msgid="5499975799312474425">"últim dissabte de cada mes"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9630361..c2960f4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Setmanalment el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> setmanes el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensualment (cada <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mensualment"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualment"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mensualment (el dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> anys"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"el mateix dia de cada mes"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"cada <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Sempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Fins a una data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Fins al dia <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 9485f86..de29380 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Jen v případě odmítnutí"</item>
     <item msgid="6367412240524984286">"Při odmítnutí nebo bez odpovědi"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"OPAKOVAT DENNĚ"</item>
+    <item msgid="6300824484048337842">"OPAKOVAT TÝDNĚ"</item>
+    <item msgid="189361731610816256">"OPAKOVAT MĚSÍČNĚ"</item>
+    <item msgid="8714177874112569158">"OPAKOVAT ROČNĚ"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"každou první neděli"</item>
+    <item msgid="2557379346106451363">"každou druhou neděli"</item>
+    <item msgid="7622144489915654132">"každou třetí neděli"</item>
+    <item msgid="527152448137686021">"každou čtvrtou neděli"</item>
+    <item msgid="5057483608824759350">"každou poslední neděli"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"každé první pondělí"</item>
+    <item msgid="4484275849072423978">"každé druhé pondělí"</item>
+    <item msgid="8956169860824371383">"každé třetí pondělí"</item>
+    <item msgid="6924403357659569326">"každé čtvrté pondělí"</item>
+    <item msgid="1379608815263472161">"každé poslední pondělí"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"každé první úterý"</item>
+    <item msgid="9063613547307760928">"každé druhé úterý"</item>
+    <item msgid="6688603328729208168">"každé třetí úterý"</item>
+    <item msgid="6695206006961533357">"každé čtvrté úterý"</item>
+    <item msgid="8619069174889809914">"každé poslední úterý"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"každou první středu"</item>
+    <item msgid="5059722045367799217">"každou druhou středu"</item>
+    <item msgid="7986246648229272275">"každou třetí středu"</item>
+    <item msgid="9068566169348980801">"každou čtvrtou středu"</item>
+    <item msgid="7976866743069062134">"každou poslední středu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"každý první čtvrtek"</item>
+    <item msgid="4857419136007543270">"každý druhý čtvrtek"</item>
+    <item msgid="222044587450564839">"každý třetí čtvrtek"</item>
+    <item msgid="6197927556533030945">"každý čtvrtý čtvrtek"</item>
+    <item msgid="1023326923033436905">"každý poslední čtvrtek"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"každý první pátek"</item>
+    <item msgid="1935608297230506940">"každý druhý pátek"</item>
+    <item msgid="4061877662049317599">"každý třetí pátek"</item>
+    <item msgid="6856646749131820614">"každý čtvrtý pátek"</item>
+    <item msgid="6533513913914859794">"každý poslední pátek"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"každou první sobotu"</item>
+    <item msgid="9130198690512925355">"každou druhou sobotu"</item>
+    <item msgid="4525736070844032405">"každou třetí sobotu"</item>
+    <item msgid="422053689531707709">"každou čtvrtou sobotu"</item>
+    <item msgid="5499975799312474425">"každou poslední sobotu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 939ab4c..fd68394 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Každý týden v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Jednou za <xliff:g id="NUMBER">%1$d</xliff:g> týd. v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Měsíčně (vždy <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Měsíčně"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ročně"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Měsíčně (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. den)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Jednou za <xliff:g id="COUNT">%d</xliff:g> r."</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"měsíčně tentýž den"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"<xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> v měsíci"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Navždy"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do určitého data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Po určitý počet událostí"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Pro <xliff:g id="EVENT_COUNT">%d</xliff:g> událost"</item>
+    <item quantity="other" msgid="8779598489398048259">"Pro následující počet událostí: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"změnit datum ukončení"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index f064850..cc9a061 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"GENTAG MÅNEDLIGT"</item>
     <item msgid="8714177874112569158">"GENTAG ÅRLIGT"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"hver første søndag i måneden"</item>
+    <item msgid="2557379346106451363">"hver anden søndag"</item>
+    <item msgid="7622144489915654132">"hver tredje søndag"</item>
+    <item msgid="527152448137686021">"hver fjerde søndag"</item>
+    <item msgid="5057483608824759350">"hver sidste søndag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"hver første mandag i måneden"</item>
+    <item msgid="4484275849072423978">"hver anden mandag"</item>
+    <item msgid="8956169860824371383">"hver tredje mandag"</item>
+    <item msgid="6924403357659569326">"hver fjerde mandag"</item>
+    <item msgid="1379608815263472161">"hver sidste mandag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"hver første tirsdag i måneden"</item>
+    <item msgid="9063613547307760928">"hver anden tirsdag"</item>
+    <item msgid="6688603328729208168">"hver tredje tirsdag"</item>
+    <item msgid="6695206006961533357">"hver fjerde tirsdag"</item>
+    <item msgid="8619069174889809914">"hver sidste tirsdag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"hver første onsdag i måneden"</item>
+    <item msgid="5059722045367799217">"hver anden onsdag"</item>
+    <item msgid="7986246648229272275">"hver tredje onsdag"</item>
+    <item msgid="9068566169348980801">"hver fjerde onsdag"</item>
+    <item msgid="7976866743069062134">"hver sidste onsdag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"hver første torsdag i måneden"</item>
+    <item msgid="4857419136007543270">"hver anden torsdag"</item>
+    <item msgid="222044587450564839">"hver tredje torsdag"</item>
+    <item msgid="6197927556533030945">"hver fjerde torsdag"</item>
+    <item msgid="1023326923033436905">"hver sidste torsdag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"hver første fredag i måneden"</item>
+    <item msgid="1935608297230506940">"hver anden fredag"</item>
+    <item msgid="4061877662049317599">"hver tredje fredag"</item>
+    <item msgid="6856646749131820614">"hver fjerde fredag"</item>
+    <item msgid="6533513913914859794">"hver sidste fredag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"hver første lørdag i måneden"</item>
+    <item msgid="9130198690512925355">"hver anden lørdag"</item>
+    <item msgid="4525736070844032405">"hver tredje lørdag"</item>
+    <item msgid="422053689531707709">"hver fjerde lørdag"</item>
+    <item msgid="5499975799312474425">"hver sidste lørdag i måneden"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0333980..bdf8bc6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Ugentligt om <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Hver <xliff:g id="NUMBER">%1$d</xliff:g>. uge om <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Månedligt (hver <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Månedligt"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Årligt"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Månedligt (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Hvert <xliff:g id="COUNT">%d</xliff:g>. år"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"samme dag hver måned"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"hver <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"For altid"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Frem til en bestemt dato"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Indtil <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9eff868..22170e7 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"Jeden Monat"</item>
     <item msgid="8714177874112569158">"Jedes Jahr"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"an jedem ersten Sonntag"</item>
+    <item msgid="2557379346106451363">"an jedem zweiten Sonntag"</item>
+    <item msgid="7622144489915654132">"an jedem dritten Sonntag"</item>
+    <item msgid="527152448137686021">"an jedem vierten Sonntag"</item>
+    <item msgid="5057483608824759350">"an jedem letzten Sonntag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"an jedem ersten Montag"</item>
+    <item msgid="4484275849072423978">"an jedem zweiten Montag"</item>
+    <item msgid="8956169860824371383">"an jedem dritten Montag"</item>
+    <item msgid="6924403357659569326">"an jedem vierten Montag"</item>
+    <item msgid="1379608815263472161">"an jedem letzten Montag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"an jedem ersten Dienstag"</item>
+    <item msgid="9063613547307760928">"an jedem zweiten Dienstag"</item>
+    <item msgid="6688603328729208168">"an jedem dritten Dienstag"</item>
+    <item msgid="6695206006961533357">"an jedem vierten Dienstag"</item>
+    <item msgid="8619069174889809914">"an jedem letzten Dienstag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"an jedem ersten Mittwoch"</item>
+    <item msgid="5059722045367799217">"an jedem zweiten Mittwoch"</item>
+    <item msgid="7986246648229272275">"an jedem dritten Mittwoch"</item>
+    <item msgid="9068566169348980801">"an jedem vierten Mittwoch"</item>
+    <item msgid="7976866743069062134">"an jedem letzten Mittwoch"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"an jedem ersten Donnerstag"</item>
+    <item msgid="4857419136007543270">"an jedem zweiten Donnerstag"</item>
+    <item msgid="222044587450564839">"an jedem dritten Donnerstag"</item>
+    <item msgid="6197927556533030945">"an jedem vierten Donnerstag"</item>
+    <item msgid="1023326923033436905">"an jedem letzten Donnerstag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"an jedem ersten Freitag"</item>
+    <item msgid="1935608297230506940">"an jedem zweiten Freitag"</item>
+    <item msgid="4061877662049317599">"an jedem dritten Freitag"</item>
+    <item msgid="6856646749131820614">"an jedem vierten Freitag"</item>
+    <item msgid="6533513913914859794">"an jedem letzten Freitag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"an jedem ersten Samstag"</item>
+    <item msgid="9130198690512925355">"an jedem zweiten Samstag"</item>
+    <item msgid="4525736070844032405">"an jedem dritten Samstag"</item>
+    <item msgid="422053689531707709">"an jedem vierten Samstag"</item>
+    <item msgid="5499975799312474425">"an jedem letzten Samstag"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a057528..b85f200 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Wöchentlich am <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Alle <xliff:g id="NUMBER">%1$d</xliff:g> Wochen am <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Monatlich (jeden <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Monatlich"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Jährlich"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Monatlich (am <xliff:g id="DAY_OF_MONTH">%s</xliff:g>.)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Alle <xliff:g id="COUNT">%d</xliff:g> Jahre"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"am gleichen Tag des Monats"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"an jedem <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Dauerhaft"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Bis zu bestimmtem Datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Bis <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index f5eaee8..320344f 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -113,8 +113,57 @@
   </string-array>
   <string-array name="recurrence_freq">
     <item msgid="3388478383574917007">"ΕΠΑΝΑΛΗΨΗ ΚΑΘΗΜΕΡΙΝΑ"</item>
-    <item msgid="6300824484048337842">"ΕΠΑΝΑΛΗΨΗ ΕΒΔΟΜΑΔΙΑΙΑ"</item>
+    <item msgid="6300824484048337842">"ΕΠΑΝΑΛΗΨΗ ΕΒΔΟΜΑΔ."</item>
     <item msgid="189361731610816256">"ΕΠΑΝΑΛΗΨΗ ΜΗΝΙΑΙΑ"</item>
     <item msgid="8714177874112569158">"ΕΠΑΝΑΛΗΨΗ ΕΤΗΣΙΩΣ"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"κάθε πρώτη Κυριακή"</item>
+    <item msgid="2557379346106451363">"κάθε δεύτερη Κυριακή"</item>
+    <item msgid="7622144489915654132">"κάθε τρίτη Κυριακή"</item>
+    <item msgid="527152448137686021">"κάθε τέταρτη Κυριακή"</item>
+    <item msgid="5057483608824759350">"κάθε προηγούμενη Κυριακή"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"κάθε πρώτη Δευτέρα"</item>
+    <item msgid="4484275849072423978">"κάθε δεύτερη Δευτέρα"</item>
+    <item msgid="8956169860824371383">"κάθε τρίτη Δευτέρα"</item>
+    <item msgid="6924403357659569326">"κάθε τέταρτη Δευτέρα"</item>
+    <item msgid="1379608815263472161">"κάθε προηγούμενη Δευτέρα"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"κάθε πρώτη Τρίτη"</item>
+    <item msgid="9063613547307760928">"κάθε δεύτερη Τρίτη"</item>
+    <item msgid="6688603328729208168">"κάθε τρίτη Τρίτη"</item>
+    <item msgid="6695206006961533357">"κάθε τέταρτη Τρίτη"</item>
+    <item msgid="8619069174889809914">"κάθε προηγούμενη Τρίτη"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"κάθε πρώτη Τετάρτη"</item>
+    <item msgid="5059722045367799217">"κάθε δεύτερη Τετάρτη"</item>
+    <item msgid="7986246648229272275">"κάθε τρίτη Τετάρτη"</item>
+    <item msgid="9068566169348980801">"κάθε τέταρτη Τετάρτη"</item>
+    <item msgid="7976866743069062134">"κάθε προηγούμενη Τετάρτη"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"κάθε πρώτη Πέμπτη"</item>
+    <item msgid="4857419136007543270">"κάθε δεύτερη Πέμπτη"</item>
+    <item msgid="222044587450564839">"κάθε τρίτη Πέμπτη"</item>
+    <item msgid="6197927556533030945">"κάθε τέταρτη Πέμπτη"</item>
+    <item msgid="1023326923033436905">"κάθε προηγούμενη Πέμπτη"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"κάθε πρώτη Παρασκευή"</item>
+    <item msgid="1935608297230506940">"κάθε δεύτερη Παρασκευή"</item>
+    <item msgid="4061877662049317599">"κάθε τρίτη Παρασκευή"</item>
+    <item msgid="6856646749131820614">"κάθε τέταρτη Παρασκευή"</item>
+    <item msgid="6533513913914859794">"κάθε προηγούμενη Παρασκευή"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"κάθε πρώτο Σάββατο"</item>
+    <item msgid="9130198690512925355">"κάθε δεύτερο Σάββατο"</item>
+    <item msgid="4525736070844032405">"κάθε τρίτο Σάββατο"</item>
+    <item msgid="422053689531707709">"κάθε τέταρτο Σάββατο"</item>
+    <item msgid="5499975799312474425">"κάθε προηγούμενο Σάββατο"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 05707f9..9bb4d18 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Κάθε εβδομάδα, μέρα <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Κάθε εβδομάδες <xliff:g id="NUMBER">%1$d</xliff:g>, μέρες <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Κάθε μήνα (κάθε <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Μηνιαία"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ετήσια"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Κάθε μήνα (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Κάθε <xliff:g id="COUNT">%d</xliff:g> έτη"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ίδια ημέρα κάθε μήνα"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"κάθε <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Για πάντα"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Μέχρι μια ορισμένη ημ/νία"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Έως τις <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 38a55a8..943b2cb 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"REPEAT MONTHLY"</item>
     <item msgid="8714177874112569158">"REPEAT YEARLY"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"on every first Sunday"</item>
+    <item msgid="2557379346106451363">"on every second Sunday"</item>
+    <item msgid="7622144489915654132">"on every third Sunday"</item>
+    <item msgid="527152448137686021">"on every fourth Sunday"</item>
+    <item msgid="5057483608824759350">"on every last Sunday"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"on every first Monday"</item>
+    <item msgid="4484275849072423978">"on every second Monday"</item>
+    <item msgid="8956169860824371383">"on every third Monday"</item>
+    <item msgid="6924403357659569326">"on every fourth Monday"</item>
+    <item msgid="1379608815263472161">"on every last Monday"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"on every first Tuesday"</item>
+    <item msgid="9063613547307760928">"on every second Tuesday"</item>
+    <item msgid="6688603328729208168">"on every third Tuesday"</item>
+    <item msgid="6695206006961533357">"on every fourth Tuesday"</item>
+    <item msgid="8619069174889809914">"on every last Tuesday"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"on every first Wednesday"</item>
+    <item msgid="5059722045367799217">"on every second Wednesday"</item>
+    <item msgid="7986246648229272275">"on every third Wednesday"</item>
+    <item msgid="9068566169348980801">"on every fourth Wednesday"</item>
+    <item msgid="7976866743069062134">"on every last Wednesday"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"on every first Thursday"</item>
+    <item msgid="4857419136007543270">"on every second Thursday"</item>
+    <item msgid="222044587450564839">"on every third Thursday"</item>
+    <item msgid="6197927556533030945">"on every fourth Thursday"</item>
+    <item msgid="1023326923033436905">"on every last Thursday"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"on every first Friday"</item>
+    <item msgid="1935608297230506940">"on every second Friday"</item>
+    <item msgid="4061877662049317599">"on every third Friday"</item>
+    <item msgid="6856646749131820614">"on every fourth Friday"</item>
+    <item msgid="6533513913914859794">"on every last Friday"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"on every first Saturday"</item>
+    <item msgid="9130198690512925355">"on every second Saturday"</item>
+    <item msgid="4525736070844032405">"on every third Saturday"</item>
+    <item msgid="422053689531707709">"on every fourth Saturday"</item>
+    <item msgid="5499975799312474425">"on every last Saturday"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7c2156d..63d1571 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Weekly on <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Every <xliff:g id="NUMBER">%1$d</xliff:g> weeks on <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Monthly (every <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Monthly"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Yearly"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Monthly (on day <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Every <xliff:g id="COUNT">%d</xliff:g> years"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"on the same day each month"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"on every <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Forever"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Until a date"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Until <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 1b9ee0f..b09c7a2 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"REPETIR MENSUALMENTE"</item>
     <item msgid="8714177874112569158">"REPETIR ANUALMENTE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"cada primer domingo del mes"</item>
+    <item msgid="2557379346106451363">"cada segundo domingo del mes"</item>
+    <item msgid="7622144489915654132">"cada tercer domingo del mes"</item>
+    <item msgid="527152448137686021">"cada cuarto domingo del mes"</item>
+    <item msgid="5057483608824759350">"cada último domingo del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"cada primer lunes del mes"</item>
+    <item msgid="4484275849072423978">"cada segundo lunes del mes"</item>
+    <item msgid="8956169860824371383">"cada tercer lunes del mes"</item>
+    <item msgid="6924403357659569326">"cada cuarto lunes del mes"</item>
+    <item msgid="1379608815263472161">"cada último lunes del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"cada primer martes del mes"</item>
+    <item msgid="9063613547307760928">"cada segundo martes del mes"</item>
+    <item msgid="6688603328729208168">"cada tercer martes del mes"</item>
+    <item msgid="6695206006961533357">"cada cuarto martes del mes"</item>
+    <item msgid="8619069174889809914">"cada último martes del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"cada primer miércoles del mes"</item>
+    <item msgid="5059722045367799217">"cada segundo miércoles del mes"</item>
+    <item msgid="7986246648229272275">"cada tercer miércoles del mes"</item>
+    <item msgid="9068566169348980801">"cada cuarto miércoles del mes"</item>
+    <item msgid="7976866743069062134">"cada último miércoles del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"cada primer jueves del mes"</item>
+    <item msgid="4857419136007543270">"cada segundo jueves del mes"</item>
+    <item msgid="222044587450564839">"cada tercer jueves del mes"</item>
+    <item msgid="6197927556533030945">"cada cuarto jueves del mes"</item>
+    <item msgid="1023326923033436905">"cada último jueves del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"cada primer viernes del mes"</item>
+    <item msgid="1935608297230506940">"cada segundo viernes del mes"</item>
+    <item msgid="4061877662049317599">"cada tercer viernes del mes"</item>
+    <item msgid="6856646749131820614">"cada cuarto viernes del mes"</item>
+    <item msgid="6533513913914859794">"cada último viernes del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"cada primer sábado del mes"</item>
+    <item msgid="9130198690512925355">"cada segundo sábado del mes"</item>
+    <item msgid="4525736070844032405">"cada tercer sábado del mes"</item>
+    <item msgid="422053689531707709">"cada cuarto sábado del mes"</item>
+    <item msgid="5499975799312474425">"cada último sábado del mes"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c839b5d..86e88af 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -139,7 +139,7 @@
     <string name="edit_event_label" msgid="7413222956349977161">"Detalles"</string>
     <string name="edit_label" msgid="8934331258435656534">"Editar"</string>
     <string name="delete_label" msgid="874742811918030739">"Eliminar"</string>
-    <string name="save_label" msgid="2133599104834432589">"Finalizado"</string>
+    <string name="save_label" msgid="2133599104834432589">"Finalizar"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancelar"</string>
     <string name="snooze_all_label" msgid="4994488813124409077">"Posponer todos"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Descartar todos"</string>
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Semanalmente el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> semana/s el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensualmente (el <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mensual"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anual"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mensualmente (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> años"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"el mismo día cada mes"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"cada <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Siempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Hasta una fecha"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hasta <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 6c885e7..518a777 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"REPETIR MENSUALMENTE"</item>
     <item msgid="8714177874112569158">"REPETIR ANUALMENTE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"cada primer domingo del mes"</item>
+    <item msgid="2557379346106451363">"cada segundo domingo del mes"</item>
+    <item msgid="7622144489915654132">"cada tercer domingo del mes"</item>
+    <item msgid="527152448137686021">"cada cuarto domingo del mes"</item>
+    <item msgid="5057483608824759350">"cada último domingo del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"cada primer lunes del mes"</item>
+    <item msgid="4484275849072423978">"cada segundo lunes del mes"</item>
+    <item msgid="8956169860824371383">"cada tercer lunes del mes"</item>
+    <item msgid="6924403357659569326">"cada cuarto lunes del mes"</item>
+    <item msgid="1379608815263472161">"cada último lunes del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"cada primer martes del mes"</item>
+    <item msgid="9063613547307760928">"cada segundo martes del mes"</item>
+    <item msgid="6688603328729208168">"cada tercer martes del mes"</item>
+    <item msgid="6695206006961533357">"cada cuarto martes del mes"</item>
+    <item msgid="8619069174889809914">"cada último martes del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"cada primer miércoles del mes"</item>
+    <item msgid="5059722045367799217">"cada segundo miércoles del mes"</item>
+    <item msgid="7986246648229272275">"cada tercer miércoles del mes"</item>
+    <item msgid="9068566169348980801">"cada cuarto miércoles del mes"</item>
+    <item msgid="7976866743069062134">"cada último miércoles del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"cada primer jueves del mes"</item>
+    <item msgid="4857419136007543270">"cada segundo jueves del mes"</item>
+    <item msgid="222044587450564839">"cada tercer jueves del mes"</item>
+    <item msgid="6197927556533030945">"cada cuarto jueves del mes"</item>
+    <item msgid="1023326923033436905">"cada último jueves del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"cada primer viernes del mes"</item>
+    <item msgid="1935608297230506940">"cada segundo viernes del mes"</item>
+    <item msgid="4061877662049317599">"cada tercer viernes del mes"</item>
+    <item msgid="6856646749131820614">"cada cuarto viernes del mes"</item>
+    <item msgid="6533513913914859794">"cada último viernes del mes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"cada primer sábado del mes"</item>
+    <item msgid="9130198690512925355">"cada segundo sábado del mes"</item>
+    <item msgid="4525736070844032405">"cada tercer sábado del mes"</item>
+    <item msgid="422053689531707709">"cada cuarto sábado del mes"</item>
+    <item msgid="5499975799312474425">"cada último sábado del mes"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 87d4b45..8bb45ee 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Semanalmente el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> semanas el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Cada mes (cada <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mensualmente"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualmente"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Cada mes (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> años"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"el mismo día cada mes"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"siempre el <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Siempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Hasta una fecha"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hasta el <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index b97d3b9..e7a0338 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"KORDA IGAS KUUS"</item>
     <item msgid="8714177874112569158">"KORDA IGAL AASTAL"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"iga kuu esimesel pühapäeval"</item>
+    <item msgid="2557379346106451363">"iga kuu teisel pühapäeval"</item>
+    <item msgid="7622144489915654132">"iga kuu kolmandal pühapäeval"</item>
+    <item msgid="527152448137686021">"iga kuu neljandal pühapäeval"</item>
+    <item msgid="5057483608824759350">"iga kuu viimasel pühapäeval"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"iga kuu esimesel esmaspäeval"</item>
+    <item msgid="4484275849072423978">"iga kuu teisel esmaspäeval"</item>
+    <item msgid="8956169860824371383">"iga kuu kolmandal esmaspäeval"</item>
+    <item msgid="6924403357659569326">"iga kuu neljandal esmaspäeval"</item>
+    <item msgid="1379608815263472161">"iga kuu viimasel esmaspäeval"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"iga kuu esimesel teisipäeval"</item>
+    <item msgid="9063613547307760928">"iga kuu teisel teisipäeval"</item>
+    <item msgid="6688603328729208168">"iga kuu kolmandal teisipäeval"</item>
+    <item msgid="6695206006961533357">"iga kuu neljandal teisipäeval"</item>
+    <item msgid="8619069174889809914">"iga kuu viimasel teisipäeval"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"iga kuu esimesel kolmapäeval"</item>
+    <item msgid="5059722045367799217">"iga kuu teisel kolmapäeval"</item>
+    <item msgid="7986246648229272275">"iga kuu kolmandal kolmapäeval"</item>
+    <item msgid="9068566169348980801">"iga kuu neljandal kolmapäeval"</item>
+    <item msgid="7976866743069062134">"iga kuu viimasel kolmapäeval"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"iga kuu esimesel neljapäeval"</item>
+    <item msgid="4857419136007543270">"iga kuu teisel neljapäeval"</item>
+    <item msgid="222044587450564839">"iga kuu kolmandal neljapäeval"</item>
+    <item msgid="6197927556533030945">"iga kuu neljandal neljapäeval"</item>
+    <item msgid="1023326923033436905">"iga kuu viimasel neljapäeval"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"iga kuu esimesel reedel"</item>
+    <item msgid="1935608297230506940">"iga kuu teisel reedel"</item>
+    <item msgid="4061877662049317599">"iga kuu kolmandal reedel"</item>
+    <item msgid="6856646749131820614">"iga kuu neljandal reedel"</item>
+    <item msgid="6533513913914859794">"iga kuu viimasel reedel"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"iga kuu esimesel laupäeval"</item>
+    <item msgid="9130198690512925355">"iga kuu teisel laupäeval"</item>
+    <item msgid="4525736070844032405">"iga kuu kolmandal laupäeval"</item>
+    <item msgid="422053689531707709">"iga kuu neljandal laupäeval"</item>
+    <item msgid="5499975799312474425">"iga kuu viimasel laupäeval"</item>
+  </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 585e28e..2515349 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Iga nädal: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Iga <xliff:g id="NUMBER">%1$d</xliff:g> nädala tagant: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Igakuine (iga <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Iga kuu"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Iga aasta"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Igakuine (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. kuupäeval)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Iga <xliff:g id="COUNT">%d</xliff:g> aasta tagant"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"iga kuu samal päeval"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"igas kuus: <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Igavesti"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Kuni kuupäevani"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Kuni <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 172bf03..d1d95e1 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"فقط درصورت ردکردن"</item>
     <item msgid="6367412240524984286">"درصورت ردکردن یا پاسخ ندادن"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"تکرار روزانه"</item>
+    <item msgid="6300824484048337842">"تکرار هفتگی"</item>
+    <item msgid="189361731610816256">"تکرار ماهانه"</item>
+    <item msgid="8714177874112569158">"تکرار سالانه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"اولین یکشنبه هر ماه"</item>
+    <item msgid="2557379346106451363">"دومین یکشنبه هر ماه"</item>
+    <item msgid="7622144489915654132">"سومین یکشنبه هر ماه"</item>
+    <item msgid="527152448137686021">"چهارمین یکشنبه هر ماه"</item>
+    <item msgid="5057483608824759350">"آخرین یکشنبه هر ماه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"اولین دوشنبه هر ماه"</item>
+    <item msgid="4484275849072423978">"دومین دوشنبه هر ماه"</item>
+    <item msgid="8956169860824371383">"سومین دوشنبه هر ماه"</item>
+    <item msgid="6924403357659569326">"چهارمین دوشنبه هر ماه"</item>
+    <item msgid="1379608815263472161">"آخرین دوشنبه هر ماه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"اولین سه‌شنبه هر ماه"</item>
+    <item msgid="9063613547307760928">"دومین سه‌شنبه هر ماه"</item>
+    <item msgid="6688603328729208168">"سومین سه‌شنبه هر ماه"</item>
+    <item msgid="6695206006961533357">"چهارمین سه‌شنبه هر ماه"</item>
+    <item msgid="8619069174889809914">"آخرین سه‌شنبه هر ماه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"اولین چهارشنبه هر ماه"</item>
+    <item msgid="5059722045367799217">"دومین چهارشنبه هر ماه"</item>
+    <item msgid="7986246648229272275">"سومین چهارشنبه هر ماه"</item>
+    <item msgid="9068566169348980801">"چهارمین چهارشنبه هر ماه"</item>
+    <item msgid="7976866743069062134">"آخرین چهارشنبه هر ماه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"اولین پنج‌شنبه هر ماه"</item>
+    <item msgid="4857419136007543270">"دومین پنج‌شنبه هر ماه"</item>
+    <item msgid="222044587450564839">"سومین پنج‌شنبه هر ماه"</item>
+    <item msgid="6197927556533030945">"چهارمین پنج‌شنبه هر ماه"</item>
+    <item msgid="1023326923033436905">"آخرین پنج‌شنبه هر ماه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"اولین جمعه هر ماه"</item>
+    <item msgid="1935608297230506940">"دومین جمعه هر ماه"</item>
+    <item msgid="4061877662049317599">"سومین جمعه هر ماه"</item>
+    <item msgid="6856646749131820614">"چهارمین جمعه هر ماه"</item>
+    <item msgid="6533513913914859794">"آخرین جمعه هر ماه"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"اولین شنبه هر ماه"</item>
+    <item msgid="9130198690512925355">"دومین شنبه هر ماه"</item>
+    <item msgid="4525736070844032405">"سومین شنبه هر ماه"</item>
+    <item msgid="422053689531707709">"چهارمین شنبه هر ماه"</item>
+    <item msgid="5499975799312474425">"آخرین شنبه هر ماه"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 30e0896..28e0869 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"هفتگی در روزهای <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"هر <xliff:g id="NUMBER">%1$d</xliff:g> در روزهای <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"ماهانه (هر <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"ماهانه"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"سالانه"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"ماهانه (در روز <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"هر <xliff:g id="COUNT">%d</xliff:g> سال"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"در یک روز معین از هر ماه"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"در هر <xliff:g id="NTH">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"همیشه"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"تا یک تاریخ معین"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"تا <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"برای تعدادی از رویدادها"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"برای <xliff:g id="EVENT_COUNT">%d</xliff:g> رویداد"</item>
+    <item quantity="other" msgid="8779598489398048259">"برای <xliff:g id="EVENT_COUNT">%d</xliff:g> رویداد"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"تغییر تاریخ پایان"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 39215c7..c7296d3 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"TOISTA KUUKAUSITTAIN"</item>
     <item msgid="8714177874112569158">"TOISTA VUOSITTAIN"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"kuukauden 1. sunnuntai"</item>
+    <item msgid="2557379346106451363">"kuukauden 2. sunnuntai"</item>
+    <item msgid="7622144489915654132">"kuukauden 3. sunnuntai"</item>
+    <item msgid="527152448137686021">"kuukauden 4. sunnuntai"</item>
+    <item msgid="5057483608824759350">"kuukauden viimeinen sunnuntai"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"kuukauden 1. maanantai"</item>
+    <item msgid="4484275849072423978">"kuukauden 2. maanantai"</item>
+    <item msgid="8956169860824371383">"kuukauden 3. maanantai"</item>
+    <item msgid="6924403357659569326">"kuukauden 4. maanantai"</item>
+    <item msgid="1379608815263472161">"kuukauden viimeinen maanantai"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"kuukauden 1. tiistai"</item>
+    <item msgid="9063613547307760928">"kuukauden 2. tiistai"</item>
+    <item msgid="6688603328729208168">"kuukauden 3. tiistai"</item>
+    <item msgid="6695206006961533357">"kuukauden 4. tiistai"</item>
+    <item msgid="8619069174889809914">"kuukauden viimeinen tiistai"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"kuukauden 1. keskiviikko"</item>
+    <item msgid="5059722045367799217">"kuukauden 2. keskiviikko"</item>
+    <item msgid="7986246648229272275">"kuukauden 3. keskiviikko"</item>
+    <item msgid="9068566169348980801">"kuukauden 4. keskiviikko"</item>
+    <item msgid="7976866743069062134">"kuukauden viim. keskiviikko"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"kuukauden 1. torstai"</item>
+    <item msgid="4857419136007543270">"kuukauden 2. torstai"</item>
+    <item msgid="222044587450564839">"kuukauden 3. torstai"</item>
+    <item msgid="6197927556533030945">"kuukauden 4. torstai"</item>
+    <item msgid="1023326923033436905">"kuukauden viimeinen torstai"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"kuukauden 1. perjantai"</item>
+    <item msgid="1935608297230506940">"kuukauden 2. perjantai"</item>
+    <item msgid="4061877662049317599">"kuukauden 3. perjantai"</item>
+    <item msgid="6856646749131820614">"kuukauden 4. perjantai"</item>
+    <item msgid="6533513913914859794">"kuukauden viimeinen perjantai"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"kuukauden 1. lauantai"</item>
+    <item msgid="9130198690512925355">"kuukauden 2. lauantai"</item>
+    <item msgid="4525736070844032405">"kuukauden 3. lauantai"</item>
+    <item msgid="422053689531707709">"kuukauden 4. lauantai"</item>
+    <item msgid="5499975799312474425">"kuukauden viimeinen lauantai"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f929478..3da4a98 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Viikoittain joka <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> viikon välein joka <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Kuukausittain (joka <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Kuukausittain"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Vuosittain"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Kuukausittain (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. päivänä)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> vuoden välein"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"samana päiv. joka kk"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"joka <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Ikuisesti"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Tiettyyn päivään saakka"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g> saakka"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 0f52927..5f92e81 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"RÉPÉTER CHAQUE MOIS"</item>
     <item msgid="8714177874112569158">"RÉPÉTER CHAQUE ANNÉE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"tous les premiers dimanches"</item>
+    <item msgid="2557379346106451363">"tous les deuxièmes dimanches"</item>
+    <item msgid="7622144489915654132">"tous les troisièmes dimanches"</item>
+    <item msgid="527152448137686021">"tous les quatrièmes dimanches"</item>
+    <item msgid="5057483608824759350">"tous les derniers dimanches"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"tous les premiers lundis"</item>
+    <item msgid="4484275849072423978">"tous les deuxièmes lundis"</item>
+    <item msgid="8956169860824371383">"tous les troisièmes lundis"</item>
+    <item msgid="6924403357659569326">"tous les quatrièmes lundis"</item>
+    <item msgid="1379608815263472161">"tous les derniers lundis"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"tous les premiers mardis"</item>
+    <item msgid="9063613547307760928">"tous les deuxièmes mardis"</item>
+    <item msgid="6688603328729208168">"tous les troisièmes mardis"</item>
+    <item msgid="6695206006961533357">"tous les quatrièmes mardis"</item>
+    <item msgid="8619069174889809914">"tous les derniers mardis"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"tous les premiers mercredis"</item>
+    <item msgid="5059722045367799217">"tous les deuxièmes mercredis"</item>
+    <item msgid="7986246648229272275">"tous les troisièmes mercredis"</item>
+    <item msgid="9068566169348980801">"tous les quatrièmes mercredis"</item>
+    <item msgid="7976866743069062134">"tous les derniers mercredis"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"tous les premiers jeudis"</item>
+    <item msgid="4857419136007543270">"tous les deuxièmes jeudis"</item>
+    <item msgid="222044587450564839">"tous les troisièmes jeudis"</item>
+    <item msgid="6197927556533030945">"tous les quatrièmes jeudis"</item>
+    <item msgid="1023326923033436905">"tous les derniers jeudis"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"tous les premiers vendredis"</item>
+    <item msgid="1935608297230506940">"tous les deuxièmes vendredis"</item>
+    <item msgid="4061877662049317599">"tous les troisièmes vendredis"</item>
+    <item msgid="6856646749131820614">"tous les quatrièmes vendredis"</item>
+    <item msgid="6533513913914859794">"tous les derniers vendredis"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"tous les premiers samedis"</item>
+    <item msgid="9130198690512925355">"tous les deuxièmes samedis"</item>
+    <item msgid="4525736070844032405">"tous les troisièmes samedis"</item>
+    <item msgid="422053689531707709">"tous les quatrièmes samedis"</item>
+    <item msgid="5499975799312474425">"tous les derniers samedis"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f19fc9a..da92000 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Hebdomadaire (le <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
     <item quantity="other" msgid="2857390143157377867">"Toutes les <xliff:g id="NUMBER">%1$d</xliff:g> semaines le <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensuel (chaque <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Tous les mois"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Tous les ans"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mensuel (le <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Tous les <xliff:g id="COUNT">%d</xliff:g> ans"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"le même jour chaque mois"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"le <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> du mois"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Toujours"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Jusqu\'à une certaine date"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Jusqu\'au <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 48ce5fa..6e798b1 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"हर माह दोहराएं"</item>
     <item msgid="8714177874112569158">"हर वर्ष दोहराएं"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"प्रत्येक पहले रविवार को"</item>
+    <item msgid="2557379346106451363">"प्रत्येक दूसरे रविवार को"</item>
+    <item msgid="7622144489915654132">"प्रत्येक तीसरे रविवार को"</item>
+    <item msgid="527152448137686021">"प्रत्येक चौथे रविवार को"</item>
+    <item msgid="5057483608824759350">"प्रत्येक अंतिम रविवार को"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"प्रत्येक पहले सोमवार को"</item>
+    <item msgid="4484275849072423978">"प्रत्येक दूसरे सोमवार को"</item>
+    <item msgid="8956169860824371383">"प्रत्येक तीसरे सोमवार को"</item>
+    <item msgid="6924403357659569326">"प्रत्येक चौथे सोमवार को"</item>
+    <item msgid="1379608815263472161">"प्रत्येक अंतिम सोमवार को"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"प्रत्येक पहले मंगलवार को"</item>
+    <item msgid="9063613547307760928">"प्रत्येक दूसरे मंगलवार को"</item>
+    <item msgid="6688603328729208168">"प्रत्येक तीसरे मंगलवार को"</item>
+    <item msgid="6695206006961533357">"प्रत्येक चौथे मंगलवार को"</item>
+    <item msgid="8619069174889809914">"प्रत्येक अंतिम मंगलवार को"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"प्रत्येक पहले बुधवार को"</item>
+    <item msgid="5059722045367799217">"प्रत्येक दूसरे बुधवार को"</item>
+    <item msgid="7986246648229272275">"प्रत्येक तीसरे बुधवार को"</item>
+    <item msgid="9068566169348980801">"प्रत्येक चौथे बुधवार को"</item>
+    <item msgid="7976866743069062134">"प्रत्येक अंतिम बुधवार को"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"प्रत्येक पहले गुरुवार को"</item>
+    <item msgid="4857419136007543270">"प्रत्येक दूसरे गुरुवार को"</item>
+    <item msgid="222044587450564839">"प्रत्येक तीसरे गुरुवार को"</item>
+    <item msgid="6197927556533030945">"प्रत्येक चौथे गुरुवार को"</item>
+    <item msgid="1023326923033436905">"प्रत्येक अंतिम गुरुवार को"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"प्रत्येक पहले शुक्रवार को"</item>
+    <item msgid="1935608297230506940">"प्रत्येक दूसरे शुक्रवार को"</item>
+    <item msgid="4061877662049317599">"प्रत्येक तीसरे शुक्रवार को"</item>
+    <item msgid="6856646749131820614">"प्रत्येक चौथे शुक्रवार को"</item>
+    <item msgid="6533513913914859794">"प्रत्येक अंतिम शुक्रवार को"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"प्रत्येक पहले शनिवार को"</item>
+    <item msgid="9130198690512925355">"प्रत्येक दूसरे शनिवार को"</item>
+    <item msgid="4525736070844032405">"प्रत्येक तीसरे शनिवार को"</item>
+    <item msgid="422053689531707709">"प्रत्येक चौथे शनिवार को"</item>
+    <item msgid="5499975799312474425">"प्रत्येक अंतिम शनिवार को"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b822b33..4e03f6a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> को साप्ताहिक रूप से"</item>
     <item quantity="other" msgid="2857390143157377867">"हर <xliff:g id="NUMBER">%1$d</xliff:g> सप्ताह में <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> को"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"मासिक (प्रत्येक <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"मासिक"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"वार्षिक"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"मासिक (इस दिन <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> वर्ष में"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"प्रत्येक माह उसी दिन"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"प्रत्येक <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> को"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"हमेशा"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"इस दिनांक तक"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g> तक"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index f940779..5a61886 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"PONAVLJAJ MJESEČNO"</item>
     <item msgid="8714177874112569158">"PONAVLJAJ GODIŠNJE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"svake prve nedjelje"</item>
+    <item msgid="2557379346106451363">"svake druge nedjelje"</item>
+    <item msgid="7622144489915654132">"svake treće nedjelje"</item>
+    <item msgid="527152448137686021">"svake četvrte nedjelje"</item>
+    <item msgid="5057483608824759350">"svake zadnje nedjelje"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"svakog prvog ponedjeljka"</item>
+    <item msgid="4484275849072423978">"svakog drugog ponedjeljka"</item>
+    <item msgid="8956169860824371383">"svakog trećeg ponedjeljka"</item>
+    <item msgid="6924403357659569326">"svakog četvrtog ponedjeljka"</item>
+    <item msgid="1379608815263472161">"svakog zadnjeg ponedjeljka"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"svakog prvog utorka"</item>
+    <item msgid="9063613547307760928">"svakog drugog utorka"</item>
+    <item msgid="6688603328729208168">"svakog trećeg utorka"</item>
+    <item msgid="6695206006961533357">"svakog četvrtog utorka"</item>
+    <item msgid="8619069174889809914">"svakog zadnjeg utorka"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"svake prve srijede"</item>
+    <item msgid="5059722045367799217">"svake druge srijede"</item>
+    <item msgid="7986246648229272275">"svake treće srijede"</item>
+    <item msgid="9068566169348980801">"svake četvrte srijede"</item>
+    <item msgid="7976866743069062134">"svake zadnje srijede"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"svakog prvog četvrtka"</item>
+    <item msgid="4857419136007543270">"svakog drugog četvrtka"</item>
+    <item msgid="222044587450564839">"svakog trećeg četvrtka"</item>
+    <item msgid="6197927556533030945">"svakog četvrtog četvrtka"</item>
+    <item msgid="1023326923033436905">"svakog zadnjeg četvrtka"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"svakog prvog petka"</item>
+    <item msgid="1935608297230506940">"svakog drugog petka"</item>
+    <item msgid="4061877662049317599">"svakog trećeg petka"</item>
+    <item msgid="6856646749131820614">"svakog četvrtog petka"</item>
+    <item msgid="6533513913914859794">"svakog zadnjeg petka"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"svake prve subote"</item>
+    <item msgid="9130198690512925355">"svake druge subote"</item>
+    <item msgid="4525736070844032405">"svake treće subote"</item>
+    <item msgid="422053689531707709">"svake četvrte subote"</item>
+    <item msgid="5499975799312474425">"svake zadnje subote"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d393172..6ae7b57 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Svaki tjedan, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Svaki <xliff:g id="NUMBER">%1$d</xliff:g>. tjedan, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mjesečno (svakih <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mjesečno"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Godišnje"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mjesečno (na dan <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,13 +265,12 @@
     <item quantity="other" msgid="5678653649746562060">"Svake <xliff:g id="COUNT">%d</xliff:g>. godine"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"na isti dan svakog mjeseca"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"svaki <xliff:g id="NTH">%1$s</xliff:g>. dan u tjednu: <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Zauvijek"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do datuma"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Za ovoliko događaja"</string>
   <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Za <xliff:g id="EVENT_COUNT">%d</xliff:g> događaj"</item>
+    <item quantity="one" msgid="1400782968090516215">"Za ovoliko događaja: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
     <item quantity="other" msgid="8779598489398048259">"Za ovoliko događaja: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
   </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"promjena datuma završetka"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 721f1d7..4e6d64f 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ISMÉTLÉS HAVONTA"</item>
     <item msgid="8714177874112569158">"ISMÉTLÉS ÉVENTE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"minden első vasárnapon"</item>
+    <item msgid="2557379346106451363">"minden második vasárnapon"</item>
+    <item msgid="7622144489915654132">"minden harmadik vasárnapon"</item>
+    <item msgid="527152448137686021">"minden negyedik vasárnapon"</item>
+    <item msgid="5057483608824759350">"minden utolsó vasárnapon"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"minden első hétfőn"</item>
+    <item msgid="4484275849072423978">"minden második hétfőn"</item>
+    <item msgid="8956169860824371383">"minden harmadik hétfőn"</item>
+    <item msgid="6924403357659569326">"minden negyedik hétfőn"</item>
+    <item msgid="1379608815263472161">"minden utolsó hétfőn"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"minden első kedden"</item>
+    <item msgid="9063613547307760928">"minden második kedden"</item>
+    <item msgid="6688603328729208168">"minden harmadik kedden"</item>
+    <item msgid="6695206006961533357">"minden negyedik kedden"</item>
+    <item msgid="8619069174889809914">"minden utolsó kedden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"minden első szerdán"</item>
+    <item msgid="5059722045367799217">"minden második szerdán"</item>
+    <item msgid="7986246648229272275">"minden harmadik szerdán"</item>
+    <item msgid="9068566169348980801">"minden negyedik szerdán"</item>
+    <item msgid="7976866743069062134">"minden utolsó szerdán"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"minden első csütörtökön"</item>
+    <item msgid="4857419136007543270">"minden második csütörtökön"</item>
+    <item msgid="222044587450564839">"minden harmadik csütörtökön"</item>
+    <item msgid="6197927556533030945">"minden negyedik csütörtökön"</item>
+    <item msgid="1023326923033436905">"minden utolsó csütörtökön"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"minden első pénteken"</item>
+    <item msgid="1935608297230506940">"minden második pénteken"</item>
+    <item msgid="4061877662049317599">"minden harmadik pénteken"</item>
+    <item msgid="6856646749131820614">"minden negyedik pénteken"</item>
+    <item msgid="6533513913914859794">"minden utolsó pénteken"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"minden első szombaton"</item>
+    <item msgid="9130198690512925355">"minden második szombaton"</item>
+    <item msgid="4525736070844032405">"minden harmadik szombaton"</item>
+    <item msgid="422053689531707709">"minden negyedik szombaton"</item>
+    <item msgid="5499975799312474425">"minden utolsó szombaton"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 29fc9d0..17959dd 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Hetente – <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>i napon"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> hetente – <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>i napon"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Havonta (minden <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Havi"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Évente"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Havonta (a(z) <xliff:g id="DAY_OF_MONTH">%s</xliff:g>. napon)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> évente"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"havonta ugyanakkor"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"minden <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>i napon"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Végtelenszer"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Meghatározott dátumig"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Záró dátum: <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 43db4af..38416f5 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -85,7 +85,7 @@
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Tidak ada tanggapan"</item>
     <item msgid="3724434080904437698">"Ya"</item>
-    <item msgid="8854145743148992583">" Mungkin hadir"</item>
+    <item msgid="8854145743148992583">"Mungkin"</item>
     <item msgid="6174292185978948873">"Tidak"</item>
   </string-array>
   <string-array name="delete_repeating_labels">
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"PENGULANGAN BULANAN"</item>
     <item msgid="8714177874112569158">"PENGULANGAN TAHUNAN"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"setiap Minggu pertama"</item>
+    <item msgid="2557379346106451363">"setiap Minggu kedua"</item>
+    <item msgid="7622144489915654132">"setiap Minggu ketiga"</item>
+    <item msgid="527152448137686021">"setiap Minggu keempat"</item>
+    <item msgid="5057483608824759350">"setiap Minggu terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"setiap Senin pertama"</item>
+    <item msgid="4484275849072423978">"setiap Senin kedua"</item>
+    <item msgid="8956169860824371383">"setiap Senin ketiga"</item>
+    <item msgid="6924403357659569326">"setiap Senin keempat"</item>
+    <item msgid="1379608815263472161">"setiap Senin terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"setiap Selasa pertama"</item>
+    <item msgid="9063613547307760928">"setiap Selasa kedua"</item>
+    <item msgid="6688603328729208168">"setiap Selasa ketiga"</item>
+    <item msgid="6695206006961533357">"setiap Selasa keempat"</item>
+    <item msgid="8619069174889809914">"setiap Selasa terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"setiap Rabu pertama"</item>
+    <item msgid="5059722045367799217">"setiap Rabu kedua"</item>
+    <item msgid="7986246648229272275">"setiap Rabu ketiga"</item>
+    <item msgid="9068566169348980801">"setiap Rabu keempat"</item>
+    <item msgid="7976866743069062134">"setiap Rabu terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"setiap Kamis pertama"</item>
+    <item msgid="4857419136007543270">"setiap Kamis kedua"</item>
+    <item msgid="222044587450564839">"setiap Kamis ketiga"</item>
+    <item msgid="6197927556533030945">"setiap Kamis keempat"</item>
+    <item msgid="1023326923033436905">"setiap Kamis terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"setiap Jumat pertama"</item>
+    <item msgid="1935608297230506940">"setiap Jumat kedua"</item>
+    <item msgid="4061877662049317599">"setiap Jumat ketiga"</item>
+    <item msgid="6856646749131820614">"setiap Jumat keempat"</item>
+    <item msgid="6533513913914859794">"setiap Jumat terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"setiap Sabtu pertama"</item>
+    <item msgid="9130198690512925355">"setiap Sabtu kedua"</item>
+    <item msgid="4525736070844032405">"setiap Sabtu ketiga"</item>
+    <item msgid="422053689531707709">"setiap Sabtu keempat"</item>
+    <item msgid="5499975799312474425">"setiap Sabtu terakhir"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b23ad0e..8ad9449 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -106,7 +106,7 @@
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Pemilih warna"</string>
     <string name="view_event_response_label" msgid="8382281658458798329">"Datang?"</string>
     <string name="response_yes" msgid="2027484304899988350">"Ya"</string>
-    <string name="response_maybe" msgid="7791500973627841695">"Tentatif"</string>
+    <string name="response_maybe" msgid="7791500973627841695">"Mungkin"</string>
     <string name="response_no" msgid="561911691884148136">"Tidak"</string>
     <string name="email_guests_label" msgid="8772030932155305903">"Kirim email ke tamu"</string>
     <string name="email_organizer_label" msgid="7178059542798074813">"Pengelola email"</string>
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Mingguan setiap <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Setiap <xliff:g id="NUMBER">%1$d</xliff:g> minggu hari <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Bulanan (setiap <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Bulanan"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Tahunan"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Bulanan (pada hari <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> tahun sekali"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"bulanan-hari yg sama"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"setiap <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> ke-<xliff:g id="NTH">%1$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Selamanya"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Sampai tanggal tertentu"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Sampai <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index f321aaa..854a0ad 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"RIPETI OGNI MESE"</item>
     <item msgid="8714177874112569158">"RIPETI OGNI ANNO"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"ogni prima domenica"</item>
+    <item msgid="2557379346106451363">"ogni seconda domenica"</item>
+    <item msgid="7622144489915654132">"ogni terza domenica"</item>
+    <item msgid="527152448137686021">"ogni quarta domenica"</item>
+    <item msgid="5057483608824759350">"ogni ultima domenica"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"ogni primo lunedì"</item>
+    <item msgid="4484275849072423978">"ogni secondo lunedì"</item>
+    <item msgid="8956169860824371383">"ogni terzo lunedì"</item>
+    <item msgid="6924403357659569326">"ogni quarto lunedì"</item>
+    <item msgid="1379608815263472161">"ogni ultimo lunedì"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"ogni primo martedì"</item>
+    <item msgid="9063613547307760928">"ogni secondo martedì"</item>
+    <item msgid="6688603328729208168">"ogni terzo martedì"</item>
+    <item msgid="6695206006961533357">"ogni quarto martedì"</item>
+    <item msgid="8619069174889809914">"ogni ultimo martedì"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"ogni primo mercoledì"</item>
+    <item msgid="5059722045367799217">"ogni secondo mercoledì"</item>
+    <item msgid="7986246648229272275">"ogni terzo mercoledì"</item>
+    <item msgid="9068566169348980801">"ogni quarto mercoledì"</item>
+    <item msgid="7976866743069062134">"ogni ultimo mercoledì"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"ogni primo giovedì"</item>
+    <item msgid="4857419136007543270">"ogni secondo giovedì"</item>
+    <item msgid="222044587450564839">"ogni terzo giovedì"</item>
+    <item msgid="6197927556533030945">"ogni quarto giovedì"</item>
+    <item msgid="1023326923033436905">"ogni ultimo giovedì"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"ogni primo venerdì"</item>
+    <item msgid="1935608297230506940">"ogni secondo venerdì"</item>
+    <item msgid="4061877662049317599">"ogni terzo venerdì"</item>
+    <item msgid="6856646749131820614">"ogni quarto venerdì"</item>
+    <item msgid="6533513913914859794">"ogni ultimo venerdì"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"ogni primo sabato"</item>
+    <item msgid="9130198690512925355">"ogni secondo sabato"</item>
+    <item msgid="4525736070844032405">"ogni terzo sabato"</item>
+    <item msgid="422053689531707709">"ogni quarto sabato"</item>
+    <item msgid="5499975799312474425">"ogni ultimo sabato"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e74e826..73c1b78 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Ogni settimana di <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Ogni <xliff:g id="NUMBER">%1$d</xliff:g> settimane di <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Ogni mese (ogni <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Ogni mese"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ogni anno"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Ogni mese (il <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Ogni <xliff:g id="COUNT">%d</xliff:g> anni"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"lo stesso giorno ogni mese"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"ogni <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Sempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Fino a una data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Fino al giorno: <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 941f351..939a56d 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"חזרה על בסיס חודשי"</item>
     <item msgid="8714177874112569158">"חזרה על בסיס שנתי"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"בכל יום ראשון הראשון בכל חודש"</item>
+    <item msgid="2557379346106451363">"בכל יום ראשון השני בכל חודש"</item>
+    <item msgid="7622144489915654132">"בכל יום ראשון השלישי בכל חודש"</item>
+    <item msgid="527152448137686021">"בכל יום ראשון הרביעי בכל חודש"</item>
+    <item msgid="5057483608824759350">"בכל יום ראשון האחרון בכל חודש"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"בכל יום שני הראשון בכל חודש"</item>
+    <item msgid="4484275849072423978">"בכל יום שני השני בכל חודש"</item>
+    <item msgid="8956169860824371383">"בכל יום שני השלישי בכל חודש"</item>
+    <item msgid="6924403357659569326">"בכל יום שני הרביעי בכל חודש"</item>
+    <item msgid="1379608815263472161">"בכל יום שני האחרון בכל חודש"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"בכל יום שלישי הראשון בכל חודש"</item>
+    <item msgid="9063613547307760928">"בכל יום שלישי השני בכל חודש"</item>
+    <item msgid="6688603328729208168">"בכל יום שלישי השלישי בכל חודש"</item>
+    <item msgid="6695206006961533357">"בכל יום שלישי הרביעי בכל חודש"</item>
+    <item msgid="8619069174889809914">"בכל יום שלישי האחרון בכל חודש"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"בכל יום רביעי הראשון בכל חודש"</item>
+    <item msgid="5059722045367799217">"בכל יום רביעי השני בכל חודש"</item>
+    <item msgid="7986246648229272275">"בכל יום רביעי השלישי בכל חודש"</item>
+    <item msgid="9068566169348980801">"בכל יום רביעי הרביעי בכל חודש"</item>
+    <item msgid="7976866743069062134">"בכל יום רביעי האחרון בכל חודש"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"בכל יום חמישי הראשון בכל חודש"</item>
+    <item msgid="4857419136007543270">"בכל יום חמישי השני בכל חודש"</item>
+    <item msgid="222044587450564839">"בכל יום חמישי השלישי בכל חודש"</item>
+    <item msgid="6197927556533030945">"בכל יום חמישי הרביעי בכל חודש"</item>
+    <item msgid="1023326923033436905">"בכל יום חמישי האחרון בכל חודש"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"בכל יום שישי הראשון בכל חודש"</item>
+    <item msgid="1935608297230506940">"בכל יום שישי השני בכל חודש"</item>
+    <item msgid="4061877662049317599">"בכל יום שישי השלישי בכל חודש"</item>
+    <item msgid="6856646749131820614">"בכל יום שישי הרביעי בכל חודש"</item>
+    <item msgid="6533513913914859794">"בכל יום שישי האחרון בכל חודש"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"בכל יום שבת הראשון בכל חודש"</item>
+    <item msgid="9130198690512925355">"בכל יום שבת השני בכל חודש"</item>
+    <item msgid="4525736070844032405">"בכל יום שבת השלישי בכל חודש"</item>
+    <item msgid="422053689531707709">"בכל יום שבת הרביעי בכל חודש"</item>
+    <item msgid="5499975799312474425">"בכל יום שבת האחרון בכל חודש"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b2b69cd..1d09f4e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"שבועי ביום <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"כל <xliff:g id="NUMBER">%1$d</xliff:g> שבועות ביום <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"מדי חודש (כל <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"כל חודש"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"כל שנה"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"מדי חודש (ביום <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"כל <xliff:g id="COUNT">%d</xliff:g> שנים"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"באותו יום בכל חודש"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"בכל יום <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> ‏<xliff:g id="NTH">%1$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"ללא תאריך סיום"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"עד תאריך מסוים"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"עד <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 3807312..487aca1 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"毎月繰り返す"</item>
     <item msgid="8714177874112569158">"毎年繰り返す"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"毎月第1日曜日"</item>
+    <item msgid="2557379346106451363">"毎月第2日曜日"</item>
+    <item msgid="7622144489915654132">"毎月第3日曜日"</item>
+    <item msgid="527152448137686021">"毎月第4日曜日"</item>
+    <item msgid="5057483608824759350">"毎月最終日曜日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"毎月第1月曜日"</item>
+    <item msgid="4484275849072423978">"毎月第2月曜日"</item>
+    <item msgid="8956169860824371383">"毎月第3月曜日"</item>
+    <item msgid="6924403357659569326">"毎月第4月曜日"</item>
+    <item msgid="1379608815263472161">"毎月最終月曜日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"毎月第1火曜日"</item>
+    <item msgid="9063613547307760928">"毎月第2火曜日"</item>
+    <item msgid="6688603328729208168">"毎月第3火曜日"</item>
+    <item msgid="6695206006961533357">"毎月第4火曜日"</item>
+    <item msgid="8619069174889809914">"毎月最終火曜日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"毎月第1水曜日"</item>
+    <item msgid="5059722045367799217">"毎月第2水曜日"</item>
+    <item msgid="7986246648229272275">"毎月第3水曜日"</item>
+    <item msgid="9068566169348980801">"毎月第4水曜日"</item>
+    <item msgid="7976866743069062134">"毎月最終水曜日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"毎月第1木曜日"</item>
+    <item msgid="4857419136007543270">"毎月第2木曜日"</item>
+    <item msgid="222044587450564839">"毎月第3木曜日"</item>
+    <item msgid="6197927556533030945">"毎月第4木曜日"</item>
+    <item msgid="1023326923033436905">"毎月最終木曜日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"毎月第1金曜日"</item>
+    <item msgid="1935608297230506940">"毎月第2金曜日"</item>
+    <item msgid="4061877662049317599">"毎月第3金曜日"</item>
+    <item msgid="6856646749131820614">"毎月第4金曜日"</item>
+    <item msgid="6533513913914859794">"毎月最終金曜日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"毎月第1土曜日"</item>
+    <item msgid="9130198690512925355">"毎月第2土曜日"</item>
+    <item msgid="4525736070844032405">"毎月第3土曜日"</item>
+    <item msgid="422053689531707709">"毎月第4土曜日"</item>
+    <item msgid="5499975799312474425">"毎月最終土曜日"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 81511d9..f3eb0e3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"毎週<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g>週間ごとの<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"毎月（<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>）"</string>
     <string name="monthly" msgid="4587116285383048586">"月次"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"毎年"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"毎月（<xliff:g id="DAY_OF_MONTH">%s</xliff:g>日）"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g>年ごと"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"毎月同じ日"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"<xliff:g id="NTH">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>ごと"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"全期間"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"終了日:"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g>まで"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 9642559..3bde3b3 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"매월 반복"</item>
     <item msgid="8714177874112569158">"매년 반복"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"매월 첫 번째 일요일"</item>
+    <item msgid="2557379346106451363">"매월 두 번째 일요일"</item>
+    <item msgid="7622144489915654132">"매월 세 번째 일요일"</item>
+    <item msgid="527152448137686021">"매월 네 번째 일요일"</item>
+    <item msgid="5057483608824759350">"매월 마지막 일요일"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"매월 첫 번째 월요일"</item>
+    <item msgid="4484275849072423978">"매월 두 번째 월요일"</item>
+    <item msgid="8956169860824371383">"매월 세 번째 월요일"</item>
+    <item msgid="6924403357659569326">"매월 네 번째 월요일"</item>
+    <item msgid="1379608815263472161">"매월 마지막 월요일"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"매월 첫 번째 화요일"</item>
+    <item msgid="9063613547307760928">"매월 두 번째 화요일"</item>
+    <item msgid="6688603328729208168">"매월 세 번째 화요일"</item>
+    <item msgid="6695206006961533357">"매월 네 번째 화요일"</item>
+    <item msgid="8619069174889809914">"매월 마지막 화요일"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"매월 첫 번째 수요일"</item>
+    <item msgid="5059722045367799217">"매월 두 번째 수요일"</item>
+    <item msgid="7986246648229272275">"매월 세 번째 수요일"</item>
+    <item msgid="9068566169348980801">"매월 네 번째 수요일"</item>
+    <item msgid="7976866743069062134">"매월 마지막 수요일"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"매월 첫 번째 목요일"</item>
+    <item msgid="4857419136007543270">"매월 두 번째 목요일"</item>
+    <item msgid="222044587450564839">"매월 세 번째 목요일"</item>
+    <item msgid="6197927556533030945">"매월 네 번째 목요일"</item>
+    <item msgid="1023326923033436905">"매월 마지막 목요일"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"매월 첫 번째 금요일"</item>
+    <item msgid="1935608297230506940">"매월 두 번째 금요일"</item>
+    <item msgid="4061877662049317599">"매월 세 번째 금요일"</item>
+    <item msgid="6856646749131820614">"매월 네 번째 금요일"</item>
+    <item msgid="6533513913914859794">"매월 마지막 금요일"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"매월 첫 번째 토요일"</item>
+    <item msgid="9130198690512925355">"매월 두 번째 토요일"</item>
+    <item msgid="4525736070844032405">"매월 세 번째 토요일"</item>
+    <item msgid="422053689531707709">"매월 네 번째 토요일"</item>
+    <item msgid="5499975799312474425">"매월 마지막 토요일"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 15668d7..a244ba1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"매주 <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g>주에 한 번 <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"매월(<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"매월"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"매년"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"매월(<xliff:g id="DAY_OF_MONTH">%s</xliff:g>일)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g>년에 한 번"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"매월 같은 날"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"매월 <xliff:g id="NTH">%1$s</xliff:g>번째 <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"계속"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"특정일까지"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"종료일: <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9f22105..41894f6 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"KARTOTI KAS MĖNESĮ"</item>
     <item msgid="8714177874112569158">"KARTOTI KASMET"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"kiekvieną pirmą sekmadienį"</item>
+    <item msgid="2557379346106451363">"kiekvieną antrą sekmadienį"</item>
+    <item msgid="7622144489915654132">"kiekvieną trečią sekmadienį"</item>
+    <item msgid="527152448137686021">"kiekvieną ketvirtą sekmadienį"</item>
+    <item msgid="5057483608824759350">"kiekvieną paskutinį sekmadienį"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"kiekvieną pirmą pirmadienį"</item>
+    <item msgid="4484275849072423978">"kiekvieną antrą pirmadienį"</item>
+    <item msgid="8956169860824371383">"kiekvieną trečią pirmadienį"</item>
+    <item msgid="6924403357659569326">"kiekvieną ketvirtą pirmadienį"</item>
+    <item msgid="1379608815263472161">"kiekvieną paskutinį pirmadienį"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"kiekvieną pirmą antradienį"</item>
+    <item msgid="9063613547307760928">"kiekvieną antrą antradienį"</item>
+    <item msgid="6688603328729208168">"kiekvieną trečią antradienį"</item>
+    <item msgid="6695206006961533357">"kiekvieną ketvirtą antradienį"</item>
+    <item msgid="8619069174889809914">"kiekvieną paskutinį antradienį"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"kiekvieną pirmą trečiadienį"</item>
+    <item msgid="5059722045367799217">"kiekvieną antrą trečiadienį"</item>
+    <item msgid="7986246648229272275">"kiekvieną trečią trečiadienį"</item>
+    <item msgid="9068566169348980801">"kiekvieną ketvirtą trečiadienį"</item>
+    <item msgid="7976866743069062134">"kiekvieną paskut. trečiadienį"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"kiekvieną pirmą ketvirtadienį"</item>
+    <item msgid="4857419136007543270">"kiekvieną antrą ketvirtadienį"</item>
+    <item msgid="222044587450564839">"kiekvieną trečią ketvirtadienį"</item>
+    <item msgid="6197927556533030945">"kiekvieną ketv. ketvirtadienį"</item>
+    <item msgid="1023326923033436905">"kiekvieną pask. ketvirtadienį"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"kiekvieną pirmą penktadienį"</item>
+    <item msgid="1935608297230506940">"kiekvieną antrą penktadienį"</item>
+    <item msgid="4061877662049317599">"kiekvieną trečią penktadienį"</item>
+    <item msgid="6856646749131820614">"kiekvieną ketvirtą penktadienį"</item>
+    <item msgid="6533513913914859794">"kiekvieną paskut. penktadienį"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"kiekvieną pirmą šeštadienį"</item>
+    <item msgid="9130198690512925355">"kiekvieną antrą šeštadienį"</item>
+    <item msgid="4525736070844032405">"kiekvieną trečią šeštadienį"</item>
+    <item msgid="422053689531707709">"kiekvieną ketvirtą šeštadienį"</item>
+    <item msgid="5499975799312474425">"kiekvieną paskutinį šeštadienį"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 04983da..46dd2cf 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Kas savaitę, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Kas <xliff:g id="NUMBER">%1$d</xliff:g> sav., <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Kas mėnesį (kas <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Kas mėnesį"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Kasmet"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Kas mėnesį (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> d.)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Kas <xliff:g id="COUNT">%d</xliff:g> m."</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"kas mėn. tą pačią d."</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"kiekvieną <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Visada"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Iki nurodytos datos"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Iki <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index f123179..db25ed3 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ATKĀRTOT KATRU MĒN."</item>
     <item msgid="8714177874112569158">"ATKĀRTOT KATRU GADU"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"katra mēneša pirmajā svētdienā"</item>
+    <item msgid="2557379346106451363">"katra mēneša otrajā svētdienā"</item>
+    <item msgid="7622144489915654132">"katra mēneša trešajā svētdienā"</item>
+    <item msgid="527152448137686021">"katra mēn. ceturtajā svētdienā"</item>
+    <item msgid="5057483608824759350">"katra mēneša pēdējā svētdienā"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"katra mēneša pirmajā pirmdienā"</item>
+    <item msgid="4484275849072423978">"katra mēneša otrajā pirmdienā"</item>
+    <item msgid="8956169860824371383">"katra mēneša trešajā pirmdienā"</item>
+    <item msgid="6924403357659569326">"katra mēn. ceturtajā pirmdienā"</item>
+    <item msgid="1379608815263472161">"katra mēneša pēdējā pirmdienā"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"katra mēneša pirmajā otrdienā"</item>
+    <item msgid="9063613547307760928">"katra mēneša otrajā otrdienā"</item>
+    <item msgid="6688603328729208168">"katra mēneša trešajā otrdienā"</item>
+    <item msgid="6695206006961533357">"katra mēn. ceturtajā otrdienā"</item>
+    <item msgid="8619069174889809914">"katra mēneša pēdējā otrdienā"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"katra mēneša pirmajā trešdienā"</item>
+    <item msgid="5059722045367799217">"katra mēneša otrajā trešdienā"</item>
+    <item msgid="7986246648229272275">"katra mēneša trešajā trešdienā"</item>
+    <item msgid="9068566169348980801">"katra mēn. ceturtajā trešdienā"</item>
+    <item msgid="7976866743069062134">"katra mēneša pēdējā trešdienā"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"katra mēn. pirmajā ceturtdienā"</item>
+    <item msgid="4857419136007543270">"katra mēn. otrajā ceturtdienā"</item>
+    <item msgid="222044587450564839">"katra mēn. trešajā ceturtdienā"</item>
+    <item msgid="6197927556533030945">"katra mēn. ceturt. ceturtdienā"</item>
+    <item msgid="1023326923033436905">"katra mēn. pēdējā ceturtdienā"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"katra mēn. pirmajā piektdienā"</item>
+    <item msgid="1935608297230506940">"katra mēneša otrajā piektdienā"</item>
+    <item msgid="4061877662049317599">"katra mēn. trešajā piektdienā"</item>
+    <item msgid="6856646749131820614">"katra mēn. ceturt. piektdienā"</item>
+    <item msgid="6533513913914859794">"katra mēneša pēdējā piektdienā"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"katra mēneša pirmajā sestdienā"</item>
+    <item msgid="9130198690512925355">"katra mēneša otrajā sestdienā"</item>
+    <item msgid="4525736070844032405">"katra mēneša trešajā sestdienā"</item>
+    <item msgid="422053689531707709">"katra mēn. ceturtajā sestdienā"</item>
+    <item msgid="5499975799312474425">"katra mēneša pēdējā sestdienā"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ac5939b..b9a4e5b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Reizi nedēļā, katru <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Reizi <xliff:g id="NUMBER">%1$d</xliff:g> nedēļās, katru <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Reizi mēnesī (katra <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Reizi mēnesī"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Reizi gadā"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Reizi mēnesī (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. datumā)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> gada(-iem)"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"katru mēn. vienā d."</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"katra mēneša <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Bezgalīgi"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Līdz noteiktam datumam"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Līdz  šādam datumam: <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index d0bd632..0af4343 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Hanya jika ditolak"</item>
     <item msgid="6367412240524984286">"Jika ditolak atau tidak dijawab"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"ULANG SETIAP HARI"</item>
+    <item msgid="6300824484048337842">"ULANG SETIAP MINGGU"</item>
+    <item msgid="189361731610816256">"ULANG SETIAP BULAN"</item>
+    <item msgid="8714177874112569158">"ULANG SETIAP TAHUN"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"pada setiap Ahad pertama"</item>
+    <item msgid="2557379346106451363">"pada setiap Ahad kedua"</item>
+    <item msgid="7622144489915654132">"pada setiap Ahad ketiga"</item>
+    <item msgid="527152448137686021">"pada setiap Ahad keempat"</item>
+    <item msgid="5057483608824759350">"pada setiap Ahad terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"pada setiap Isnin pertama"</item>
+    <item msgid="4484275849072423978">"pada setiap Isnin kedua"</item>
+    <item msgid="8956169860824371383">"pada setiap Isnin ketiga"</item>
+    <item msgid="6924403357659569326">"pada setiap Isnin keempat"</item>
+    <item msgid="1379608815263472161">"pada setiap Isnin terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"pada setiap Selasa pertama"</item>
+    <item msgid="9063613547307760928">"pada setiap Selasa kedua"</item>
+    <item msgid="6688603328729208168">"pada setiap Selasa ketiga"</item>
+    <item msgid="6695206006961533357">"pada setiap Selasa keempat"</item>
+    <item msgid="8619069174889809914">"pada setiap Selasa terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"pada setiap Rabu pertama"</item>
+    <item msgid="5059722045367799217">"pada setiap Rabu kedua"</item>
+    <item msgid="7986246648229272275">"pada setiap Rabu ketiga"</item>
+    <item msgid="9068566169348980801">"pada setiap Rabu keempat"</item>
+    <item msgid="7976866743069062134">"pada setiap Rabu terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"pada setiap Khamis pertama"</item>
+    <item msgid="4857419136007543270">"pada setiap Khamis kedua"</item>
+    <item msgid="222044587450564839">"pada setiap Khamis ketiga"</item>
+    <item msgid="6197927556533030945">"pada setiap Khamis keempat"</item>
+    <item msgid="1023326923033436905">"pada setiap Khamis terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"pada setiap Jumaat pertama"</item>
+    <item msgid="1935608297230506940">"pada setiap Jumaat kedua"</item>
+    <item msgid="4061877662049317599">"pada setiap Jumaat ketiga"</item>
+    <item msgid="6856646749131820614">"pada setiap Jumaat keempat"</item>
+    <item msgid="6533513913914859794">"pada setiap Jumaat terakhir"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"pada setiap Sabtu pertama"</item>
+    <item msgid="9130198690512925355">"pada setiap Sabtu kedua"</item>
+    <item msgid="4525736070844032405">"pada setiap Sabtu ketiga"</item>
+    <item msgid="422053689531707709">"pada setiap Sabtu keempat"</item>
+    <item msgid="5499975799312474425">"pada setiap Sabtu terakhir"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8c6217c..ac8d296 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Mingguan pada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Setiap <xliff:g id="NUMBER">%1$d</xliff:g> minggu pada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Bulanan (setiap <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> ke-<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Bulanan"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Tahunan"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Bulanan (pada hari ke-<xliff:g id="DAY_OF_MONTH">%s</xliff:g> )"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Setiap <xliff:g id="COUNT">%d</xliff:g> tahun"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"hari sama setiap bln"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"pada setiap <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Selamanya"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Sehingga tarikh"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Sehingga <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Untuk sejumlah acara"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
+    <item quantity="other" msgid="8779598489398048259">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"tukar tarikh akhir"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index f7ce511..0623b03 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"GJENTA MÅNEDLIG"</item>
     <item msgid="8714177874112569158">"GJENTA ÅRLIG"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"hver første søndag i måneden"</item>
+    <item msgid="2557379346106451363">"hver andre søndag i måneden"</item>
+    <item msgid="7622144489915654132">"hver tredje søndag i måneden"</item>
+    <item msgid="527152448137686021">"hver fjerde søndag i måneden"</item>
+    <item msgid="5057483608824759350">"hver siste søndag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"hver første mandag i måneden"</item>
+    <item msgid="4484275849072423978">"hver andre mandag i måneden"</item>
+    <item msgid="8956169860824371383">"hver tredje mandag i måneden"</item>
+    <item msgid="6924403357659569326">"hver fjerde mandag i måneden"</item>
+    <item msgid="1379608815263472161">"hver siste mandag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"hver første tirsdag i måneden"</item>
+    <item msgid="9063613547307760928">"hver andre tirsdag i måneden"</item>
+    <item msgid="6688603328729208168">"hver tredje tirsdag i måneden"</item>
+    <item msgid="6695206006961533357">"hver fjerde tirsdag i måneden"</item>
+    <item msgid="8619069174889809914">"hver siste tirsdag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"hver første onsdag i måneden"</item>
+    <item msgid="5059722045367799217">"hver andre onsdag i måneden"</item>
+    <item msgid="7986246648229272275">"hver tredje onsdag i måneden"</item>
+    <item msgid="9068566169348980801">"hver fjerde onsdag i måneden"</item>
+    <item msgid="7976866743069062134">"hver siste onsdag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"hver første torsdag i måneden"</item>
+    <item msgid="4857419136007543270">"hver andre torsdag i måneden"</item>
+    <item msgid="222044587450564839">"hver tredje torsdag i måneden"</item>
+    <item msgid="6197927556533030945">"hver fjerde torsdag i måneden"</item>
+    <item msgid="1023326923033436905">"hver siste torsdag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"hver første fredag i måneden"</item>
+    <item msgid="1935608297230506940">"hver andre fredag i måneden"</item>
+    <item msgid="4061877662049317599">"hver tredje fredag i måneden"</item>
+    <item msgid="6856646749131820614">"hver fjerde fredag i måneden"</item>
+    <item msgid="6533513913914859794">"hver siste fredag i måneden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"hver første lørdag i måneden"</item>
+    <item msgid="9130198690512925355">"hver andre lørdag i måneden"</item>
+    <item msgid="4525736070844032405">"hver tredje lørdag i måneden"</item>
+    <item msgid="422053689531707709">"hver fjerde lørdag i måneden"</item>
+    <item msgid="5499975799312474425">"hver siste lørdag i måneden"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7cc0f0c..9f8ce9d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Ukentlig på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Hver <xliff:g id="NUMBER">%1$d</xliff:g>. uke på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Hver måned (hver <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Månedlig"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Årlig"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Hver måned (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>.)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Hvert <xliff:g id="COUNT">%d</xliff:g>. år"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"på samme dag hver måned"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"hver <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"For alltid"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"inntil en gitt dato"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Til <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 32a597b..f714558 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"MAANDELIJKS HERHALEN"</item>
     <item msgid="8714177874112569158">"JAARLIJKS HERHALEN"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"op elke eerste zondag"</item>
+    <item msgid="2557379346106451363">"op elke tweede zondag"</item>
+    <item msgid="7622144489915654132">"op elke derde zondag"</item>
+    <item msgid="527152448137686021">"op elke vierde zondag"</item>
+    <item msgid="5057483608824759350">"op elke laatste zondag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"op elke eerste maandag"</item>
+    <item msgid="4484275849072423978">"op elke tweede maandag"</item>
+    <item msgid="8956169860824371383">"op elke derde maandag"</item>
+    <item msgid="6924403357659569326">"op elke vierde maandag"</item>
+    <item msgid="1379608815263472161">"op elke laatste maandag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"op elke eerste dinsdag"</item>
+    <item msgid="9063613547307760928">"op elke tweede dinsdag"</item>
+    <item msgid="6688603328729208168">"op elke derde dinsdag"</item>
+    <item msgid="6695206006961533357">"op elke vierde dinsdag"</item>
+    <item msgid="8619069174889809914">"op elke laatste dinsdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"op elke eerste woensdag"</item>
+    <item msgid="5059722045367799217">"op elke tweede woensdag"</item>
+    <item msgid="7986246648229272275">"op elke derde woensdag"</item>
+    <item msgid="9068566169348980801">"op elke vierde woensdag"</item>
+    <item msgid="7976866743069062134">"op elke laatste woensdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"op elke eerste donderdag"</item>
+    <item msgid="4857419136007543270">"op elke tweede donderdag"</item>
+    <item msgid="222044587450564839">"op elke derde donderdag"</item>
+    <item msgid="6197927556533030945">"op elke vierde donderdag"</item>
+    <item msgid="1023326923033436905">"op elke laatste donderdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"op elke eerste vrijdag"</item>
+    <item msgid="1935608297230506940">"op elke tweede vrijdag"</item>
+    <item msgid="4061877662049317599">"op elke derde vrijdag"</item>
+    <item msgid="6856646749131820614">"op elke vierde vrijdag"</item>
+    <item msgid="6533513913914859794">"op elke laatste vrijdag"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"op elke eerste zaterdag"</item>
+    <item msgid="9130198690512925355">"op elke tweede zaterdag"</item>
+    <item msgid="4525736070844032405">"op elke derde zaterdag"</item>
+    <item msgid="422053689531707709">"op elke vierde zaterdag"</item>
+    <item msgid="5499975799312474425">"op elke laatste zaterdag"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5cd97b0..39df6c8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Wekelijks op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Elke <xliff:g id="NUMBER">%1$d</xliff:g> weken op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Maandelijks (elke <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Maandelijks"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Jaarlijks"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Maandelijks (op dag <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"elke maand op dezelfde dag"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"op elke <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Voor altijd"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Tot een datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Tot <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index be1c395..8b4c54d 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -112,9 +112,58 @@
     <item msgid="6367412240524984286">"Po odrzuceniu lub gdy bez odpowiedzi"</item>
   </string-array>
   <string-array name="recurrence_freq">
-    <item msgid="3388478383574917007">"ODPOWIADAJ CODZIENNIE"</item>
-    <item msgid="6300824484048337842">"ODPOWIADAJ CO TYDZIEŃ"</item>
-    <item msgid="189361731610816256">"ODPOWIADAJ CO MIESIĄC"</item>
-    <item msgid="8714177874112569158">"ODPOWIADAJ CO ROK"</item>
+    <item msgid="3388478383574917007">"POWTARZAJ CODZIENNIE"</item>
+    <item msgid="6300824484048337842">"POWTARZAJ CO TYDZIEŃ"</item>
+    <item msgid="189361731610816256">"POWTARZAJ CO MIESIĄC"</item>
+    <item msgid="8714177874112569158">"POWTARZAJ CO ROK"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"w każdą pierwszą niedzielę"</item>
+    <item msgid="2557379346106451363">"w każdą drugą niedzielę"</item>
+    <item msgid="7622144489915654132">"w każdą trzecią niedzielę"</item>
+    <item msgid="527152448137686021">"w każdą czwartą niedzielę"</item>
+    <item msgid="5057483608824759350">"w każdą ostatnią niedzielę"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"w każdy pierwszy poniedziałek"</item>
+    <item msgid="4484275849072423978">"w każdy drugi poniedziałek"</item>
+    <item msgid="8956169860824371383">"w każdy trzeci poniedziałek"</item>
+    <item msgid="6924403357659569326">"w każdy czwarty poniedziałek"</item>
+    <item msgid="1379608815263472161">"w każdy ostatni poniedziałek"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"w każdy pierwszy wtorek"</item>
+    <item msgid="9063613547307760928">"w każdy drugi wtorek"</item>
+    <item msgid="6688603328729208168">"w każdy trzeci wtorek"</item>
+    <item msgid="6695206006961533357">"w każdy czwarty wtorek"</item>
+    <item msgid="8619069174889809914">"w każdy ostatni wtorek"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"w każdą pierwszą środę"</item>
+    <item msgid="5059722045367799217">"w każdą drugą środę"</item>
+    <item msgid="7986246648229272275">"w każdą trzecią środę"</item>
+    <item msgid="9068566169348980801">"w każdą czwartą środę"</item>
+    <item msgid="7976866743069062134">"w każdą ostatnią środę"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"w każdy pierwszy czwartek"</item>
+    <item msgid="4857419136007543270">"w każdy drugi czwartek"</item>
+    <item msgid="222044587450564839">"w każdy trzeci czwartek"</item>
+    <item msgid="6197927556533030945">"w każdy czwarty czwartek"</item>
+    <item msgid="1023326923033436905">"w każdy ostatni czwartek"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"w każdy pierwszy piątek"</item>
+    <item msgid="1935608297230506940">"w każdy drugi piątek"</item>
+    <item msgid="4061877662049317599">"w każdy trzeci piątek"</item>
+    <item msgid="6856646749131820614">"w każdy czwarty piątek"</item>
+    <item msgid="6533513913914859794">"w każdy ostatni piątek"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"w każdą pierwszą sobotę"</item>
+    <item msgid="9130198690512925355">"w każdą drugą sobotę"</item>
+    <item msgid="4525736070844032405">"w każdą trzecią sobotę"</item>
+    <item msgid="422053689531707709">"w każdą czwartą sobotę"</item>
+    <item msgid="5499975799312474425">"w każdą ostatnią sobotę"</item>
   </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6eb192c..8f6f60c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Co tydzień w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Co <xliff:g id="NUMBER">%1$d</xliff:g> tygodni(e) w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Co miesiąc (co <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Co miesiąc"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Co rok"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Co miesiąc (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. każdego miesiąca)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Co <xliff:g id="COUNT">%d</xliff:g> lat(a)"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"tego samego dnia miesiąca"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"<xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> miesiąca"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Bez końca"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do daty"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 3155da6..420c575 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"REPETIR MENSALMENTE"</item>
     <item msgid="8714177874112569158">"REPETIR ANUALMENTE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"em cada primeiro domingo"</item>
+    <item msgid="2557379346106451363">"em cada segundo domingo"</item>
+    <item msgid="7622144489915654132">"em cada terceiro domingo"</item>
+    <item msgid="527152448137686021">"em cada quarto domingo"</item>
+    <item msgid="5057483608824759350">"em cada último domingo"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"em cada primeira segunda-feira"</item>
+    <item msgid="4484275849072423978">"em cada segunda segunda-feira"</item>
+    <item msgid="8956169860824371383">"em cada terceira segunda-feira"</item>
+    <item msgid="6924403357659569326">"em cada quarta segunda-feira"</item>
+    <item msgid="1379608815263472161">"em cada última segunda-feira"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"em cada primeira terça-feira"</item>
+    <item msgid="9063613547307760928">"em cada segunda terça-feira"</item>
+    <item msgid="6688603328729208168">"em cada terceira terça-feira"</item>
+    <item msgid="6695206006961533357">"em cada quarta terça-feira"</item>
+    <item msgid="8619069174889809914">"em cada última terça-feira"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"em cada primeira quarta-feira"</item>
+    <item msgid="5059722045367799217">"em cada segunda quarta-feira"</item>
+    <item msgid="7986246648229272275">"em cada terceira quarta-feira"</item>
+    <item msgid="9068566169348980801">"em cada quarta quarta-feira"</item>
+    <item msgid="7976866743069062134">"em cada última quarta-feira"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"em cada primeira quinta-feira"</item>
+    <item msgid="4857419136007543270">"em cada segunda quinta-feira"</item>
+    <item msgid="222044587450564839">"em cada terceira quinta-feira"</item>
+    <item msgid="6197927556533030945">"em cada quarta quinta-feira"</item>
+    <item msgid="1023326923033436905">"em cada última quinta-feira"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"em cada primeira sexta-feira"</item>
+    <item msgid="1935608297230506940">"em cada segunda sexta-feira"</item>
+    <item msgid="4061877662049317599">"em cada terceira sexta-feira"</item>
+    <item msgid="6856646749131820614">"em cada quarta sexta-feira"</item>
+    <item msgid="6533513913914859794">"em cada última sexta-feira"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"em cada primeiro sábado"</item>
+    <item msgid="9130198690512925355">"em cada segundo sábado"</item>
+    <item msgid="4525736070844032405">"em cada terceiro sábado"</item>
+    <item msgid="422053689531707709">"em cada quarto sábado"</item>
+    <item msgid="5499975799312474425">"em cada último sábado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 64f5f01..cedd884 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Semanalmente às <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"A cada <xliff:g id="NUMBER">%1$d</xliff:g> semanas, às <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensalmente (a cada <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mensalmente"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualmente"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mensalmente (no dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"A cada <xliff:g id="COUNT">%d</xliff:g> anos"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"no mesmo dia de cada mês"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"a cada <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Para Sempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Até uma data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Até <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 60e4463..0abd44e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -76,10 +76,10 @@
     <item msgid="9182342638433672664">"Público"</item>
   </string-array>
   <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primeiro"</item>
-    <item msgid="5631923029483854900">"segundo"</item>
-    <item msgid="148935502975250973">"terceiro"</item>
-    <item msgid="5124200797326669172">"quarto"</item>
+    <item msgid="2693927956303125332">"primeiro(a)"</item>
+    <item msgid="5631923029483854900">"segundo(a)"</item>
+    <item msgid="148935502975250973">"terceiro(a)"</item>
+    <item msgid="5124200797326669172">"quarto(a)"</item>
     <item msgid="7564374178324652137">"último"</item>
   </string-array>
   <string-array name="response_labels1">
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"REPETIR MENSALMENTE"</item>
     <item msgid="8714177874112569158">"REPETIR ANUALMENTE"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"primeiro domingo do mês"</item>
+    <item msgid="2557379346106451363">"segundo domingo do mês"</item>
+    <item msgid="7622144489915654132">"terceiro domingo do mês"</item>
+    <item msgid="527152448137686021">"quarto domingo do mês"</item>
+    <item msgid="5057483608824759350">"último domingo do mês"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"primeira segunda-feira do mês"</item>
+    <item msgid="4484275849072423978">"segunda segunda-feira do mês"</item>
+    <item msgid="8956169860824371383">"terceira segunda-feira do mês"</item>
+    <item msgid="6924403357659569326">"quarta segunda-feira do mês"</item>
+    <item msgid="1379608815263472161">"última segunda-feira do mês"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"primeira terça-feira do mês"</item>
+    <item msgid="9063613547307760928">"segunda terça-feira do mês"</item>
+    <item msgid="6688603328729208168">"terceira terça-feira do mês"</item>
+    <item msgid="6695206006961533357">"quarta terça-feira do mês"</item>
+    <item msgid="8619069174889809914">"última terça-feira do mês"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"primeira quarta-feira do mês"</item>
+    <item msgid="5059722045367799217">"segunda quarta-feira do mês"</item>
+    <item msgid="7986246648229272275">"terceira quarta-feira do mês"</item>
+    <item msgid="9068566169348980801">"quarta quarta-feira do mês"</item>
+    <item msgid="7976866743069062134">"última quarta-feira do mês"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"primeira quinta-feira do mês"</item>
+    <item msgid="4857419136007543270">"segunda quinta-feira do mês"</item>
+    <item msgid="222044587450564839">"terceira quinta-feira do mês"</item>
+    <item msgid="6197927556533030945">"quarta quinta-feira do mês"</item>
+    <item msgid="1023326923033436905">"última quinta-feira do mês"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"primeira sexta-feira do mês"</item>
+    <item msgid="1935608297230506940">"segunda sexta-feira do mês"</item>
+    <item msgid="4061877662049317599">"terceira sexta-feira do mês"</item>
+    <item msgid="6856646749131820614">"quarta sexta-feira do mês"</item>
+    <item msgid="6533513913914859794">"última sexta-feira do mês"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"primeiro sábado do mês"</item>
+    <item msgid="9130198690512925355">"segundo sábado do mês"</item>
+    <item msgid="4525736070844032405">"terceiro sábado do mês"</item>
+    <item msgid="422053689531707709">"quarto sábado do mês"</item>
+    <item msgid="5499975799312474425">"último sábado do mês"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 23c702a..d38c906 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"A cada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> a cada <xliff:g id="NUMBER">%1$d</xliff:g> semanas"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mensalmente (todo(a) <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mensalmente"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualmente"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mensalmente (no dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"A cada <xliff:g id="COUNT">%d</xliff:g> anos"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"no mesmo dia de cada mês"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"a cada <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Sempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Até uma data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Até <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 8bea47f..0ea6554 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Numai dacă sunt respinse"</item>
     <item msgid="6367412240524984286">"Dacă sunt respinse sau fără răspuns"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"REPETAȚI ZILNIC"</item>
+    <item msgid="6300824484048337842">"REPETAȚI SĂPTĂMÂNAL"</item>
+    <item msgid="189361731610816256">"REPETAȚI LUNAR"</item>
+    <item msgid="8714177874112569158">"REPETAȚI ANUAL"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"în prima duminică din lună"</item>
+    <item msgid="2557379346106451363">"în a doua duminică din lună"</item>
+    <item msgid="7622144489915654132">"în a treia duminică din lună"</item>
+    <item msgid="527152448137686021">"în a patra duminică din lună"</item>
+    <item msgid="5057483608824759350">"în ultima duminică din lună"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"în prima luni din lună"</item>
+    <item msgid="4484275849072423978">"în a doua luni din lună"</item>
+    <item msgid="8956169860824371383">"în a treia luni din lună"</item>
+    <item msgid="6924403357659569326">"în a patra luni din lună"</item>
+    <item msgid="1379608815263472161">"în ultima luni din lună"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"în prima marți din lună"</item>
+    <item msgid="9063613547307760928">"în a doua marți din lună"</item>
+    <item msgid="6688603328729208168">"în a treia marți din lună"</item>
+    <item msgid="6695206006961533357">"în a patra marți din lună"</item>
+    <item msgid="8619069174889809914">"în ultima marți din lună"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"în prima miercuri din lună"</item>
+    <item msgid="5059722045367799217">"în a doua miercuri din lună"</item>
+    <item msgid="7986246648229272275">"în a treia miercuri din lună"</item>
+    <item msgid="9068566169348980801">"în a patra miercuri din lună"</item>
+    <item msgid="7976866743069062134">"în ultima miercuri din lună"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"în prima joi din lună"</item>
+    <item msgid="4857419136007543270">"în a doua joi din lună"</item>
+    <item msgid="222044587450564839">"în a treia joi din lună"</item>
+    <item msgid="6197927556533030945">"în a patra joi din lună"</item>
+    <item msgid="1023326923033436905">"în ultima joi din lună"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"în prima vineri din lună"</item>
+    <item msgid="1935608297230506940">"în a doua vineri din lună"</item>
+    <item msgid="4061877662049317599">"în a treia vineri din lună"</item>
+    <item msgid="6856646749131820614">"în a patra vineri din lună"</item>
+    <item msgid="6533513913914859794">"în ultima vineri din lună"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"în prima sâmbătă din lună"</item>
+    <item msgid="9130198690512925355">"în a doua sâmbătă din lună"</item>
+    <item msgid="4525736070844032405">"în a treia sâmbătă din lună"</item>
+    <item msgid="422053689531707709">"în a patra sâmbătă din lună"</item>
+    <item msgid="5499975799312474425">"în ultima sâmbătă din lună"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0e3e742..6da82c1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Săptămânal, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"La fiecare <xliff:g id="NUMBER">%1$d</xliff:g> săpt., <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Lunar (în fiecare <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Lunar"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anual"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Lunar (în zile de <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"O dată la <xliff:g id="COUNT">%d</xliff:g> ani"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"în aceeași zi lunar"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"în fiecare <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Întotdeauna"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Până la o anumită dată"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Până la <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"De mai multe ori"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Pentru <xliff:g id="EVENT_COUNT">%d</xliff:g> eveniment"</item>
+    <item quantity="other" msgid="8779598489398048259">"Pentru <xliff:g id="EVENT_COUNT">%d</xliff:g> evenimente"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"schimbați data de încheiere"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index e12be91..5fff3be 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Только если отклонено"</item>
     <item msgid="6367412240524984286">"Если отклонено или нет ответа"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"ЕЖЕДНЕВНО"</item>
+    <item msgid="6300824484048337842">"ЕЖЕНЕДЕЛЬНО"</item>
+    <item msgid="189361731610816256">"ЕЖЕМЕСЯЧНО"</item>
+    <item msgid="8714177874112569158">"ЕЖЕГОДНО"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"первое воскресенье месяца"</item>
+    <item msgid="2557379346106451363">"второе воскресенье месяца"</item>
+    <item msgid="7622144489915654132">"третье воскресенье месяца"</item>
+    <item msgid="527152448137686021">"четвертое воскресенье месяца"</item>
+    <item msgid="5057483608824759350">"последнее воскресенье месяца"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"первый понедельник месяца"</item>
+    <item msgid="4484275849072423978">"второй понедельник месяца"</item>
+    <item msgid="8956169860824371383">"третий понедельник месяца"</item>
+    <item msgid="6924403357659569326">"четвертый понедельник месяца"</item>
+    <item msgid="1379608815263472161">"последний понедельник месяца"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"первый вторник месяца"</item>
+    <item msgid="9063613547307760928">"второй вторник месяца"</item>
+    <item msgid="6688603328729208168">"третий вторник месяца"</item>
+    <item msgid="6695206006961533357">"четвертый вторник месяца"</item>
+    <item msgid="8619069174889809914">"последний вторник месяца"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"первая среда месяца"</item>
+    <item msgid="5059722045367799217">"вторая среда месяца"</item>
+    <item msgid="7986246648229272275">"третья среда месяца"</item>
+    <item msgid="9068566169348980801">"четвертая среда месяца"</item>
+    <item msgid="7976866743069062134">"последняя среда месяца"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"первый четверг месяца"</item>
+    <item msgid="4857419136007543270">"второй четверг месяца"</item>
+    <item msgid="222044587450564839">"третий четверг месяца"</item>
+    <item msgid="6197927556533030945">"четвертый четверг месяца"</item>
+    <item msgid="1023326923033436905">"последний четверг месяца"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"первая пятница месяца"</item>
+    <item msgid="1935608297230506940">"вторая пятница месяца"</item>
+    <item msgid="4061877662049317599">"третья пятница месяца"</item>
+    <item msgid="6856646749131820614">"четвертая пятница месяца"</item>
+    <item msgid="6533513913914859794">"последняя пятница месяца"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"первая суббота месяца"</item>
+    <item msgid="9130198690512925355">"вторая суббота месяца"</item>
+    <item msgid="4525736070844032405">"третья суббота месяца"</item>
+    <item msgid="422053689531707709">"четвертая суббота месяца"</item>
+    <item msgid="5499975799312474425">"последняя суббота месяца"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a4a8b8d..afcde93 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Еженедельно (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
     <item quantity="other" msgid="2857390143157377867">"Кажд. <xliff:g id="NUMBER">%1$d</xliff:g> нед. (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Ежемесячно (<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Ежемесячно"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ежегодно"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Ежемесячно (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> числа)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Интервал: <xliff:g id="COUNT">%d</xliff:g> гг./лет"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ежемесячно"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"<xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Всегда"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"до определенной даты"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"несколько раз"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Повторов: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="8779598489398048259">"Повторов: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"изменить дату окончания"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 82dde88..82c0202 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Iba ak sú odmietnuté"</item>
     <item msgid="6367412240524984286">"Ak sú odmietnuté alebo bez odpovede"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"OPAKOVAŤ DENNE"</item>
+    <item msgid="6300824484048337842">"OPAKOVAŤ TÝŽDENNE"</item>
+    <item msgid="189361731610816256">"OPAKOVAŤ MESAČNE"</item>
+    <item msgid="8714177874112569158">"OPAKOVAŤ ROČNE"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"každú prvú nedeľu"</item>
+    <item msgid="2557379346106451363">"každú druhú nedeľu"</item>
+    <item msgid="7622144489915654132">"každú tretiu nedeľu"</item>
+    <item msgid="527152448137686021">"každú štvrtú nedeľu"</item>
+    <item msgid="5057483608824759350">"každú poslednú nedeľu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"každý prvý pondelok"</item>
+    <item msgid="4484275849072423978">"každý druhý pondelok"</item>
+    <item msgid="8956169860824371383">"každý tretí pondelok"</item>
+    <item msgid="6924403357659569326">"každý štvrtý pondelok"</item>
+    <item msgid="1379608815263472161">"každý posledný pondelok"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"každý prvý utorok"</item>
+    <item msgid="9063613547307760928">"každý druhý utorok"</item>
+    <item msgid="6688603328729208168">"každý tretí utorok"</item>
+    <item msgid="6695206006961533357">"každý štvrtý utorok"</item>
+    <item msgid="8619069174889809914">"každý posledný utorok"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"každú prvú stredu"</item>
+    <item msgid="5059722045367799217">"každú druhú stredu"</item>
+    <item msgid="7986246648229272275">"každú tretiu stredu"</item>
+    <item msgid="9068566169348980801">"každú štvrtú stredu"</item>
+    <item msgid="7976866743069062134">"každú poslednú stredu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"každý prvý štvrtok"</item>
+    <item msgid="4857419136007543270">"každý druhý štvrtok"</item>
+    <item msgid="222044587450564839">"každý tretí štvrtok"</item>
+    <item msgid="6197927556533030945">"každý štvrtý štvrtok"</item>
+    <item msgid="1023326923033436905">"každý posledný štvrtok"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"každý prvý piatok"</item>
+    <item msgid="1935608297230506940">"každý druhý piatok"</item>
+    <item msgid="4061877662049317599">"každý tretí piatok"</item>
+    <item msgid="6856646749131820614">"každý štvrtý piatok"</item>
+    <item msgid="6533513913914859794">"každý posledný piatok"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"každú prvú sobotu"</item>
+    <item msgid="9130198690512925355">"každú druhú sobotu"</item>
+    <item msgid="4525736070844032405">"každú tretiu sobotu"</item>
+    <item msgid="422053689531707709">"každú štvrtú sobotu"</item>
+    <item msgid="5499975799312474425">"každú poslednú sobotu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e211d85..84f80db 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Každý týždeň v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Raz za <xliff:g id="NUMBER">%1$d</xliff:g> týžd. v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mesačne (vždy <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mesačne"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ročne"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mesačne (dňa <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Raz za <xliff:g id="COUNT">%d</xliff:g> r."</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"mesačne v ten istý deň"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"vždy v tento deň: <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Stále"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do dátumu"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Pre určitý počet udalostí"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Pre <xliff:g id="EVENT_COUNT">%d</xliff:g> udalosť"</item>
+    <item quantity="other" msgid="8779598489398048259">"Pre <xliff:g id="EVENT_COUNT">%d</xliff:g> udalosti/-í"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"zmeniť dátum ukončenia"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 319b173..e94d36a 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Samo ob zavrnitvi"</item>
     <item msgid="6367412240524984286">"Ob zavrnitvi ali neodzivanju"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"PONAVLJAJ VSAK DAN"</item>
+    <item msgid="6300824484048337842">"PONAVLJAJ VSAK TEDEN"</item>
+    <item msgid="189361731610816256">"PONAVLJAJ VSAK MESEC"</item>
+    <item msgid="8714177874112569158">"PONAVLJAJ VSAKO LETO"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"vsako prvo nedeljo v mesecu"</item>
+    <item msgid="2557379346106451363">"vsako drugo nedeljo v mesecu"</item>
+    <item msgid="7622144489915654132">"vsako tretjo nedeljo v mesecu"</item>
+    <item msgid="527152448137686021">"vsako četrto nedeljo v mesecu"</item>
+    <item msgid="5057483608824759350">"vsako zadnjo nedeljo v mesecu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"vsak prvi ponedeljek v mesecu"</item>
+    <item msgid="4484275849072423978">"vsak drugi ponedeljek v mesecu"</item>
+    <item msgid="8956169860824371383">"vsak tretji ponedeljek v mes."</item>
+    <item msgid="6924403357659569326">"vsak četrti ponedeljek v mes."</item>
+    <item msgid="1379608815263472161">"vsak zadnji ponedeljek v mes."</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"vsak prvi torek v mesecu"</item>
+    <item msgid="9063613547307760928">"vsak drugi torek v mesecu"</item>
+    <item msgid="6688603328729208168">"vsak tretji torek v mesecu"</item>
+    <item msgid="6695206006961533357">"vsak četrti torek v mesecu"</item>
+    <item msgid="8619069174889809914">"vsak zadnji torek v mesecu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"vsako prvo sredo v mesecu"</item>
+    <item msgid="5059722045367799217">"vsako drugo sredo v mesecu"</item>
+    <item msgid="7986246648229272275">"vsako tretjo sredo v mesecu"</item>
+    <item msgid="9068566169348980801">"vsako četrto sredo v mesecu"</item>
+    <item msgid="7976866743069062134">"vsako zadnjo sredo v mesecu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"vsak prvi četrtek v mesecu"</item>
+    <item msgid="4857419136007543270">"vsak drugi četrtek v mesecu"</item>
+    <item msgid="222044587450564839">"vsak tretji četrtek v mesecu"</item>
+    <item msgid="6197927556533030945">"vsak četrti četrtek v mesecu"</item>
+    <item msgid="1023326923033436905">"vsak zadnji četrtek v mesecu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"vsak prvi petek v mesecu"</item>
+    <item msgid="1935608297230506940">"vsak drugi petek v mesecu"</item>
+    <item msgid="4061877662049317599">"vsak tretji petek v mesecu"</item>
+    <item msgid="6856646749131820614">"vsak četrti petek v mesecu"</item>
+    <item msgid="6533513913914859794">"vsak zadnji petek v mesecu"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"vsako prvo soboto v mesecu"</item>
+    <item msgid="9130198690512925355">"vsako drugo soboto v mesecu"</item>
+    <item msgid="4525736070844032405">"vsako tretjo soboto v mesecu"</item>
+    <item msgid="422053689531707709">"vsako četrto soboto v mesecu"</item>
+    <item msgid="5499975799312474425">"vsako zadnjo soboto v mesecu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cd9af6b..2470612 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Tedensko: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> – na vsakih toliko tednov: <xliff:g id="NUMBER">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Mesečno (vsak <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Mesečno"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Letno"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Mesečno (na dan <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Vsakih toliko let: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"istega dne vsak mesec"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"vsak(-o) <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Za vedno"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do datuma"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Za določeno št. dogodkov"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Za toliko dogodkov: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="8779598489398048259">"Za toliko dogodkov: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"sprememba končnega datuma"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 9f179d3..52b962f 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ПОНАВЉАЈ МЕСЕЧНО"</item>
     <item msgid="8714177874112569158">"ПОНАВЉАЈ ГОДИШЊЕ"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"сваке прве недеље"</item>
+    <item msgid="2557379346106451363">"сваке друге недеље"</item>
+    <item msgid="7622144489915654132">"сваке треће недеље"</item>
+    <item msgid="527152448137686021">"сваке четврте недеље"</item>
+    <item msgid="5057483608824759350">"сваке последње недеље"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"сваког првог понедељка"</item>
+    <item msgid="4484275849072423978">"сваког другог понедељка"</item>
+    <item msgid="8956169860824371383">"сваког трећег понедељка"</item>
+    <item msgid="6924403357659569326">"сваког четвртог понедељка"</item>
+    <item msgid="1379608815263472161">"сваког последњег понедељка"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"сваког првог уторка"</item>
+    <item msgid="9063613547307760928">"сваког другог уторка"</item>
+    <item msgid="6688603328729208168">"сваког трећег уторка"</item>
+    <item msgid="6695206006961533357">"сваког четвртог уторка"</item>
+    <item msgid="8619069174889809914">"сваког последњег уторка"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"сваке прве среде"</item>
+    <item msgid="5059722045367799217">"сваке друге среде"</item>
+    <item msgid="7986246648229272275">"сваке треће среде"</item>
+    <item msgid="9068566169348980801">"сваке четврте среде"</item>
+    <item msgid="7976866743069062134">"сваке последње среде"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"сваког првог четвртка"</item>
+    <item msgid="4857419136007543270">"сваког другог четвртка"</item>
+    <item msgid="222044587450564839">"сваког трећег четвртка"</item>
+    <item msgid="6197927556533030945">"сваког четвртог четвртка"</item>
+    <item msgid="1023326923033436905">"сваког последњег четвртка"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"сваког првог петка"</item>
+    <item msgid="1935608297230506940">"сваког другог петка"</item>
+    <item msgid="4061877662049317599">"сваког трећег петка"</item>
+    <item msgid="6856646749131820614">"сваког четвртог петка"</item>
+    <item msgid="6533513913914859794">"сваког последњег петка"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"сваке прве суботе"</item>
+    <item msgid="9130198690512925355">"сваке друге суботе"</item>
+    <item msgid="4525736070844032405">"сваке треће суботе"</item>
+    <item msgid="422053689531707709">"сваке четврте суботе"</item>
+    <item msgid="5499975799312474425">"сваке последње суботе"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 36eebbc..c2b7081 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Недељно (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
     <item quantity="other" msgid="2857390143157377867">"На <xliff:g id="NUMBER">%1$d</xliff:g> недеље(а) (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"На месечном нивоу (сваки/а <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"На месечном нивоу"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"На годишњем нивоу"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"На месечном нивоу (дана <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"На <xliff:g id="COUNT">%d</xliff:g> године(а)"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"истог дана сваког месеца"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"сваки(а) <xliff:g id="NTH">%1$s</xliff:g>. <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Заувек"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"До одређеног датума"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index e6aa8cf..6fabec6 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"UPPREPA VARJE MÅNAD"</item>
     <item msgid="8714177874112569158">"UPPREPA VARJE ÅR"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"den första söndagen i månaden"</item>
+    <item msgid="2557379346106451363">"den andra söndagen i månaden"</item>
+    <item msgid="7622144489915654132">"den tredje söndagen i månaden"</item>
+    <item msgid="527152448137686021">"den fjärde söndagen i månaden"</item>
+    <item msgid="5057483608824759350">"den sista söndagen i månaden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"den första måndagen i månaden"</item>
+    <item msgid="4484275849072423978">"den andra måndagen i månaden"</item>
+    <item msgid="8956169860824371383">"den tredje måndagen i månaden"</item>
+    <item msgid="6924403357659569326">"den fjärde måndagen i månaden"</item>
+    <item msgid="1379608815263472161">"den sista måndagen i månaden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"den första tisdagen i månaden"</item>
+    <item msgid="9063613547307760928">"den andra tisdagen i månaden"</item>
+    <item msgid="6688603328729208168">"den tredje tisdagen i månaden"</item>
+    <item msgid="6695206006961533357">"den fjärde tisdagen i månaden"</item>
+    <item msgid="8619069174889809914">"den sista tisdagen i månaden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"den första onsdagen i månaden"</item>
+    <item msgid="5059722045367799217">"den andra onsdagen i månaden"</item>
+    <item msgid="7986246648229272275">"den tredje onsdagen i månaden"</item>
+    <item msgid="9068566169348980801">"den fjärde onsdagen i månaden"</item>
+    <item msgid="7976866743069062134">"den sista onsdagen i månaden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"den första torsdagen i månaden"</item>
+    <item msgid="4857419136007543270">"den andra torsdagen i månaden"</item>
+    <item msgid="222044587450564839">"den tredje torsdagen i månaden"</item>
+    <item msgid="6197927556533030945">"den fjärde torsdagen i månaden"</item>
+    <item msgid="1023326923033436905">"den sista torsdagen i månaden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"den första fredagen i månaden"</item>
+    <item msgid="1935608297230506940">"den andra fredagen i månaden"</item>
+    <item msgid="4061877662049317599">"den tredje fredagen i månaden"</item>
+    <item msgid="6856646749131820614">"den fjärde fredagen i månaden"</item>
+    <item msgid="6533513913914859794">"den sista fredagen i månaden"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"den första lördagen i månaden"</item>
+    <item msgid="9130198690512925355">"den andra lördagen i månaden"</item>
+    <item msgid="4525736070844032405">"den tredje lördagen i månaden"</item>
+    <item msgid="422053689531707709">"den fjärde lördagen i månaden"</item>
+    <item msgid="5499975799312474425">"den sista lördagen i månaden"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 21148c9..94e9b97 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Varje vecka på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Med <xliff:g id="NUMBER">%1$d</xliff:g> v. intervall på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Varje månad (den <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>en)"</string>
     <string name="monthly" msgid="4587116285383048586">"Varje månad"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Varje år"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Varje månad (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,14 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Med <xliff:g id="COUNT">%d</xliff:g> års intervall"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"samma dag varje månad"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"var <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"För alltid"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Till ett visst datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Till den <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Ett antal upprepningar"</string>
   <plurals name="recurrence_end_count">
     <item quantity="one" msgid="1400782968090516215">"För <xliff:g id="EVENT_COUNT">%d</xliff:g> event"</item>
-    <item quantity="other" msgid="8779598489398048259">"För <xliff:g id="EVENT_COUNT">%d</xliff:g> events"</item>
+    <item quantity="other" msgid="8779598489398048259">"För <xliff:g id="EVENT_COUNT">%d</xliff:g> event"</item>
   </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"ändra slutdatum"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 044f574..85d14b7 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Ikiwa itakataliwa tu"</item>
     <item msgid="6367412240524984286">"Ikikataliwa au Isipojibiwa"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"RUDIA KILA SIKU"</item>
+    <item msgid="6300824484048337842">"RUDIA KILA WIKI"</item>
+    <item msgid="189361731610816256">"RUDIA KILA MWEZI"</item>
+    <item msgid="8714177874112569158">"RUDIA KILA MWAKA"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"kila Jumapili ya kwanza"</item>
+    <item msgid="2557379346106451363">"kila Jumapili ya pili"</item>
+    <item msgid="7622144489915654132">"kila Jumapili ya tatu"</item>
+    <item msgid="527152448137686021">"kila Jumapili ya nne"</item>
+    <item msgid="5057483608824759350">"kila Jumapili ya mwisho"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"kila Jumatatu ya kwanza"</item>
+    <item msgid="4484275849072423978">"kila Jumatatu ya pili"</item>
+    <item msgid="8956169860824371383">"kila Jumatatu ya tatu"</item>
+    <item msgid="6924403357659569326">"kila Jumatatu ya nne"</item>
+    <item msgid="1379608815263472161">"kila Jumatatu ya mwisho"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"kila Jumanne ya kwanza"</item>
+    <item msgid="9063613547307760928">"kila Jumanne ya pili"</item>
+    <item msgid="6688603328729208168">"kila Jumanne ya tatu"</item>
+    <item msgid="6695206006961533357">"kila Jumanne ya nne"</item>
+    <item msgid="8619069174889809914">"kila Jumanne ya mwisho"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"kila Jumatano ya kwanza"</item>
+    <item msgid="5059722045367799217">"kila Jumatano ya pili"</item>
+    <item msgid="7986246648229272275">"kila Jumatano ya tatu"</item>
+    <item msgid="9068566169348980801">"kila Jumatano ya nne"</item>
+    <item msgid="7976866743069062134">"kila Jumatano ya mwisho"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"kila Alhamisi ya kwanza"</item>
+    <item msgid="4857419136007543270">"kila Alhamisi ya pili"</item>
+    <item msgid="222044587450564839">"kila Alhamisi ya tatu"</item>
+    <item msgid="6197927556533030945">"kila Alhamisi ya nne"</item>
+    <item msgid="1023326923033436905">"kila Alhamisi ya mwisho"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"kila Ijumaa ya kwanza"</item>
+    <item msgid="1935608297230506940">"kila Ijumaa ya pili"</item>
+    <item msgid="4061877662049317599">"kila Ijumaa ya tatu"</item>
+    <item msgid="6856646749131820614">"kila Ijumaa ya nne"</item>
+    <item msgid="6533513913914859794">"kila Ijumaa ya mwisho"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"kila Jumamosi ya kwanza"</item>
+    <item msgid="9130198690512925355">"kila Jumamosi ya pili"</item>
+    <item msgid="4525736070844032405">"kila Jumamosi ya tatu"</item>
+    <item msgid="422053689531707709">"kila Jumamosi ya nne"</item>
+    <item msgid="5499975799312474425">"kila Jumamosi ya mwisho"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 977728d..b9e5746 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -60,11 +60,11 @@
     <string name="event_delete" msgid="2386667193277770442">"Futa tukio"</string>
     <string name="goto_today" msgid="9162136434410891230">"Leo"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Mipangilio"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalenda za kuonyesha"</string>
+    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalenda za kuonyeshwa"</string>
     <string name="search" msgid="550656004486017426">"Tafuta"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ficha vidhibiti"</string>
     <string name="show_controls" msgid="715520586028062621">"Onyesha vidhibiti"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalenda za kuonyesha"</string>
+    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalenda za kuonyeshwa"</string>
     <string name="synced" msgid="7913940305983383493">"Vilivyosawazishwa"</string>
     <string name="not_synced" msgid="4275114941801829419">"haijasawazishwa"</string>
     <string name="acct_not_synced" msgid="6126800985681230627">"Akaunti hii hailandanishwi na huenda kalenda zako zaweza kuwa hazijasasishwa."</string>
@@ -101,7 +101,7 @@
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Mwandalizi:"</string>
     <string name="choose_event_color_label" msgid="2192923501857428854">"Chagua rangi ya tukio"</string>
     <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Rangi ya Tukio"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"Weka katika rangi chaguo msingi ya kalenda"</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">"Fanya iwe rangi ya kawaida ya kalenda"</string>
     <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Rangi ya Kalenda"</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Kiteua rangi"</string>
     <string name="view_event_response_label" msgid="8382281658458798329">"Unahudhuria?"</string>
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Kila wiki siku ya <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Kila wiki  <xliff:g id="NUMBER">%1$d</xliff:g> siku ya <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Kila mwezi (kila <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Kila mwezi"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Kila mwaka"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Kila mwezi (kwa siku ya <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Kila baada ya miaka <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"katika siku sawa ya kila mwezi"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"katika kila <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Milele"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Hadi tarehe"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hadi <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Kwa matukio kadhaa"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Kwa tukio <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="8779598489398048259">"Kwa matukio <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"badilisha tarehe ya mwisho"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 9c11153..e1d13a3 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ซ้ำทุกเดือน"</item>
     <item msgid="8714177874112569158">"ซ้ำทุกปี"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"ในทุกวันอาทิตย์แรก"</item>
+    <item msgid="2557379346106451363">"ในทุกวันอาทิตย์ที่สอง"</item>
+    <item msgid="7622144489915654132">"ในทุกวันอาทิตย์ที่สาม"</item>
+    <item msgid="527152448137686021">"ในทุกวันอาทิตย์ที่สี่"</item>
+    <item msgid="5057483608824759350">"ในทุกวันอาทิตย์สุดท้าย"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"ในทุกวันจันทร์แรก"</item>
+    <item msgid="4484275849072423978">"ในทุกวันจันทร์ที่สอง"</item>
+    <item msgid="8956169860824371383">"ในทุกวันจันทร์ที่สาม"</item>
+    <item msgid="6924403357659569326">"ในทุกวันจันทร์ที่สี่"</item>
+    <item msgid="1379608815263472161">"ในทุกวันจันทร์สุดท้าย"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"ในทุกวันอังคารแรก"</item>
+    <item msgid="9063613547307760928">"ในทุกวันอังคารที่สอง"</item>
+    <item msgid="6688603328729208168">"ในทุกวันอังคารที่สาม"</item>
+    <item msgid="6695206006961533357">"ในทุกวันอังคารที่สี่"</item>
+    <item msgid="8619069174889809914">"ในทุกวันอังคารสุดท้าย"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"ในทุกวันพุธแรก"</item>
+    <item msgid="5059722045367799217">"เมื่อทุกวันพุธที่สอง"</item>
+    <item msgid="7986246648229272275">"ในทุกวันพุธที่สาม"</item>
+    <item msgid="9068566169348980801">"ในทุกวันพุธที่สี่"</item>
+    <item msgid="7976866743069062134">"ในทุกวันพุธสุดท้าย"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"ในทุกวันพฤหัสบดีแรก"</item>
+    <item msgid="4857419136007543270">"ในทุกวันพฤหัสบดีที่สอง"</item>
+    <item msgid="222044587450564839">"ในทุกวันพฤหัสบดีที่สาม"</item>
+    <item msgid="6197927556533030945">"ในทุกพฤหัสบดีที่สี่"</item>
+    <item msgid="1023326923033436905">"ในทุกวันพฤหัสบดีสุดท้าย"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"ในทุกวันศุกร์แรก"</item>
+    <item msgid="1935608297230506940">"ในทุกวันศุกร์ที่สอง"</item>
+    <item msgid="4061877662049317599">"ในทุกวันศุกร์ที่สาม"</item>
+    <item msgid="6856646749131820614">"ในทุกวันศุกร์ที่สี่"</item>
+    <item msgid="6533513913914859794">"ในทุกวันศุกร์สุดท้าย"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"ในทุกวันเสาร์แรก"</item>
+    <item msgid="9130198690512925355">"ในทุกวันเสาร์ที่สอง"</item>
+    <item msgid="4525736070844032405">"ในทุกวันเสาร์ที่สาม"</item>
+    <item msgid="422053689531707709">"ในทุกวันเสาร์ที่สี่"</item>
+    <item msgid="5499975799312474425">"ในทุกวันเสาร์สุดท้าย"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ae7ab66..aae9c3e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"ทุก <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ของแต่ละสัปดาห์"</item>
     <item quantity="other" msgid="2857390143157377867">"ทุก <xliff:g id="NUMBER">%1$d</xliff:g> สัปดาห์ใน <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"รายเดือน (ทุก <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g><xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"รายเดือน"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"รายปี"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"รายเดือน (ในวันที่ <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"ทุก <xliff:g id="COUNT">%d</xliff:g> ปี"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ในวันเดียวกันในแต่ละเดือน"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"ทุก <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"ตลอดไป"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"จนถึงวันที่"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"จนถึงวันที่ <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index e628a64..564c04e 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ULITIN BUWAN-BUWAN"</item>
     <item msgid="8714177874112569158">"ULITIN TAON-TAON"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"tuwing unang Linggo"</item>
+    <item msgid="2557379346106451363">"tuwing ikalawang Linggo"</item>
+    <item msgid="7622144489915654132">"tuwing ikatlong Linggo"</item>
+    <item msgid="527152448137686021">"tuwing ikaapat na Linggo"</item>
+    <item msgid="5057483608824759350">"tuwing huling Linggo"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"tuwing unang Lunes"</item>
+    <item msgid="4484275849072423978">"tuwing ikalawang Lunes"</item>
+    <item msgid="8956169860824371383">"tuwing ikatlong Lunes"</item>
+    <item msgid="6924403357659569326">"tuwing ikaapat na Lunes"</item>
+    <item msgid="1379608815263472161">"tuwing huling Lunes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"tuwing unang Martes"</item>
+    <item msgid="9063613547307760928">"tuwing ikalawang Martes"</item>
+    <item msgid="6688603328729208168">"tuwing ikatlong Martes"</item>
+    <item msgid="6695206006961533357">"tuwing ikaapat na Martes"</item>
+    <item msgid="8619069174889809914">"tuwing huling Martes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"tuwing unang Miyerkules"</item>
+    <item msgid="5059722045367799217">"tuwing ikalawang Miyerkules"</item>
+    <item msgid="7986246648229272275">"tuwing ikatlong Miyerkules"</item>
+    <item msgid="9068566169348980801">"tuwing ikaapat na Miyerkules"</item>
+    <item msgid="7976866743069062134">"tuwing huling Miyerkules"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"tuwing unang Huwebes"</item>
+    <item msgid="4857419136007543270">"tuwing ikalawang Huwebes"</item>
+    <item msgid="222044587450564839">"tuwing ikatlong Huwebes"</item>
+    <item msgid="6197927556533030945">"tuwing ikaapat na Huwebes"</item>
+    <item msgid="1023326923033436905">"tuwing huling Huwebes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"tuwing unang Biyernes"</item>
+    <item msgid="1935608297230506940">"tuwing ikalawang Biyernes"</item>
+    <item msgid="4061877662049317599">"tuwing ikatlong Biyernes"</item>
+    <item msgid="6856646749131820614">"tuwing ikaapat na Biyernes"</item>
+    <item msgid="6533513913914859794">"tuwing huling Biyernes"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"tuwing unang Sabado"</item>
+    <item msgid="9130198690512925355">"tuwing ikalawang Sabado"</item>
+    <item msgid="4525736070844032405">"tuwing ikatlong Sabado"</item>
+    <item msgid="422053689531707709">"tuwing ikaapat na Sabado"</item>
+    <item msgid="5499975799312474425">"tuwing huling Sabado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2acd214..8196be3 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> linggu-linggo"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> bawat <xliff:g id="NUMBER">%1$d</xliff:g> (na) linggo"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Buwan-buwan (tuwing <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Buwan-buwan"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Taun-taon"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Buwan-buwan (sa araw na <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) taon"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"pareho araw buwanan"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"bawat <xliff:g id="NTH">%1$s</xliff:g> (na) <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Habambuhay"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"hanggang tukoy na petsa"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hanggang <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b3971fe..d6169b1 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Yalnızca reddedildiyse"</item>
     <item msgid="6367412240524984286">"Reddedildiyse veya yanıt verilmediyse"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"HER GÜN YİNELE"</item>
+    <item msgid="6300824484048337842">"HER HAFTA YİNELE"</item>
+    <item msgid="189361731610816256">"HER AY YİNELE"</item>
+    <item msgid="8714177874112569158">"HER YIL YİNELE"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"her ayın ilk Pazar günü"</item>
+    <item msgid="2557379346106451363">"her ayın ikinci Pazar günü"</item>
+    <item msgid="7622144489915654132">"her ayın üçüncü Pazar günü"</item>
+    <item msgid="527152448137686021">"her ayın dördüncü Pazar günü"</item>
+    <item msgid="5057483608824759350">"her ayın son Pazar günü"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"her ayın ilk Pazartesi günü"</item>
+    <item msgid="4484275849072423978">"her ayın ikinci Pazartesi günü"</item>
+    <item msgid="8956169860824371383">"her ayın üçüncü Pazartesi günü"</item>
+    <item msgid="6924403357659569326">"her ayın dördüncü Pazartesi günü"</item>
+    <item msgid="1379608815263472161">"her ayın son Pazartesi günü"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"her ayın ilk Salı günü"</item>
+    <item msgid="9063613547307760928">"her ayın ikinci Salı günü"</item>
+    <item msgid="6688603328729208168">"her ayın üçüncü Salı günü"</item>
+    <item msgid="6695206006961533357">"her ayın dördüncü Salı günü"</item>
+    <item msgid="8619069174889809914">"her ayın son Salı günü"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"her ayın ilk Çarşamba günü"</item>
+    <item msgid="5059722045367799217">"her ayın ikinci Çarşamba günü"</item>
+    <item msgid="7986246648229272275">"her ayın üçüncü Çarşamba günü"</item>
+    <item msgid="9068566169348980801">"her ayın dördüncü Çarşamba günü"</item>
+    <item msgid="7976866743069062134">"her ayın son Çarşamba günü"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"her ayın ilk Perşembe günü"</item>
+    <item msgid="4857419136007543270">"her ayın ikinci Perşembe günü"</item>
+    <item msgid="222044587450564839">"her ayın üçüncü Perşembe günü"</item>
+    <item msgid="6197927556533030945">"her ayın dördüncü Perşembe günü"</item>
+    <item msgid="1023326923033436905">"her ayın son Perşembe günü"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"her ayın ilk Cuma günü"</item>
+    <item msgid="1935608297230506940">"her ayın ikinci Cuma günü"</item>
+    <item msgid="4061877662049317599">"her ayın üçüncü Cuma günü"</item>
+    <item msgid="6856646749131820614">"her ayın dördüncü Cuma günü"</item>
+    <item msgid="6533513913914859794">"her ayın son Cuma günü"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"her ayın ilk Cumartesi günü"</item>
+    <item msgid="9130198690512925355">"her ayın ikinci Cumartesi günü"</item>
+    <item msgid="4525736070844032405">"her ayın üçüncü Cumartesi günü"</item>
+    <item msgid="422053689531707709">"her ayın dördüncü Cumartesi günü"</item>
+    <item msgid="5499975799312474425">"her ayın son Cumartesi günü"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b8831de..b71c4ee 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Haftalık olarak her <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> haftada bir her <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Ayda bir (her <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Aylık"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Yılda bir"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Ayda bir (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. günde)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Her <xliff:g id="COUNT">%d</xliff:g> yılda bir"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"her ayın aynı gününde"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"her ayın <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g> günü"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Sonsuza kadar"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Belirli bir tarihe kadar"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g> tarihine kadar"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Belirli sayıda etkinlik"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> etkinlik için"</item>
+    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> etkinlik için"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"bitiş tarihini değiştir"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 3500eb6..89595ba 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"ПОВТОРЮВАТИ ЩОМІСЯЦЯ"</item>
     <item msgid="8714177874112569158">"ПОВТОРЮВАТИ ЩОРОКУ"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"кожної першої неділі"</item>
+    <item msgid="2557379346106451363">"кожної другої неділі"</item>
+    <item msgid="7622144489915654132">"кожної третьої неділі"</item>
+    <item msgid="527152448137686021">"кожної четвертої неділі"</item>
+    <item msgid="5057483608824759350">"кожної останньої неділі"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"кожного першого понеділка"</item>
+    <item msgid="4484275849072423978">"кожного другого понеділка"</item>
+    <item msgid="8956169860824371383">"кожного третього понеділка"</item>
+    <item msgid="6924403357659569326">"кожного четвертого понеділка"</item>
+    <item msgid="1379608815263472161">"кожного останнього понеділка"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"кожного першого вівторка"</item>
+    <item msgid="9063613547307760928">"кожного другого вівторка"</item>
+    <item msgid="6688603328729208168">"кожного третього вівторка"</item>
+    <item msgid="6695206006961533357">"кожного четвертого вівторка"</item>
+    <item msgid="8619069174889809914">"кожного останнього вівторка"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"кожної першої середи"</item>
+    <item msgid="5059722045367799217">"кожної другої середи"</item>
+    <item msgid="7986246648229272275">"кожної третьої середи"</item>
+    <item msgid="9068566169348980801">"кожної четвертої середи"</item>
+    <item msgid="7976866743069062134">"кожної останньої середи"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"кожного першого четверга"</item>
+    <item msgid="4857419136007543270">"кожного другого четверга"</item>
+    <item msgid="222044587450564839">"кожного третього четверга"</item>
+    <item msgid="6197927556533030945">"кожного четвертого четверга"</item>
+    <item msgid="1023326923033436905">"кожного останнього четверга"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"кожної першої п’ятниці"</item>
+    <item msgid="1935608297230506940">"кожної другої п’ятниці"</item>
+    <item msgid="4061877662049317599">"кожної третьої п’ятниці"</item>
+    <item msgid="6856646749131820614">"кожної четвертої п’ятниці"</item>
+    <item msgid="6533513913914859794">"кожної останньої п’ятниці"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"кожної першої суботи"</item>
+    <item msgid="9130198690512925355">"кожної другої суботи"</item>
+    <item msgid="4525736070844032405">"кожної третьої суботи"</item>
+    <item msgid="422053689531707709">"кожної четвертої суботи"</item>
+    <item msgid="5499975799312474425">"кожної останньої суботи"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 21373bc..4f6511a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Щотижня в <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Кожні <xliff:g id="NUMBER">%1$d</xliff:g> тжн. у <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Щомісяця (кожн. <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Щомісяця"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Щороку"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Щомісяця (у день: <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -255,7 +254,7 @@
   </plurals>
   <plurals name="recurrence_interval_weekly">
     <item quantity="one" msgid="4948681635464488351">"Кожен <xliff:g id="COUNT">%d</xliff:g> тжн."</item>
-    <item quantity="other" msgid="7094801039989237061">"Кожні <xliff:g id="COUNT">%d</xliff:g> тжн."</item>
+    <item quantity="other" msgid="7094801039989237061">"Інтервал: <xliff:g id="COUNT">%d</xliff:g> тжн."</item>
   </plurals>
   <plurals name="recurrence_interval_monthly">
     <item quantity="one" msgid="4768178401603139718">"Кожен <xliff:g id="COUNT">%d</xliff:g> міс."</item>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"Кожні <xliff:g id="COUNT">%d</xliff:g> р."</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"певного дня щомісяця"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"у такий день: <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Постійно"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"До певної дати"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 4b61ea0..09b617b 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -111,8 +111,59 @@
     <item msgid="2285927842308686988">"Chỉ khi bị từ chối"</item>
     <item msgid="6367412240524984286">"Nếu bị từ chối hoặc không phản hổi"</item>
   </string-array>
-    <!-- no translation found for recurrence_freq:0 (3388478383574917007) -->
-    <!-- no translation found for recurrence_freq:1 (6300824484048337842) -->
-    <!-- no translation found for recurrence_freq:2 (189361731610816256) -->
-    <!-- no translation found for recurrence_freq:3 (8714177874112569158) -->
+  <string-array name="recurrence_freq">
+    <item msgid="3388478383574917007">"LẶP LẠI HÀNG NGÀY"</item>
+    <item msgid="6300824484048337842">"LẶP LẠI HÀNG TUẦN"</item>
+    <item msgid="189361731610816256">"LẶP LẠI HÀNG THÁNG"</item>
+    <item msgid="8714177874112569158">"LẶP LẠI HÀNG NĂM"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"vào mọi Chủ Nhật đầu tiên"</item>
+    <item msgid="2557379346106451363">"vào mọi Chủ Nhật thứ hai"</item>
+    <item msgid="7622144489915654132">"vào mọi Chủ Nhật thứ ba"</item>
+    <item msgid="527152448137686021">"vào mọi Chủ Nhật thứ tư"</item>
+    <item msgid="5057483608824759350">"vào mọi Chủ Nhật cuối cùng"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"vào mọi Thứ Hai đầu tiên"</item>
+    <item msgid="4484275849072423978">"vào mọi Thứ Hai thứ hai"</item>
+    <item msgid="8956169860824371383">"vào mọi Thứ Hai thứ ba"</item>
+    <item msgid="6924403357659569326">"vào mọi Thứ Hai thứ tư"</item>
+    <item msgid="1379608815263472161">"vào mọi Thứ Hai cuối cùng"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"vào mọi Thứ Ba đầu tiên"</item>
+    <item msgid="9063613547307760928">"vào mọi Thứ Ba thứ hai"</item>
+    <item msgid="6688603328729208168">"vào mọi Thứ Ba thứ ba"</item>
+    <item msgid="6695206006961533357">"vào mọi Thứ Ba thứ tư"</item>
+    <item msgid="8619069174889809914">"vào mọi Thứ Ba cuối cùng"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"vào mọi Thứ Tư đầu tiên"</item>
+    <item msgid="5059722045367799217">"vào mọi Thứ Tư thứ hai"</item>
+    <item msgid="7986246648229272275">"vào mọi Thứ Tư thứ ba"</item>
+    <item msgid="9068566169348980801">"vào mọi Thứ Tư thứ tư"</item>
+    <item msgid="7976866743069062134">"vào mọi Thứ Tư cuối cùng"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"vào mọi Thứ Năm đầu tiên"</item>
+    <item msgid="4857419136007543270">"vào mọi Thứ Năm thứ hai"</item>
+    <item msgid="222044587450564839">"vào mọi Thứ Năm thứ ba"</item>
+    <item msgid="6197927556533030945">"vào mọi Thứ Năm thứ tư"</item>
+    <item msgid="1023326923033436905">"vào mọi Thứ Năm cuối cùng"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"vào mọi Thứ Sáu đầu tiên"</item>
+    <item msgid="1935608297230506940">"vào mọi Thứ Sáu thứ hai"</item>
+    <item msgid="4061877662049317599">"vào mọi Thứ Sáu thứ ba"</item>
+    <item msgid="6856646749131820614">"vào mọi Thứ Sáu thứ tư"</item>
+    <item msgid="6533513913914859794">"vào mọi Thứ Sáu cuối cùng"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"vào mọi Thứ Bảy đầu tiên"</item>
+    <item msgid="9130198690512925355">"vào mọi Thứ Bảy thứ hai"</item>
+    <item msgid="4525736070844032405">"vào mọi Thứ Bảy thứ ba"</item>
+    <item msgid="422053689531707709">"vào mọi Thứ Bảy thứ tư"</item>
+    <item msgid="5499975799312474425">"vào mọi Thứ Bảy cuối cùng"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9d77439..3400f21 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"Hàng tuần vào <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Định kỳ <xliff:g id="NUMBER">%1$d</xliff:g> tuần vào <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Hàng tháng (mỗi <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Hàng tháng"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Hàng năm"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Hàng tháng (vào ngày <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -266,12 +265,13 @@
     <item quantity="other" msgid="5678653649746562060">"Cứ <xliff:g id="COUNT">%d</xliff:g> năm một lần"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"vào cùng một ngày trong mỗi tháng"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"vào mọi <xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Vĩnh viễn"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Đến một ngày nhất định"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Cho đến ngày <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Đối với một số sự kiện"</string>
-    <!-- no translation found for recurrence_end_count:one (1400782968090516215) -->
-    <!-- no translation found for recurrence_end_count:other (8779598489398048259) -->
+  <plurals name="recurrence_end_count">
+    <item quantity="one" msgid="1400782968090516215">"Cho <xliff:g id="EVENT_COUNT">%d</xliff:g> sự kiện"</item>
+    <item quantity="other" msgid="8779598489398048259">"Cho <xliff:g id="EVENT_COUNT">%d</xliff:g> sự kiện"</item>
+  </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"thay đổi ngày kết thúc"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 9867a7e..f26a4de 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"每月重复"</item>
     <item msgid="8714177874112569158">"每年重复"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"第一个星期日"</item>
+    <item msgid="2557379346106451363">"第二个星期日"</item>
+    <item msgid="7622144489915654132">"第三个星期日"</item>
+    <item msgid="527152448137686021">"第四个星期日"</item>
+    <item msgid="5057483608824759350">"最后一个星期日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"第一个星期一"</item>
+    <item msgid="4484275849072423978">"第二个星期一"</item>
+    <item msgid="8956169860824371383">"第三个星期一"</item>
+    <item msgid="6924403357659569326">"第四个星期一"</item>
+    <item msgid="1379608815263472161">"最后一个星期一"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"第一个星期二"</item>
+    <item msgid="9063613547307760928">"第二个星期二"</item>
+    <item msgid="6688603328729208168">"第三个星期二"</item>
+    <item msgid="6695206006961533357">"第四个星期二"</item>
+    <item msgid="8619069174889809914">"最后一个星期二"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"第一个星期三"</item>
+    <item msgid="5059722045367799217">"第二个星期三"</item>
+    <item msgid="7986246648229272275">"第三个星期三"</item>
+    <item msgid="9068566169348980801">"第四个星期三"</item>
+    <item msgid="7976866743069062134">"最后一个星期三"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"第一个星期四"</item>
+    <item msgid="4857419136007543270">"第二个星期四"</item>
+    <item msgid="222044587450564839">"第三个星期四"</item>
+    <item msgid="6197927556533030945">"第四个星期四"</item>
+    <item msgid="1023326923033436905">"最后一个星期四"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"第一个星期五"</item>
+    <item msgid="1935608297230506940">"第二个星期五"</item>
+    <item msgid="4061877662049317599">"第三个星期五"</item>
+    <item msgid="6856646749131820614">"第四个星期五"</item>
+    <item msgid="6533513913914859794">"最后一个星期五"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"第一个星期六"</item>
+    <item msgid="9130198690512925355">"第二个星期六"</item>
+    <item msgid="4525736070844032405">"第三个星期六"</item>
+    <item msgid="422053689531707709">"第四个星期六"</item>
+    <item msgid="5499975799312474425">"最后一个星期六"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9ece5cd..15cfe19 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"每周的<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"每<xliff:g id="NUMBER">%1$d</xliff:g>周的<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"每个月的<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="monthly" msgid="4587116285383048586">"每月"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"每年"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"每月（<xliff:g id="DAY_OF_MONTH">%s</xliff:g> 日）"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"每<xliff:g id="COUNT">%d</xliff:g>年"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"在每个月的同一天"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"在每个月的<xliff:g id="NTH">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"无限重复"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"截至某个日期"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"截至<xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 6724ff9..ae1113c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"每月重複"</item>
     <item msgid="8714177874112569158">"每年重複"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"每月第一個週日"</item>
+    <item msgid="2557379346106451363">"每月第二個週日"</item>
+    <item msgid="7622144489915654132">"每月第三個週日"</item>
+    <item msgid="527152448137686021">"每月第四個週日"</item>
+    <item msgid="5057483608824759350">"每月最後一個週日"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"每月第一個週一"</item>
+    <item msgid="4484275849072423978">"每月第二個週一"</item>
+    <item msgid="8956169860824371383">"每月第三個週一"</item>
+    <item msgid="6924403357659569326">"每月第四個週一"</item>
+    <item msgid="1379608815263472161">"每月最後一個週一"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"每月第一個週二"</item>
+    <item msgid="9063613547307760928">"每月第二個週二"</item>
+    <item msgid="6688603328729208168">"每月第三個週二"</item>
+    <item msgid="6695206006961533357">"每月第四個週二"</item>
+    <item msgid="8619069174889809914">"每月最後一個週二"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"每月第一個週三"</item>
+    <item msgid="5059722045367799217">"每月第二個週三"</item>
+    <item msgid="7986246648229272275">"每月第三個週三"</item>
+    <item msgid="9068566169348980801">"每月第四個週三"</item>
+    <item msgid="7976866743069062134">"每月最後一個週三"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"每月第一個週四"</item>
+    <item msgid="4857419136007543270">"每月第二個週四"</item>
+    <item msgid="222044587450564839">"每月第三個週四"</item>
+    <item msgid="6197927556533030945">"每月第四個週四"</item>
+    <item msgid="1023326923033436905">"每月最後一個週四"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"每月第一個週五"</item>
+    <item msgid="1935608297230506940">"每月第二個週五"</item>
+    <item msgid="4061877662049317599">"每月第三個週五"</item>
+    <item msgid="6856646749131820614">"每月第四個週五"</item>
+    <item msgid="6533513913914859794">"每月最後一個週五"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"每月第一個週六"</item>
+    <item msgid="9130198690512925355">"每月第二個週六"</item>
+    <item msgid="4525736070844032405">"每月第三個週六"</item>
+    <item msgid="422053689531707709">"每月第四個週六"</item>
+    <item msgid="5499975799312474425">"每月最後一個週六"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 07275de..b147310 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -159,7 +159,6 @@
     <item quantity="one" msgid="5463021019301453273">"每週 (每<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
     <item quantity="other" msgid="2857390143157377867">"每 <xliff:g id="NUMBER">%1$d</xliff:g> 週 (每<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"每月 (<xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"每月"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"每年"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"每月 (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> 日)"</string>
@@ -266,7 +265,6 @@
     <item quantity="other" msgid="5678653649746562060">"每 <xliff:g id="COUNT">%d</xliff:g> 年"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"每月的同一天"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"每月的<xliff:g id="NTH">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"無限期"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"直到指定日期為止"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"結束日期：<xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 380dd55..bf7217d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -117,4 +117,53 @@
     <item msgid="189361731610816256">"PHINDA NGENYANGA"</item>
     <item msgid="8714177874112569158">"PHINDA NGONYAKA"</item>
   </string-array>
+  <string-array name="repeat_by_nth_sun">
+    <item msgid="143841313172233420">"njalo ngeSonto lokuqala"</item>
+    <item msgid="2557379346106451363">"njalo ngeSonto lesibili"</item>
+    <item msgid="7622144489915654132">"njalo ngeSonto lesithathu"</item>
+    <item msgid="527152448137686021">"njalo ngeSonto lesine"</item>
+    <item msgid="5057483608824759350">"njalo ngeSonto lokugcina"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_mon">
+    <item msgid="7539974918997689048">"njalo ngoMsombuluko wokuqala"</item>
+    <item msgid="4484275849072423978">"njalo ngoMsombuluko wesibili"</item>
+    <item msgid="8956169860824371383">"njalo ngoMsombuluko wesithathu"</item>
+    <item msgid="6924403357659569326">"njalo ngoMsombuluko wesine"</item>
+    <item msgid="1379608815263472161">"njalo ngoMsombuluko wokugcina"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_tues">
+    <item msgid="8690802834039790777">"njalo ngoLwesibili wokuqala"</item>
+    <item msgid="9063613547307760928">"njalo ngoLwesibili wesibili"</item>
+    <item msgid="6688603328729208168">"njalo ngoLwesibili wesithathu"</item>
+    <item msgid="6695206006961533357">"njalo ngoLwesibili wesine"</item>
+    <item msgid="8619069174889809914">"njalo ngoLwesibili wokugcina"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_wed">
+    <item msgid="3233850232075584386">"njalo ngoLwesithathu wokuqala"</item>
+    <item msgid="5059722045367799217">"njalo ngoLwesithathu wesibili"</item>
+    <item msgid="7986246648229272275">"njalo ngoLwesithathu wesithathu"</item>
+    <item msgid="9068566169348980801">"njalo ngoLwesithathu wesine"</item>
+    <item msgid="7976866743069062134">"njalo ngoLwesithathu wokugcina"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_thurs">
+    <item msgid="920673677566009313">"njalo ngoLwesine wokuqala"</item>
+    <item msgid="4857419136007543270">"njalo ngoLwesine wesibili"</item>
+    <item msgid="222044587450564839">"njalo ngoLwesine wesithathu"</item>
+    <item msgid="6197927556533030945">"njalo ngoLwesine wesine"</item>
+    <item msgid="1023326923033436905">"njalo ngoLwesine wokugcina"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_fri">
+    <item msgid="6534500380525126157">"njalo ngoLwesihlanu wokuqala"</item>
+    <item msgid="1935608297230506940">"njalo ngoLwesihlanu wesibili"</item>
+    <item msgid="4061877662049317599">"njalo ngoLwesihlanu wesithathu"</item>
+    <item msgid="6856646749131820614">"njalo ngoLwesihlanu wesine"</item>
+    <item msgid="6533513913914859794">"njalo ngoLwesihlanu wokugcina"</item>
+  </string-array>
+  <string-array name="repeat_by_nth_sat">
+    <item msgid="3556369572649948699">"njalo ngoMgqibelo wokuqala"</item>
+    <item msgid="9130198690512925355">"njalo ngoMgqibelo wesibili"</item>
+    <item msgid="4525736070844032405">"njalo ngoMgqibelo wesithathu"</item>
+    <item msgid="422053689531707709">"njalo ngoMgqibelo wesine"</item>
+    <item msgid="5499975799312474425">"njalo ngoMgqibelo wokugcina"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d36a001..cbe0f32 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -163,7 +163,6 @@
     <item quantity="one" msgid="5463021019301453273">"Njalo ngeviki nge-<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2857390143157377867">"Njalo ngamaviki angu-<xliff:g id="NUMBER">%1$d</xliff:g> nge-<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="monthly_on_day_count" msgid="6847991854413461795">"Zinyanga zonke (njalo <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
     <string name="monthly" msgid="4587116285383048586">"Nyanga zonke"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Mnyaka yonke"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Zinyanga zonke (ngosuku <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
@@ -270,7 +269,6 @@
     <item quantity="other" msgid="5678653649746562060">"Njalo ngeminyaka engu-<xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ngosuku olufanayo njalo ngenyanga"</string>
-    <string name="recurrence_month_pattern_by_day_of_week" msgid="6397271483826512155">"njalo ngo-<xliff:g id="NTH">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Phakade"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Kuze kube idethi ethile"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"kuze kube ngumhla ka-<xliff:g id="DATE">%s</xliff:g>"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f4a78a5..b14854a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -244,4 +244,66 @@
         <item >REPEAT MONTHLY</item>
         <item >REPEAT YEARLY</item>
     </string-array>
+
+    <!-- The following sets of strings describe a monthly recurring event, which will repeat
+         on the Nth WEEKDAY of every month. For example, the 3rd Monday of every month, or
+         the last Sunday. These are set up like this to resolve any gender-matching issues
+         that were present in some languages.
+     -->
+    <!-- Repeat a monthly event on the same nth day of every Sunday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_sun">
+        <item >on every first Sunday</item>
+        <item >on every second Sunday</item>
+        <item >on every third Sunday</item>
+        <item >on every fourth Sunday</item>
+        <item >on every last Sunday</item>
+    </string-array>
+    <!-- Repeat a monthly event on the same nth day of every Monday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_mon">
+        <item >on every first Monday</item>
+        <item >on every second Monday</item>
+        <item >on every third Monday</item>
+        <item >on every fourth Monday</item>
+        <item >on every last Monday</item>
+    </string-array>
+    <!-- Repeat a monthly event on the same nth day of every Tuesday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_tues">
+        <item >on every first Tuesday</item>
+        <item >on every second Tuesday</item>
+        <item >on every third Tuesday</item>
+        <item >on every fourth Tuesday</item>
+        <item >on every last Tuesday</item>
+    </string-array>
+    <!-- Repeat a monthly event on the same nth day of every Wednesday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_wed">
+        <item >on every first Wednesday</item>
+        <item >on every second Wednesday</item>
+        <item >on every third Wednesday</item>
+        <item >on every fourth Wednesday</item>
+        <item >on every last Wednesday</item>
+    </string-array>
+    <!-- Repeat a monthly event on the same nth day of every Thursday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_thurs">
+        <item >on every first Thursday</item>
+        <item >on every second Thursday</item>
+        <item >on every third Thursday</item>
+        <item >on every fourth Thursday</item>
+        <item >on every last Thursday</item>
+    </string-array>
+    <!-- Repeat a monthly event on the same nth day of every Friday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_fri">
+        <item >on every first Friday</item>
+        <item >on every second Friday</item>
+        <item >on every third Friday</item>
+        <item >on every fourth Friday</item>
+        <item >on every last Friday</item>
+    </string-array>
+    <!-- Repeat a monthly event on the same nth day of every Saturday. [CHAR LIMIT=30] -->
+    <string-array name="repeat_by_nth_sat">
+        <item >on every first Saturday</item>
+        <item >on every second Saturday</item>
+        <item >on every third Saturday</item>
+        <item >on every fourth Saturday</item>
+        <item >on every last Saturday</item>
+    </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 956cdd4..5a71aae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -429,10 +429,6 @@
         <item quantity="other">Every <xliff:g id="number">%1$d</xliff:g> weeks on <xliff:g id="days_of_week">%2$s</xliff:g></item>
     </plurals>
 
-    <!-- Example: 'Monthly (every first Sunday)' -->
-    <!--   1st parameter is an ordinal number, like 'first' -->
-    <!--   2nd parameter is a day of the week, like 'Sunday' -->
-    <string name="monthly_on_day_count">"Monthly (every <xliff:g id="ordinal_number">%1$s</xliff:g> <xliff:g id="day_of_week">%2$s</xliff:g>)"</string>
     <!-- The common portion of a string describing how often an event repeats,
          example: 'Monthly (on day 2)' -->
     <string name="monthly">Monthly</string>
@@ -721,9 +717,6 @@
 
     <!-- Repeat an monthly event on the same day of every month [CHAR LIMIT=20] -->
     <string name="recurrence_month_pattern_by_day">on the same day each month</string>
-    <!-- Repeat an monthly event on the same nth day of the week of every month.
-         For example, on every second Tuesday [CHAR LIMIT=30] -->
-    <string name="recurrence_month_pattern_by_day_of_week">on every <xliff:g id="nth">%1$s</xliff:g> <xliff:g id="day_of_week">%2$s</xliff:g></string>
 
     <!-- Specifies that a repeating event to repeat forever (based on the defined frequency) instead of ending at a future date[CHAR LIMIT=25] -->
     <string name="recurrence_end_continously">Forever</string>
@@ -743,4 +736,6 @@
     <!-- Description of the selected marker for accessibility support [CHAR LIMIT = NONE]-->
     <string name="acessibility_recurrence_choose_end_date_description">change end date</string>
 
+    <!-- Do Not Translate.  Sender identity for global notification synchronization. -->
+    <string name="notification_sender_id"></string>
 </resources>
diff --git a/src/com/android/calendar/CloudNotificationBackplane.java b/src/com/android/calendar/CloudNotificationBackplane.java
new file mode 100644
index 0000000..d9ff0cc
--- /dev/null
+++ b/src/com/android/calendar/CloudNotificationBackplane.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.calendar;
+
+import java.io.IOException;
+
+import android.content.Context;
+import android.os.Bundle;
+
+public interface CloudNotificationBackplane {
+    public boolean open(Context context);
+    public boolean subscribeToGroup(String senderId, String account, String groupId)
+            throws IOException;
+    public void send(String to, String msgId, Bundle data) throws IOException;
+    public void close();
+}
diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java
index a45c1be..613ba6b 100644
--- a/src/com/android/calendar/EventInfoFragment.java
+++ b/src/com/android/calendar/EventInfoFragment.java
@@ -846,6 +846,7 @@
 
         if (mAttendeeResponseFromIntent != Attendees.ATTENDEE_STATUS_NONE) {
             mEditResponseHelper.setWhichEvents(UPDATE_ALL);
+            mWhichEvents = mEditResponseHelper.getWhichEvents();
         }
         mHandler = new QueryHandler(activity);
         if (!mIsDialog) {
@@ -1338,6 +1339,9 @@
             return true;
         }
 
+        if (DEBUG) {
+            Log.d(TAG, "Repeating event: mWhichEvents=" + mWhichEvents);
+        }
         // This is a repeating event
         switch (mWhichEvents) {
             case -1:
diff --git a/src/com/android/calendar/EventRecurrenceFormatter.java b/src/com/android/calendar/EventRecurrenceFormatter.java
index 1d3df70..b9e33fd 100644
--- a/src/com/android/calendar/EventRecurrenceFormatter.java
+++ b/src/com/android/calendar/EventRecurrenceFormatter.java
@@ -28,6 +28,10 @@
 
 public class EventRecurrenceFormatter
 {
+
+    private static int[] mMonthRepeatByDayOfWeekIds;
+    private static String[][] mMonthRepeatByDayOfWeekStrs;
+
     public static String getRepeatString(Context context, Resources r, EventRecurrence recurrence,
             boolean includeEndString) {
         String endString = "";
@@ -99,11 +103,17 @@
             }
             case EventRecurrence.MONTHLY: {
                 if (recurrence.bydayCount == 1) {
-                    String[] ordinals = r.getStringArray(R.array.ordinal_labels);
+                    int weekday = recurrence.startDate.weekDay;
+                    // Cache this stuff so we won't have to redo work again later.
+                    cacheMonthRepeatStrings(r, weekday);
                     int dayNumber = (recurrence.startDate.monthDay - 1) / 7;
-                    int day = EventRecurrence.timeDay2Day(recurrence.startDate.weekDay);
-                    return r.getString(R.string.monthly_on_day_count, ordinals[dayNumber],
-                            dayToString(day, DateUtils.LENGTH_LONG)) + endString;
+                    StringBuilder sb = new StringBuilder();
+                    sb.append(r.getString(R.string.monthly));
+                    sb.append(" (");
+                    sb.append(mMonthRepeatByDayOfWeekStrs[weekday][dayNumber]);
+                    sb.append(")");
+                    sb.append(endString);
+                    return sb.toString();
                 }
                 return r.getString(R.string.monthly) + endString;
             }
@@ -114,6 +124,26 @@
         return null;
     }
 
+    private static void cacheMonthRepeatStrings(Resources r, int weekday) {
+        if (mMonthRepeatByDayOfWeekIds == null) {
+            mMonthRepeatByDayOfWeekIds = new int[7];
+            mMonthRepeatByDayOfWeekIds[0] = R.array.repeat_by_nth_sun;
+            mMonthRepeatByDayOfWeekIds[1] = R.array.repeat_by_nth_mon;
+            mMonthRepeatByDayOfWeekIds[2] = R.array.repeat_by_nth_tues;
+            mMonthRepeatByDayOfWeekIds[3] = R.array.repeat_by_nth_wed;
+            mMonthRepeatByDayOfWeekIds[4] = R.array.repeat_by_nth_thurs;
+            mMonthRepeatByDayOfWeekIds[5] = R.array.repeat_by_nth_fri;
+            mMonthRepeatByDayOfWeekIds[6] = R.array.repeat_by_nth_sat;
+        }
+        if (mMonthRepeatByDayOfWeekStrs == null) {
+            mMonthRepeatByDayOfWeekStrs = new String[7][];
+        }
+        if (mMonthRepeatByDayOfWeekStrs[weekday] == null) {
+            mMonthRepeatByDayOfWeekStrs[weekday] =
+                    r.getStringArray(mMonthRepeatByDayOfWeekIds[weekday]);
+        }
+    }
+
     /**
      * Converts day of week to a String.
      * @param day a EventRecurrence constant
diff --git a/src/com/android/calendar/ExtensionsFactory.java b/src/com/android/calendar/ExtensionsFactory.java
index aaf7b01..c323e16 100644
--- a/src/com/android/calendar/ExtensionsFactory.java
+++ b/src/com/android/calendar/ExtensionsFactory.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,10 +28,12 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+
 /*
  * Skeleton for additional options in the AllInOne menu.
  */
 public class ExtensionsFactory {
+
     private static String TAG = "ExtensionsFactory";
 
     // Config filename for mappings of various class names to their custom
@@ -38,6 +41,7 @@
     private static String EXTENSIONS_PROPERTIES = "calendar_extensions.properties";
 
     private static String ALL_IN_ONE_MENU_KEY = "AllInOneMenuExtensions";
+    private static String CLOUD_NOTIFICATION_KEY = "CloudNotificationChannel";
 
     private static Properties sProperties = new Properties();
     private static AllInOneMenuExtensionsInterface sAllInOneMenuExtensions = null;
@@ -95,4 +99,39 @@
 
         return sAllInOneMenuExtensions;
     }
+
+    public static CloudNotificationBackplane getCloudNotificationBackplane() {
+        CloudNotificationBackplane cnb = null;
+
+        String className = sProperties.getProperty(CLOUD_NOTIFICATION_KEY);
+        if (className != null) {
+            cnb = createInstance(className);
+        } else {
+            Log.d(TAG, CLOUD_NOTIFICATION_KEY + " not found in properties file.");
+        }
+
+        if (cnb == null) {
+            cnb = new CloudNotificationBackplane() {
+                @Override
+                public boolean open(Context context) {
+                    return true;
+                }
+
+                @Override
+                public boolean subscribeToGroup(String senderId, String account, String groupId)
+                        throws IOException {
+                    return true;}
+
+                @Override
+                public void send(String to, String msgId, Bundle data) {
+                }
+
+                @Override
+                public void close() {
+                }
+            };
+        }
+
+        return cnb;
+    }
 }
diff --git a/src/com/android/calendar/GeneralPreferences.java b/src/com/android/calendar/GeneralPreferences.java
index ccd4b33..54fc0e7 100644
--- a/src/com/android/calendar/GeneralPreferences.java
+++ b/src/com/android/calendar/GeneralPreferences.java
@@ -210,7 +210,7 @@
             mTzPickerUtils = new TimeZonePickerUtils(getActivity());
         }
         CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(getActivity(), mTimeZoneId,
-                System.currentTimeMillis());
+                System.currentTimeMillis(), false);
         mHomeTZ.setSummary(timezoneName != null ? timezoneName : mTimeZoneId);
 
         TimeZonePickerDialog tzpd = (TimeZonePickerDialog) activity.getFragmentManager()
@@ -425,7 +425,7 @@
         }
 
         final CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(
-                getActivity(), tzi.mTzId, System.currentTimeMillis());
+                getActivity(), tzi.mTzId, System.currentTimeMillis(), false);
         mHomeTZ.setSummary(timezoneName);
         Utils.setTimeZone(getActivity(), tzi.mTzId);
     }
diff --git a/src/com/android/calendar/alerts/AlertActivity.java b/src/com/android/calendar/alerts/AlertActivity.java
index 12d7b10..6e9af6d 100644
--- a/src/com/android/calendar/alerts/AlertActivity.java
+++ b/src/com/android/calendar/alerts/AlertActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.calendar.alerts;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.TaskStackBuilder;
@@ -24,6 +25,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.CalendarAlerts;
@@ -39,6 +41,10 @@
 import com.android.calendar.EventInfoActivity;
 import com.android.calendar.R;
 import com.android.calendar.Utils;
+import com.android.calendar.alerts.GlobalDismissManager.AlarmId;
+
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * The alert panel that pops up when there is a calendar event alarm.
@@ -93,14 +99,50 @@
         String selection = CalendarAlerts.STATE + "=" + CalendarAlerts.STATE_FIRED;
         mQueryHandler.startUpdate(0, null, CalendarAlerts.CONTENT_URI, values,
                 selection, null /* selectionArgs */, Utils.UNDO_DELAY);
+
+        if (mCursor == null) {
+            Log.e(TAG, "Unable to globally dismiss all notifications because cursor was null.");
+            return;
+        }
+        if (mCursor.isClosed()) {
+            Log.e(TAG, "Unable to globally dismiss all notifications because cursor was closed.");
+            return;
+        }
+        if (!mCursor.moveToFirst()) {
+            Log.e(TAG, "Unable to globally dismiss all notifications because cursor was empty.");
+            return;
+        }
+
+        List<AlarmId> alarmIds = new LinkedList<AlarmId>();
+        do {
+            long eventId = mCursor.getLong(INDEX_EVENT_ID);
+            long eventStart = mCursor.getLong(INDEX_BEGIN);
+            alarmIds.add(new AlarmId(eventId, eventStart));
+        } while (mCursor.moveToNext());
+        initiateGlobalDismiss(alarmIds);
     }
 
-    private void dismissAlarm(long id) {
+    private void dismissAlarm(long id, long eventId, long startTime) {
         ContentValues values = new ContentValues(1 /* size */);
         values.put(PROJECTION[INDEX_STATE], CalendarAlerts.STATE_DISMISSED);
         String selection = CalendarAlerts._ID + "=" + id;
         mQueryHandler.startUpdate(0, null, CalendarAlerts.CONTENT_URI, values,
                 selection, null /* selectionArgs */, Utils.UNDO_DELAY);
+
+        List<AlarmId> alarmIds = new LinkedList<AlarmId>();
+        alarmIds.add(new AlarmId(eventId, startTime));
+        initiateGlobalDismiss(alarmIds);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void initiateGlobalDismiss(List<AlarmId> alarmIds) {
+        new AsyncTask<List<AlarmId>, Void, Void>() {
+            @Override
+            protected Void doInBackground(List<AlarmId>... params) {
+                GlobalDismissManager.dismissGlobally(getApplicationContext(), params[0]);
+                return null;
+            }
+        }.execute(alarmIds);
     }
 
     private class QueryHandler extends AsyncQueryService {
@@ -131,21 +173,24 @@
 
     private final OnItemClickListener mViewListener = new OnItemClickListener() {
 
+        @SuppressLint("NewApi")
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position,
                 long i) {
             AlertActivity alertActivity = AlertActivity.this;
             Cursor cursor = alertActivity.getItemForView(view);
 
+            long alarmId = cursor.getLong(INDEX_ROW_ID);
+            long eventId = cursor.getLong(AlertActivity.INDEX_EVENT_ID);
+            long startMillis = cursor.getLong(AlertActivity.INDEX_BEGIN);
+
             // Mark this alarm as DISMISSED
-            dismissAlarm(cursor.getLong(INDEX_ROW_ID));
+            dismissAlarm(alarmId, eventId, startMillis);
 
             // build an intent and task stack to start EventInfoActivity with AllInOneActivity
             // as the parent activity rooted to home.
-            long id = cursor.getInt(AlertActivity.INDEX_EVENT_ID);
-            long startMillis = cursor.getLong(AlertActivity.INDEX_BEGIN);
             long endMillis = cursor.getLong(AlertActivity.INDEX_END);
-            Intent eventIntent = AlertUtils.buildEventViewIntent(AlertActivity.this, id,
+            Intent eventIntent = AlertUtils.buildEventViewIntent(AlertActivity.this, eventId,
                     startMillis, endMillis);
 
             if (Utils.isJellybeanOrLater()) {
diff --git a/src/com/android/calendar/alerts/AlertReceiver.java b/src/com/android/calendar/alerts/AlertReceiver.java
index e9822b1..e1f7dec 100644
--- a/src/com/android/calendar/alerts/AlertReceiver.java
+++ b/src/com/android/calendar/alerts/AlertReceiver.java
@@ -105,9 +105,7 @@
         }
         if (DELETE_ALL_ACTION.equals(intent.getAction())) {
 
-            /* The user has clicked the "Clear All Notifications"
-             * buttons so dismiss all Calendar alerts.
-             */
+            // The user has dismissed a digest notification.
             // TODO Grab a wake lock here?
             Intent serviceIntent = new Intent(context, DismissAlarmsService.class);
             context.startService(serviceIntent);
@@ -466,8 +464,10 @@
         Resources res = context.getResources();
         int numEvents = notificationInfos.size();
         long[] eventIds = new long[notificationInfos.size()];
+        long[] startMillis = new long[notificationInfos.size()];
         for (int i = 0; i < notificationInfos.size(); i++) {
             eventIds[i] = notificationInfos.get(i).eventId;
+            startMillis[i] = notificationInfos.get(i).startMillis;
         }
 
         // Create an intent triggered by clicking on the status icon that shows the alerts list.
@@ -479,6 +479,7 @@
         deleteIntent.setClass(context, DismissAlarmsService.class);
         deleteIntent.setAction(DELETE_ALL_ACTION);
         deleteIntent.putExtra(AlertUtils.EVENT_IDS_KEY, eventIds);
+        deleteIntent.putExtra(AlertUtils.EVENT_STARTS_KEY, startMillis);
         PendingIntent pendingDeleteIntent = PendingIntent.getService(context, 0, deleteIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
 
diff --git a/src/com/android/calendar/alerts/AlertService.java b/src/com/android/calendar/alerts/AlertService.java
index 046af04..fbb5ad1 100644
--- a/src/com/android/calendar/alerts/AlertService.java
+++ b/src/com/android/calendar/alerts/AlertService.java
@@ -814,6 +814,8 @@
                     lowPriorityEvents.add(newInfo);
                 }
             }
+            // TODO(cwren) add beginTime/startTime
+            GlobalDismissManager.processEventIds(context, eventIds.keySet());
         } finally {
             if (alertCursor != null) {
                 alertCursor.close();
diff --git a/src/com/android/calendar/alerts/AlertUtils.java b/src/com/android/calendar/alerts/AlertUtils.java
index 766d8e4..a9a74ee 100644
--- a/src/com/android/calendar/alerts/AlertUtils.java
+++ b/src/com/android/calendar/alerts/AlertUtils.java
@@ -56,6 +56,7 @@
     public static final String EVENT_END_KEY = "eventend";
     public static final String NOTIFICATION_ID_KEY = "notificationid";
     public static final String EVENT_IDS_KEY = "eventids";
+    public static final String EVENT_STARTS_KEY = "starts";
 
     // A flag for using local storage to save alert state instead of the alerts DB table.
     // This allows the unbundled app to run alongside other calendar apps without eating
diff --git a/src/com/android/calendar/alerts/DismissAlarmsService.java b/src/com/android/calendar/alerts/DismissAlarmsService.java
index b52ffd5..d5dfaf3 100644
--- a/src/com/android/calendar/alerts/DismissAlarmsService.java
+++ b/src/com/android/calendar/alerts/DismissAlarmsService.java
@@ -28,6 +28,10 @@
 import android.support.v4.app.TaskStackBuilder;
 
 import com.android.calendar.EventInfoActivity;
+import com.android.calendar.alerts.GlobalDismissManager.AlarmId;
+
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Service for asynchronously marking fired alarms as dismissed.
@@ -55,21 +59,31 @@
         long eventEnd = intent.getLongExtra(AlertUtils.EVENT_END_KEY, -1);
         boolean showEvent = intent.getBooleanExtra(AlertUtils.SHOW_EVENT_KEY, false);
         long[] eventIds = intent.getLongArrayExtra(AlertUtils.EVENT_IDS_KEY);
+        long[] eventStarts = intent.getLongArrayExtra(AlertUtils.EVENT_STARTS_KEY);
         int notificationId = intent.getIntExtra(AlertUtils.NOTIFICATION_ID_KEY, -1);
+        List<AlarmId> alarmIds = new LinkedList<AlarmId>();
 
         Uri uri = CalendarAlerts.CONTENT_URI;
         String selection;
 
         // Dismiss a specific fired alarm if id is present, otherwise, dismiss all alarms
         if (eventId != -1) {
+            alarmIds.add(new AlarmId(eventId, eventStart));
             selection = CalendarAlerts.STATE + "=" + CalendarAlerts.STATE_FIRED + " AND " +
             CalendarAlerts.EVENT_ID + "=" + eventId;
-        } else if (eventIds != null && eventIds.length > 0) {
+        } else if (eventIds != null && eventIds.length > 0 &&
+                eventStarts != null && eventIds.length == eventStarts.length) {
             selection = buildMultipleEventsQuery(eventIds);
+            for (int i = 0; i < eventIds.length; i++) {
+                alarmIds.add(new AlarmId(eventIds[i], eventStarts[i]));
+            }
         } else {
+            // NOTE: I don't believe that this ever happens.
             selection = CalendarAlerts.STATE + "=" + CalendarAlerts.STATE_FIRED;
         }
 
+        GlobalDismissManager.dismissGlobally(getApplicationContext(), alarmIds);
+
         ContentResolver resolver = getContentResolver();
         ContentValues values = new ContentValues();
         values.put(PROJECTION[COLUMN_INDEX_STATE], CalendarAlerts.STATE_DISMISSED);
@@ -90,9 +104,6 @@
             TaskStackBuilder.create(this)
                     .addParentStack(EventInfoActivity.class).addNextIntent(i).startActivities();
         }
-
-        // Stop this service
-        stopSelf();
     }
 
     private String buildMultipleEventsQuery(long[] eventIds) {
diff --git a/src/com/android/calendar/alerts/GlobalDismissManager.java b/src/com/android/calendar/alerts/GlobalDismissManager.java
new file mode 100644
index 0000000..6bbd2bc
--- /dev/null
+++ b/src/com/android/calendar/alerts/GlobalDismissManager.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.calendar.alerts;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.provider.CalendarContract.CalendarAlerts;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
+import android.util.Log;
+import android.util.Pair;
+
+import com.android.calendar.CloudNotificationBackplane;
+import com.android.calendar.ExtensionsFactory;
+import com.android.calendar.R;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Utilities for managing notification dismissal across devices.
+ */
+public class GlobalDismissManager extends BroadcastReceiver {
+    private static final String TAG = "GlobalDismissManager";
+    private static final String GOOGLE_ACCOUNT_TYPE = "com.google";
+    private static final String GLOBAL_DISMISS_MANAGER_PREFS = "com.android.calendar.alerts.GDM";
+    private static final String ACCOUNT_KEY = "known_accounts";
+    protected static final long FOUR_WEEKS = 60 * 60 * 24 * 7 * 4;
+
+    static final String[] EVENT_PROJECTION = new String[] {
+            Events._ID,
+            Events.CALENDAR_ID
+    };
+    static final String[] EVENT_SYNC_PROJECTION = new String[] {
+            Events._ID,
+            Events._SYNC_ID
+    };
+    static final String[] CALENDARS_PROJECTION = new String[] {
+            Calendars._ID,
+            Calendars.ACCOUNT_NAME,
+            Calendars.ACCOUNT_TYPE
+    };
+
+    public static final String KEY_PREFIX = "com.android.calendar.alerts.";
+    public static final String SYNC_ID = KEY_PREFIX + "sync_id";
+    public static final String START_TIME = KEY_PREFIX + "start_time";
+    public static final String ACCOUNT_NAME = KEY_PREFIX + "account_name";
+    public static final String DISMISS_INTENT = KEY_PREFIX + "DISMISS";
+
+    public static class AlarmId {
+        public long mEventId;
+        public long mStart;
+         public AlarmId(long id, long start) {
+             mEventId = id;
+             mStart = start;
+         }
+    }
+
+    /**
+     * Look for unknown accounts in a set of events and associate with them.
+     * Returns immediately, processing happens in the background.
+     * 
+     * @param context application context
+     * @param eventIds IDs for events that have posted notifications that may be
+     *            dismissed.
+     */
+    public static void processEventIds(final Context context, final Set<Long> eventIds) {
+        final String senderId = context.getResources().getString(R.string.notification_sender_id);
+        if (senderId == null || senderId.isEmpty()) {
+            Log.i(TAG, "no sender configured");
+            return;
+        }
+        Map<Long, Long> eventsToCalendars = lookupEventToCalendarMap(context, eventIds);
+        Set<Long> calendars = new LinkedHashSet<Long>();
+        calendars.addAll(eventsToCalendars.values());
+        if (calendars.isEmpty()) {
+            Log.d(TAG, "found no calendars for events");
+            return;
+        }
+
+        Map<Long, Pair<String, String>> calendarsToAccounts =
+                lookupCalendarToAccountMap(context, calendars);
+
+        if (calendarsToAccounts.isEmpty()) {
+            Log.d(TAG, "found no accounts for calendars");
+            return;
+        }
+
+        // filter out non-google accounts (necessary?)
+        Set<String> accounts = new LinkedHashSet<String>();
+        for (Pair<String, String> accountPair : calendarsToAccounts.values()) {
+            if (GOOGLE_ACCOUNT_TYPE.equals(accountPair.first)) {
+                accounts.add(accountPair.second);
+            }
+        }
+
+        // filter out accounts we already know about
+        SharedPreferences prefs =
+                context.getSharedPreferences(GLOBAL_DISMISS_MANAGER_PREFS,
+                        Context.MODE_PRIVATE);
+        Set<String> existingAccounts = prefs.getStringSet(ACCOUNT_KEY,
+                new HashSet<String>());
+        accounts.removeAll(existingAccounts);
+
+        if (accounts.isEmpty()) {
+            // nothing to do, we've already registered all the accounts.
+            return;
+        }
+
+        // subscribe to remaining accounts
+        CloudNotificationBackplane cnb =
+                ExtensionsFactory.getCloudNotificationBackplane();
+        if (cnb.open(context)) {
+            for (String account : accounts) {
+                try {
+                    if (cnb.subscribeToGroup(senderId, account, account)) {
+                        existingAccounts.add(account);
+                    }
+                } catch (IOException e) {
+                    // Try again, next time the account triggers and alert.
+                }
+            }
+            cnb.close();
+            prefs.edit()
+            .putStringSet(ACCOUNT_KEY, existingAccounts)
+            .commit();
+        }
+    }
+
+    /**
+     * Globally dismiss notifications that are backed by the same events.
+     * 
+     * @param context application context
+     * @param alarmIds Unique identifiers for events that have been dismissed by the user.
+     * @return true if notification_sender_id is available
+     */
+    public static void dismissGlobally(final Context context, final List<AlarmId> alarmIds) {
+        final String senderId = context.getResources().getString(R.string.notification_sender_id);
+        if ("".equals(senderId)) {
+            Log.i(TAG, "no sender configured");
+            return;
+        }
+        Set<Long> eventIds = new HashSet<Long>(alarmIds.size());
+        for (AlarmId alarmId: alarmIds) {
+            eventIds.add(alarmId.mEventId);
+        }
+        // find the mapping between calendars and events
+        Map<Long, Long> eventsToCalendars = lookupEventToCalendarMap(context, eventIds);
+
+        if (eventsToCalendars.isEmpty()) {
+            Log.d(TAG, "found no calendars for events");
+            return;
+        }
+
+        Set<Long> calendars = new LinkedHashSet<Long>();
+        calendars.addAll(eventsToCalendars.values());
+
+        // find the accounts associated with those calendars
+        Map<Long, Pair<String, String>> calendarsToAccounts =
+                lookupCalendarToAccountMap(context, calendars);
+
+        if (calendarsToAccounts.isEmpty()) {
+            Log.d(TAG, "found no accounts for calendars");
+            return;
+        }
+
+        // TODO group by account to reduce queries
+        Map<String, String> syncIdToAccount = new HashMap<String, String>();
+        Map<Long, String> eventIdToSyncId = new HashMap<Long, String>();
+        ContentResolver resolver = context.getContentResolver();
+        for (Long eventId : eventsToCalendars.keySet()) {
+            Long calendar = eventsToCalendars.get(eventId);
+            Pair<String, String> account = calendarsToAccounts.get(calendar);
+            if (GOOGLE_ACCOUNT_TYPE.equals(account.first)) {
+                Uri uri = asSync(Events.CONTENT_URI, account.first, account.second);
+                Cursor cursor = resolver.query(uri, EVENT_SYNC_PROJECTION,
+                        Events._ID + " = " + eventId, null, null);
+                try {
+                    cursor.moveToPosition(-1);
+                    int sync_id_idx = cursor.getColumnIndex(Events._SYNC_ID);
+                    if (sync_id_idx != -1) {
+                        while (cursor.moveToNext()) {
+                            String syncId = cursor.getString(sync_id_idx);
+                            syncIdToAccount.put(syncId, account.second);
+                            eventIdToSyncId.put(eventId, syncId);
+                        }
+                    }
+                } finally {
+                    cursor.close();
+                }
+            }
+        }
+
+        if (syncIdToAccount.isEmpty()) {
+            Log.d(TAG, "found no syncIds for events");
+            return;
+        }
+
+        // TODO group by account to reduce packets
+        CloudNotificationBackplane cnb = ExtensionsFactory.getCloudNotificationBackplane();
+        if (cnb.open(context)) {
+            for (AlarmId alarmId: alarmIds) {
+                String syncId = eventIdToSyncId.get(alarmId.mEventId);
+                String account = syncIdToAccount.get(syncId);
+                Bundle data = new Bundle();
+                data.putString(SYNC_ID, syncId);
+                data.putString(START_TIME, Long.toString(alarmId.mStart));
+                data.putString(ACCOUNT_NAME, account);
+                try {
+                    cnb.send(account, syncId + ":" + alarmId.mStart, data);
+                } catch (IOException e) {
+                    // TODO save a note to try again later
+                }
+            }
+            cnb.close();
+        }
+    }
+
+    private static Uri asSync(Uri uri, String accountType, String account) {
+        return uri
+                .buildUpon()
+                .appendQueryParameter(
+                        android.provider.CalendarContract.CALLER_IS_SYNCADAPTER, "true")
+                .appendQueryParameter(Calendars.ACCOUNT_NAME, account)
+                .appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
+    }
+
+    /**
+     * build a selection over a set of row IDs
+     * 
+     * @param ids row IDs to select
+     * @param key row name for the table
+     * @return a selection string suitable for a resolver query.
+     */
+    private static String buildMultipleIdQuery(Set<Long> ids, String key) {
+        StringBuilder selection = new StringBuilder();
+        boolean first = true;
+        for (Long id : ids) {
+            if (first) {
+                first = false;
+            } else {
+                selection.append(" OR ");
+            }
+            selection.append(key);
+            selection.append("=");
+            selection.append(id);
+        }
+        return selection.toString();
+    }
+
+    /**
+     * @param context application context
+     * @param eventIds Event row IDs to query.
+     * @return a map from event to calendar
+     */
+    private static Map<Long, Long> lookupEventToCalendarMap(final Context context,
+            final Set<Long> eventIds) {
+        Map<Long, Long> eventsToCalendars = new HashMap<Long, Long>();
+        ContentResolver resolver = context.getContentResolver();
+        String eventSelection = buildMultipleIdQuery(eventIds, Events._ID);
+        Cursor eventCursor = resolver.query(Events.CONTENT_URI, EVENT_PROJECTION,
+                eventSelection, null, null);
+        try {
+            eventCursor.moveToPosition(-1);
+            int calendar_id_idx = eventCursor.getColumnIndex(Events.CALENDAR_ID);
+            int event_id_idx = eventCursor.getColumnIndex(Events._ID);
+            if (calendar_id_idx != -1 && event_id_idx != -1) {
+                while (eventCursor.moveToNext()) {
+                    eventsToCalendars.put(eventCursor.getLong(event_id_idx),
+                            eventCursor.getLong(calendar_id_idx));
+                }
+            }
+        } finally {
+            eventCursor.close();
+        }
+        return eventsToCalendars;
+    }
+
+    /**
+     * @param context application context
+     * @param calendars Calendar row IDs to query.
+     * @return a map from Calendar to a pair (account type, account name)
+     */
+    private static Map<Long, Pair<String, String>> lookupCalendarToAccountMap(final Context context,
+            Set<Long> calendars) {
+        Map<Long, Pair<String, String>> calendarsToAccounts =
+                new HashMap<Long, Pair<String, String>>();
+        ;
+        ContentResolver resolver = context.getContentResolver();
+        String calendarSelection = buildMultipleIdQuery(calendars, Calendars._ID);
+        Cursor calendarCursor = resolver.query(Calendars.CONTENT_URI, CALENDARS_PROJECTION,
+                calendarSelection, null, null);
+        try {
+            calendarCursor.moveToPosition(-1);
+            int calendar_id_idx = calendarCursor.getColumnIndex(Calendars._ID);
+            int account_name_idx = calendarCursor.getColumnIndex(Calendars.ACCOUNT_NAME);
+            int account_type_idx = calendarCursor.getColumnIndex(Calendars.ACCOUNT_TYPE);
+            if (calendar_id_idx != -1 && account_name_idx != -1 && account_type_idx != -1) {
+                while (calendarCursor.moveToNext()) {
+                    Long id = calendarCursor.getLong(calendar_id_idx);
+                    String name = calendarCursor.getString(account_name_idx);
+                    String type = calendarCursor.getString(account_type_idx);
+                    calendarsToAccounts.put(id, new Pair<String, String>(type, name));
+                }
+            }
+        } finally {
+            calendarCursor.close();
+        }
+        return calendarsToAccounts;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        new AsyncTask<Pair<Context, Intent>, Void, Void>() {
+            @Override
+            protected Void doInBackground(Pair<Context, Intent>... params) {
+                Context context = params[0].first;
+                Intent intent = params[0].second;
+                boolean updated = false;
+                if (intent.hasExtra(SYNC_ID) && intent.hasExtra(ACCOUNT_NAME)) {
+                    String syncId = intent.getStringExtra(SYNC_ID);
+                    long startTime = Long.parseLong(intent.getStringExtra(START_TIME));
+                    ContentResolver resolver = context.getContentResolver();
+
+                    Uri uri = asSync(Events.CONTENT_URI, GOOGLE_ACCOUNT_TYPE,
+                            intent.getStringExtra(ACCOUNT_NAME));
+                    Cursor cursor = resolver.query(uri, EVENT_SYNC_PROJECTION,
+                            Events._SYNC_ID + " = '" + syncId + "'", null, null);
+                    try {
+                        int event_id_idx = cursor.getColumnIndex(Events._ID);
+                        cursor.moveToFirst();
+                        if (event_id_idx != -1 && !cursor.isAfterLast()) {
+                            long eventId = cursor.getLong(event_id_idx);
+                            ContentValues values = new ContentValues();
+                            String selection = CalendarAlerts.STATE + "=" +
+                                    CalendarAlerts.STATE_FIRED + " AND " +
+                                    CalendarAlerts.EVENT_ID + "=" + eventId + " AND " +
+                                    CalendarAlerts.BEGIN + "=" + startTime;
+                            values.put(CalendarAlerts.STATE, CalendarAlerts.STATE_DISMISSED);
+                            int rows = resolver.update(CalendarAlerts.CONTENT_URI, values,
+                                    selection, null);
+                            updated = rows > 0;
+                        }
+                    } finally {
+                        cursor.close();
+                    }
+                }
+
+                if (updated) {
+                    Log.d(TAG, "updating alarm state");
+                    AlertService.updateAlertNotification(context);
+                }
+                return null;
+            }
+        }.execute(new Pair<Context, Intent>(context, intent));
+    }
+}
diff --git a/src/com/android/calendar/event/CreateEventDialogFragment.java b/src/com/android/calendar/event/CreateEventDialogFragment.java
index 5eb69a1..0381b30 100644
--- a/src/com/android/calendar/event/CreateEventDialogFragment.java
+++ b/src/com/android/calendar/event/CreateEventDialogFragment.java
@@ -31,6 +31,7 @@
 import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.format.Time;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -52,6 +53,8 @@
  */
 public class CreateEventDialogFragment extends DialogFragment implements TextWatcher {
 
+    private static final String TAG = "CreateEventDialogFragment";
+
     private static final int TOKEN_CALENDARS = 1 << 3;
 
     private static final String KEY_DATE_STRING = "date_string";
@@ -261,8 +264,15 @@
             return;
         }
 
-        String defaultCalendar = Utils.getSharedPreference(
-                getActivity(), GeneralPreferences.KEY_DEFAULT_CALENDAR, (String) null);
+
+        String defaultCalendar = null;
+        final Activity activity = getActivity();
+        if (activity != null) {
+            defaultCalendar = Utils.getSharedPreference(activity,
+                    GeneralPreferences.KEY_DEFAULT_CALENDAR, (String) null);
+        } else {
+            Log.e(TAG, "Activity is null, cannot load default calendar");
+        }
 
         int calendarOwnerIndex = cursor.getColumnIndexOrThrow(Calendars.OWNER_ACCOUNT);
         int accountNameIndex = cursor.getColumnIndexOrThrow(Calendars.ACCOUNT_NAME);
diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java
index 8e83be9..b110591 100644
--- a/src/com/android/calendar/event/EditEventHelper.java
+++ b/src/com/android/calendar/event/EditEventHelper.java
@@ -60,6 +60,9 @@
 
     private static final boolean DEBUG = false;
 
+    // Used for parsing rrules for special cases.
+    private EventRecurrence mEventRecurrence = new EventRecurrence();
+
     private static final String NO_EVENT_COLOR = "";
 
     public static final String[] EVENT_PROJECTION = new String[] {
@@ -1221,6 +1224,7 @@
 
         startTime.set(model.mStart);
         endTime.set(model.mEnd);
+        offsetStartTimeIfNecessary(startTime, endTime, rrule, model);
 
         ContentValues values = new ContentValues();
 
@@ -1296,6 +1300,79 @@
     }
 
     /**
+     * If the recurrence rule is such that the event start date doesn't actually fall in one of the
+     * recurrences, then push the start date up to the first actual instance of the event.
+     */
+    private void offsetStartTimeIfNecessary(Time startTime, Time endTime, String rrule,
+            CalendarEventModel model) {
+        if (rrule == null || rrule.isEmpty()) {
+            // No need to waste any time with the parsing if the rule is empty.
+            return;
+        }
+
+        mEventRecurrence.parse(rrule);
+        // Check if we meet the specific special case. It has to:
+        //  * be weekly
+        //  * not recur on the same day of the week that the startTime falls on
+        // In this case, we'll need to push the start time to fall on the first day of the week
+        // that is part of the recurrence.
+        if (mEventRecurrence.freq != EventRecurrence.WEEKLY) {
+            // Not weekly so nothing to worry about.
+            return;
+        }
+        if (mEventRecurrence.byday.length > mEventRecurrence.bydayCount) {
+            // This shouldn't happen, but just in case something is weird about the recurrence.
+            return;
+        }
+
+        // Start to figure out what the nearest weekday is.
+        int closestWeekday = Integer.MAX_VALUE;
+        int weekstart = EventRecurrence.day2TimeDay(mEventRecurrence.wkst);
+        int startDay = startTime.weekDay;
+        for (int i = 0; i < mEventRecurrence.bydayCount; i++) {
+            int day = EventRecurrence.day2TimeDay(mEventRecurrence.byday[i]);
+            if (day == startDay) {
+                // Our start day is one of the recurring days, so we're good.
+                return;
+            }
+
+            if (day < weekstart) {
+                // Let's not make any assumptions about what weekstart can be.
+                day += 7;
+            }
+            // We either want the earliest day that is later in the week than startDay ...
+            if (day > startDay && (day < closestWeekday || closestWeekday < startDay)) {
+                closestWeekday = day;
+            }
+            // ... or if there are no days later than startDay, we want the earliest day that is
+            // earlier in the week than startDay.
+            if (closestWeekday == Integer.MAX_VALUE || closestWeekday < startDay) {
+                // We haven't found a day that's later in the week than startDay yet.
+                if (day < closestWeekday) {
+                    closestWeekday = day;
+                }
+            }
+        }
+
+        // We're here, so unfortunately our event's start day is not included in the days of
+        // the week of the recurrence. To save this event correctly we'll need to push the start
+        // date to the closest weekday that *is* part of the recurrence.
+        if (closestWeekday < startDay) {
+            closestWeekday += 7;
+        }
+        int daysOffset = closestWeekday - startDay;
+        startTime.monthDay += daysOffset;
+        endTime.monthDay += daysOffset;
+        long newStartTime = startTime.normalize(true);
+        long newEndTime = endTime.normalize(true);
+
+        // Later we'll actually be using the values from the model rather than the startTime
+        // and endTime themselves, so we need to make these changes to the model as well.
+        model.mStart = newStartTime;
+        model.mEnd = newEndTime;
+    }
+
+    /**
      * Takes an e-mail address and returns the domain (everything after the last @)
      */
     public static String extractDomain(String email) {
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index 09daa0c..3df601c 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -432,7 +432,7 @@
             mTzPickerUtils = new TimeZonePickerUtils(mActivity);
         }
         CharSequence displayName =
-                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime);
+                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime, true);
 
         mTimezoneTextView.setText(displayName);
         mTimezoneButton.setText(displayName);
diff --git a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
index 6de8439..580d211 100644
--- a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
+++ b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
@@ -327,8 +327,10 @@
     private LinearLayout mWeekGroup2;
     // Sun = 0
     private ToggleButton[] mWeekByDayButtons = new ToggleButton[7];
-    private String[] mDayOfWeekString;
-    private String[] mOrdinalArray;
+    /** A double array of Strings to hold the 7x5 list of possible strings of the form:
+     *  "on every [Nth] [DAY_OF_WEEK]", e.g. "on every second Monday",
+     *  where [Nth] can be [first, second, third, fourth, last] */
+    private String[][] mMonthRepeatByDayOfWeekStrs;
 
     private LinearLayout mMonthGroup;
     private RadioGroup mMonthRepeatByRadioGroup;
@@ -730,14 +732,18 @@
         mWeekGroup = (LinearLayout) mView.findViewById(R.id.weekGroup);
         mWeekGroup2 = (LinearLayout) mView.findViewById(R.id.weekGroup2);
 
-        mOrdinalArray = mResources.getStringArray(R.array.ordinal_labels);
-
         // In Calendar.java day of week order e.g Sun = 1 ... Sat = 7
         String[] dayOfWeekString = new DateFormatSymbols().getWeekdays();
-        mDayOfWeekString = new String[7];
-        for (int i = 0; i < 7; i++) {
-            mDayOfWeekString[i] = dayOfWeekString[TIME_DAY_TO_CALENDAR_DAY[i]];
-        }
+
+        mMonthRepeatByDayOfWeekStrs = new String[7][];
+        // from Time.SUNDAY as 0 through Time.SATURDAY as 6
+        mMonthRepeatByDayOfWeekStrs[0] = mResources.getStringArray(R.array.repeat_by_nth_sun);
+        mMonthRepeatByDayOfWeekStrs[1] = mResources.getStringArray(R.array.repeat_by_nth_mon);
+        mMonthRepeatByDayOfWeekStrs[2] = mResources.getStringArray(R.array.repeat_by_nth_tues);
+        mMonthRepeatByDayOfWeekStrs[3] = mResources.getStringArray(R.array.repeat_by_nth_wed);
+        mMonthRepeatByDayOfWeekStrs[4] = mResources.getStringArray(R.array.repeat_by_nth_thurs);
+        mMonthRepeatByDayOfWeekStrs[5] = mResources.getStringArray(R.array.repeat_by_nth_fri);
+        mMonthRepeatByDayOfWeekStrs[6] = mResources.getStringArray(R.array.repeat_by_nth_sat);
 
         // In Time.java day of week order e.g. Sun = 0
         int idx = Utils.getFirstDayOfWeek(getActivity());
@@ -932,10 +938,10 @@
                         mModel.monthlyByDayOfWeek = mTime.weekDay;
                     }
 
-                    mMonthRepeatByDayOfWeekStr = mResources.getString(
-                            R.string.recurrence_month_pattern_by_day_of_week,
-                            mOrdinalArray[mModel.monthlyByNthDayOfWeek - 1],
-                            mDayOfWeekString[mModel.monthlyByDayOfWeek]);
+                    String[] monthlyByNthDayOfWeekStrs =
+                            mMonthRepeatByDayOfWeekStrs[mModel.monthlyByDayOfWeek];
+                    mMonthRepeatByDayOfWeekStr =
+                            monthlyByNthDayOfWeekStrs[mModel.monthlyByNthDayOfWeek - 1];
                     mRepeatMonthlyByNthDayOfWeek.setText(mMonthRepeatByDayOfWeekStr);
                 }
                 break;