diff --git a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java index 7ae019d80..9a68d734b 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java @@ -144,7 +144,7 @@ public class StringUtils { } public static String formatCoordinate(Context context, Position position) { - return context.getString(R.string.location_latitude_longitude, Location.convert(position.latitude(), Location.FORMAT_DEGREES), Location.convert(position.longitude(), Location.FORMAT_DEGREES)); + return context.getString(R.string.location_latitude_longitude,position.latitude(), position.longitude()); } public static Pair getHeartRateParts(Context context, HeartRate heartrate) { diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index da0b76b69..8e764e6a6 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -540,8 +540,6 @@ limitations under the License. خط العرض/خط الطول لا يمكن حذف هذا المسار لأنه يتم تسجيله حاليًا. لا توجد فواصل بعد - %1$s° - %1$s، %2$s النظام الافتراضي {n, plural, =1 {كيلومتر واحد في الساعة} other {{n,number,#.0} كيلومترات في الساعة} } سرعة الدورة diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index 32a2b757c..6902d1bf0 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -398,11 +398,9 @@ Secundario GPS Velocidad de la voz - %1$s, %2$s Todos los ajustes de diseño se revertirán a los valores predeterminados. Esto no eliminará ningún recorrido en el dispositivo. Distancia, velocidad y cadencia Latitud/Longitud - %1$s° Selecciona una opción Distancia y velocidad Cadencia diff --git a/src/main/res/values-co/strings.xml b/src/main/res/values-co/strings.xml index 4b64f68a0..750818c9a 100644 --- a/src/main/res/values-co/strings.xml +++ b/src/main/res/values-co/strings.xml @@ -323,7 +323,6 @@ min/km min/mi min/NM - %1$s° %1$d ft (ricumandatu) %1$.1f km/o %1$.1f km/o (ricumandatu) @@ -491,7 +490,6 @@ nodi km/o mph - %1$s, %2$s NM %1$d km/o %1$d mi/o diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 2bddb360a..5132dbdc6 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -440,8 +440,6 @@ limitations under the License. Zvolit možnost OpenTracks vyžaduje povolení k používání Bluetoothu. Tep - %1$s° - %1$s, %2$s Generické Cyklistika Běh diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index c9e93d078..f7bb4001e 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -493,8 +493,6 @@ limitations under the License. Vis kun Bluetooth-enheder, der annoncerer de krævede tjenester Der er ingen aktiviteter for det angivne filter %1$.1f km/h - %1$s° - %1$s, %2$s Fortryd Vælg layout Udseende, registreringslayout, tema diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 03cca8d6f..ab29cbb13 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -581,7 +581,6 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka Keine kompatible Kamera-Anwendung installiert Keine kompatible Bildergalerie Anwendung installiert Es ist keine Anwendung installiert, die die OpenTracks Dashboard API unterstützt. - %1$s, %2$s Nautisches Maß (NM, ft) min/NM Verwende den Lautsprecher des Gerätes @@ -589,7 +588,6 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka pro nautische Meile OpenTracks Dashboard API OpenTracks selbst stellt keine Karte bereit. Bitte installieren Sie OSMDashboard, um Ihre Aufnahmen auf einer Karte anzuzeigen. - %1$s° %1$.1f mi/h {n, plural, =1 {1 nautische Meile} other {{n,number,#.0} nautische Meilen} } %1$.1f Knoten diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 441350551..451642549 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -487,8 +487,6 @@ limitations under the License. ¿Restablecer todos los diseños\? Todos los diseños se han revertido a los valores predeterminados Restablecer - %1$s° - %1$s, %2$s Remover Selecciona una opción Restablecer pantalla personalizada diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index 0d054ee32..c5b59c2e8 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -446,8 +446,6 @@ limitations under the License. Import OpenTracks vajab Bluetooth-i kasutamiseks luba. Peate Opentracks\'ile süsteemiseadetes andma käsitsi loa lähedalasuvatele seadmetele. - %1$s, %2$s - %1$s° Esmane Valige suvand Kõik paigutusseaded on muudetud vaikeväärtusteks diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index d37a519dd..51ac47b5e 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -449,7 +449,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Diseinu Lehenetsia Berrezarri Diseinu Pertsonalizatua Diseinuak berrezarri\? - %1$s° Kendu Ezin izan da direktorioa esportatu. " (idatzi ezin dena).)" @@ -502,7 +501,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Ez dago jarduerarik zehaztutako iragazkiarentzat Bigarren mailakoa Nagusia - %1$s, %2$s Desegin Fitxategi-kudeatzaile bateragarririk ez da instalatu \ No newline at end of file diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 29203b515..1c34e3582 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -474,8 +474,6 @@ limitations under the License. Pyöräily Yleinen OpenTracks tarvitsee luvan käyttääkseen Bluetoothia. - %1$s° - %1$s, %2$s Eilen Käyttöliittymä Tuo, vie, automaattinen vienti diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index aef8e4d46..98c366167 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -493,8 +493,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Réinitialiser vos dispositions \? Tous les paramètres de mise en page sont revenus à leur valeur par défaut Réinitialiser - %1$s° - %1$s, %2$s OpenTracks a besoin de la permission d\'utiliser le Bluetooth. Champs de données par rangée Principal diff --git a/src/main/res/values-ga/strings.xml b/src/main/res/values-ga/strings.xml index e5584d5fc..396a92ab9 100644 --- a/src/main/res/values-ga/strings.xml +++ b/src/main/res/values-ga/strings.xml @@ -387,8 +387,6 @@ %1$d km/u %1$.1f km/u %1$d tr (GPS ar fheabhas) - %1$s, %2$s - %1$s° nóim/NM %1$d m (GPS ar fheabhas) %1$d m (GPS go dona) diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index f20df61b8..14e3d1f61 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -435,8 +435,6 @@ limitations under the License. Restablecer Pulso cardíaco Cadencia - %1$sº - %1$s, %2$s Eliminar Primario Secundario diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 2118ebc89..006056bdb 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -449,7 +449,6 @@ limitations under the License. Nije instalirana nijedna kompatibilna aplikacija galerije slika Pokaži greške Nije instalirana nijedna aplikacija koja podržava API OpenTracks kontrolne ploče. - %1$s° Prikaži sve dostupne Bluetooth uređaje Odaberi raspored Standardne vrijednosti aktivnosti @@ -476,7 +475,6 @@ limitations under the License. Brzina runde Uvijek Opseg kotača (mm) - %1$s, %2$s Vrijeme runde Kako prikazati rutu na karti\? Odbacivanje rute diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 3c0ede85d..4e32ef7ff 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -477,8 +477,6 @@ limitations under the License. Alapértelmezett elrendezés Egyéni elrendezés visszaállítása Kerékpározás - %1$s° - %1$s, %2$s Mindig Az %1$s összeomlott Idő, távolság, beszédhang sebessége diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 5bd74f542..67417be78 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -442,8 +442,6 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Orologio Intervallo di tempo Lunghezza giro - %1$s, %2$s - %1$s° %1$.1f km/h (consigliato) %1$.1f mi/h %1$.1f mi/h (consigliato) diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml index f06e2274b..5354abb0f 100644 --- a/src/main/res/values-kn/strings.xml +++ b/src/main/res/values-kn/strings.xml @@ -388,8 +388,6 @@ ನಿಮಿಷ/ಕಿಮೀ ನಿಮಿಷ/ಮೈ ನಿಮಿಷ/NM - %1$s° - %1$s, %2$s %1$d ಅಡಿ (ಅತ್ಯುತ್ತಮ GPS) %1$d ಅಡಿ (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ) %1$d ಕಿಮೀ/ಗಂ diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 1ecfac644..41faacfcd 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -426,8 +426,6 @@ limitations under the License. Tilbakestill Kadens Kraft - %1$s° - %1$s, %2$s Primær Sekundær Fjern diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index cc245fe19..4b8b5c4ce 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -468,8 +468,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Uitvoer Generiek " (geen schrijfrecht!)" - %1$s° - %1$s, %2$s %1$.1f km/u (aanbevolen) GPS Geen schrijfrecht in export map. diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index f52ea9f7d..5e4eb4c49 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -485,8 +485,6 @@ limitations under the License. Szerokość/długość geograficzna Tempo Moc - %1$s° - %1$s, %2$s %1$.1f km/h (zalecane) %1$.1f mi/h %1$.1f mi/h (zalecane) diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 5019a0c74..58780b81c 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -397,8 +397,6 @@ Redefinir Latitude/Longitude Poder - %1$s° - %1$s, %2$s Primário Secundário Remover diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index d0f2fa6e5..b2f2249e6 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -300,7 +300,6 @@ Outras aplicações instaladas podem iniciar ou interromper gravações. Precisão da localização: %1$s NM - %1$s, %2$s %1$d nós Frequência cardíaca média Frequência cardíaca atual @@ -472,7 +471,6 @@ Não há atividades para o filtro especificado Não há nenhum intervalo ainda kn - %1$s° min/NM %1$.1f km/h %1$.1f km/h (Recomendado) diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 3c955d676..8173251f4 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -592,8 +592,6 @@ limitations under the License. NM kn min/NM - %1$s° - %1$s, %2$s %1$.1f nós (recomendado) Tempo da volta Ritmo diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 6ebe2d8d0..efb87c512 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -506,8 +506,6 @@ limitations under the License. Приложение, запустившее запись, также может просматривать записанные данные. Записанные данные не будут автоматически доступны другим приложениям. Широта/долгота - %1$s° - %1$s, %2$s %1$.1f км/ч %1$.1f км/ч (рекомендуется) Дополнительная diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index db70e095f..c352df742 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -443,7 +443,6 @@ limitations under the License. Predvolené rozloženie Zemepisná šírka/dĺžka územia GPS - %1$s° OpenTracks vyžaduje povolenie na používanie Bluetooth. Obvod kolesa (mm) Zobrazenie iba zariadení Bluetooth, ktoré oznamujú požadované služby @@ -457,7 +456,6 @@ limitations under the License. Túto stopu nie je možné vymazať, pretože je práve nahraná. %1$.1f míľ/h (odporúčané) %1$.1f km/h (odporúčané) - %1$s, %2$s Pre zadaný filter neexistujú žiadne aktivity Intervaly Rád by som sa s vami podelil o jeden obrázok diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index 05847f2ca..18645527a 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -346,8 +346,6 @@ limitations under the License. Kolesarjenje Teče Natančnost lokacije: %1$s - %1$s, %2$s - %1$s° Razdalja: %1$s na kilometer Povprečni srčni utrip diff --git a/src/main/res/values-ta/strings.xml b/src/main/res/values-ta/strings.xml index 1648ce23b..f05b3563b 100644 --- a/src/main/res/values-ta/strings.xml +++ b/src/main/res/values-ta/strings.xml @@ -386,8 +386,6 @@ கி.மீ. கிமீ/மணி நிமிடம்/என்.எம் - %1$s ° - %1$s, %2$s %1$d அடி (பரிந்துரைக்கப்படுகிறது) %1$d கிமீ/மணி %1$.1f கிமீ/மணி diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 1a3d66915..180d414e4 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -507,8 +507,6 @@ limitations under the License. dk/mi dk/NM - %1$s° - %1$s, %2$s %1$d ft (mükemmel GPS) %1$d ft (önerilen) diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index e43374c1b..ad7d17eca 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -476,9 +476,7 @@ limitations under the License. Вчора Не вдається виконати запис до каталогу експорту. " (недоступно для запису!)" - %1$s° %1$.1f миль/год (рекомендовано) - %1$s, %2$s %1$.1f км/год (рекомендовано) %1$.1f миль/год GPS diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 60ac2ba56..f3f81718a 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -433,8 +433,6 @@ limitations under the License. Sức mạnh Khoảng cách: %1$s Tốc độ: %1$s - %1$s, %2$s - %1$s° Nhịp độ: %1$s Xuất tuyến đường vào bộ nhớ sau khi ghi xong Giữ để dừng lại diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 8f614380b..b8fb90056 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -461,8 +461,6 @@ limitations under the License. 分鐘/英里 分鐘/海里 - %1$s° - %1$s, %2$s %1$d 英尺(GPS 訊號佳) %1$d 英尺(建議值) diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index 862a25da7..df9a1a0af 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -431,7 +431,6 @@ limitations under the License. 心率 丢弃路线 海里 - %1$s, %2$s 每英里 没有安装兼容的文件管理器 分段 @@ -443,7 +442,6 @@ limitations under the License. 位置精度:%1$s 节 分钟/海里 - %1$s° %1$.1f 公里/小时 %1$d 节 %1$.1f 英里/小时 diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml index cd066beea..7f30bda57 100644 --- a/src/main/res/values/do_not_translate.xml +++ b/src/main/res/values/do_not_translate.xml @@ -31,6 +31,9 @@ limitations under the License. %1$s %2$s %1$d:%2$02d + %1$s° + %1$.5f, %2$.5f + 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 149b446e0..c79ce7642 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -515,9 +515,6 @@ limitations under the License. min/km min/mi min/NM - - %1$s° - %1$s, %2$s %1$d ft (excellent GPS)