diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
index 4428d3588..2c8e329e1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -232,7 +232,7 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun updateSnoozeText() {
-        settings_snooze_delay.text = res.getQuantityString(R.plurals.minutes, config.snoozeDelay, config.snoozeDelay)
+        settings_snooze_delay.text = res.getQuantityString(R.plurals.by_minutes, config.snoozeDelay, config.snoozeDelay)
     }
 
     private fun setupEventReminder() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
index b9667588f..8f3fb59ea 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -134,10 +134,10 @@ fun Context.getFormattedMinutes(minutes: Int, showBefore: Boolean = true) = when
         else if (minutes % 1440 == 0)
             resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440)
         else if (minutes % 60 == 0) {
-            val base = if (showBefore) R.plurals.hours_before else R.plurals.hours
+            val base = if (showBefore) R.plurals.hours_before else R.plurals.by_hours
             resources.getQuantityString(base, minutes / 60, minutes / 60)
         } else {
-            val base = if (showBefore) R.plurals.minutes_before else R.plurals.minutes
+            val base = if (showBefore) R.plurals.minutes_before else R.plurals.by_minutes
             resources.getQuantityString(base, minutes, minutes)
         }
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c41450af4..fc86da5b7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a19ad08ac..e3ab5910d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8f01a14a2..885702800 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index f2202f144..f61c43ccb 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 14b785a2d..8c0f842a8 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 47600649b..9b0c4faac 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1451af920..b25f62680 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ae43b594c..65ffe98be 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bd7f68157..9eab3b87b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 18dd0b2ed..cbe33aa0f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minuto</item>
         <item quantity="other">%1$d minutos</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hora</item>
         <item quantity="other">%1$d horas</item>
     </plurals>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c07504c34..b015a1971 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -214,13 +214,13 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d минута</item>
         <item quantity="few">%1$d минуты</item>
         <item quantity="many">%1$d минут</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d час</item>
         <item quantity="few">%1$d часа</item>
         <item quantity="many">%1$d часов</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 67390f2d7..b252317ec 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -207,15 +207,15 @@
     <string name="google_sync_error_update">Chyba pri úprave udalosti na Googli: %1$s</string>
     <string name="google_sync_error_fetch">Chyba pri čítaní Google udalostí: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minútu</item>
         <item quantity="few">%1$d minúty</item>
         <item quantity="other">%1$d minút</item>
     </plurals>
 
-    <plurals name="hours">
-        <item quantity="one">%1$d hodiny</item>
-        <item quantity="few">%1$d hodín</item>
+    <plurals name="by_hours">
+        <item quantity="one">%1$d hodinu</item>
+        <item quantity="few">%1$d hodiny</item>
         <item quantity="other">%1$d hodín</item>
     </plurals>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f681ff3c7..69780ed53 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minut</item>
         <item quantity="other">%1$d minuter</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d timme</item>
         <item quantity="other">%1$d timmar</item>
     </plurals>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 909f93a0f..ef08df162 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c8a86e64..0026ba653 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -200,12 +200,12 @@
     <string name="google_sync_error_update">Error updating event at Google: %1$s</string>
     <string name="google_sync_error_fetch">Error fetching Google events: %1$s</string>
 
-    <plurals name="minutes">
+    <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-    <plurals name="hours">
+    <plurals name="by_hours">
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>