From 63b7aecdb7a6e85307fe6c18d9c688360ebc6f3e Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 6 Jul 2021 06:25:00 +0200
Subject: [PATCH] Translations: move file plural to individual locales (TTS).

Part of #867.
---
 src/main/res/values-ar/strings.xml       | 42 ++++++++++++++----------
 src/main/res/values-b+en+001/strings.xml | 30 +++++++----------
 src/main/res/values-b+es+419/strings.xml | 30 +++++++----------
 src/main/res/values-bg/strings.xml       | 30 +++++++----------
 src/main/res/values-ca/strings.xml       | 30 +++++++----------
 src/main/res/values-cs/strings.xml       | 33 +++++++++----------
 src/main/res/values-da/strings.xml       | 30 +++++++----------
 src/main/res/values-de/strings.xml       | 30 +++++++----------
 src/main/res/values-el/strings.xml       | 30 +++++++----------
 src/main/res/values-es/strings.xml       | 30 +++++++----------
 src/main/res/values-et/strings.xml       | 30 +++++++----------
 src/main/res/values-eu/strings.xml       | 30 +++++++----------
 src/main/res/values-fa/strings.xml       | 30 +++++++----------
 src/main/res/values-fi/strings.xml       | 30 +++++++----------
 src/main/res/values-fr-rCA/strings.xml   | 30 +++++++----------
 src/main/res/values-fr-rCH/strings.xml   | 30 +++++++----------
 src/main/res/values-fr/strings.xml       | 30 +++++++----------
 src/main/res/values-gl/strings.xml       | 30 +++++++----------
 src/main/res/values-hi/strings.xml       | 30 +++++++----------
 src/main/res/values-hr/strings.xml       | 33 +++++++++----------
 src/main/res/values-hu/strings.xml       | 30 +++++++----------
 src/main/res/values-in/strings.xml       | 27 +++++----------
 src/main/res/values-it/strings.xml       | 30 +++++++----------
 src/main/res/values-iw/strings.xml       | 36 ++++++++++----------
 src/main/res/values-ja/strings.xml       | 27 +++++----------
 src/main/res/values-ko/strings.xml       | 27 +++++----------
 src/main/res/values-lt/strings.xml       | 20 -----------
 src/main/res/values-lv/strings.xml       | 33 +++++++++----------
 src/main/res/values-mo/strings.xml       | 42 ++++++++++++++----------
 src/main/res/values-ms/strings.xml       | 27 +++++----------
 src/main/res/values-nb/strings.xml       | 30 +++++++----------
 src/main/res/values-nl/strings.xml       | 30 +++++++----------
 src/main/res/values-pl/strings.xml       | 36 ++++++++++----------
 src/main/res/values-pt-rBR/strings.xml   | 30 +++++++----------
 src/main/res/values-pt-rPT/strings.xml   | 30 +++++++----------
 src/main/res/values-pt/strings.xml       | 30 +++++++----------
 src/main/res/values-ro/strings.xml       | 33 +++++++++----------
 src/main/res/values-ru/strings.xml       | 36 ++++++++++----------
 src/main/res/values-sk/strings.xml       | 33 +++++++++----------
 src/main/res/values-sl/strings.xml       | 37 ++++++++++-----------
 src/main/res/values-sr/strings.xml       | 33 +++++++++----------
 src/main/res/values-sv/strings.xml       | 30 +++++++----------
 src/main/res/values-th/strings.xml       | 27 +++++----------
 src/main/res/values-tl/strings.xml       | 30 +++++++----------
 src/main/res/values-tr/strings.xml       | 30 +++++++----------
 src/main/res/values-uk/strings.xml       | 36 ++++++++++----------
 src/main/res/values-vi/strings.xml       | 27 +++++----------
 src/main/res/values-zh-rHK/strings.xml   | 27 +++++----------
 src/main/res/values-zh-rTW/strings.xml   | 27 +++++----------
 src/main/res/values-zh/strings.xml       | 27 +++++----------
 src/main/res/values/plurals.xml          | 25 --------------
 src/main/res/values/strings.xml          | 30 +++++++----------
 52 files changed, 645 insertions(+), 946 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 91360c0f1..037e45854 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -328,26 +328,32 @@ limitations under the License.
     <string name="value_smallest">الأصغر</string>
     <string name="value_smallest_recommended">الأصغر (موصى به)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ساعات</string>
-    <string name="voice_hours_many">%1$d ساعة</string>
-    <string name="voice_hours_one">ساعة واحدة</string>
-    <string name="voice_hours_other">%1$d ساعة</string>
-    <string name="voice_hours_two">ساعتان</string>
-    <string name="voice_hours_zero">0 ساعة</string>
-    <string name="voice_minutes_few">%1$d دقائق</string>
-    <string name="voice_minutes_many">%1$d دقيقة</string>
-    <string name="voice_minutes_one">دقيقة واحدة</string>
-    <string name="voice_minutes_other">%1$d دقيقة</string>
-    <string name="voice_minutes_two">دقيقتان</string>
-    <string name="voice_minutes_zero">0 دقائق</string>
+    <plurals name="voiceHours">
+        <item quantity="zero">0 ساعة</item>
+        <item quantity="one">ساعة واحدة</item>
+        <item quantity="two">ساعتان</item>
+        <item quantity="few">%1$d ساعات</item>
+        <item quantity="many">%1$d ساعة</item>
+        <item quantity="other">%1$d ساعة</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="zero">0 دقائق</item>
+        <item quantity="one">دقيقة واحدة</item>
+        <item quantity="two">دقيقتان</item>
+        <item quantity="few">%1$d دقائق</item>
+        <item quantity="many">%1$d دقيقة</item>
+        <item quantity="other">%1$d دقيقة</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="zero">0 ثانية</item>
+        <item quantity="one">ثانية واحدة</item>
+        <item quantity="two">ثانيتان</item>
+        <item quantity="few">%1$d ثوانٍ</item>
+        <item quantity="many">%1$d ثانية</item>
+        <item quantity="other">%1$d ثانية</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s لكل كيلومتر</string>
     <string name="voice_pace_per_mile">%1$s لكل ميل</string>
-    <string name="voice_seconds_few">%1$d ثوانٍ</string>
-    <string name="voice_seconds_many">%1$d ثانية</string>
-    <string name="voice_seconds_one">ثانية واحدة</string>
-    <string name="voice_seconds_other">%1$d ثانية</string>
-    <string name="voice_seconds_two">ثانيتان</string>
-    <string name="voice_seconds_zero">0 ثانية</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f كيلومتر في الساعة</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f كيلومتر في الساعة</string>
     <string name="voice_speed_kilometers_per_hour_one">1 كيلومتر في الساعة</string>
diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml
index 603da785a..171935488 100644
--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@@ -275,26 +275,20 @@
     <string name="value_off">Off</string>
     <string name="value_smallest">Smallest</string>
     <string name="value_smallest_recommended">Smallest (recommended)</string>
-    <string name="voice_hours_few">%1$d hours</string>
-    <string name="voice_hours_many">%1$d hours</string>
-    <string name="voice_hours_one">1 hour</string>
-    <string name="voice_hours_other">%1$d hours</string>
-    <string name="voice_hours_two">2 hours</string>
-    <string name="voice_hours_zero">0 hours</string>
-    <string name="voice_minutes_few">%1$d minutes</string>
-    <string name="voice_minutes_many">%1$d minutes</string>
-    <string name="voice_minutes_one">1 minute</string>
-    <string name="voice_minutes_other">%1$d minutes</string>
-    <string name="voice_minutes_two">2 minutes</string>
-    <string name="voice_minutes_zero">0 minutes</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hour</item>
+        <item quantity="other">%1$d hours</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 second</item>
+        <item quantity="other">%1$d seconds</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per kilometre</string>
     <string name="voice_pace_per_mile">%1$s per mile</string>
-    <string name="voice_seconds_few">%1$d seconds</string>
-    <string name="voice_seconds_many">%1$d seconds</string>
-    <string name="voice_seconds_one">1 second</string>
-    <string name="voice_seconds_other">%1$d seconds</string>
-    <string name="voice_seconds_two">2 seconds</string>
-    <string name="voice_seconds_zero">0 seconds</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometres per hour</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometres per hour</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometre per hour</string>
diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
index c7b5e6904..826f2059d 100644
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@@ -278,26 +278,20 @@
     <string name="value_off">Desactivado</string>
     <string name="value_smallest">Menor</string>
     <string name="value_smallest_recommended">Mínimo (recomendado)</string>
-    <string name="voice_hours_few">%1$d horas</string>
-    <string name="voice_hours_many">%1$d horas</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d horas</string>
-    <string name="voice_hours_two">2 horas</string>
-    <string name="voice_hours_zero">0 horas</string>
-    <string name="voice_minutes_few">%1$d minutos</string>
-    <string name="voice_minutes_many">%1$d minutos</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minutos</string>
-    <string name="voice_minutes_two">2 minutos</string>
-    <string name="voice_minutes_zero">0 minutos</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other">1$d horas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 segundo</item>
+        <item quantity="other">%1$d segundos</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s por kilómetro</string>
     <string name="voice_pace_per_mile">%1$s por milla</string>
-    <string name="voice_seconds_few">%1$d segundos</string>
-    <string name="voice_seconds_many">%1$d segundos</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundos</string>
-    <string name="voice_seconds_two">2 segundos</string>
-    <string name="voice_seconds_zero">0 segundos</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilómetro por hora</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 98fe1f393..f88905cd7 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -326,26 +326,20 @@ limitations under the License.
     <string name="value_smallest">Най-малката</string>
     <string name="value_smallest_recommended">Най-малкото (препоръчително)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d часа</string>
-    <string name="voice_hours_many">%1$d часа</string>
-    <string name="voice_hours_one">1 час</string>
-    <string name="voice_hours_other">%1$d часа</string>
-    <string name="voice_hours_two">2 часа</string>
-    <string name="voice_hours_zero">0 часа</string>
-    <string name="voice_minutes_few">%1$d минути</string>
-    <string name="voice_minutes_many">%1$d минути</string>
-    <string name="voice_minutes_one">1 минута</string>
-    <string name="voice_minutes_other">%1$d минути</string>
-    <string name="voice_minutes_two">2 минути</string>
-    <string name="voice_minutes_zero">0 минути</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 час</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 минута</item>
+        <item quantity="other">%1$d минути</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 секунда</item>
+        <item quantity="other">%1$d секунди</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s на километър</string>
     <string name="voice_pace_per_mile">%1$s на миля</string>
-    <string name="voice_seconds_few">%1$d секунди</string>
-    <string name="voice_seconds_many">%1$d секунди</string>
-    <string name="voice_seconds_one">1 секунда</string>
-    <string name="voice_seconds_other">%1$d секунди</string>
-    <string name="voice_seconds_two">2 секунди</string>
-    <string name="voice_seconds_zero">0 секунди</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f километра в час</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f километра в час</string>
     <string name="voice_speed_kilometers_per_hour_one">1 километър в час</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 1a2b15296..fa798deb2 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -325,26 +325,20 @@ limitations under the License.
     <string name="value_smallest">Més petit</string>
     <string name="value_smallest_recommended">Més petit (recomanat)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d hores</string>
