diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml
index ffe89038e..336b8d3d4 100644
--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@@ -211,26 +211,6 @@
     <string name="value_none">None</string>
     <string name="value_off">Off</string>
     <string name="value_smallest_recommended">Smallest (recommended)</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>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 kilometer per hour</item>
-        <item quantity="other">%1$.1f kilometers per hour</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 mile per hour</item>
-        <item quantity="other">%1$.1f miles per hour</item>
-    </plurals>
     <string name="waypoint_type_atm">Cashpoint</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar/pub</string>
diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
index 5d8deabeb..36c1b363a 100644
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@@ -214,26 +214,6 @@
     <string name="value_none">Ninguno</string>
     <string name="value_off">Desactivado</string>
     <string name="value_smallest_recommended">Mínimo (recomendado)</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>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 kilómetro por hora</item>
-        <item quantity="other">%1$.1f kilómetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 milla por hora</item>
-        <item quantity="other">%1$.1f millas por hora</item>
-    </plurals>
     <string name="waypoint_type_atm">cajero automático</string>
     <string name="waypoint_type_bank">banco</string>
     <string name="waypoint_type_bar">barra</string>
@@ -507,14 +487,6 @@
     <string name="lap_speed">Velocidad de vuelta</string>
     <string name="speed">Velocidad</string>
     <string name="total_distance">Distancia total</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">1 kilómetro</item>
-        <item quantity="other">%1$.1f kilómetros</item>
-    </plurals>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">1 milla</item>
-        <item quantity="other">%1$.1f millas</item>
-    </plurals>
     <string name="average_heart_rate">Ritmo cardíaco promedio</string>
     <string name="current_heart_rate">Ritmo cardíaco actual</string>
     <string name="settings_export_filename_title">Formato del nombre del archivo</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 92b2e55ca..e6012be7c 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -333,26 +333,36 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="value_off">Aus</string>
     <string name="value_smallest_recommended">Kleinster (empfohlen)</string>
     <!-- Voice -->
