diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3a670ca5..2dbad0e24 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -841,11 +841,11 @@ File %1$s contained %2$s.\n\n
   <string name="list">List</string>
   <string name="repeats_from">Repeats from</string>
   <string name="repeats_single">Repeats %s</string>
-  <string name="repeats_single_on">Repeats %s on %s</string>
-  <string name="repeats_single_until">Repeats %s until %s</string>
-  <string name="repeats_single_number_of_times">Repeats %s, occurs %d %s</string>
-  <string name="repeats_single_on_until">Repeats %s on %s until %s</string>
-  <string name="repeats_single_on_number_of_times">Repeats %s on %s, occurs %d %s</string>
+  <string name="repeats_single_on">Repeats %1$s on %2$s</string>
+  <string name="repeats_single_until">Repeats %1$s until %2$s</string>
+  <string name="repeats_single_number_of_times">Repeats %1$s, occurs %2$d %3$s</string>
+  <string name="repeats_single_on_until">Repeats %1$s on %2$s until %3$s</string>
+  <string name="repeats_single_on_number_of_times">Repeats %1$s on %2$s, occurs %3$d %4$s</string>
   <string name="repeats_minutely">minutely</string>
   <string name="repeats_hourly">hourly</string>
   <string name="repeats_daily">daily</string>
@@ -853,11 +853,11 @@ File %1$s contained %2$s.\n\n
   <string name="repeats_monthly">monthly</string>
   <string name="repeats_yearly">yearly</string>
   <string name="repeats_plural">Repeats every %s</string>
-  <string name="repeats_plural_on">Repeats every %s on %s</string>
-  <string name="repeats_plural_until">Repeats every %s until %s</string>
-  <string name="repeats_plural_number_of_times">Repeats every %s, occurs %d %s</string>
-  <string name="repeats_plural_on_until">Repeats every %s on %s until %s</string>
-  <string name="repeats_plural_on_number_of_times">Repeats every %s on %s, occurs %d %s</string>
+  <string name="repeats_plural_on">Repeats every %1$s on %2$s</string>
+  <string name="repeats_plural_until">Repeats every %1$s until %2$s</string>
+  <string name="repeats_plural_number_of_times">Repeats every %1$s, occurs %2$d %3$s</string>
+  <string name="repeats_plural_on_until">Repeats every %1$s on %2$s until %3$s</string>
+  <string name="repeats_plural_on_number_of_times">Repeats every %1$s on %2$s, occurs %3$d %4$s</string>
   <string name="list_separator_with_space">,\u0020</string>
   <string name="dont_add_to_calendar">Don\'t add to calendar</string>
   <string name="default_calendar">Default calendar</string>
diff --git a/gradle.properties b/gradle.properties
index b3c7a0330..b8a807e22 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx2048M
+android.enableAapt2=false