-    <string name="voice_hours_many">%1$d hores</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d hores</string>
-    <string name="voice_hours_two">2 hores</string>
-    <string name="voice_hours_zero">0 hores</string>
-    <string name="voice_minutes_few">%1$d minuts</string>
-    <string name="voice_minutes_many">%1$d minuts</string>
-    <string name="voice_minutes_one">1 minut</string>
-    <string name="voice_minutes_other">%1$d minuts</string>
-    <string name="voice_minutes_two">2 minuts</string>
-    <string name="voice_minutes_zero">0 minuts</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other">%1$d hores</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minut</item>
+        <item quantity="other">%1$d minuts</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 segon</item>
+        <item quantity="other">%1$d segons</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per quilòmetre</string>
     <string name="voice_pace_per_mile">%1$s per milla</string>
-    <string name="voice_seconds_few">%1$d segons</string>
-    <string name="voice_seconds_many">%1$d segons</string>
-    <string name="voice_seconds_one">1 segon</string>
-    <string name="voice_seconds_other">%1$d segons</string>
-    <string name="voice_seconds_two">2 segons</string>
-    <string name="voice_seconds_zero">0 segons</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f quilòmetres per hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f quilòmetres per hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 quilòmetre per hora</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 654f384d9..aa90b8674 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -393,26 +393,23 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs
     <string name="value_smallest">Nejmenší</string>
     <string name="value_smallest_recommended">Nejnižší hodnota (doporučeno)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d hodiny</string>
-    <string name="voice_hours_many">%1$d hodin</string>
-    <string name="voice_hours_one">1 hodina</string>
-    <string name="voice_hours_other">%1$d hodin</string>
-    <string name="voice_hours_two">2 hodiny</string>
-    <string name="voice_hours_zero">0 hodin</string>
-    <string name="voice_minutes_few">%1$d minuty</string>
-    <string name="voice_minutes_many">%1$d minut</string>
-    <string name="voice_minutes_one">1 minuta</string>
-    <string name="voice_minutes_other">%1$d minut</string>
-    <string name="voice_minutes_two">2 minuty</string>
-    <string name="voice_minutes_zero">0 minut</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hodina</item>
+        <item quantity="few">%1$d hodiny</item>
+        <item quantity="other">%1$d hodin</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuta</item>
+        <item quantity="few">%1$d minuty</item>
+        <item quantity="other">%1$d minut</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekunda</item>
+        <item quantity="few">%1$d sekundy</item>
+        <item quantity="other">%1$d sekund</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s na kilometr</string>
     <string name="voice_pace_per_mile">%1$s na míli</string>
-    <string name="voice_seconds_few">%1$d sekundy</string>
-    <string name="voice_seconds_many">%1$d sekund</string>
-    <string name="voice_seconds_one">1 sekunda</string>
-    <string name="voice_seconds_other">%1$d sekund</string>
-    <string name="voice_seconds_two">2 sekundy</string>
-    <string name="voice_seconds_zero">0 sekund</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometry za hodinu</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometrů za hodinu</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometr za hodinu</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index cbd5223f4..0e12ac161 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -397,26 +397,20 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="value_smallest">Mindste</string>
     <string name="value_smallest_recommended">Mindst (anbefalet)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d timer</string>
-    <string name="voice_hours_many">%1$d timer</string>
-    <string name="voice_hours_one">1 time</string>
-    <string name="voice_hours_other">%1$d timer</string>
-    <string name="voice_hours_two">2 timer</string>
-    <string name="voice_hours_zero">0 timer</string>
-    <string name="voice_minutes_few">%1$d minutter</string>
-    <string name="voice_minutes_many">%1$d minutter</string>
-    <string name="voice_minutes_one">1 minut</string>
-    <string name="voice_minutes_other">%1$d minutter</string>
-    <string name="voice_minutes_two">2 minutter</string>
-    <string name="voice_minutes_zero">0 minutter</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 time</item>
+        <item quantity="other">>%1$d timer</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minut</item>
+        <item quantity="other">%1$d minutter</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%1$d sekunder</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s pr. kilometer</string>
     <string name="voice_pace_per_mile">%1$s pr. mil</string>
-    <string name="voice_seconds_few">%1$d sekunder</string>
-    <string name="voice_seconds_many">%1$d sekunder</string>
-    <string name="voice_seconds_one">1 sekund</string>
-    <string name="voice_seconds_other">%1$d sekunder</string>
-    <string name="voice_seconds_two">2 sekunder</string>
-    <string name="voice_seconds_zero">0 sekunder</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometer i timen</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometer i timen</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer i timen</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 02e313db1..c41233ae1 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -403,26 +403,20 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <string name="value_smallest">Kleinster</string>
     <string name="value_smallest_recommended">Kleinster (empfohlen)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d Stunden</string>
-    <string name="voice_hours_many">%1$d Stunden</string>
-    <string name="voice_hours_one">1 Stunde</string>
-    <string name="voice_hours_other">%1$d Stunden</string>
-    <string name="voice_hours_two">2 Stunden</string>
-    <string name="voice_hours_zero">0 Stunden</string>
-    <string name="voice_minutes_few">%1$d Minuten</string>
-    <string name="voice_minutes_many">%1$d Minuten</string>
-    <string name="voice_minutes_one">1 Minute</string>
-    <string name="voice_minutes_other">%1$d Minuten</string>
-    <string name="voice_minutes_two">2 Minuten</string>
-    <string name="voice_minutes_zero">0 Minuten</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 Stunde</item>
+        <item quantity="other">%1$d Stunden</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 Minuten</item>
+        <item quantity="other">%1$d Minuten</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 Sekunde</item>
+        <item quantity="other">%1$d Sekunden</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s pro Kilometer</string>
     <string name="voice_pace_per_mile">%1$s pro Meile</string>
-    <string name="voice_seconds_few">%1$d Sekunden</string>
-    <string name="voice_seconds_many">%1$d Sekunden</string>
-    <string name="voice_seconds_one">1 Sekunde</string>
-    <string name="voice_seconds_other">%1$d Sekunden</string>
-    <string name="voice_seconds_two">2 Sekunden</string>
-    <string name="voice_seconds_zero">0 Sekunden</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f Kilometer pro Stunde</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f Kilometer pro Stunde</string>
     <string name="voice_speed_kilometers_per_hour_one">1 Kilometer pro Stunde</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 8d5e30738..f2a58536a 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -325,26 +325,20 @@ limitations under the License.
     <string name="value_smallest">Μικρότερη</string>
     <string name="value_smallest_recommended">Μικρότερη (συνιστάται)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ώρες</string>
-    <string name="voice_hours_many">%1$d ώρες</string>
-    <string name="voice_hours_one">1 ώρα</string>
-    <string name="voice_hours_other">%1$d ώρες</string>
-    <string name="voice_hours_two">2 ώρες</string>
-    <string name="voice_hours_zero">0 ώρες</string>
-    <string name="voice_minutes_few">%1$d λεπτά</string>
-    <string name="voice_minutes_many">%1$d λεπτά</string>
-    <string name="voice_minutes_one">1 λεπτό</string>
-    <string name="voice_minutes_other">%1$d λεπτά</string>
-    <string name="voice_minutes_two">2 λεπτά</string>
-    <string name="voice_minutes_zero">0 λεπτά</string>
+    <plurals name="voiceHours">
+        <item quantity="one">>1 ώρα</item>
+        <item quantity="other">%1$d ώρες</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 λεπτό</item>
+        <item quantity="other">%1$d λεπτά</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 δευτερόλεπτο</item>
+        <item quantity="other">%1$d δευτερόλεπταr</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s ανά χιλιόμετρο</string>
     <string name="voice_pace_per_mile">%1$s ανά μίλι</string>
-    <string name="voice_seconds_few">%1$d δευτερόλεπτα</string>
-    <string name="voice_seconds_many">%1$d δευτερόλεπτα</string>
-    <string name="voice_seconds_one">1 δευτερόλεπτο</string>
-    <string name="voice_seconds_other">%1$d δευτερόλεπτα</string>
-    <string name="voice_seconds_two">2 δευτερόλεπτα</string>
-    <string name="voice_seconds_zero">0 δευτερόλεπτα</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f χιλιόμετρα ανά ώρα</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f χιλιόμετρα ανά ώρα</string>
     <string name="voice_speed_kilometers_per_hour_one">1 χιλιόμετρο ανά ώρα</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 4994b6c84..5d6470a42 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -393,26 +393,20 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida
     <string name="value_smallest">Menor</string>
     <string name="value_smallest_recommended">Mínimo (recomendado)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d horas</string>
-    <string name="voice_hours_many">%1$d horas</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d horas</string>
-    <string name="voice_hours_two">2 horas</string>
-    <string name="voice_hours_zero">0 horas</string>
-    <string name="voice_minutes_few">%1$d minutos</string>
-    <string name="voice_minutes_many">%1$d minutos</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minutos</string>
-    <string name="voice_minutes_two">2 minutos</string>
-    <string name="voice_minutes_zero">0 minutos</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other">1$d horas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 segundo</item>
+        <item quantity="other">%1$d segundos</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s por kilómetro</string>
     <string name="voice_pace_per_mile">%1$s por milla</string>
-    <string name="voice_seconds_few">%1$d segundos</string>
-    <string name="voice_seconds_many">%1$d segundos</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundos</string>
-    <string name="voice_seconds_two">2 segundos</string>
-    <string name="voice_seconds_zero">0 segundos</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilómetro por hora</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 8d7129448..52d8c04a3 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -392,26 +392,20 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s
     <string name="value_smallest">Kõige väiksem</string>
     <string name="value_smallest_recommended">Väikseim (soovitatav)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d tundi</string>
-    <string name="voice_hours_many">%1$d tundi</string>
-    <string name="voice_hours_one">1 tund</string>
-    <string name="voice_hours_other">%1$d tundi</string>
-    <string name="voice_hours_two">2 tundi</string>
-    <string name="voice_hours_zero">0 tundi</string>
-    <string name="voice_minutes_few">%1$d minutit</string>
-    <string name="voice_minutes_many">%1$d minutit</string>
-    <string name="voice_minutes_one">1 minut</string>
-    <string name="voice_minutes_other">%1$d minutit</string>
-    <string name="voice_minutes_two">2 minutit</string>
-    <string name="voice_minutes_zero">0 minutit</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 tund</item>
+        <item quantity="other">%1$d tundi</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minut</item>
+        <item quantity="other">%1$d minutit</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%1$d sekundit</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s kilomeetri kohta</string>
     <string name="voice_pace_per_mile">%1$s miilis</string>
-    <string name="voice_seconds_few">%1$d sekundit</string>
-    <string name="voice_seconds_many">%1$d sekundit</string>
-    <string name="voice_seconds_one">1 sekund</string>
-    <string name="voice_seconds_other">%1$d sekundit</string>
-    <string name="voice_seconds_two">2 sekundit</string>
-    <string name="voice_seconds_zero">0 sekundit</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilomeetrit tunnis</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilomeetrit tunnis</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilomeeter tunnis</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 02286e34c..8a3034feb 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -393,26 +393,20 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="value_smallest">Txikiena</string>
     <string name="value_smallest_recommended">Txikiena (gomendatua)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ordu</string>
-    <string name="voice_hours_many">%1$d ordu</string>
-    <string name="voice_hours_one">1 ordu</string>
-    <string name="voice_hours_other">%1$d ordu</string>
-    <string name="voice_hours_two">2 ordu</string>
-    <string name="voice_hours_zero">0 ordu</string>
-    <string name="voice_minutes_few">%1$d minutu</string>
-    <string name="voice_minutes_many">%1$d minutu</string>
-    <string name="voice_minutes_one">1 minutu</string>
-    <string name="voice_minutes_other">%1$d minutu</string>
-    <string name="voice_minutes_two">2 minutu</string>
-    <string name="voice_minutes_zero">0 minutu</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 ordu</item>
+        <item quantity="other">%1$d ordu</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minutu</item>
+        <item quantity="other">%1$d minutu</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 segundo</item>
+        <item quantity="other">%1$d segundo</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s kilometro bakoitzeko</string>
     <string name="voice_pace_per_mile">%1$s miliako</string>