-    <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>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 Kilometer pro Stunde</item>
-        <item quantity="other">%1$.1f Kilometer pro Stunde</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 Meile pro Stunde</item>
-        <item quantity="other">%1$.1f Meilen pro Stunde</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        =1 {1 Stunde}
+        other {{n,number,#.0} Stunden}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        =1 {1 Minuten}
+        other {{n} Minuten}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+        { n, plural,
+        =1 {1 Sekunde}
+        other {{n} Sekunden}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        =1 {1 Kilometer pro Stunde}
+        other {{n,number,#.0} Kilometer pro Stunde}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        =1 {1 Meile pro Stunde}
+        other {{n,number,#.0} Meilen pro Stunde}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Geldautomat</string>
     <string name="waypoint_type_bank">Bank</string>
@@ -537,10 +547,12 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="current_heart_rate">Aktueller Puls</string>
     <string name="export_cannot_write_to_dir">Kann nicht in Export-Verzeichnis schreiben.</string>
     <string name="stats_sensors_cadence">Trittfrequenz</string>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">1 Meile</item>
-        <item quantity="other">%1$.1f Meilen</item>
-    </plurals>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        =1 {1 Meile}
+        other {{n,number,#.0} Meilen}
+        }
+    </string>
     <string name="field_set_primary">Primär</string>
     <string name="voice_per_mile">pro Meile</string>
     <string name="lap_time">Rundenzeit</string>
@@ -549,10 +561,12 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="lap_speed">Rundengeschwindigkeit</string>
     <string name="speed">Geschwindigkeit</string>
     <string name="total_distance">Gesamtstrecke</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">1 Kilometer</item>
-        <item quantity="other">%1$.1f Kilometer</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        =1 {1 Kilometer}
+        other {{n,number,#.0} Kilometer}
+        }
+    </string>
     <string name="no_compatible_file_manager_installed">Kein kompatibler Dateimanager installiert</string>
     <string name="aggregated_stats_filter_no_results">Es gibt keine Aktivitäten für diesen Filter</string>
     <string name="settings_announcements_summary">Zeit, Entfernung, Sprachgeschwindigkeit</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index b17116839..0a0daa91b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -322,31 +322,41 @@ limitations under the License.
     <string name="value_off">Desactivado</string>
     <string name="value_smallest_recommended">Mínimo (recomendado)</string>
     <!-- Voice -->
-    <plurals name="voiceHours">
-        <item quantity="one">1 hora</item>
-        <item quantity="many">%1$d horas</item>
-        <item quantity="other">%1$d horas</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">1 minuto</item>
-        <item quantity="many">%1$d minutos</item>
-        <item quantity="other">%1$d minutos</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">1 segundo</item>
-        <item quantity="many">%1$d segundos</item>
-        <item quantity="other">%1$d segundos</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 kilómetro por hora</item>
-        <item quantity="many">%1$.1f kilómetros por hora</item>
-        <item quantity="other">%1$.1f kilómetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 milla por hora</item>
-        <item quantity="many">%1$.1f millas por hora</item>
-        <item quantity="other">%1$.1f millas por hora</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        one {{n} hora}
+        many {{n} horas}
+        other {{n} horas}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        one {{n} minuto}
+        many {{n} minutos}
+        other {{n} minutos}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+        { n, plural,
+        one {{n} segundo}
+        many {{n} segundos}
+        other {{n} segundos}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} kilómetro por hora}
+        many {{n,number,#.0} kilómetros por hora}
+        other {{n,number,#.0} kilómetros por hora}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} milla por hora}
+        many {{n,number,#.0} millas por hora}
+        other {{n,number,#.0} millas por hora}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">cajero automático</string>
     <string name="waypoint_type_bank">banco</string>
@@ -564,16 +574,20 @@ limitations under the License.
     <string name="lap_speed">Velocidad de vuelta</string>
     <string name="speed">Velocidad</string>
     <string name="total_distance">Distancia total</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">1 kilómetro</item>
-        <item quantity="many">%1$.1f kilómetros</item>
-        <item quantity="other">%1$.1f kilómetros</item>
-    </plurals>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">1 milla</item>
-        <item quantity="many">%1$.1f millas</item>
-        <item quantity="other">%1$.1f millas</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        one {{n,number,#.0} kilomètre}
+        many {{n,number,#.0} kilomètres}
+        other {{n,number,#.0} kilomètres}
+        }
+    </string>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} milla}
+        many {{n,number,#.0} millas}
+        other {{n,number,#.0} millas}
+        }
+    </string>
     <string name="average_heart_rate">Ritmo cardíaco promedio</string>
     <string name="current_heart_rate">Ritmo cardíaco actual</string>
     <string name="settings_export_filename_title">Formato del nombre del archivo</string>
@@ -602,16 +616,20 @@ limitations under the License.
     <string name="settings_announcements_lap_heart_rate">Frecuencia cardiaca por vuelta</string>
     <string name="settings_public_api_package_title">Nombre del paquete para el API público</string>
     <string name="unit_knots">Nudo</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="one">%1$.1f nudo</item>
-        <item quantity="many">%1$.1f nudos</item>
-        <item quantity="other">%1$.1f nudos</item>
-    </plurals>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="one">%1$.1f milla náutica</item>
-        <item quantity="many">%1$.1f millas náuticas</item>
-        <item quantity="other">%1$.1f millas náuticas</item>
-    </plurals>
+    <string name="voiceSpeedMKnotsPlural">
+        { n, plural,
+        one {{n,number,#.0} nudo}
+        many {{n,number,#.0} nudos}
+        other {{n,number,#.0} nudos}
+        }
+    </string>
+    <string name="voiceDistanceNauticalMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} milla náutica}
+        many {{n,number,#.0} millas náuticas}
+        other {{n,number,#.0} millas náuticas}
+        }
+    </string>
     <string name="select_show_on_map_behavior">Seleccionar el comportamiento de \"mostrar en el mapa\"</string>
     <string name="introduction_osm_dashboard">OpenTracks en sí no proporciona un mapa. Por favor, instale OSMDashboard para ver sus grabaciones en un mapa.</string>
     <string name="share_crash_report">Compartir informe de fallo</string>
diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml
index ae609e0f4..938692a5a 100644
--- a/src/main/res/values-fr-rCA/strings.xml
+++ b/src/main/res/values-fr-rCA/strings.xml
@@ -210,26 +210,6 @@
     <string name="value_none">Aucun</string>
     <string name="value_off">Désactivé</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</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 seconde</item>
-        <item quantity="other">%1$d secondes</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f kilomètre à l\'heure</item>
-        <item quantity="other">%1$.1f kilomètres à l\'heure</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f mille à l\'heure</item>
-        <item quantity="other">%1$.1f milles à l\'heure</item>
-    </plurals>
     <string name="waypoint_type_atm">guichet automatique bancaire</string>
     <string name="waypoint_type_bank">banque</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml
index db5819ba6..00354b012 100644
--- a/src/main/res/values-fr-rCH/strings.xml
+++ b/src/main/res/values-fr-rCH/strings.xml
@@ -212,26 +212,6 @@
     <string name="value_none">Aucun</string>
     <string name="value_off">Désactiver</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</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 seconde</item>
-        <item quantity="other">%1$d secondes</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f kilomètre-heure</item>
-        <item quantity="other">%1$.1f kilomètres-heure</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f mile par heure</item>
-        <item quantity="other">%1$.1f miles par heure</item>
-    </plurals>
     <string name="waypoint_type_atm">bancomat</string>
     <string name="waypoint_type_bank">banque</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 4e66b0db2..e3945ddea 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -324,31 +324,41 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="value_off">Désactiver</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</string>
     <!-- Voice -->
-    <plurals name="voiceHours">
-        <item quantity="one">%1$d heure</item>
-        <item quantity="many">%1$d heures</item>
-        <item quantity="other">%1$d heures</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">%1$d minute</item>
-        <item quantity="many">%1$d minutes</item>
-        <item quantity="other">%1$d minutes</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">%1$d seconde</item>
-        <item quantity="many">%1$d secondes</item>
-        <item quantity="other">%1$d secondes</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f kilomètre-heure</item>
-        <item quantity="many">%1$.1f kilomètres-heure</item>
-        <item quantity="other">%1$.1f kilomètres-heure</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f mile par heure</item>
-        <item quantity="many">%1$.1f miles par heure</item>
-        <item quantity="other">%1$.1f miles par heure</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        one {{n} heure}
+        many {{n} heures}
+        other {{n} heures}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        one {{n} minute}
+        many {{n} minute}
+        other {{n} minutes}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+        { n, plural,
+        one {{n} seconde}
+        many {{n} secondes}
+        other {{n} secondes}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} kilomètre-heure}
+        many {{n,number,#.0} kilomètres-heure}
+        other {{n,number,#.0} kilomètres-heure}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} mile par heure}
+        many {{n,number,#.0} miles par heure}
+        other {{n,number,#.0} miles par heure}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">distributeur de billets</string>
     <string name="waypoint_type_bank">banque</string>
@@ -548,21 +558,25 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="settings_public_api_enabled_title">API publique</string>
     <string name="average_heart_rate">Fréquence cardiaque moyenne</string>
     <string name="current_heart_rate">Fréquence cardiaque actuelle</string>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">%1$.1f mile</item>
-        <item quantity="many">%1$.1f miles</item>
-        <item quantity="other">%1$.1f miles</item>
-    </plurals>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} mile}
+        many {{n,number,#.0} miles}
+        other {{n,number,#.0} miles}
+        }
+    </string>
     <string name="lap_time">Temps par tour</string>
     <string name="speed">Vitesse moyenne</string>
     <string name="settings_public_api_dashboard_enabled_summary_off">Les données enregistrées ne seront pas automatiquement partagées avec d\'autres applications.</string>
     <string name="settings_public_api_enabled_summary_on">D\'autres applications installées peuvent démarrer ou arrêter les enregistrements.</string>
     <string name="settings_public_api_enabled_summary_off">Seul OpenTracks peut démarrer et arrêter les enregistrements.</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">%1$.1f kilomètre</item>
-        <item quantity="many">%1$.1f kilomètres</item>
-        <item quantity="other">%1$.1f kilomètres</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        one {{n,number,#.0} kilomètre}
+        many {{n,number,#.0} kilomètres}
+        other {{n,number,#.0} kilomètres}
+        }
+    </string>
     <string name="total_distance">Distance totale</string>
     <string name="activity_type_swimming">natation</string>
     <string name="activity_type_swimming_open">natation en eau libre</string>
@@ -603,16 +617,20 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="value_float_knots">%1$.1f nœuds</string>
     <string name="value_float_knots_recommended">%1$.1f nœuds (recommandé)</string>
     <string name="voice_per_nautical_mile">par mile nautique</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="one">%1$.1f nœud</item>
-        <item quantity="many">%1$.1f nœuds</item>
-        <item quantity="other">%1$.1f nœuds</item>
-    </plurals>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="one">%1$.1f mille nautique</item>
-        <item quantity="many">%1$.1f milles nautique</item>
-        <item quantity="other">%1$.1f milles nautique</item>
-    </plurals>
+    <string name="voiceSpeedMKnotsPlural">
+        { n, plural,
+        one {{n,number,#.0} nœud}
+        many {{n,number,#.0} nœuds}
+        other {{n,number,#.0} nœuds}
+        }
+    </string>
+    <string name="voiceDistanceNauticalMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} mille nautique}
+        many {{n,number,#.0} milles nautique}
+        other {{n,number,#.0} milles nautique}
+        }
+    </string>
     <string name="settings_public_api_package_title">Nom du paquet pour l\'API Publique</string>
     <string name="track_delete_number_of_tracks">%1$d tracés</string>
     <string name="introduction_osm_dashboard">OpenTracks ne fournit pas de carte en tant que telle. Veuillez installer OSMDashboard pour visualiser vos tracés sur une carte.</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 33a8d2cff..59a91040f 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -212,18 +212,6 @@
     <string name="value_none">Nenhuma</string>
     <string name="value_off">Desativar</string>
     <string name="value_smallest_recommended">Menor (recomendado)</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="waypoint_type_atm">caixa eletrônico</string>
     <string name="waypoint_type_bank">banco</string>
     <string name="waypoint_type_bar">bar</string>
@@ -405,14 +393,6 @@
     <string name="delete_service">Serviço de exclusão</string>
     <string name="menu_voice_rate">Velocidade da voz</string>
     <string name="track_delete_not_recording">Esta trilha não pode ser excluída porque está gravada no momento.</string>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f quilômetro por hora</item>
-        <item quantity="other">%1$.1f quilômetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f milha por hora</item>
-        <item quantity="other">%1$.1f milhas por hora</item>
-    </plurals>
     <string name="settings_sensor_cycling_cadence">Cadência</string>
     <string name="settings_sensor_cycling_distance_speed">Distância e velocidade</string>
     <string name="settings_sensor_running_speed_and_cadence">Distância, velocidade e cadência</string>
@@ -500,10 +480,6 @@
     <string name="average_heart_rate">Frequência cardíaca média</string>
     <string name="settings_public_api_dashboard_enabled_summary_on">Um aplicativo que iniciou uma gravação também pode acessar os dados gravados.</string>
     <string name="settings_public_api_dashboard_enabled_summary_off">Os dados gravados não serão compartilhados automaticamente com outros aplicativos.</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">%1$.1f quilômetro</item>
-        <item quantity="other">%1$.1f quilômetros</item>
-    </plurals>
     <string name="generic_dismiss">Dispensar</string>
     <string name="settings_api_title">API pública</string>
     <string name="settings_public_api_dashboard_enabled_title">Transferência automática de dados</string>
@@ -511,10 +487,6 @@
     <string name="voice_per_mile">por milha</string>
     <string name="lap_speed">Velocidade da volta</string>
     <string name="total_distance">Distância total</string>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">%1$.1f milha</item>
-        <item quantity="other">%1$.1f milhas</item>
-    </plurals>
     <string name="current_heart_rate">Frequência cardíaca atual</string>
     <string name="settings_export_filename_title">Formato do nome do arquivo</string>
     <string name="settings_announcements_average_heart_rate">Frequência cardíaca média</string>
@@ -544,12 +516,4 @@
     <string name="show_on_dashboard">Painel API do OpenTracks</string>
     <string name="always">Sempre</string>
     <string name="description_speed_nautical">Velocidade (nós)</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="one">%1$.1f nó</item>
-        <item quantity="other">%1$.1f nós</item>
-    </plurals>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="one">%1$.1f milha náutica</item>
-        <item quantity="other">%1$.1f milhas náuticas</item>
-    </plurals>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index c99bec3bc..212096358 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -212,26 +212,6 @@
     <string name="value_none">Nenhuma</string>
     <string name="value_off">Desativar</string>
     <string name="value_smallest_recommended">Menor (recomendado)</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>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f quilómetro por hora</item>
-        <item quantity="other">%1$.1f quilómetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f milha por hora</item>
-        <item quantity="other">%1$.1f milhas por hora</item>
-    </plurals>
     <string name="waypoint_type_atm">caixa eletrônico</string>
     <string name="waypoint_type_bank">banco</string>
     <string name="waypoint_type_bar">bar</string>
@@ -512,10 +492,6 @@
     <string name="value_float_knots">%1$.1f nós</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (Recomendado)</string>
     <string name="value_float_knots_recommended">%1$.1f nós (recomendado)</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="one">%1$.1f nó</item>
-        <item quantity="other">%1$.1f nós</item>
-    </plurals>
     <string name="voice_per_kilometer">por quilômetro</string>
     <string name="voice_per_mile">por milha</string>
     <string name="voice_per_nautical_mile">por milha náutica</string>
@@ -524,18 +500,6 @@
     <string name="lap_speed">Velocidade da volta</string>
     <string name="speed">Velocidade</string>
     <string name="total_distance">Distância total</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">%1$.1f quilómetro</item>
-        <item quantity="other">%1$.1f quilómetros</item>
-    </plurals>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">%1$.1f milha</item>
-        <item quantity="other">%1$.1f milhas</item>
-    </plurals>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="one">%1$.1f milha náutica</item>
-        <item quantity="other">%1$.1f milhas náuticas</item>
-    </plurals>
     <string name="share_image_body">Acho que pode estar interessado nesta imagem.</string>
     <string name="hold_to_stop">Segure para parar</string>
     <string name="instant_export_enabled_summary">Exportar trilha para armazenamento depois que a gravação for concluída</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 11fb6c441..7376ab8b3 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -260,31 +260,41 @@ limitations under the License.
     <string name="value_off">Desativar</string>
     <string name="value_smallest_recommended">Menor (recomendado)</string>
     <!-- Voice -->
-    <plurals name="voiceHours">
-        <item quantity="one">%1$d hora</item>
-        <item quantity="many">%1$d horas</item>
-        <item quantity="other">%1$d horas</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">%1$d minuto</item>
-        <item quantity="many">%1$d minutos</item>
-        <item quantity="other">%1$d minutos</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">%1$d segundo</item>
-        <item quantity="many">%1$d segundos</item>
-        <item quantity="other">%1$d segundos</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f quilómetro por hora</item>
-        <item quantity="many">%1$.1f quilómetros por hora</item>
-        <item quantity="other">%1$.1f quilómetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f milha por hora</item>
-        <item quantity="many">%1$.1f milhas por hora</item>
-        <item quantity="other">%1$.1f milhas por hora</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        one {{n} hora}
+        many {{n} horas}
+        other {{n} horas}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        one {{n} minuto}
+        many {{n} minutos}
+        other {{n} minutos}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+         { n, plural,
+        one {{n} segundo}
+        many {{n} segundos}
+        other {{n} segundos}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} quilômetro por hora}
+        many {{n,number,#.0} quilómetros por hora}
+        other {{n,number,#.0} quilómetros por hora}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} milha por hora}
+        many {{n,number,#.0} milhas por hora}
+        other {{n,number,#.0} milhas por hora}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">caixa eletrônico</string>
     <string name="waypoint_type_bank">banco</string>
@@ -492,27 +502,35 @@ limitations under the License.
     <string name="value_float_knots">%1$.1f nós</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (Recomendado)</string>
     <string name="voice_per_kilometer">por quilômetro</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="one">%1$.1f nó</item>
-        <item quantity="other">%1$.1f nós</item>
-    </plurals>
+    <string name="voiceSpeedMKnotsPlural">
+        { n, plural,
+        one {{n,number,#.0} nó}
+        other {{n,number,#.0} nós}
+        }
+    </string>
     <string name="voice_per_mile">por milha</string>
     <string name="voice_per_nautical_mile">por milha náutica</string>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">%1$.1f milha</item>
-        <item quantity="other">%1$.1f milhas</item>
-    </plurals>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="one">%1$.1f milha náutica</item>
-        <item quantity="other">%1$.1f milhas náuticas</item>
-    </plurals>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} milha}
+        other {{n,number,#.0} milhas}
+        }
+    </string>
+    <string name="voiceDistanceNauticalMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} milha náutica}
+        other {{n,number,#.0} milhas náuticas}
+        }
+    </string>
     <string name="total_distance">Distância total</string>
     <string name="average_heart_rate">Frequência cardíaca média</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">%1$.1f quilómetro</item>
-        <item quantity="many">%1$.1f quilómetros</item>
-        <item quantity="other">%1$.1f quilómetros</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        one {{n,number,#.0} quilómetro}
+        many {{n,number,#.0} quilómetros}
+        other {{n,number,#.0} quilómetros}
+        }
+    </string>
     <string name="current_heart_rate">Frequência cardíaca atual</string>
     <string name="share_image_subject">Gostaria de compartilhar uma imagem consigo</string>
     <string name="share_image_body">Acho que pode estar interessado nesta imagem.</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 979f28765..217c2c946 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -277,21 +277,31 @@ limitations under the License.
     <string name="value_off">关闭</string>
     <string name="value_smallest_recommended">最小（建议）</string>
     <!-- Voice -->
-    <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>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="other">每小时 %1$.1f 公里</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="other">每小时 %1$.1f 英里</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        other {{n} 小时}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        other {{n} 分钟}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+        { n, plural,
+        other {{n} 秒}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        other {每小时 {n,number,#.0} 公里}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        other {每小时 {n,number,#.0} 英里}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">自动取款机</string>
     <string name="waypoint_type_bank">银行</string>
@@ -488,22 +498,30 @@ limitations under the License.
     <string name="track_distance_notification">距离：%1$s</string>
     <string name="value_float_mile_hour_recommended">%1$.1f 英里/小时（推荐）</string>
     <string name="lap_time">单圈用时</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="other">%1$.1f 公里</item>
-    </plurals>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="other">%1$.1f 英里</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        other {{n,number,#.0} 公里}
+        }
+    </string>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        other {{n,number,#.0} 英里}
+        }
+    </string>
     <string name="average_heart_rate">平均心率</string>
     <string name="export_without_photos">不带照片</string>
     <string name="settings_sensor_bluetooth_service_filter_on">只显示蓝牙广播中包含所需服务的设备</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="other">%1$.1f 节</item>
-    </plurals>
+    <string name="voiceSpeedMKnotsPlural">
+        { n, plural,
+        other {{n,number,#.0} 节}
+        }
+    </string>
     <string name="voice_per_nautical_mile">每海里</string>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="other">%1$.1f 海里</item>
-    </plurals>
+    <string name="voiceDistanceNauticalMilesPlural">
+        { n, plural,
+        other {{n,number,#.0} 海里}
+        }
+    </string>
     <string name="share_image_subject">我想跟你分享一张图片</string>
     <string name="share_image_body">我觉得你可能对这张图片感兴趣。</string>
     <string name="field_set_primary">设为主要</string>