diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index 7f8a68630..0de090ecd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -120,11 +120,11 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { 30 -> getString(R.string.mins_before_30) else -> { if (minutes % 1440 == 0) - "${minutes / 1440} ${getString(R.string.days)}" + resources.getQuantityString(R.plurals.days, minutes / 1440, minutes / 1440) else if (minutes % 60 == 0) - "${minutes / 60} ${getString(R.string.hours)}" + resources.getQuantityString(R.plurals.hours, minutes / 60, minutes / 60) else - "$minutes ${getString(R.string.minutes)}" + resources.getQuantityString(R.plurals.minutes, minutes, minutes) } } diff --git a/app/src/main/res/layout/dialog_custom_event_reminder.xml b/app/src/main/res/layout/dialog_custom_event_reminder.xml index 124bb6bd2..2df6e7fad 100644 --- a/app/src/main/res/layout/dialog_custom_event_reminder.xml +++ b/app/src/main/res/layout/dialog_custom_event_reminder.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:paddingBottom="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin" - android:text="@string/minutes"/> + android:text="@string/minutes_raw"/> + android:text="@string/hours_raw"/> + android:text="@string/days_raw"/> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0fe3ff254..229ced917 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Benutzerdefiniert vorher - Minuten - Stunden - Tage + Minuten + Stunden + Tage + + + %1$d minute + %1$d Minuten + + + + %1$d hour + %1$d Stunden + + + + %1$d day + %1$d Tage + importiere Termine diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index c0fb110d5..b179e2ec5 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Personalizado antes de - minutos - horas - días + minutos + horas + días + + + %1$d minute + %1$d minutos + + + + %1$d hour + %1$d horas + + + + %1$d day + %1$d días + Import events diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d6370cf10..5331cd67e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Personnalisé avant - minutes - heures - jours + minutes + heures + jours + + + %1$d minute + %1$d minutes + + + + %1$d hour + %1$d heures + + + + %1$d day + %1$d jours + Import events diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 18229d82f..f1c098e7c 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Custom before - minutes - hours - days + minutes + hours + days + + + %1$d minute + %1$d minutes + + + + %1$d hour + %1$d hours + + + + %1$d day + %1$d days + Import events diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 2ee52be08..a73d9b9a3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Egyedi korábban - perccel - órával - nappal + perc + óra + nap + + + %1$d percel + %1$d percel + + + + %1$d órával + %1$d órával + + + + %1$d nappal + %1$d nappal + Import events diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e6e3ed794..7ca638831 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Custom before - minutes - hours - days + minutes + hours + days + + + %1$d minute + %1$d minutes + + + + %1$d hour + %1$d hours + + + + %1$d day + %1$d days + Import events diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 78c3f7145..5d1465c71 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -45,9 +45,24 @@ 30 minutes before מותאם אישית לפני - דקות - שעות - ימים + minutes + hours + days + + + %1$d minute + %1$d minutes + + + + %1$d hour + %1$d hours + + + + %1$d day + %1$d days + ייבוא אירועים diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 201a816e5..e91cada14 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -45,9 +45,24 @@ 30 minutes before カスタム - - 時間 - + + 時間 + + + + %1$d minute + %1$d 分 + + + + %1$d hour + %1$d 時間 + + + + %1$d day + %1$d 日 + Import events diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3de403db5..9e8855c40 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Personalizado antes - minutos - horas - dias + minutos + horas + dias + + + %1$d minute + %1$d minutos + + + + %1$d hour + %1$d horas + + + + %1$d day + %1$d dias + Importar eventos diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3aed89f72..50df7cd08 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Настраиваемое до события - минут - часов - дней + минут + часов + дней + + + %1$d minute + %1$d минут + + + + %1$d hour + %1$d часов + + + + %1$d day + %1$d дней + Импорт событий diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e2259a9a1..6558047ab 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Egen före - minuter - timmar - dagar + minuter + timmar + dagar + + + %1$d minute + %1$d minuter + + + + %1$d hour + %1$d timmar + + + + %1$d day + %1$d dagar + Import events diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 7d85fdf3b..2ca98bf39 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -7,9 +7,9 @@ - @string/minutes - @string/hours - @string/days + @string/minutes_raw + @string/hours_raw + @string/days_raw diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3a38d457a..d30d85ad8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,9 +45,24 @@ 30 minutes before Custom before - minutes - hours - days + minutes + hours + days + + + %1$d minute + %1$d minutes + + + + %1$d hour + %1$d hours + + + + %1$d day + %1$d days + Import events