-    <string name="voice_seconds_few">%1$d segundo</string>
-    <string name="voice_seconds_many">%1$d segundo</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundo</string>
-    <string name="voice_seconds_two">2 segundo</string>
-    <string name="voice_seconds_zero">0 segundo</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometro orduko</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometro orduko</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometro orduko</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index fb3831897..a67392999 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -324,26 +324,20 @@ limitations under the License.
     <string name="value_smallest">کوچکترین</string>
     <string name="value_smallest_recommended">کوچکترین (توصیه می‌شود)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ساعت</string>
-    <string name="voice_hours_many">%1$d ساعت</string>
-    <string name="voice_hours_one">۱ ساعت</string>
-    <string name="voice_hours_other">%1$d ساعت</string>
-    <string name="voice_hours_two">۲ ساعت</string>
-    <string name="voice_hours_zero">0 ساعت</string>
-    <string name="voice_minutes_few">%1$d دقیقه</string>
-    <string name="voice_minutes_many">%1$d دقیقه</string>
-    <string name="voice_minutes_one">۱ دقیقه</string>
-    <string name="voice_minutes_other">%1$d دقیقه</string>
-    <string name="voice_minutes_two">۲ دقیقه</string>
-    <string name="voice_minutes_zero">0 دقیقه</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d ساعت</item>
+        <item quantity="other">%1$d ساعت</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d دقیقه</item>
+        <item quantity="other">%1$d دقیقه</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d ثانیه</item>
+        <item quantity="other">%1$d ثانیه</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s در کیلومتر</string>
     <string name="voice_pace_per_mile">%1$s در مایل</string>
-    <string name="voice_seconds_few">%1$d ثانیه</string>
-    <string name="voice_seconds_many">%1$d ثانیه</string>
-    <string name="voice_seconds_one">۱ ثانیه</string>
-    <string name="voice_seconds_other">%1$d ثانیه</string>
-    <string name="voice_seconds_two">۲ ثانیه</string>
-    <string name="voice_seconds_zero">0 ثانیه</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f کیلومتر در ساعت</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f کیلومتر در ساعت</string>
     <string name="voice_speed_kilometers_per_hour_one">1 کیلومتر در ساعت</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 1d13b72cb..9b4497d5d 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -402,26 +402,20 @@ jotta ne voidaan tuoda kohteeseen %1$s.</string>
     <string name="value_smallest">Pienin</string>
     <string name="value_smallest_recommended">Pienin (suositus)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d tuntia</string>
-    <string name="voice_hours_many">%1$d tuntia</string>
-    <string name="voice_hours_one">1 tunti</string>
-    <string name="voice_hours_other">%1$d tuntia</string>
-    <string name="voice_hours_two">2 tuntia</string>
-    <string name="voice_hours_zero">0 tuntia</string>
-    <string name="voice_minutes_few">%1$d minuuttia</string>
-    <string name="voice_minutes_many">%1$d minuuttia</string>
-    <string name="voice_minutes_one">1 minuutti</string>
-    <string name="voice_minutes_other">%1$d minuuttia</string>
-    <string name="voice_minutes_two">2 minuuttia</string>
-    <string name="voice_minutes_zero">0 minuuttia</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 tunti</item>
+        <item quantity="other">%1$d tuntia</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuutti</item>
+        <item quantity="other">%1$d minuuttia</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekunti</item>
+        <item quantity="other">%1$d sekuntia</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s kilometriä kohti</string>
     <string name="voice_pace_per_mile">%1$s mailia kohti</string>
-    <string name="voice_seconds_few">%1$d sekuntia</string>
-    <string name="voice_seconds_many">%1$d sekuntia</string>
-    <string name="voice_seconds_one">1 sekunti</string>
-    <string name="voice_seconds_other">%1$d sekuntia</string>
-    <string name="voice_seconds_two">2 sekuntia</string>
-    <string name="voice_seconds_zero">0 sekuntia</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometriä tunnissa</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometriä tunnissa</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometri tunnissa</string>
diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml
index def2741bf..f670c0a36 100644
--- a/src/main/res/values-fr-rCA/strings.xml
+++ b/src/main/res/values-fr-rCA/strings.xml
@@ -274,26 +274,20 @@
     <string name="value_off">Désactivé</string>
     <string name="value_smallest">La plus petite</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</string>
-    <string name="voice_hours_few">%1$d heures</string>
-    <string name="voice_hours_many">%1$d heures</string>
-    <string name="voice_hours_one">1 heure</string>
-    <string name="voice_hours_other">%1$d heures</string>
-    <string name="voice_hours_two">2 heures</string>
-    <string name="voice_hours_zero">0 heure</string>
-    <string name="voice_minutes_few">%1$d minutes</string>
-    <string name="voice_minutes_many">%1$d minutes</string>
-    <string name="voice_minutes_one">1 minute</string>
-    <string name="voice_minutes_other">%1$d minutes</string>
-    <string name="voice_minutes_two">2 minutes</string>
-    <string name="voice_minutes_zero">0 minute</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d heure</item>
+        <item quantity="other">%1$d heures</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s par kilomètre</string>
     <string name="voice_pace_per_mile">%1$s par mille</string>
-    <string name="voice_seconds_few">%1$d secondes</string>
-    <string name="voice_seconds_many">%1$d secondes</string>
-    <string name="voice_seconds_one">1 seconde</string>
-    <string name="voice_seconds_other">%1$d secondes</string>
-    <string name="voice_seconds_two">2 secondes</string>
-    <string name="voice_seconds_zero">0 seconde</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilomètres à l\'heure</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilomètres à l\'heure</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilomètre à l\'heure</string>
diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml
index 80f5d1bee..f1a48a7c1 100644
--- a/src/main/res/values-fr-rCH/strings.xml
+++ b/src/main/res/values-fr-rCH/strings.xml
@@ -274,26 +274,20 @@
     <string name="value_off">Désactiver</string>
     <string name="value_smallest">La plus faible</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</string>
-    <string name="voice_hours_few">%1$d heures</string>
-    <string name="voice_hours_many">%1$d heures</string>
-    <string name="voice_hours_one">1 heure</string>
-    <string name="voice_hours_other">%1$d heures</string>
-    <string name="voice_hours_two">2 heures</string>
-    <string name="voice_hours_zero">0 heure</string>
-    <string name="voice_minutes_few">%1$d minutes</string>
-    <string name="voice_minutes_many">%1$d minutes</string>
-    <string name="voice_minutes_one">1 minute</string>
-    <string name="voice_minutes_other">%1$d minutes</string>
-    <string name="voice_minutes_two">2 minutes</string>
-    <string name="voice_minutes_zero">0 minute</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d heure</item>
+        <item quantity="other">%1$d heures</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s par kilomètre</string>
     <string name="voice_pace_per_mile">%1$s par mile</string>
-    <string name="voice_seconds_few">%1$d secondes</string>
-    <string name="voice_seconds_many">%1$d secondes</string>
-    <string name="voice_seconds_one">1 seconde</string>
-    <string name="voice_seconds_other">%1$d secondes</string>
-    <string name="voice_seconds_two">2 secondes</string>
-    <string name="voice_seconds_zero">0 seconde</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilomètres-heure</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilomètres-heure</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilomètre-heure</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8eb44c87b..01b411d17 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -392,26 +392,20 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="value_smallest">La plus faible</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d heures</string>
-    <string name="voice_hours_many">%1$d heures</string>
-    <string name="voice_hours_one">1 heure</string>
-    <string name="voice_hours_other">%1$d heures</string>
-    <string name="voice_hours_two">2 heures</string>
-    <string name="voice_hours_zero">0 heure</string>
-    <string name="voice_minutes_few">%1$d minutes</string>
-    <string name="voice_minutes_many">%1$d minutes</string>
-    <string name="voice_minutes_one">1 minute</string>
-    <string name="voice_minutes_other">%1$d minutes</string>
-    <string name="voice_minutes_two">2 minutes</string>
-    <string name="voice_minutes_zero">0 minute</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d heure</item>
+        <item quantity="other">%1$d heures</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s par kilomètre</string>
     <string name="voice_pace_per_mile">%1$s par mile</string>
-    <string name="voice_seconds_few">%1$d secondes</string>
-    <string name="voice_seconds_many">%1$d secondes</string>
-    <string name="voice_seconds_one">1 seconde</string>
-    <string name="voice_seconds_other">%1$d secondes</string>
-    <string name="voice_seconds_two">2 secondes</string>
-    <string name="voice_seconds_zero">0 seconde</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilomètres-heure</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilomètres-heure</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilomètre-heure</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 9dfb84891..336bd20ac 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -410,26 +410,20 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="value_smallest">Máis pequeno</string>
     <string name="value_smallest_recommended">O máis pequeno (recomendado)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d horas</string>
-    <string name="voice_hours_many">%1$d horas</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d horas</string>
-    <string name="voice_hours_two">2 horas</string>
-    <string name="voice_hours_zero">0 horas</string>
-    <string name="voice_minutes_few">%1$d minutos</string>
-    <string name="voice_minutes_many">%1$d minutos</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minutos</string>
-    <string name="voice_minutes_two">2 minutos</string>
-    <string name="voice_minutes_zero">0 minutos</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 segundo</item>
+        <item quantity="other">%1$d segundos</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s por quilómetro</string>
     <string name="voice_pace_per_mile">%1$s por quilómetro</string>
-    <string name="voice_seconds_few">%1$d segundos</string>
-    <string name="voice_seconds_many">%1$d segundos</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundos</string>
-    <string name="voice_seconds_two">2 segundos</string>
-    <string name="voice_seconds_zero">0 segundos</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f quilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f quilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 quilómetro por hora</string>
diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml
index 760455daf..70e9b017f 100644
--- a/src/main/res/values-hi/strings.xml
+++ b/src/main/res/values-hi/strings.xml
@@ -324,26 +324,20 @@ limitations under the License.
     <string name="value_smallest">सबसे छोटा</string>
     <string name="value_smallest_recommended">सबसे छोटा (अनुशंसित)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d घंटे</string>
-    <string name="voice_hours_many">%1$d घंटे</string>
-    <string name="voice_hours_one">1 घंटा</string>
-    <string name="voice_hours_other">%1$d घंटे</string>
-    <string name="voice_hours_two">2 घंटे</string>
-    <string name="voice_hours_zero">0 घंटे</string>
-    <string name="voice_minutes_few">%1$d मिनट</string>
-    <string name="voice_minutes_many">%1$d मिनट</string>
-    <string name="voice_minutes_one">1 मिनट</string>
-    <string name="voice_minutes_other">%1$d मिनट</string>
-    <string name="voice_minutes_two">2 मिनट</string>
-    <string name="voice_minutes_zero">0 मिनट</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d घंटा</item>
+        <item quantity="other">%1$d घंटे</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d मिनट</item>
+        <item quantity="other">%1$d मिनट</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d सेकंड</item>
+        <item quantity="other">%1$d सेकंड</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s प्रति किलोमीटर</string>
     <string name="voice_pace_per_mile">%1$s प्रति मील</string>
