diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java index 4ae12974c..e71ab2513 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java @@ -153,15 +153,15 @@ public class StringUtilsTest { assertEquals("10", StringUtils.formatDecimal(10.1, 0)); assertEquals("-0", StringUtils.formatDecimal(-0.1, 0)); - assertEquals("0", StringUtils.formatDecimal(0.0, 2)); - assertEquals("0.1", StringUtils.formatDecimal(0.1, 2)); - assertEquals("1.1", StringUtils.formatDecimal(1.1, 2)); - assertEquals("10", StringUtils.formatDecimal(10, 2)); - assertEquals("10.1", StringUtils.formatDecimal(10.1, 2)); + assertEquals("0.00", StringUtils.formatDecimal(0.0, 2)); + assertEquals("0.10", StringUtils.formatDecimal(0.1, 2)); + assertEquals("1.10", StringUtils.formatDecimal(1.1, 2)); + assertEquals("10.00", StringUtils.formatDecimal(10, 2)); + assertEquals("10.10", StringUtils.formatDecimal(10.1, 2)); assertEquals("10.11", StringUtils.formatDecimal(10.111, 2)); - assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2)); + assertEquals("-0.10", StringUtils.formatDecimal(-0.1, 2)); - assertEquals("1", StringUtils.formatDecimal(0.99, 1)); + assertEquals("1.0", StringUtils.formatDecimal(0.99, 1)); } @Test @@ -181,7 +181,7 @@ public class StringUtilsTest { assertEquals("4:59 min/km", StringUtils.formatSpeed(context, Speed.of(3.34), true, false)); assertEquals("8:02 min/mi", StringUtils.formatSpeed(context, Speed.of(3.34), false, false)); - assertEquals("12.02 km/h", StringUtils.formatSpeed(context, Speed.of(3.34), true, true)); - assertEquals("7.47 mph", StringUtils.formatSpeed(context, Speed.of(3.34), false, true)); + assertEquals("12.0 km/h", StringUtils.formatSpeed(context, Speed.of(3.34), true, true)); + assertEquals("7.5 mph", StringUtils.formatSpeed(context, Speed.of(3.34), false, true)); } } diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java b/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java index 2015c7a3f..ff6cacff5 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java @@ -76,16 +76,10 @@ final class PreferenceHelper { } } else { int feet = (int) (value * UnitConversions.M_TO_FT); - if (feet < 2000) { - displayValue = context.getString(R.string.value_integer_feet, feet); - if (value == maxRecordingDistanceDefault) { - entries[i] = context.getString(R.string.value_integer_feet_recommended, feet); - } else { - entries[i] = displayValue; - } + displayValue = context.getString(R.string.value_integer_feet, feet); + if (value == maxRecordingDistanceDefault) { + entries[i] = context.getString(R.string.value_integer_feet_recommended, feet); } else { - double mile = feet * UnitConversions.FT_TO_MI; - displayValue = context.getString(R.string.value_float_mile, mile); entries[i] = displayValue; } } @@ -118,24 +112,14 @@ final class PreferenceHelper { } } else { int feet = (int) (value * UnitConversions.M_TO_FT); - if (feet < 2000) { - displayValue = context.getString(R.string.value_integer_feet, feet); + displayValue = context.getString(R.string.value_integer_feet, feet); - if (value == recordingGPSAccuracyDefault) { - entries[i] = context.getString(R.string.value_integer_feet_recommended, feet); - } else if (value == recordingGPSAccuracyExcellent) { - entries[i] = context.getString(R.string.value_integer_feet_excellent_gps, feet); - } else { - entries[i] = displayValue; - } + if (value == recordingGPSAccuracyDefault) { + entries[i] = context.getString(R.string.value_integer_feet_recommended, feet); + } else if (value == recordingGPSAccuracyExcellent) { + entries[i] = context.getString(R.string.value_integer_feet_excellent_gps, feet); } else { - double mile = feet * UnitConversions.FT_TO_MI; - displayValue = context.getString(R.string.value_float_mile, mile); - if (value == recordingGPSAccuracyPoor) { - entries[i] = context.getString(R.string.value_float_mile_poor_gps, mile); - } else { - entries[i] = displayValue; - } + entries[i] = displayValue; } } } diff --git a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java index 60f5b90e6..20b22b8cb 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java @@ -33,7 +33,6 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; -import java.util.Locale; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Distance; @@ -96,38 +95,15 @@ public class StringUtils { return context.getString(R.string.value_unknown); } - if (metricUnits) { - if (distance.greaterThan(Distance.of(500))) { - return context.getString(R.string.value_float_kilometer, distance.toKM()); - } else { - return context.getString(R.string.value_float_meter, distance.toM()); - } - } else { - if (distance.greaterThan(Distance.ofMile(0.5))) { - return context.getString(R.string.value_float_mile, distance.toMI()); - } else { - return context.getString(R.string.value_float_feet, distance.toFT()); - } - } + Pair distanceParts = getDistanceParts(context, distance, metricUnits); + + return context.getString(R.string.distance_with_unit, distanceParts.first, distanceParts.second); } public static String formatSpeed(Context context, Speed speed, boolean metricUnits, boolean reportSpeed) { - if (reportSpeed) { - if (metricUnits) { - return context.getString(R.string.value_float_kilometer_hour, speed.toKMH()); - } else { - return context.getString(R.string.value_float_mile_hour, speed.toMPH()); - } - } else { - int pace = (int) speed.toPace(metricUnits).getSeconds(); - int minutes = pace / 60; - int seconds = pace % 60; - if (metricUnits) { - return context.getString(R.string.value_pace_kilometer, minutes, seconds); - } else { - return context.getString(R.string.value_pace_mile, minutes, seconds); - } - } + Pair distanceParts = getSpeedParts(context, speed, metricUnits, reportSpeed); + + return context.getString(R.string.speed_with_unit, distanceParts.first, distanceParts.second); } private static String formatDecimal(double value) { @@ -139,6 +115,7 @@ public class StringUtils { */ public static String formatDecimal(double value, int decimalPlaces) { DecimalFormat df = new DecimalFormat(); + df.setMinimumFractionDigits(decimalPlaces); df.setMaximumFractionDigits(decimalPlaces); df.setRoundingMode(RoundingMode.HALF_EVEN); return df.format(value); @@ -173,7 +150,7 @@ public class StringUtils { return new Pair<>(formatDecimal(distance.toM()), context.getString(R.string.unit_meter)); } } else { - if (distance.greaterThan(Distance.of(0.5 * UnitConversions.M_TO_MI))) { + if (distance.greaterThan(Distance.ofMile(0.5))) { return new Pair<>(formatDecimal(distance.toMI()), context.getString(R.string.unit_mile)); } else { return new Pair<>(formatDecimal(distance.toFT()), context.getString(R.string.unit_feet)); @@ -211,7 +188,7 @@ public class StringUtils { int minutes = pace / 60; int seconds = pace % 60; - return new Pair<>(String.format(Locale.US, "%d:%02d", minutes, seconds), unitString); + return new Pair<>(context.getString(R.string.time, minutes, seconds), unitString); } /** diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 37c09a643..566a81a53 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -339,11 +339,6 @@ limitations under the License. تكييف من أجل الدقة التكيف بحسب عمر البطارية دائمًا - %1$.2f‏ قدم - %1$.2f‏ كم‏ - %1$.2f‏ م - %1$.2f ميل - %1$.1f ميل (إشارة نظام تحديد المواقع سيئة) %1$d قدم %1$d قدم (إشارة نظام تحديد المواقع ممتازة) %1$d قدم (موصى به) diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml index 9951fc748..251772fc1 100644 --- a/src/main/res/values-b+en+001/strings.xml +++ b/src/main/res/values-b+en+001/strings.xml @@ -291,11 +291,6 @@ Adapt for accuracy Adapt for battery life Always - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (poor GPS) %1$d ft %1$d ft (excellent GPS) %1$d ft (recommended) diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index 1cb1fdb62..20b0b5b40 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -295,11 +295,6 @@ Adaptar para precisión Adaptar a la duración de la batería Siempre - %1$.2f pies - %1$.2f km - %1$.2f m - %1$.2f millas - %1$.1f millas (señal de GPS deficiente) %1$d pies %1$d pies (señal de GPS excelente) %1$d pies (recomendado) @@ -462,10 +457,6 @@ \nd) desactivar el ahorro de energía. \n \nSi todo no ayuda, informe un error. - %1$.2f km/h - %1$.2f mph - %1$d:%2$02d min/mi - %1$d:%2$02d min/km Usted puede: \na) haga correr la voz sobre OpenTracks, \nb) proponer funciones , diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index f6f45ea55..e816b1796 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -341,11 +341,6 @@ limitations under the License. Адаптиране за точност Адаптиране спрямо батерията Винаги - %1$.2f фт - %1$.2f км - %1$.2f м - %1$.2f мил - %1$.1f мил (слаб GPS) %1$d фт %1$d фт (отличен GPS) %1$d фт (препоръчително) diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 48b9a2b0f..140299acc 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -341,11 +341,6 @@ es vegi el cel. Torneu-ho a provar més tard. Adapta\'n la precisió Adapta a la durada de la bateria Sempre - %1$.2f peus - %1$.2f km - %1$.2f m - %1$.2f milles - %1$.1f milles (GPS amb poca senyal) %1$d peus %1$d peus (senyal de GPS excel·lent) %1$d peus (recomanat) diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 60cda0c71..8d820e680 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -411,11 +411,6 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs Upřednostnit přesnost Upřednostnit výdrži baterie Vždy - %1$.2f stop - %1$.2f km - %1$.2f m - %1$.2f mil - %1$.1f mil (špatný signál GPS) %1$d stop %1$d stop (vynikající signál GPS) %1$d stop (doporučeno) @@ -556,10 +551,6 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs Intervaly Rozdělit interval Intervaly - %1$.2f km/h - %1$.2f mil/h - %1$d:%2$02d min/mi - %1$d:%2$02d min/km Čas na kolo %1$s Podržet pro pozastavení Poslední trasa exportována diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 22d1687e9..a4c158a4f 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -417,11 +417,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj Juster nøjagtighed Tilpas til batterilevetid Altid - %1$.2f fod - %1$.2f km - %1$.2f m - %1$.2f mil - %1$.1f mil (dårlig GPS) %1$d fod %1$d fod (fremragende GPS) %1$d fod (anbefales) @@ -545,10 +540,7 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj Åbn som %1$s elektrisk scooter Klik tilbage igen for at annullere - %1$.2f km/t Kunne ikke importere filen:%1$s - %1$d:%2$02d min/mi - %1$d:%2$02d min/km Du har indstillet forhindre genimport af spor Spor eksportmappe Eksporter spor til lagring, når optagelsen er færdig @@ -583,7 +575,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj Der er ikke noget interval endnu Optag dit første spor for at se aggregerede statistikker Intervaller - %1$.2f mph Omgangstid på %1$s Omgangshastighed på %1$s Hold nede for at holde pause diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index da9179753..f2cbe5b36 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -422,11 +422,6 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft. Genauigkeit anpassen An Akkulaufzeit anpassen Immer - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f Meilen - %1$.1f Meilen (schlechtes GPS-Signal) %1$d Fuß %1$d Fuß (ausgezeichnetes GPS-Signal) %1$d Fuß (empfohlen) @@ -601,6 +596,4 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft. Strecke: %1$s Geschwindigkeit: %1$s Tempo: %1$s - %1$d:%2$02d min/mi - %1$d:%2$02d min/km \ No newline at end of file diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index d6f8aa5f7..d4ba87dee 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -340,11 +340,6 @@ limitations under the License. Προσαρμογή για ακρίβεια Καλύτερο για μπατ. Πάντα - %1$.2f πόδια - %1$.2f χιλιόμετρα - %1$.2f μέτρα - %1$.2f μίλια - %1$.1f μίλια (χαμηλό σήμα GPS) %1$d πόδια %1$d πόδια (τέλειο σήμα GPS) %1$d ft (συνιστάται) diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 2d908a520..b60b46318 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -412,11 +412,6 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida Adaptar para obtener valores exactos Adaptar a la duración de la batería Siempre - %1$.2f pies - %1$.2f km - %1$.2f m - %1$.2f millas - %1$.1f millas (señal de GPS débil) %1$d pies %1$d pies (señal de GPS excelente) %1$d pies (recomendado) @@ -595,12 +590,8 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida Errores Archivos importados Pérdida de altura: %1$d m (%2$d pies) - %1$.2f mph - %1$d:%2$02d min/km - %1$d:%2$02d min/mi Cadencia máxima Cadencia media - %1$.2f km/h Pistas sobrescritas Pistas omitidas Errores diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index 776f9ed89..cf666d6df 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -411,11 +411,6 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s Täpsuse kohandamine Kohandage aku elueale Alati - %1$.2f jalga - %1$.2f km - %1$.2f m - %1$.2f miili - %1$.1f miili (nõrk GPS-signaal) %1$d jalga %1$d jalga (tugev GPS-signaal) %1$d jalga (soovitatav) @@ -579,10 +574,6 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s Jagatud intervall Intervallid Ei ole ühtegi intervalli veel - %1$d:%2$02d min/km - %1$d:%2$02d min/mi - %1$.2f mph - %1$.2f km/h Ringi kiirus %1$s Hoidke lõpetada Hoidke pausi diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 556d87b00..aa1430311 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -412,11 +412,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Doitu zehaztasuna Doitu bateriaren iraupenera Beti - %1$.2f oin - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (GPS ahula) %1$d ft %1$d ft (GPS bikaina) %1$d oin (gomendatua) @@ -543,13 +538,9 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O eskooterra Grabatzen ari zaren bitartean, pantaila osoan ikusi. Pantaila osoa - %1$.2f mph - %1$.2f km/h - %1$d:%2$02d min/mi Track esportazio-direktorioa Berehalako post-entrenamendu esportatu Esportazio-pista biltegiratze ondoren grabaketa amaitu da - %1$d:%2$02d min/km Ez dira edozein tarte oraindik Grabatu zure lehen pista ikusteko batzen estatistikak Ireki gisa GPX diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index dd174e8f7..125ba0864 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -339,11 +339,6 @@ limitations under the License. تعدیل به خاطر دقت تعدیل به خاطر عمر باتری همیشه - %1$.2f فوت - %1$.2f کیلومتر - %1$.2f متر - %1$.2f مایل - %1$.1f مایل (GPS ضعیف) %1$d فوت %1$d فوت (GPS عالی) %1$d فوت (توصیه می‌شود) diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index dba54915b..29b56dfd6 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -422,11 +422,6 @@ jotta ne voidaan tuoda kohteeseen %1$s. Säädä tarkkuutta Sovita akun kestoon Aina - %1$.2f jalkaa - %1$.2f km - %1$.2f m - %1$.2f mailia - %1$.1f mailia (heikko GPS) %1$d jalkaa %1$d jalkaa (erinomainen GPS) %1$d jalkaa (suositus) @@ -560,7 +555,6 @@ jotta ne voidaan tuoda kohteeseen %1$s. Seuraa vientihakemistoa Vie raita varastoon tallennuksen jälkeen on valmis Kierrosnopeus %1$s - %1$d:%2$02d min/km Pyörän ympärysmitta (mm) Välein Lanka keskeytetty @@ -605,12 +599,9 @@ jotta ne voidaan tuoda kohteeseen %1$s. Korkeussijaintitappio: %1$d m (%2$d ft) Maksimisyke Avg syke - %1$.2f k/t - %1$d:%2$02d min/mailia eskootteri Keskim.Poljinnopeus Suurin Poljinnopeus - %1$.2f mt Avattu reitti Etäisyys: %1$s Vauhti: %1$s diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml index 9ee08e463..acb6c1f5d 100644 --- a/src/main/res/values-fr-rCA/strings.xml +++ b/src/main/res/values-fr-rCA/strings.xml @@ -290,11 +290,6 @@ Adapter pour la précision Optimiser pour économiser la pile Toujours - %1$.2f pi - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (mauvaise réception GPS) %1$d pi %1$d pi(s) (réception GPS excellente) %1$d pi (recommandé) diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml index cfa0434bf..502d90cee 100644 --- a/src/main/res/values-fr-rCH/strings.xml +++ b/src/main/res/values-fr-rCH/strings.xml @@ -291,12 +291,7 @@ Adapter pour la précision Économiser la batterie Toujours - %1$.2f pi - %1$.2f km - %1$.2f m - %1$.2f mile(s) - %1$.1f mile(s) (mauvaise réception GPS) - %1$d pied(s) + %1$d pied(s) %1$d pied(s) (réception GPS excellente) %1$d pied(s) (recommandé) %1$d km diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 776c60e79..17667e203 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -412,11 +412,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Adapter pour la précision Économiser la batterie Toujours - %1$.2f pi - %1$.2f km - %1$.2f m - %1$.2f mile(s) - %1$.1f mile(s) (mauvaise réception GPS) %1$d pied(s) %1$d pied(s) (réception GPS excellente) %1$d pied(s) (recommandé) @@ -542,10 +537,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Intervalles Il n\'y a pas encore d\'intervalle Enregistrez votre première piste pour voir les statistiques agrégées - %1$.2f km/h - %1$.2f mph - %1$d:%2$02d min/km - %1$d:%2$02d min/mi Temps au tour de %1$s Vitesse du tour de %1$s Dernière piste exportée diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 291d8ce40..3998184bd 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -429,11 +429,6 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser Adaptar para obter precisión Adaptar á duración restante da batería Sempre - %1$.2f pés - %1$.2f km - %1$.2f m - %1$.2f km - %1$.1f km (GPS deficiente) %1$d m %1$d m (GPS excelente) %1$d m (recomendado) @@ -593,12 +588,8 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser Exportadas as novas rutas Non se atopou ficheiro doc.kml en KMZ Perda - %1$.2f km/h - %1$.2f mph Perda de altitude: %1$d m (%2$d ft) Fallou a exportación, comproba o directorio de exportación. - %1$d:%2$02d min/mi - %1$d:%2$02d min/km Previr a reimportación de rutas Rutas sobrescritas Rutas omitidas diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml index cc906b4fe..cb14577df 100644 --- a/src/main/res/values-hi/strings.xml +++ b/src/main/res/values-hi/strings.xml @@ -339,11 +339,6 @@ limitations under the License. सटीकता के लिए ग्रहण करें बैटरी जीवन के लिए ग्रहण करें हमेशा - %1$.2f फुट - %1$.2f किमी - %1$.2f मी - %1$.2f मी - %1$.1f मी (खराब GPS) %1$d फुट %1$d फुट (उत्कृष्ट GPS) %1$d फ़ुट (अनुशंसित) diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 1b420e644..8da656beb 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -340,11 +340,6 @@ limitations under the License. Prilagodba radi točnosti Prilagodi vijeku trajanja baterije Uvijek - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (loš GPS) %1$d ft %1$d ft (izvrstan GPS) %1$d ft (preporučeno) diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index dd948e6c7..6e221f94b 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -341,11 +341,6 @@ limitations under the License. Beállítás pontossághoz Akkumulátor élettartama szerint Mindig - %1$.2f láb - %1$.2f km - %1$.2f m - %1$.2f mérföld - %1$.1f mérföld (gyenge GPS-jel) %1$d láb %1$d láb (kiváló GPS-jel) %1$d láb (ajánlott) @@ -499,15 +494,12 @@ limitations under the License. Most egy új szám felvétele Most folytatódik a pálya Még nincs intervallum - %1$.2f mph - %1$d:%2$02d min/mi Pálya export könyvtár Sáv exportálása a tárolóba a felvétel befejezése után Utolsó exportált zeneszám Tartsa a szünethez Tartsa lenyomva a leállításhoz Távolság: %1$s - %1$d:%2$02d min/km Azonnali edzés utáni export Tempó: %1$s fotókkal @@ -519,7 +511,6 @@ limitations under the License. Nem támogatott fájlformátum Tevékenységtípus szerint fotók nélkül - %1$.2f km/h %1$s körsebessége Mit tehetsz: \n a) ellenőrizze, hogy a GPS engedélyezve van-e, diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml index b2ed8594c..66211d9dc 100644 --- a/src/main/res/values-in/strings.xml +++ b/src/main/res/values-in/strings.xml @@ -291,11 +291,6 @@ Sesuaikan dengan akurasi Sesuaikan untuk masa pakai baterai Selalu - %1$.2f kaki - %1$.2f km - %1$.2f m - %1$.2f mil - %1$.1f mil (GPS buruk) %1$d kaki %1$d kaki (GPS sangat baik) %1$d kaki (direkomendasikan) diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 7f36d588a..37ad6e714 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -385,11 +385,6 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Adatta per la precisione Adatta per la massima durata della batteria Sempre - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (GPS debole) %1$d pd %1$d pd (GPS forte) %1$d pd (consigliato) @@ -605,16 +600,12 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Errore Potenza media Frequenza cardiaca max - %1$d:%2$02d min/cm - %1$.2f cp/s Discesa Circonferenza della ruota (mm) Perdita di quota: %1$d m (%2$d ft) Tasso cardiaco medio Cadenza max Cadenza media - %1$.2f mpo - %1$d:%2$02d min/mi Distanza: %1$s Velocità: %1$s Ritmo: %1$s diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 204ce1899..8ac97d724 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -291,11 +291,6 @@ התאם למען הדיוק התאם לחיי הסוללה תמיד - %1$.2f רגל - %1$.2f ק\"מ - %1$.2f מ\' - %1$.2f מייל - %1$.1f מייל (GPS חלש) %1$d רגל %1$d רגל (GPS מעולה) %1$d רגל (מומלץ) diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 2ded500b6..f21c46417 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -341,11 +341,6 @@ limitations under the License. 精度を重視 電池残量を重視 常に使用する - %1$.2fフィート - %1$.2fkm - %1$.2fm - %1$.2fmi - %1$.1fmi(GPS信号: 弱) %1$dft %1$dft(GPS信号: 強) %1$dft(推奨) diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 556a431da..95f46d3ba 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -340,11 +340,6 @@ limitations under the License. 정확도를 위해 조정 배터리 수명을 위해 조정 항상 - %1$.2f피트 - %1$.2fkm - %1$.2fm - %1$.2f마일 - %1$.1f마일(GPS 수신 불량) %1$d피트 %1$d피트(GPS 수신 원활) %1$d피트(권장) diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml index 7f27e6241..cc2731c86 100644 --- a/src/main/res/values-lt/strings.xml +++ b/src/main/res/values-lt/strings.xml @@ -342,11 +342,6 @@ limitations under the License. Pritaikyti siekiant tikslumo Pritaik. taus. akum. Visada - %1$.2f pėd. - %1$.2f km - %1$.2f m - %1$.2f myl. - %1$.1f myl. (prastas GPS) %1$d pėd. %1$d pėd. (puikus GPS) %1$d pėd. (rekomenduojama) diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml index 1cecfed3d..2685f7fc7 100644 --- a/src/main/res/values-lv/strings.xml +++ b/src/main/res/values-lv/strings.xml @@ -340,11 +340,6 @@ limitations under the License. Pielāgot precizitātei Pielāgot akumulatora darbības ilgumam Vienmēr - %1$.2f pēda(-as) - %1$.2f km - %1$.2f m - %1$.2f jūdze(-es) - %1$.1f jūdze(-es) (vājš GPS) %1$d pēda(-as) %1$d pēda(-as) (izcilas kvalitātes GPS) %1$d pēdas (ieteicams) diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml index 1c9fc0ccb..c8f19ad0a 100644 --- a/src/main/res/values-mo/strings.xml +++ b/src/main/res/values-mo/strings.xml @@ -291,11 +291,6 @@ Adaptaţi pentru acurateţe Economisiţi bateria Întotdeauna - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (semnal GPS slab) %1$d ft %1$d ft (semnal GPS excelent) %1$d ft (recomandat) diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml index f60437ef1..87bcf7161 100644 --- a/src/main/res/values-ms/strings.xml +++ b/src/main/res/values-ms/strings.xml @@ -341,11 +341,6 @@ limitations under the License. Sesuaikan untuk ketepatan Sesuaikan untuk hayat bateri Sentiasa - %1$.2f kaki - %1$.2f km - %1$.2f m - %1$.2f batu - %1$.1f batu (GPS lemah) %1$d kaki %1$d kaki (GPS bagus) %1$d kaki (disyorkan) diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 0ccc839ec..e39f13ff6 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -342,11 +342,6 @@ limitations under the License. Tilpass for nøyaktighet Tilpass for batterilevetid Alltid - %1$.2f fot - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (dårlig GPS) %1$d fot %1$d fot (utmerket GPS) %1$d fot (anbefales) @@ -579,10 +574,6 @@ limitations under the License. \n e) kjøpe i Google Play Store, \n f) donere, og \n g) gjøre hva du tror hjelper OpenTracks. - %1$.2f km/t - %1$d:%2$02d min/km - %1$.2f mph - %1$d:%2$02d min/mi Total nedstigning: %1$d m (%2$d ft) Total nedstigning Du har stilt inn å forhindre at spor importeres om igjen diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index f3e34202c..f24818d1f 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -411,11 +411,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Aanpassen voor nauwkeurigheid Aanpassen voor resterende accutijd Altijd - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (slecht GPS-signaal) %1$d ft %1$d ft (uitstekend GPS-signaal) %1$d ft (aanbevolen) @@ -553,7 +548,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Geen doc.kml bestand gevonden in KMZ Volledig scherm GPS vast en klaar - %1$.2f km/h Neem uw eerste track op om geaggregeerde statistieken te zien Intervallen Wielomtrek (mm) @@ -574,12 +568,9 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Systeem UI Thema Verlies - %1$.2f mph Er zijn nog geen intervallen Gesplitst interval Intervallen - %1$d:%2$02d min/km - %1$d:%2$02d min/mi Rondetijd van %1$s Ronde snelheid van %1$s Directe export na de training diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 6107a4a9e..0f0bbdf2f 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -378,11 +378,6 @@ limitations under the License. Dostosuj pod kątem dokładności Dostosuj pod kątem żywotności baterii Zawsze - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (słaby sygnał GPS) %1$d ft %1$d ft (doskonały sygnał GPS) %1$d ft (zalecane) @@ -609,10 +604,6 @@ limitations under the License. Prędkość: %1$s Szybkość: %1$s Odległość: %1$s - %1$d:%2$02d min/km - %1$d:%2$02d min/mi - %1$.2f mph - %1$.2f km/h Dane osób trzecich Usługa usuwania %1$d/%2$d diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index fde7301c0..d093018d9 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -294,11 +294,6 @@ Adaptar para fins de precisão Adaptar à vida da bateria Sempre - %1$.2f pés - %1$.2f km - %1$.2f m - %1$.2f milhas - %1$.1f milhas (GPS com sinal baixo) %1$d pés %1$d pés (GPS excelente) %1$d pés (recomendado) @@ -530,16 +525,12 @@ Tempo da volta de %1$s Eu gostaria de compartilhar uma imagem com você Exportar trilha para armazenamento depois que a gravação for concluída - %1$.2f mph - %1$d:%2$02d min/km Você definiu evitar reimportar a trilha Perda A exportação pós-treino falhou, verifique o diretório de exportação. - %1$.2f km/h Perda de elevação: %1$d m (%2$d ft) Novas trilhas exportadas Nenhum arquivo doc.kml encontrado no KMZ - %1$d:%2$02d min/mi Impedir a reimportação de trilhas Trilhas sobrescritas Trilhas puladas diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 655372183..4165187a4 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -290,11 +290,6 @@ Adaptar para precisão Adaptar para a vida da bateria Sempre - %1$.2f pés - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (GPS fraco) %1$d pés %1$d pés (GPS excelente) %1$d pés (recomendado) diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 15729f709..b39bea906 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -342,11 +342,6 @@ limitations under the License. Adaptar para fins de precisão Adaptar à vida da bateria Sempre - %1$.2f pés - %1$.2f km - %1$.2f m - %1$.2f milhas - %1$.1f milhas (GPS com sinal baixo) %1$d pés %1$d pés (GPS excelente) %1$d pés (recomendado) diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index d13068ca5..4f42316d9 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -340,11 +340,6 @@ limitations under the License. Adaptaţi pentru acurateţe Economisiţi bateria Întotdeauna - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (semnal GPS slab) %1$d ft %1$d ft (semnal GPS excelent) %1$d ft (recomandat) diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index f2e24996f..a342a97be 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -340,11 +340,6 @@ limitations under the License. Макс. точность Мин. расход батареи Всегда - %1$.2f фт - %1$.2f км - %1$.2f м - %1$.2f мил - %1$.1f мил. (слабый сигнал) %1$d фт %1$d фт (отличный сигнал) %1$d фт (рекомендуется) @@ -569,10 +564,6 @@ limitations under the License. Темп: %1$s Скорость: %1$s Расстояние: %1$s - %1$d:%2$02d мин/км - %1$d:%2$02d мин/миль - %1$.2f mph - %1$.2f км/ч Интервалов пока нет Запишите свой первый трек, чтобы увидеть агрегированную статистику Теперь возобновляем путь diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 899906581..b92664fe1 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -339,11 +339,6 @@ limitations under the License. Prispôsobiť na presnosť Prispôsobiť na výdrž batérie Vždy - %1$.2f stopy - %1$.2f km - %1$.2f m - %1$.2f mi. - %1$.1f mi. (slabý signál GPS) %1$d st. %1$d st. (výborný signál GPS) %1$d st. (odporúčané) diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index 20c372ab5..9b5b334a4 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -341,11 +341,6 @@ limitations under the License. Prilagodi za natančnost Prilagodi za življenjsko dobo baterije Vedno - %1$.2f čevljev - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (slab signal GPS) %1$d čevljev %1$d čevljev (odličen signal GPS) %1$d čevljev (priporočeno) diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 4bd6d7ff9..126efb85a 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -339,11 +339,6 @@ limitations under the License. Прилагоди за прецизност Прилагоди трајању батерије Увек - %1$.2f ст - %1$.2f км - %1$.2f м - %1$.2f ми - %1$.1f ми (слаб GPS) %1$d ст %1$d ст (одличан GPS) %1$d ст (препоручено) diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index b0a278d5e..e970f21e5 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -339,11 +339,6 @@ limitations under the License. Anpassa för noggrannhet Anpassa för batterilivslängd Alltid - %1$.2f fot - %1$.2f km - %1$.2f m - %1$.2f mile - %1$.1f mile (dålig GPS-mottagning) %1$d fot %1$d fot (utmärkt GPS-mottagning) %1$d fot (rekommenderas) diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml index 6956890fb..df6d3fdc4 100644 --- a/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -339,11 +339,6 @@ limitations under the License. ปรับความแม่นยำ ปรับเพื่อแบตเตอรี่ เปิดใช้งานเสมอ - %1$.2f ฟุต - %1$.2f กม. - %1$.2f ม. - %1$.2f ไมล์ - %1$.1f ไมล์ (สัญญาณ GPS ไม่ดี) %1$d ฟุต %1$d ฟุต (สัญญาณ GPS ดี) %1$d ฟุต (แนะนำ) diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml index cdfff7424..a61bc2f4c 100644 --- a/src/main/res/values-tl/strings.xml +++ b/src/main/res/values-tl/strings.xml @@ -339,11 +339,6 @@ limitations under the License. Iangkop para sa katumpakan Iangkop para sa antas ng baterya Palagi - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mi - %1$.1f mi (mahina ang GPS) %1$d ft %1$d ft (malinaw na GPS) %1$d ft (inirerekomenda) diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index e3a73e5db..e7297ac5c 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -340,11 +340,6 @@ limitations under the License. Doğruluk için uyarla Pil ömrü için uyarla Her zaman - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f mil - %1$.1f mil (zayıf GPS) %1$d ft %1$d ft (mükemmel GPS) %1$d ft (önerilir) diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index d505ac5c4..0e53b7daf 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -341,11 +341,6 @@ limitations under the License. Адаптувати для точності Адаптувати до часу роботи батареї Завжди - %1$.2f фт - %1$.2f км - %1$.2f м - Миль: %1$.2f - Миль: %1$.1f (слабкий сигнал GPS) %1$d фут %1$d фут. (відмінний сигнал GPS) %1$d фут. (рекомендовано) @@ -474,14 +469,11 @@ limitations under the License. Розділити на Точність місцеположення: %1$s Інтервали - %1$d:%2$02d хв/милі Швидкість кола %1$s Час кола %1$s Зараз записується новий трек Відновлюємо запис треку Ще немає інтервалу - %1$.2f км/г - %1$.2f миль/г Думаю, вам може бути цікаво це зображення. Затисніть Експорт треку в сховище після завершення запису @@ -582,7 +574,6 @@ limitations under the License. Під час запису показувати статистику без розблокування пристрою. Втрачено Інтервали - %1$d:%2$02d хв/км Я хотів би поділитися з вами зображенням Останній трек експортовано Каталог експорту треків diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 5c3e741c8..f9f0fc5a7 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -341,11 +341,6 @@ limitations under the License. Thích ứng với độ chính xác Thích ứng với tuổi thọ pin Luôn luôn - %1$.2f ft - %1$.2f km - %1$.2f m - %1$.2f dặm - %1$.1f dặm (tín hiệu GPS xấu) %1$d ft %1$d ft (tín hiệu GPS tốt) %1$d ft (được đề nghị) diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml index 454213679..d7421b3cf 100644 --- a/src/main/res/values-zh-rHK/strings.xml +++ b/src/main/res/values-zh-rHK/strings.xml @@ -292,11 +292,6 @@ 根據精度調整 根據電池壽命調整 一律使用 - %1$.2f 英尺 - %1$.2f 公里 - %1$.2f 公尺 - %1$.2f 英里 - %1$.1f 英里 (GPS 訊號差) %1$d 英尺 %1$d 英尺 (GPS 訊號佳) %1$d 英尺 (建議值) diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 454213679..d7421b3cf 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -292,11 +292,6 @@ 根據精度調整 根據電池壽命調整 一律使用 - %1$.2f 英尺 - %1$.2f 公里 - %1$.2f 公尺 - %1$.2f 英里 - %1$.1f 英里 (GPS 訊號差) %1$d 英尺 %1$d 英尺 (GPS 訊號佳) %1$d 英尺 (建議值) diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index bcd9b47f1..1241a37e6 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -342,11 +342,6 @@ limitations under the License. 适应精度 视电池电量而定 一律启用 - %1$.2f 英尺 - %1$.2f 公里 - %1$.2f 米 - %1$.2f 英里 - %1$.1f 英里(GPS 信号差) %1$d 英尺 %1$d 英尺(GPS 信号极佳) %1$d 英尺(推荐) diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml index c814289f3..02b71e85f 100644 --- a/src/main/res/values/do_not_translate.xml +++ b/src/main/res/values/do_not_translate.xml @@ -24,6 +24,11 @@ limitations under the License. Data provided by GeographicLib. + + %1$s %2$s + %1$s %2$s + %1$d:%2$02d + Google\'s androidX support (Apache License, Version 2.0) \n diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 32e7df3a3..0642d4896 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -507,21 +507,14 @@ limitations under the License. km/h m mi - mi/h + mph min/km min/mi Adapt for accuracy Adapt for battery life Always - %1$.2f ft - %1$.2f km - %1$.2f km/h - %1$.2f m - %1$.2f mi - %1$.2f mph - %1$.1f mi (poor GPS) %1$d ft %1$d ft (excellent GPS) %1$d ft (recommended) @@ -536,8 +529,6 @@ limitations under the License. %1$d min %1$d %% %1$d s - %1$d:%2$02d min/mi - %1$d:%2$02d min/km None Off Smallest