-    <string name="voice_seconds_few">%1$d सेकंड</string>
-    <string name="voice_seconds_many">%1$d सेकंड</string>
-    <string name="voice_seconds_one">1 सेकंड</string>
-    <string name="voice_seconds_other">%1$d सेकंड</string>
-    <string name="voice_seconds_two">2 सेकंड</string>
-    <string name="voice_seconds_zero">0 सेकंड</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f किलोमीटर प्रति घंटा</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f किलोमीटर प्रति घंटा</string>
     <string name="voice_speed_kilometers_per_hour_one">1 किलोमीटर प्रति घंटा</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index 1d1774689..871c7f25f 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -326,26 +326,23 @@ limitations under the License.
     <string name="value_smallest">Najmanja</string>
     <string name="value_smallest_recommended">Najmanji (preporučeno)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d sata</string>
-    <string name="voice_hours_many">%1$d sati</string>
-    <string name="voice_hours_one">1 sat</string>
-    <string name="voice_hours_other">%1$d sati</string>
-    <string name="voice_hours_two">2 sata</string>
-    <string name="voice_hours_zero">0 sati</string>
-    <string name="voice_minutes_few">%1$d minute</string>
-    <string name="voice_minutes_many">%1$d minuta</string>
-    <string name="voice_minutes_one">jednu minutu</string>
-    <string name="voice_minutes_other">%1$d minuta</string>
-    <string name="voice_minutes_two">dvije minute</string>
-    <string name="voice_minutes_zero">0 minuta</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d sat</item>
+        <item quantity="few">%1$d sata</item>
+        <item quantity="other">%1$d sati</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minutu</item>
+        <item quantity="few">%1$d minute</item>
+        <item quantity="other">%1$d minuta</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d sekundu</item>
+        <item quantity="few">%1$d sekunde</item>
+        <item quantity="other">%1$d sekunda</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s po kilometru</string>
     <string name="voice_pace_per_mile">%1$s po milji</string>
-    <string name="voice_seconds_few">%1$d sekunde</string>
-    <string name="voice_seconds_many">%1$d sekunda</string>
-    <string name="voice_seconds_one">jednu sekundu</string>
-    <string name="voice_seconds_other">%1$d sekunda</string>
-    <string name="voice_seconds_two">dvije sekunde</string>
-    <string name="voice_seconds_zero">0 sekunda</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometra na sat</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometara na sat</string>
     <string name="voice_speed_kilometers_per_hour_one">jednog kilometra na sat</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index bdd74bcaa..6d7dff729 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -326,26 +326,20 @@ limitations under the License.
     <string name="value_smallest">Legkisebb</string>
     <string name="value_smallest_recommended">Legkisebb (ajánlott)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d óra</string>
-    <string name="voice_hours_many">%1$d óra</string>
-    <string name="voice_hours_one">1 óra</string>
-    <string name="voice_hours_other">%1$d óra</string>
-    <string name="voice_hours_two">2 óra</string>
-    <string name="voice_hours_zero">0 óra</string>
-    <string name="voice_minutes_few">%1$d perc</string>
-    <string name="voice_minutes_many">%1$d perc</string>
-    <string name="voice_minutes_one">1 perc</string>
-    <string name="voice_minutes_other">%1$d perc</string>
-    <string name="voice_minutes_two">2 perc</string>
-    <string name="voice_minutes_zero">0 perc</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 óra</item>
+        <item quantity="other">%1$d óra</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 perc</item>
+        <item quantity="other">%1$d perc</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 másodperc</item>
+        <item quantity="other">%1$d másodperc</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s kilométerenként</string>
     <string name="voice_pace_per_mile">%1$s mérföldenként</string>
-    <string name="voice_seconds_few">%1$d másodperc</string>
-    <string name="voice_seconds_many">%1$d másodperc</string>
-    <string name="voice_seconds_one">1 másodperc</string>
-    <string name="voice_seconds_other">%1$d másodperc</string>
-    <string name="voice_seconds_two">2 másodperc</string>
-    <string name="voice_seconds_zero">0 másodperc</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilométer óránként</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilométer óránként</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilométer óránként</string>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 0be4c7a55..369f25805 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -273,26 +273,17 @@
     <string name="value_off">Nonaktif</string>
     <string name="value_smallest">Terkecil</string>
     <string name="value_smallest_recommended">Terkecil (disarankan)</string>
-    <string name="voice_hours_few">%1$d jam</string>
-    <string name="voice_hours_many">%1$d jam</string>
-    <string name="voice_hours_one">1 jam</string>
-    <string name="voice_hours_other">%1$d jam</string>
-    <string name="voice_hours_two">2 jam</string>
-    <string name="voice_hours_zero">0 jam</string>
-    <string name="voice_minutes_few">%1$d menit</string>
-    <string name="voice_minutes_many">%1$d menit</string>
-    <string name="voice_minutes_one">1 menit</string>
-    <string name="voice_minutes_other">%1$d menit</string>
-    <string name="voice_minutes_two">2 menit</string>
-    <string name="voice_minutes_zero">0 menit</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d jam</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d menit</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d detik</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per kilometer</string>
     <string name="voice_pace_per_mile">%1$s per mil</string>
-    <string name="voice_seconds_few">%1$d detik</string>
-    <string name="voice_seconds_many">%1$d detik</string>
-    <string name="voice_seconds_one">1 detik</string>
-    <string name="voice_seconds_other">%1$d detik</string>
-    <string name="voice_seconds_two">2 detik</string>
-    <string name="voice_seconds_zero">0 detik</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometer per jam</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometer per jam</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer per jam</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 178053773..1538a7d7b 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -369,26 +369,20 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="value_smallest">Il più piccolo</string>
     <string name="value_smallest_recommended">Il più piccolo (consigliato)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ore</string>
-    <string name="voice_hours_many">%1$d ore</string>
-    <string name="voice_hours_one">1 ora</string>
-    <string name="voice_hours_other">%1$d ore</string>
-    <string name="voice_hours_two">2 ore</string>
-    <string name="voice_hours_zero">0 ore</string>
-    <string name="voice_minutes_few">%1$d minuti</string>
-    <string name="voice_minutes_many">%1$d minuti</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minuti</string>
-    <string name="voice_minutes_two">2 minuti</string>
-    <string name="voice_minutes_zero">0 minuti</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 ora</item>
+        <item quantity="other">%1$d ore</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuto</item>
+        <item quantity="other">%1$d minuti</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 secondo</item>
+        <item quantity="other">%1$d secondi</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per chilometro</string>
     <string name="voice_pace_per_mile">%1$s per miglio</string>
-    <string name="voice_seconds_few">%1$d secondi</string>
-    <string name="voice_seconds_many">%1$d secondi</string>
-    <string name="voice_seconds_one">1 secondo</string>
-    <string name="voice_seconds_other">%1$d secondi</string>
-    <string name="voice_seconds_two">2 secondi</string>
-    <string name="voice_seconds_zero">{0}[TWO]{/0}# secondi</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f chilometri all\'ora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f chilometri all\'ora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 km all\'ora</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 62968162f..2bc661922 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -276,26 +276,26 @@
     <string name="value_off">מושתק</string>
     <string name="value_smallest">הקטן ביותר</string>
     <string name="value_smallest_recommended">הנמוך ביותר (מומלץ)</string>
-    <string name="voice_hours_few">%1$d שעות</string>
-    <string name="voice_hours_many">%1$d שעות</string>
-    <string name="voice_hours_one">שעה אחת</string>
-    <string name="voice_hours_other">%1$d שעות</string>
-    <string name="voice_hours_two">שעתיים</string>
-    <string name="voice_hours_zero">אפס שעות</string>
-    <string name="voice_minutes_few">%1$d דקות</string>
-    <string name="voice_minutes_many">%1$d דקות</string>
-    <string name="voice_minutes_one">דקה אחת</string>
-    <string name="voice_minutes_other">%1$d דקות</string>
-    <string name="voice_minutes_two">שתי דקות</string>
-    <string name="voice_minutes_zero">אפס דקות</string>
+    <plurals name="voiceHours">
+        <item quantity="one">שעה אחת</item>
+        <item quantity="two">שעתיים</item>
+        <item quantity="many">>%1$d שעות</item>
+        <item quantity="other">%1$d שעות</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">דקה אחת</item>
+        <item quantity="two">>שתי דקות</item>
+        <item quantity="many">>%1$d דקות</item>
+        <item quantity="other">%1$d דקות</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">שנייה אחת</item>
+        <item quantity="two">שתי שניות</item>
+        <item quantity="many">%1$d שניות</item>
+        <item quantity="other">%1$d שניותr</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s לקילומטר</string>
     <string name="voice_pace_per_mile">%1$s למייל</string>
-    <string name="voice_seconds_few">%1$d שניות</string>
-    <string name="voice_seconds_many">%1$d שניות</string>
-    <string name="voice_seconds_one">שנייה אחת</string>
-    <string name="voice_seconds_other">%1$d שניות</string>
-    <string name="voice_seconds_two">שתי שניות</string>
-    <string name="voice_seconds_zero">אפס שניות</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f קילומטר לשעה</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f קילומטר לשעה</string>
     <string name="voice_speed_kilometers_per_hour_one">קילומטר אחד לשעה</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index ea12c2b43..40f4e6082 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -324,26 +324,17 @@ limitations under the License.
     <string name="value_smallest">最小</string>
     <string name="value_smallest_recommended">最小値（推奨）</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d時間</string>
-    <string name="voice_hours_many">%1$d時間</string>
-    <string name="voice_hours_one">1時間</string>
-    <string name="voice_hours_other">%1$d時間</string>
-    <string name="voice_hours_two">2時間</string>
-    <string name="voice_hours_zero">0時間</string>
-    <string name="voice_minutes_few">%1$d分</string>
-    <string name="voice_minutes_many">%1$d分</string>
-    <string name="voice_minutes_one">1分</string>
-    <string name="voice_minutes_other">%1$d分</string>
-    <string name="voice_minutes_two">2分</string>
-    <string name="voice_minutes_zero">0分</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d時間</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d分</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d秒</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">1キロあたり%1$s</string>
     <string name="voice_pace_per_mile">1マイルあたり%1$s</string>
-    <string name="voice_seconds_few">%1$d秒</string>
-    <string name="voice_seconds_many">%1$d秒</string>
-    <string name="voice_seconds_one">1秒</string>
-    <string name="voice_seconds_other">%1$d秒</string>
-    <string name="voice_seconds_two">2秒</string>
-    <string name="voice_seconds_zero">0秒</string>
     <string name="voice_speed_kilometers_per_hour_few">時速%1$.1fキロ</string>
     <string name="voice_speed_kilometers_per_hour_many">時速%1$.1fキロ</string>
     <string name="voice_speed_kilometers_per_hour_one">時速1キロ</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 528798de6..5a30815d8 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -323,26 +323,17 @@ limitations under the License.
     <string name="value_smallest">최소</string>
     <string name="value_smallest_recommended">최소(권장)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d시간</string>
-    <string name="voice_hours_many">%1$d시간</string>
-    <string name="voice_hours_one">1시간</string>
-    <string name="voice_hours_other">%1$d시간</string>
-    <string name="voice_hours_two">2시간</string>
-    <string name="voice_hours_zero">0시간</string>
-    <string name="voice_minutes_few">%1$d분</string>
-    <string name="voice_minutes_many">%1$d분</string>
-    <string name="voice_minutes_one">1분</string>
-    <string name="voice_minutes_other">%1$d분</string>
-    <string name="voice_minutes_two">2분</string>
-    <string name="voice_minutes_zero">0분</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d시간</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d분</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d초</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">킬로미터 당 %1$s</string>
     <string name="voice_pace_per_mile">마일 당 %1$s</string>
-    <string name="voice_seconds_few">%1$d초</string>
-    <string name="voice_seconds_many">%1$d초</string>
-    <string name="voice_seconds_one">1초</string>
-    <string name="voice_seconds_other">%1$d초</string>
-    <string name="voice_seconds_two">2초</string>
-    <string name="voice_seconds_zero">0초</string>
     <string name="voice_speed_kilometers_per_hour_few">시속 %1$.1f킬로미터</string>
     <string name="voice_speed_kilometers_per_hour_many">시속 %1$.1f킬로미터</string>
     <string name="voice_speed_kilometers_per_hour_one">시속 1킬로미터</string>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index e9c638231..512ae8932 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -327,26 +327,6 @@ limitations under the License.
     <string name="value_smallest">Mažiausia</string>
     <string name="value_smallest_recommended">Mažiausia (rekomenduojama)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d val.</string>
-    <string name="voice_hours_many">%1$d val.</string>
-    <string name="voice_hours_one">1 val.</string>
-    <string name="voice_hours_other">%1$d val.</string>
-    <string name="voice_hours_two">2 valandos</string>
-    <string name="voice_hours_zero">{0}[NULIS]{/0}# val.</string>
-    <string name="voice_minutes_few">%1$d min.</string>
-    <string name="voice_minutes_many">%1$d min.</string>
-    <string name="voice_minutes_one">1 min.</string>
-    <string name="voice_minutes_other">%1$d min.</string>
-    <string name="voice_minutes_two">2 min.</string>
-    <string name="voice_minutes_zero">0 min.</string>
-    <string name="voice_pace_per_kilometer">%1$s per km</string>
-    <string name="voice_pace_per_mile">%1$s per myl.</string>
-    <string name="voice_seconds_few">%1$d sek.</string>
-    <string name="voice_seconds_many">%1$d sek.</string>
-    <string name="voice_seconds_one">1 sek.</string>
-    <string name="voice_seconds_other">%1$d sek.</string>
-    <string name="voice_seconds_two">2 sek.</string>
-    <string name="voice_seconds_zero">{0}[DVI]{/0}# sek.</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f km per valandą</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f km per valandą</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometras per valandą</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index d34d186c4..5721b562f 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -326,26 +326,23 @@ limitations under the License.
     <string name="value_smallest">Mazākais</string>
     <string name="value_smallest_recommended">Mazākais (ieteicams)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d stundas</string>
-    <string name="voice_hours_many">%1$d stundas</string>
-    <string name="voice_hours_one">1 stunda</string>
-    <string name="voice_hours_other">%1$d stundas</string>
-    <string name="voice_hours_two">2 stundas</string>
-    <string name="voice_hours_zero">0 stundas</string>
-    <string name="voice_minutes_few">%1$d minūtes</string>
-    <string name="voice_minutes_many">%1$d minūtes</string>
-    <string name="voice_minutes_one">1 minūte</string>
-    <string name="voice_minutes_other">%1$d minūtes</string>
-    <string name="voice_minutes_two">2 minūtes</string>
-    <string name="voice_minutes_zero">0 minūtes</string>
+    <plurals name="voiceHours">
+        <item quantity="zero">%1$d stundas</item>
+        <item quantity="one">%1$d stunda</item>
+        <item quantity="other">%1$d stundas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="zero">%1$d minūtes</item>
+        <item quantity="one">%1$d minūte</item>
+        <item quantity="other">%1$d minūtes</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="zero">%1$d sekundes</item>
+        <item quantity="one">%1$d sekunde</item>
+        <item quantity="other">%1$d sekundes</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s kilometrā</string>
     <string name="voice_pace_per_mile">%1$s jūdzē</string>
-    <string name="voice_seconds_few">%1$d sekundes</string>
-    <string name="voice_seconds_many">%1$d sekundes</string>
-    <string name="voice_seconds_one">1 sekunde</string>
-    <string name="voice_seconds_other">%1$d sekundes</string>
-    <string name="voice_seconds_two">2 sekundes</string>
-    <string name="voice_seconds_zero">0 sekundes</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometri stundā</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometri stundā</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometrs stundā</string>
diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml
index 2cbcb9e0c..39a8a18b1 100644
--- a/src/main/res/values-mo/strings.xml
+++ b/src/main/res/values-mo/strings.xml
@@ -279,26 +279,32 @@
     <string name="value_off">Dezactivare</string>
     <string name="value_smallest">Cea mai mică valoare</string>
     <string name="value_smallest_recommended">Cea mai mică valoare (recomandată)</string>
-    <string name="voice_hours_few">%1$d ore</string>
-    <string name="voice_hours_many">%1$d (de) ore</string>
-    <string name="voice_hours_one">1 oră</string>
-    <string name="voice_hours_other">%1$d (de) ore</string>
-    <string name="voice_hours_two">2 ore</string>
-    <string name="voice_hours_zero">0 ore</string>
-    <string name="voice_minutes_few">%1$d minute</string>
-    <string name="voice_minutes_many">%1$d minute</string>
-    <string name="voice_minutes_one">1 minut</string>
-    <string name="voice_minutes_other">%1$d (de) minute</string>
-    <string name="voice_minutes_two">2 minute</string>
-    <string name="voice_minutes_zero">0 minute</string>
+    <plurals name="voiceHours">
+        <item quantity="zero">0 ore</item>
+        <item quantity="one">1 oră</item>
+        <item quantity="two">2 ore</item>
+        <item quantity="few">%1$d ore</item>
+        <item quantity="many">%1$d (de) ore</item>
+        <item quantity="other">%1$d (de) ore</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="zero">0 minute</item>
+        <item quantity="one">1 minut</item>
+        <item quantity="two">2 minute</item>
+        <item quantity="few">%1$d minute</item>
+        <item quantity="many">%1$d minute</item>
+        <item quantity="other">%1$d (de) minute</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="zero">0 secunde</item>
+        <item quantity="one">1 secundă</item>
+        <item quantity="two">2 secunde</item>
+        <item quantity="few">%1$d secunde</item>
+        <item quantity="many">%1$d (de) secunde</item>
+        <item quantity="other">>%1$d secunde</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s pe kilometru</string>
     <string name="voice_pace_per_mile">%1$s pe milă</string>
-    <string name="voice_seconds_few">%1$d secunde</string>
-    <string name="voice_seconds_many">%1$d (de) secunde</string>
-    <string name="voice_seconds_one">1 secundă</string>
-    <string name="voice_seconds_other">%1$d secunde</string>
-    <string name="voice_seconds_two">2 secunde</string>
-    <string name="voice_seconds_zero">0 secunde</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometri pe oră</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f (de) kilometri pe oră</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometru pe oră</string>
diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml
index 91133e2f2..6e00ad2a0 100644
--- a/src/main/res/values-ms/strings.xml
+++ b/src/main/res/values-ms/strings.xml
@@ -326,26 +326,17 @@ limitations under the License.
     <string name="value_smallest">Paling kecil</string>
     <string name="value_smallest_recommended">Terkecil (disyorkan)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d jam</string>
-    <string name="voice_hours_many">%1$d jam</string>
-    <string name="voice_hours_one">1 jam</string>
-    <string name="voice_hours_other">%1$d jam</string>
-    <string name="voice_hours_two">2 jam</string>
-    <string name="voice_hours_zero">0 jam</string>
-    <string name="voice_minutes_few">%1$d minit</string>
-    <string name="voice_minutes_many">%1$d minit</string>
-    <string name="voice_minutes_one">1 minit</string>
-    <string name="voice_minutes_other">%1$d minit</string>
-    <string name="voice_minutes_two">2 minit</string>
-    <string name="voice_minutes_zero">0 minit</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d jam</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d minit</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d saat</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s sekilometer</string>
     <string name="voice_pace_per_mile">%1$s sejam</string>
-    <string name="voice_seconds_few">%1$d saat</string>
-    <string name="voice_seconds_many">%1$d saat</string>
-    <string name="voice_seconds_one">1 saat</string>
-    <string name="voice_seconds_other">%1$d saat</string>
-    <string name="voice_seconds_two">2 saat</string>
-    <string name="voice_seconds_zero">0 saat</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometer sejam</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometer sejam</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer sejam</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 80abc8f9c..044368466 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -326,26 +326,20 @@ limitations under the License.
     <string name="value_smallest">Minst</string>
     <string name="value_smallest_recommended">Minste (anbefales)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d timer</string>
-    <string name="voice_hours_many">%1$d timer</string>
-    <string name="voice_hours_one">1 time</string>
-    <string name="voice_hours_other">%1$d timer</string>
-    <string name="voice_hours_two">2 timer</string>
-    <string name="voice_hours_zero">0 timer</string>
-    <string name="voice_minutes_few">%1$d minutter</string>
-    <string name="voice_minutes_many">%1$d minutter</string>
-    <string name="voice_minutes_one">1 minutt</string>
-    <string name="voice_minutes_other">%1$d minutter</string>
-    <string name="voice_minutes_two">2 minutter</string>
-    <string name="voice_minutes_zero">0 minutter</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minutt</item>
+        <item quantity="other">%1$d minutter</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%1$d sekunder</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per kilometer</string>
     <string name="voice_pace_per_mile">%1$s per engelsk mil</string>
-    <string name="voice_seconds_few">%1$d sekunder</string>
-    <string name="voice_seconds_many">%1$d sekunder</string>
-    <string name="voice_seconds_one">1 sekund</string>
-    <string name="voice_seconds_other">%1$d sekunder</string>
-    <string name="voice_seconds_two">2 sekunder</string>
-    <string name="voice_seconds_zero">0 sekunder</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometer i timen</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometer i timen</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer i timen</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 62c47e566..9a8615436 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -392,26 +392,20 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="value_smallest">Kleinste</string>
     <string name="value_smallest_recommended">Kleinste (aanbevolen)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d uur</string>
-    <string name="voice_hours_many">%1$d uur</string>
-    <string name="voice_hours_one">1 uur</string>
-    <string name="voice_hours_other">%1$d uur</string>
-    <string name="voice_hours_two">2 uur</string>
-    <string name="voice_hours_zero">0 uur</string>
-    <string name="voice_minutes_few">%1$d minuten</string>
-    <string name="voice_minutes_many">%1$d minuten</string>
-    <string name="voice_minutes_one">1 minuut</string>
-    <string name="voice_minutes_other">%1$d minuten</string>
-    <string name="voice_minutes_two">2 minuten</string>
-    <string name="voice_minutes_zero">0 minuten</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 uur</item>
+        <item quantity="other">%1$d uur</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuut</item>
+        <item quantity="other">%1$d minutenr</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 seconde</item>
+        <item quantity="other">%1$d seconden</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s te kilometer</string>
     <string name="voice_pace_per_mile">%1$s per mijl</string>
-    <string name="voice_seconds_few">%1$d seconden</string>
-    <string name="voice_seconds_many">%1$d seconden</string>
-    <string name="voice_seconds_one">1 seconde</string>
-    <string name="voice_seconds_other">%1$d seconden</string>
-    <string name="voice_seconds_two">2 seconden</string>
-    <string name="voice_seconds_zero">0 seconden</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometer per uur</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometer per uur</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer per uur</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index c73387043..99ae33f39 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -365,26 +365,26 @@ limitations under the License.
     <string name="value_smallest">Najniższa</string>
     <string name="value_smallest_recommended">Najmniejsza (zalecane)</string>
     <!-- Voice -->
-    <string name="voice_hours_one">1 godzina</string>
-    <string name="voice_hours_few">%1$d godziny</string>
-    <string name="voice_hours_many">%1$d godzin</string>
-    <string name="voice_hours_other">%1$d godzin</string>
-    <string name="voice_hours_two">2 godziny</string>
-    <string name="voice_hours_zero">0 godzin</string>
-    <string name="voice_minutes_one">1 minuta</string>
-    <string name="voice_minutes_few">%1$d minuty</string>
-    <string name="voice_minutes_many">%1$d minut</string>
-    <string name="voice_minutes_other">%1$d minut</string>
-    <string name="voice_minutes_two">2 minuty</string>
-    <string name="voice_minutes_zero">0 minut</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 godzina</item>
+        <item quantity="few">%1$d godziny</item>
+        <item quantity="many">%1$d godzin</item>
+        <item quantity="other">%1$d godzinr</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minuta</item>
+        <item quantity="few">%1$d minuty</item>
+        <item quantity="many">%1$d minut</item>
+        <item quantity="other">%1$d minut</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekunda</item>
+        <item quantity="few">%1$d sekundy</item>
+        <item quantity="many">%1$d sekund</item>
+        <item quantity="other">%1$d sekund</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s na kilometr</string>
     <string name="voice_pace_per_mile">%1$s na milę</string>
-    <string name="voice_seconds_one">1 sekunda</string>
-    <string name="voice_seconds_few">%1$d sekundy</string>
-    <string name="voice_seconds_many">%1$d sekund</string>
-    <string name="voice_seconds_other">%1$d sekund</string>
-    <string name="voice_seconds_two">2 sekundy</string>
-    <string name="voice_seconds_zero">0 sekund</string>
     <string name="voice_speed_kilometers_per_hour_one">kilometr na godzinę</string>
     <!-- NOTE: Ułamki km, czyli xxx przecinek yy dzisiątych kilometr_a_-->
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometra na godzinę</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 6d63eed15..3131766d5 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -277,26 +277,20 @@
     <string name="value_off">Desativar</string>
     <string name="value_smallest">Menor</string>
     <string name="value_smallest_recommended">Menor (recomendado)</string>
-    <string name="voice_hours_few">%1$d horas</string>
-    <string name="voice_hours_many">%1$d horas</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d horas</string>
-    <string name="voice_hours_two">2 horas</string>
-    <string name="voice_hours_zero">0 hora</string>
-    <string name="voice_minutes_few">%1$d minutos</string>
-    <string name="voice_minutes_many">%1$d minutos</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minutos</string>
-    <string name="voice_minutes_two">2 minutos</string>
-    <string name="voice_minutes_zero">0 minuto</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d segundo</item>
+        <item quantity="other">%1$d segundos</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s por quilômetro</string>
     <string name="voice_pace_per_mile">%1$s por milha</string>
-    <string name="voice_seconds_few">%1$d segundos</string>
-    <string name="voice_seconds_many">%1$d segundos</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundos</string>
-    <string name="voice_seconds_two">2 segundos</string>
-    <string name="voice_seconds_zero">0 segundo</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f quilômetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f quilômetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 quilômetro por hora</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index 36c004cef..91a08bcac 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -274,26 +274,20 @@
     <string name="value_off">Desativar</string>
     <string name="value_smallest">O menor</string>
     <string name="value_smallest_recommended">Menor (recomendado)</string>
-    <string name="voice_hours_few">%1$d horas</string>
-    <string name="voice_hours_many">%1$d horas</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d horas</string>
-    <string name="voice_hours_two">2 horas</string>
-    <string name="voice_hours_zero">0 horas</string>
-    <string name="voice_minutes_few">%1$d minutos</string>
-    <string name="voice_minutes_many">%1$d minutos</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minutos</string>
-    <string name="voice_minutes_two">2 minutos</string>
-    <string name="voice_minutes_zero">0 minutos</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d segundo</item>
+        <item quantity="other">%1$d segundos</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s por quilômetro</string>
     <string name="voice_pace_per_mile">%1$s por milha</string>
-    <string name="voice_seconds_few">%1$d segundos</string>
-    <string name="voice_seconds_many">%1$d segundos</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundos</string>
-    <string name="voice_seconds_two">2 segundos</string>
-    <string name="voice_seconds_zero">0 segundos</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f quilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f quilómetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 quilômetro por hora</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 0bd03b5fb..e6d22422a 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -326,26 +326,20 @@ limitations under the License.
     <string name="value_smallest">Menor</string>
     <string name="value_smallest_recommended">Menor (recomendado)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d horas</string>
-    <string name="voice_hours_many">%1$d horas</string>
-    <string name="voice_hours_one">1 hora</string>
-    <string name="voice_hours_other">%1$d horas</string>
-    <string name="voice_hours_two">2 horas</string>
-    <string name="voice_hours_zero">0 hora</string>
-    <string name="voice_minutes_few">%1$d minutos</string>
-    <string name="voice_minutes_many">%1$d minutos</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d minutos</string>
-    <string name="voice_minutes_two">2 minutos</string>
-    <string name="voice_minutes_zero">0 minuto</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d segundo</item>
+        <item quantity="other">%1$d segundos</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s por quilômetro</string>
     <string name="voice_pace_per_mile">%1$s por milha</string>
-    <string name="voice_seconds_few">%1$d segundos</string>
-    <string name="voice_seconds_many">%1$d segundos</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d segundos</string>
-    <string name="voice_seconds_two">2 segundos</string>
-    <string name="voice_seconds_zero">0 segundo</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f quilômetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f quilômetros por hora</string>
     <string name="voice_speed_kilometers_per_hour_one">1 quilômetro por hora</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index da76b6c57..70091102c 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -326,26 +326,23 @@ limitations under the License.
     <string name="value_smallest">Cea mai mică valoare</string>
     <string name="value_smallest_recommended">Cea mai mică valoare (recomandată)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ore</string>
-    <string name="voice_hours_many">%1$d (de) ore</string>
-    <string name="voice_hours_one">1 oră</string>
-    <string name="voice_hours_other">%1$d (de) ore</string>
-    <string name="voice_hours_two">2 ore</string>
-    <string name="voice_hours_zero">0 ore</string>
-    <string name="voice_minutes_few">%1$d minute</string>
-    <string name="voice_minutes_many">%1$d minute</string>
-    <string name="voice_minutes_one">1 minut</string>
-    <string name="voice_minutes_other">%1$d (de) minute</string>
-    <string name="voice_minutes_two">2 minute</string>
-    <string name="voice_minutes_zero">0 minute</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 oră</item>
+        <item quantity="few">%1$d ore</item>
+        <item quantity="other">%1$d (de) ore</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minut</item>
+        <item quantity="few">%1$d minute</item>
+        <item quantity="other">%1$d (de) minute</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 secundă</item>
+        <item quantity="few">%1$d secunde</item>
+        <item quantity="other">%1$d secunde</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s pe kilometru</string>
     <string name="voice_pace_per_mile">%1$s pe milă</string>
-    <string name="voice_seconds_few">%1$d secunde</string>
-    <string name="voice_seconds_many">%1$d (de) secunde</string>
-    <string name="voice_seconds_one">1 secundă</string>
-    <string name="voice_seconds_other">%1$d secunde</string>
-    <string name="voice_seconds_two">2 secunde</string>
-    <string name="voice_seconds_zero">0 secunde</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometri pe oră</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f (de) kilometri pe oră</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometru pe oră</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 561de7c03..c7155d37a 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -327,26 +327,26 @@ limitations under the License.
     <string name="value_smallest">Мин. время</string>
     <string name="value_smallest_recommended">Мин. время (рекомендуется)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d часа</string>
-    <string name="voice_hours_many">%1$d часов</string>
-    <string name="voice_hours_one">1 час</string>
-    <string name="voice_hours_other">%1$d часа</string>
-    <string name="voice_hours_two">2 часа</string>
-    <string name="voice_hours_zero">0 часов</string>
-    <string name="voice_minutes_few">%1$d минуты</string>
-    <string name="voice_minutes_many">%1$d минут</string>
-    <string name="voice_minutes_one">1 минута</string>
-    <string name="voice_minutes_other">%1$d минуты</string>
-    <string name="voice_minutes_two">2 минуты</string>
-    <string name="voice_minutes_zero">0 минут</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d час</item>
+        <item quantity="few">%1$d часа</item>
+        <item quantity="many">%1$d часов</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d минута</item>
+        <item quantity="few">%1$d минуты</item>
+        <item quantity="many">%1$d минут</item>
+        <item quantity="other">>%1$d минуты</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d секунда</item>
+        <item quantity="few">%1$d секунды</item>
+        <item quantity="many">%1$d секунд</item>
+        <item quantity="other">%1$d секунды</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s на километр</string>
     <string name="voice_pace_per_mile">%1$s на милю</string>
-    <string name="voice_seconds_few">%1$d секунды</string>
-    <string name="voice_seconds_many">%1$d секунд</string>
-    <string name="voice_seconds_one">1 секунда</string>
-    <string name="voice_seconds_other">%1$d секунды</string>
-    <string name="voice_seconds_two">2 секунды</string>
-    <string name="voice_seconds_zero">0 секунд</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f километра в час</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f километров в час</string>
     <string name="voice_speed_kilometers_per_hour_one">1 километр в час</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index dde08a66e..490a2eb63 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -325,26 +325,23 @@ limitations under the License.
     <string name="value_smallest">Najmenšie</string>
     <string name="value_smallest_recommended">Najmenšia (odporúčané)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d hodiny</string>
-    <string name="voice_hours_many">%1$d hodín</string>
-    <string name="voice_hours_one">1 hodina</string>
-    <string name="voice_hours_other">%1$d hodín</string>
-    <string name="voice_hours_two">2 hodiny</string>
-    <string name="voice_hours_zero">0 hodín</string>
-    <string name="voice_minutes_few">%1$d minúty</string>
-    <string name="voice_minutes_many">%1$d minút</string>
-    <string name="voice_minutes_one">1 minúta</string>
-    <string name="voice_minutes_other">%1$d minút</string>
-    <string name="voice_minutes_two">2 minúty</string>
-    <string name="voice_minutes_zero">0 minút</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hodina</item>
+        <item quantity="few">%1$d hodiny</item>
+        <item quantity="other">%1$d hodín</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minúta</item>
+        <item quantity="few">%1$d minúty</item>
+        <item quantity="other">%1$d minút</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekunda</item>
+        <item quantity="few">%1$d sekundy</item>
+        <item quantity="other">%1$d sekúnd</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s na kilometer</string>
     <string name="voice_pace_per_mile">%1$s na míľu</string>
-    <string name="voice_seconds_few">%1$d sekundy</string>
-    <string name="voice_seconds_many">%1$d sekúnd</string>
-    <string name="voice_seconds_one">1 sekunda</string>
-    <string name="voice_seconds_other">%1$d sekúnd</string>
-    <string name="voice_seconds_two">2 sekundy</string>
-    <string name="voice_seconds_zero">0 sekúnd</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometre za hodinu</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometrov za hodinu</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer za hodinu</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index f6b3377a4..1a6ad6965 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -327,26 +327,25 @@ limitations under the License.
     <string name="value_smallest">Najmanjša</string>
     <string name="value_smallest_recommended">Najmanjše (priporočeno)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ur</string>
-    <string name="voice_hours_many">%1$d ur</string>
-    <string name="voice_hours_one">1 ura</string>
-    <string name="voice_hours_other">%1$d ur</string>
-    <string name="voice_hours_two">2 uri</string>
-    <string name="voice_hours_zero">0 ur</string>
-    <string name="voice_minutes_few">%1$d minut</string>
-    <string name="voice_minutes_many">%1$d minut</string>
-    <string name="voice_minutes_one">1 minuta</string>
-    <string name="voice_minutes_other">%1$d minut</string>
-    <string name="voice_minutes_two">2 minuti</string>
-    <string name="voice_minutes_zero">0 minut</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d ura</item>
+        <item quantity="two">%1$d uri</item>
+        <item quantity="few">%1$d ur</item>
+        <item quantity="other">%1$d ur</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minuta</item>
+        <item quantity="two">%1$d minuti</item>
+        <item quantity="few">%1$d minut</item>
+        <item quantity="other">%1$d minut</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d sekunda</item>
+        <item quantity="two">%1$d sekundi</item>
+        <item quantity="few">%1$d sekund</item>
+        <item quantity="other">>%1$d sekund</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s na kilometer</string>
-    <string name="voice_pace_per_mile">%1$s na miljo</string>
-    <string name="voice_seconds_few">%1$d sekund</string>
-    <string name="voice_seconds_many">%1$d sekund</string>
-    <string name="voice_seconds_one">1 sekunda</string>
-    <string name="voice_seconds_other">%1$d sekund</string>
-    <string name="voice_seconds_two">2 sekundi</string>
-    <string name="voice_seconds_zero">0 sekund</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometrov na uro</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometrov na uro</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer na uro</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 8e0609e98..621090e8e 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -325,26 +325,23 @@ limitations under the License.
     <string name="value_smallest">Најмање</string>
     <string name="value_smallest_recommended">Најмање (препоручено)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d сата</string>
-    <string name="voice_hours_many">%1$d сати</string>
-    <string name="voice_hours_one">1 сат</string>
-    <string name="voice_hours_other">%1$d сати</string>
-    <string name="voice_hours_two">2 сата</string>
-    <string name="voice_hours_zero">0 сати</string>
-    <string name="voice_minutes_few">%1$d минута</string>
-    <string name="voice_minutes_many">%1$d минута</string>
-    <string name="voice_minutes_one">1 минут</string>
-    <string name="voice_minutes_other">%1$d минута</string>
-    <string name="voice_minutes_two">2 минута</string>
-    <string name="voice_minutes_zero">0 минута</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d сат</item>
+        <item quantity="few">%1$d сати</item>
+        <item quantity="other">%1$d сата</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d минут</item>
+        <item quantity="few">%1$d минута</item>
+        <item quantity="other">%1$d минута</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d секунда</item>
+        <item quantity="few">%1$d секунде</item>
+        <item quantity="other">%1$d секунди</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s по километру</string>
     <string name="voice_pace_per_mile">%1$s по миљи</string>
-    <string name="voice_seconds_few">%1$d секунде</string>
-    <string name="voice_seconds_many">%1$d секунди</string>
-    <string name="voice_seconds_one">1 секунда</string>
-    <string name="voice_seconds_other">%1$d секунди</string>
-    <string name="voice_seconds_two">2 секунде</string>
-    <string name="voice_seconds_zero">0 секунди</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f километра на сат</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f километара на сат</string>
     <string name="voice_speed_kilometers_per_hour_one">1 километар на сат</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index e6b6c3b1e..6ab5bf84d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -324,26 +324,20 @@ limitations under the License.
     <string name="value_smallest">Lägsta</string>
     <string name="value_smallest_recommended">Minsta (rekommenderas)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d timmar</string>
-    <string name="voice_hours_many">%1$d timmar</string>
-    <string name="voice_hours_one">1 timme</string>
-    <string name="voice_hours_other">%1$d timmar</string>
-    <string name="voice_hours_two">2 timmar</string>
-    <string name="voice_hours_zero">0 timmar</string>
-    <string name="voice_minutes_few">%1$d minuter</string>
-    <string name="voice_minutes_many">%1$d minuter</string>
-    <string name="voice_minutes_one">1 minut</string>
-    <string name="voice_minutes_other">%1$d minuter</string>
-    <string name="voice_minutes_two">2 minuter</string>
-    <string name="voice_minutes_zero">0 minuter</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 timme</item>
+        <item quantity="other">%1$d timmar</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%1$d minuter</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%1$d sekunder</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per kilometer</string>
     <string name="voice_pace_per_mile">%1$s per mile</string>
-    <string name="voice_seconds_few">%1$d sekunder</string>
-    <string name="voice_seconds_many">%1$d sekunder</string>
-    <string name="voice_seconds_one">1 sekund</string>
-    <string name="voice_seconds_other">%1$d sekunder</string>
-    <string name="voice_seconds_two">2 sekunder</string>
-    <string name="voice_seconds_zero">0 sekunder</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometer per timme</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometer per timme</string>
     <string name="voice_speed_kilometers_per_hour_one">1 km per timme</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 5b95023e5..cfa950f5a 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -323,26 +323,17 @@ limitations under the License.
     <string name="value_smallest">น้อยที่สุด</string>
     <string name="value_smallest_recommended">น้อยที่สุด (แนะนำ)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d ชั่วโมง</string>
-    <string name="voice_hours_many">%1$d ชั่วโมง</string>
-    <string name="voice_hours_one">1 ชั่วโมง</string>
-    <string name="voice_hours_other">%1$d ชั่วโมง</string>
-    <string name="voice_hours_two">2 ชั่วโมง</string>
-    <string name="voice_hours_zero">0 ชั่วโมง</string>
-    <string name="voice_minutes_few">%1$d นาที</string>
-    <string name="voice_minutes_many">%1$d นาที</string>
-    <string name="voice_minutes_one">1 นาที</string>
-    <string name="voice_minutes_other">%1$d นาที</string>
-    <string name="voice_minutes_two">2 นาที</string>
-    <string name="voice_minutes_zero">0 นาที</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d ชั่วโมง</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d นาท</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$s ต่อไมล</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s ต่อกิโลเมตร</string>
     <string name="voice_pace_per_mile">%1$s ต่อไมล์</string>
-    <string name="voice_seconds_few">%1$d วินาที</string>
-    <string name="voice_seconds_many">%1$d วินาที</string>
-    <string name="voice_seconds_one">1 วินาที</string>
-    <string name="voice_seconds_other">%1$d วินาที</string>
-    <string name="voice_seconds_two">2 วินาที</string>
-    <string name="voice_seconds_zero">0 วินาที</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f กิโลเมตรต่อชั่วโมง</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f กิโลเมตรต่อชั่วโมง</string>
     <string name="voice_speed_kilometers_per_hour_one">1 กิโลเมตรต่อชั่วโมง</string>
diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml
index 48d62ffe3..cea6a5277 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/src/main/res/values-tl/strings.xml
@@ -324,26 +324,20 @@ limitations under the License.
     <string name="value_smallest">Pinakamaliit</string>
     <string name="value_smallest_recommended">Pinakamaliit (inirerekomenda)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d (na) oras</string>
-    <string name="voice_hours_many">%1$d (na) oras</string>
-    <string name="voice_hours_one">1 oras</string>
-    <string name="voice_hours_other">%1$d (na) oras</string>
-    <string name="voice_hours_two">2 oras</string>
-    <string name="voice_hours_zero">0 oras</string>
-    <string name="voice_minutes_few">%1$d (na) minuto</string>
-    <string name="voice_minutes_many">%1$d (na) minuto</string>
-    <string name="voice_minutes_one">1 minuto</string>
-    <string name="voice_minutes_other">%1$d (na) minuto</string>
-    <string name="voice_minutes_two">2 minuto</string>
-    <string name="voice_minutes_zero">0 minuto</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d oras</item>
+        <item quantity="other">%1$d (na) oras</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d minuto</item>
+        <item quantity="other">%1$d (na) minuto</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d segundo</item>
+        <item quantity="other">%1$d (na) segundo</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s bawat kilometro</string>
     <string name="voice_pace_per_mile">%1$s bawat milya</string>
-    <string name="voice_seconds_few">%1$d (na) segundo</string>
-    <string name="voice_seconds_many">%1$d (na) segundo</string>
-    <string name="voice_seconds_one">1 segundo</string>
-    <string name="voice_seconds_other">%1$d (na) segundo</string>
-    <string name="voice_seconds_two">2 segundo</string>
-    <string name="voice_seconds_zero">0 segundo</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f (na) kilometro bawat oras</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f (na) kilometro bawat oras</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometro bawat oras</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 1bacc2db9..f6923dab4 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -325,26 +325,20 @@ limitations under the License.
     <string name="value_smallest">En küçük</string>
     <string name="value_smallest_recommended">En küçük (önerilir)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d saat</string>
-    <string name="voice_hours_many">%1$d saat</string>
-    <string name="voice_hours_one">1 saat</string>
-    <string name="voice_hours_other">%1$d saat</string>
-    <string name="voice_hours_two">2 saat</string>
-    <string name="voice_hours_zero">0 saat</string>
-    <string name="voice_minutes_few">%1$d dakika</string>
-    <string name="voice_minutes_many">%1$d dakika</string>
-    <string name="voice_minutes_one">1 dakika</string>
-    <string name="voice_minutes_other">%1$d dakika</string>
-    <string name="voice_minutes_two">2 dakika</string>
-    <string name="voice_minutes_zero">0 dakika</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 saat</item>
+        <item quantity="other">%1$d saat</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 dakika</item>
+        <item quantity="other">%1$d dakika</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 saniye</item>
+        <item quantity="other">%1$d saniye</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">kilometrede %1$s</string>
     <string name="voice_pace_per_mile">milde %1$s</string>
-    <string name="voice_seconds_few">%1$d saniye</string>
-    <string name="voice_seconds_many">%1$d saniye</string>
-    <string name="voice_seconds_one">1 saniye</string>
-    <string name="voice_seconds_other">%1$d saniye</string>
-    <string name="voice_seconds_two">2 saniye</string>
-    <string name="voice_seconds_zero">0 saniye</string>
     <string name="voice_speed_kilometers_per_hour_few">Saatte %1$.1f kilometre</string>
     <string name="voice_speed_kilometers_per_hour_many">saatte %1$.1f kilometre</string>
     <string name="voice_speed_kilometers_per_hour_one">saatte 1 kilometre</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index f1bbdc949..eccbff55d 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -328,26 +328,26 @@ limitations under the License.
     <string name="value_smallest">Найменше</string>
     <string name="value_smallest_recommended">Найменше (рекомендовано)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d години</string>
-    <string name="voice_hours_many">%1$d годин</string>
-    <string name="voice_hours_one">1 година</string>
-    <string name="voice_hours_other">%1$d год</string>
-    <string name="voice_hours_two">2 години</string>
-    <string name="voice_hours_zero">0 годин</string>
-    <string name="voice_minutes_few">%1$d хвилини</string>
-    <string name="voice_minutes_many">%1$d хвилин</string>
-    <string name="voice_minutes_one">1 хвилина</string>
-    <string name="voice_minutes_other">%1$d хв</string>
-    <string name="voice_minutes_two">2 хвилини</string>
-    <string name="voice_minutes_zero">0 хвилин</string>
+    <plurals name="voiceHours">
+        <item quantity="one">%1$d година</item>
+        <item quantity="few">%1$d години</item>
+        <item quantity="many">%1$d годин</item>
+        <item quantity="other">%1$d годин</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">%1$d хвилина</item>
+        <item quantity="few">%1$d хвилини</item>
+        <item quantity="many">%1$d хвилин</item>
+        <item quantity="other">%1$d хв</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">%1$d секунда</item>
+        <item quantity="few">%1$d секунди</item>
+        <item quantity="many">%1$d секунд</item>
+        <item quantity="other">1$d секунд</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s на кілометр</string>
     <string name="voice_pace_per_mile">%1$s на милю</string>
-    <string name="voice_seconds_few">%1$d секунди</string>
-    <string name="voice_seconds_many">%1$d секунд</string>
-    <string name="voice_seconds_one">1 секунда</string>
-    <string name="voice_seconds_other">%1$d с</string>
-    <string name="voice_seconds_two">2 секунди</string>
-    <string name="voice_seconds_zero">0 секунд</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f кілометри на годину</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f км/год</string>
     <string name="voice_speed_kilometers_per_hour_one">1 кілометр на годину</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index d780c1e94..b83f3e220 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -325,26 +325,17 @@ limitations under the License.
     <string name="value_smallest">Nhỏ nhất</string>
     <string name="value_smallest_recommended">Nhỏ nhất (được đề nghị)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d giờ</string>
-    <string name="voice_hours_many">%1$d giờ</string>
-    <string name="voice_hours_one">1 giờ</string>
-    <string name="voice_hours_other">%1$d giờ</string>
-    <string name="voice_hours_two">2 giờ</string>
-    <string name="voice_hours_zero">0 giờ</string>
-    <string name="voice_minutes_few">%1$d phút</string>
-    <string name="voice_minutes_many">%1$d phút</string>
-    <string name="voice_minutes_one">1 phút</string>
-    <string name="voice_minutes_other">%1$d phút</string>
-    <string name="voice_minutes_two">2 phút</string>
-    <string name="voice_minutes_zero">0 phút</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d giờ</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d phút</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d giây</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s mỗi ki lô mét</string>
     <string name="voice_pace_per_mile">%1$s mỗi dặm</string>
-    <string name="voice_seconds_few">%1$d giây</string>
-    <string name="voice_seconds_many">%1$d giây</string>
-    <string name="voice_seconds_one">1 giây</string>
-    <string name="voice_seconds_other">%1$d giây</string>
-    <string name="voice_seconds_two">2 giây</string>
-    <string name="voice_seconds_zero">0 giây</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f ki lô mét mỗi giờ</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f ki lô mét mỗi giờ</string>
     <string name="voice_speed_kilometers_per_hour_one">1 ki lô mét mỗi giờ</string>
diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml
index 1dc41fd53..4655900eb 100644
--- a/src/main/res/values-zh-rHK/strings.xml
+++ b/src/main/res/values-zh-rHK/strings.xml
@@ -274,26 +274,17 @@
     <string name="value_off">關閉</string>
     <string name="value_smallest">最小</string>
     <string name="value_smallest_recommended">最小 (建議值)</string>
-    <string name="voice_hours_few">%1$d 小時</string>
-    <string name="voice_hours_many">%1$d 小時</string>
-    <string name="voice_hours_one">1 小時</string>
-    <string name="voice_hours_other">%1$d 小時</string>
-    <string name="voice_hours_two">2 小時</string>
-    <string name="voice_hours_zero">0 小時</string>
-    <string name="voice_minutes_few">%1$d 分鐘</string>
-    <string name="voice_minutes_many">%1$d 分鐘</string>
-    <string name="voice_minutes_one">1 分鐘</string>
-    <string name="voice_minutes_other">%1$d 分鐘</string>
-    <string name="voice_minutes_two">2 分鐘</string>
-    <string name="voice_minutes_zero">0 分鐘</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d 小時</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d 分鐘</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d 秒</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">每公里 %1$s</string>
     <string name="voice_pace_per_mile">每英里 %1$s</string>
-    <string name="voice_seconds_few">%1$d 秒</string>
-    <string name="voice_seconds_many">%1$d 秒</string>
-    <string name="voice_seconds_one">1 秒</string>
-    <string name="voice_seconds_other">%1$d 秒</string>
-    <string name="voice_seconds_two">2 秒</string>
-    <string name="voice_seconds_zero">0 秒</string>
     <string name="voice_speed_kilometers_per_hour_few">每小時 %1$.1f 公里</string>
     <string name="voice_speed_kilometers_per_hour_many">每小時 %1$.1f 公里</string>
     <string name="voice_speed_kilometers_per_hour_one">每小時 1 公里</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 1dc41fd53..4655900eb 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -274,26 +274,17 @@
     <string name="value_off">關閉</string>
     <string name="value_smallest">最小</string>
     <string name="value_smallest_recommended">最小 (建議值)</string>
-    <string name="voice_hours_few">%1$d 小時</string>
-    <string name="voice_hours_many">%1$d 小時</string>
-    <string name="voice_hours_one">1 小時</string>
-    <string name="voice_hours_other">%1$d 小時</string>
-    <string name="voice_hours_two">2 小時</string>
-    <string name="voice_hours_zero">0 小時</string>
-    <string name="voice_minutes_few">%1$d 分鐘</string>
-    <string name="voice_minutes_many">%1$d 分鐘</string>
-    <string name="voice_minutes_one">1 分鐘</string>
-    <string name="voice_minutes_other">%1$d 分鐘</string>
-    <string name="voice_minutes_two">2 分鐘</string>
-    <string name="voice_minutes_zero">0 分鐘</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d 小時</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d 分鐘</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d 秒</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">每公里 %1$s</string>
     <string name="voice_pace_per_mile">每英里 %1$s</string>
-    <string name="voice_seconds_few">%1$d 秒</string>
-    <string name="voice_seconds_many">%1$d 秒</string>
-    <string name="voice_seconds_one">1 秒</string>
-    <string name="voice_seconds_other">%1$d 秒</string>
-    <string name="voice_seconds_two">2 秒</string>
-    <string name="voice_seconds_zero">0 秒</string>
     <string name="voice_speed_kilometers_per_hour_few">每小時 %1$.1f 公里</string>
     <string name="voice_speed_kilometers_per_hour_many">每小時 %1$.1f 公里</string>
     <string name="voice_speed_kilometers_per_hour_one">每小時 1 公里</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 128f505b1..b9d584136 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -343,26 +343,17 @@ limitations under the License.
     <string name="value_smallest">最小</string>
     <string name="value_smallest_recommended">最小（建议）</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d 小时</string>
-    <string name="voice_hours_many">%1$d 小时</string>
-    <string name="voice_hours_one">1 小时</string>
-    <string name="voice_hours_other">%1$d 小时</string>
-    <string name="voice_hours_two">2 小时</string>
-    <string name="voice_hours_zero">0 小时</string>
-    <string name="voice_minutes_few">%1$d 分钟</string>
-    <string name="voice_minutes_many">%1$d 分钟</string>
-    <string name="voice_minutes_one">1 分钟</string>
-    <string name="voice_minutes_other">%1$d 分钟</string>
-    <string name="voice_minutes_two">2 分钟</string>
-    <string name="voice_minutes_zero">0 分钟</string>
+    <plurals name="voiceHours">
+        <item quantity="other">%1$d 小时</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="other">%1$d 分钟</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="other">%1$d 秒</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">每公里 %1$s</string>
     <string name="voice_pace_per_mile">每英里 %1$s</string>
-    <string name="voice_seconds_few">%1$d 秒</string>
-    <string name="voice_seconds_many">%1$d 秒</string>
-    <string name="voice_seconds_one">1 秒</string>
-    <string name="voice_seconds_other">%1$d 秒</string>
-    <string name="voice_seconds_two">2 秒</string>
-    <string name="voice_seconds_zero">0 秒</string>
     <string name="voice_speed_kilometers_per_hour_few">每小时 %1$.1f 公里</string>
     <string name="voice_speed_kilometers_per_hour_many">每小时 %1$.1f 公里</string>
     <string name="voice_speed_kilometers_per_hour_one">每小时 1 公里</string>
diff --git a/src/main/res/values/plurals.xml b/src/main/res/values/plurals.xml
index 19655b4fa..d0b262fc0 100644
--- a/src/main/res/values/plurals.xml
+++ b/src/main/res/values/plurals.xml
@@ -14,31 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
-<plurals name="voiceHours">
-        <item quantity="zero">@string/voice_hours_zero</item>
-        <item quantity="one">@string/voice_hours_one</item>
-        <item quantity="two">@string/voice_hours_two</item>
-        <item quantity="few">@string/voice_hours_few</item>
-        <item quantity="many">@string/voice_hours_many</item>
-        <item quantity="other">@string/voice_hours_other</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="zero">@string/voice_minutes_zero</item>
-        <item quantity="one">@string/voice_minutes_one</item>
-        <item quantity="two">@string/voice_minutes_two</item>
-        <item quantity="few">@string/voice_minutes_few</item>
-        <item quantity="many">@string/voice_minutes_many</item>
-        <item quantity="other">@string/voice_minutes_other</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="zero">@string/voice_seconds_zero</item>
-        <item quantity="one">@string/voice_seconds_one</item>
-        <item quantity="two">@string/voice_seconds_two</item>
-        <item quantity="few">@string/voice_seconds_few</item>
-        <item quantity="many">@string/voice_seconds_many</item>
-        <item quantity="other">@string/voice_seconds_other</item>
-    </plurals>
     <plurals name="voiceSpeedKilometersPerHour">
         <item quantity="zero">@string/voice_speed_kilometers_per_hour_zero</item>
         <item quantity="one">@string/voice_speed_kilometers_per_hour_one</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index db13536a7..33e5bd35f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -498,26 +498,20 @@ limitations under the License.
     <string name="value_smallest">Smallest</string>
     <string name="value_smallest_recommended">Smallest (recommended)</string>
     <!-- Voice -->
-    <string name="voice_hours_few">%1$d hours</string>
-    <string name="voice_hours_many">%1$d hours</string>
-    <string name="voice_hours_one">1 hour</string>
-    <string name="voice_hours_other">%1$d hours</string>
-    <string name="voice_hours_two">2 hours</string>
-    <string name="voice_hours_zero">0 hours</string>
-    <string name="voice_minutes_few">%1$d minutes</string>
-    <string name="voice_minutes_many">%1$d minutes</string>
-    <string name="voice_minutes_one">1 minute</string>
-    <string name="voice_minutes_other">%1$d minutes</string>
-    <string name="voice_minutes_two">2 minutes</string>
-    <string name="voice_minutes_zero">0 minutes</string>
+    <plurals name="voiceHours">
+        <item quantity="one">1 hour</item>
+        <item quantity="other">%1$d hours</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 second</item>
+        <item quantity="other">%1$d seconds</item>
+    </plurals>
     <string name="voice_pace_per_kilometer">%1$s per kilometer</string>
     <string name="voice_pace_per_mile">%1$s per mile</string>
-    <string name="voice_seconds_few">%1$d seconds</string>
-    <string name="voice_seconds_many">%1$d seconds</string>
-    <string name="voice_seconds_one">1 second</string>
-    <string name="voice_seconds_other">%1$d seconds</string>
-    <string name="voice_seconds_two">2 seconds</string>
-    <string name="voice_seconds_zero">0 seconds</string>
     <string name="voice_speed_kilometers_per_hour_few">%1$.1f kilometers per hour</string>
     <string name="voice_speed_kilometers_per_hour_many">%1$.1f kilometers per hour</string>
     <string name="voice_speed_kilometers_per_hour_one">1 kilometer per hour</string>