Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename foots

Browse source
This commit is contained in:
sonora 2016-08-30 09:09:59 +02:00
parent e1fae2b379
commit 6d5e602bba
48 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-af/strings.xml
View file

@ -400,7 +400,7 @@
<string name="shared_string_previous">Vorige</string>
<string name="unit_of_length_descr">Verander eenhede van lengte en spoed</string>
<string name="unit_of_length">Meeteenheid</string>
<string name="si_mi_foots">Myle / voete</string>
<string name="si_mi_feet">Myle / voete</string>
<string name="si_mi_yard">Myle/jaarts</string>
<string name="si_km_m">Kilometers/meters</string>
<string name="yard">Jrt</string>

2
OsmAnd/res/values-ar/strings.xml
View file

@ -1054,7 +1054,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="shared_string_previous">السابق</string>
<string name="unit_of_length_descr">تغيير وحدات الطول</string>
<string name="unit_of_length">وحدة الطول</string>
<string name="si_mi_foots">ميل/قدم</string>
<string name="si_mi_feet">ميل/قدم</string>
<string name="si_mi_yard">ميل/ ياردة</string>
<string name="si_km_m">كيلومتر/متر</string>
<string name="yard">ياردة</string>

2
OsmAnd/res/values-b+hsb/strings.xml
View file

@ -639,7 +639,7 @@
<string name="incomplete_locale">njehotowa</string>
<string name="unit_of_length_descr">Wubjerće jednotki dołhosće a spěšnosće</string>
<string name="unit_of_length">Měrjenske jednotki</string>
<string name="si_mi_foots">Mile/stopy</string>
<string name="si_mi_feet">Mile/stopy</string>
<string name="si_mi_yard">Miles/yardy</string>
<string name="si_km_m">Kilometry/metry</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -1398,7 +1398,7 @@ Zaraz jo {2} MB volnaha miesca.</string>
<string name="shared_string_previous">Nazad</string>
<string name="unit_of_length_descr">Źmianіć adzіnkі adlehłaścі</string>
<string name="unit_of_length">Adzіnka vymiareńnia adlehłaścі</string>
<string name="si_mi_foots">Mіli/futy</string>
<string name="si_mi_feet">Mіli/futy</string>
<string name="si_mi_yard">Mіli/jardy</string>
<string name="si_km_m">Kіlametry/metry</string>
<string name="yard">jard</string>

2
OsmAnd/res/values-be/strings.xml
View file

@ -905,7 +905,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="unit_of_length_descr">Зьмяніць адзінкі адлегласьці</string>
<string name="unit_of_length">Адзінка вымярэньня адлегласьці</string>
<string name="si_mi_foots">Мілі/футы</string>
<string name="si_mi_feet">Мілі/футы</string>
<string name="si_mi_yard">Мілі/ярды</string>
<string name="si_km_m">Кілямэтры/мэтры</string>
<string name="yard">ярд</string>

2
OsmAnd/res/values-bg/strings.xml
View file

@ -685,7 +685,7 @@
<string name="shared_string_previous">Предишен</string>
<string name="unit_of_length_descr">Промяна на мерните единици за разстояние и скорост</string>
<string name="unit_of_length">Мерни единици</string>
<string name="si_mi_foots">Мили/фута</string>
<string name="si_mi_feet">Мили/фута</string>
<string name="si_mi_yard">Мили/ярда</string>
<string name="si_km_m">Километри/метри</string>
<string name="yard">ярда</string>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -297,7 +297,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
<string name="shared_string_previous">Enrere</string>
<string name="unit_of_length_descr">Canvia les unitats de longitud</string>
<string name="unit_of_length">Unitat de longitud</string>
<string name="si_mi_foots">Milles/peus</string>
<string name="si_mi_feet">Milles/peus</string>
<string name="si_mi_yard">Milles/iardes</string>
<string name="si_km_m">Quilòmetres/metres</string>
<string name="send_location_sms_pattern">Ubicació: %1$s\n%2$s</string>

2
OsmAnd/res/values-cs/strings.xml
View file

@ -300,7 +300,7 @@ Nyní je k dispozici {2} MB.</string>
<string name="shared_string_previous">Předchozí</string>
<string name="unit_of_length_descr">Zvolte jednotku vzdálenosti</string>
<string name="unit_of_length">Jednotka vzdálenosti</string>
<string name="si_mi_foots">Míle/stopy</string>
<string name="si_mi_feet">Míle/stopy</string>
<string name="si_mi_yard">Míle/yardy</string>
<string name="si_km_m">Kilometry/metry</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-da/strings.xml
View file

@ -788,7 +788,7 @@ Liste over understøttede lande (dybest set hele verden!): Afghanistan, Albanien
<string name="unit_of_length_descr">Vælg enhed for afstand</string>
<string name="unit_of_length">Afstand</string>
<string name="si_mi_foots">Mil/fod</string>
<string name="si_mi_feet">Mil/fod</string>
<string name="si_mi_yard">Mil/yards</string>
<string name="si_km_m">Kilometer/meter</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-de/strings.xml
View file

@ -547,7 +547,7 @@ Aktuell sind {2} MB verfügbar.</string>
<string name="shared_string_previous">Zurück</string>
<string name="unit_of_length_descr">Längeneinheiten auswählen</string>
<string name="unit_of_length">Längeneinheiten</string>
<string name="si_mi_foots">Meilen/Fuß</string>
<string name="si_mi_feet">Meilen/Fuß</string>
<string name="si_mi_yard">Meilen/Yards</string>
<string name="si_km_m">Kilometer/Meter</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-el/strings.xml
View file

@ -482,7 +482,7 @@
<string name="shared_string_previous">Προηγούμενο</string>
<string name="unit_of_length_descr">Αλλαγή μονάδων μήκους και ταχύτητας</string>
<string name="unit_of_length">Μονάδα μέτρησης</string>
<string name="si_mi_foots">Μίλια/πόδια</string>
<string name="si_mi_feet">Μίλια/πόδια</string>
<string name="si_mi_yard">Μίλια/γιάρδες</string>
<string name="si_km_m">Χιλιόμετρα/μέτρα</string>
<string name="yard">γδ</string>

2
OsmAnd/res/values-eo/strings.xml
View file

@ -1729,7 +1729,7 @@ Kaj la loko kaj tempo estas montrataj ĉe la OsmAnd stirpanelo, kaj ĉe la fenes
<string name="preferred_locale_descr">Elektu lingvon de fasado (bonvolu restarti OsmAnd post ŝanĝo)</string>
<string name="unit_of_length">Long-unuo</string>
<string name="unit_of_length_descr">Ŝanĝu unuon de longo</string>
<string name="si_mi_foots">Mejloj/futoj</string>
<string name="si_mi_feet">Mejloj/futoj</string>
<string name="si_mi_yard">Mejloj/jardoj</string>
<string name="si_km_m">Kilometroj/metroj</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -1428,7 +1428,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="incomplete_locale">incompleto</string>
<string name="unit_of_length_descr">Cambia las unidades de longitud</string>
<string name="unit_of_length">Unidad de longitud</string>
<string name="si_mi_foots">Millas/pies</string>
<string name="si_mi_feet">Millas/pies</string>
<string name="si_mi_yard">Millas/yardas</string>
<string name="si_km_m">Kilómetros/metros</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -1428,7 +1428,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="incomplete_locale">incompleto</string>
<string name="unit_of_length_descr">Cambia las unidades de longitud</string>
<string name="unit_of_length">Unidad de longitud</string>
<string name="si_mi_foots">Millas/pies</string>
<string name="si_mi_feet">Millas/pies</string>
<string name="si_mi_yard">Millas/yardas</string>
<string name="si_km_m">Kilómetros/metros</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-es/strings.xml
View file

@ -212,7 +212,7 @@
<string name="shared_string_previous">Anterior</string>
<string name="unit_of_length_descr">Cambia las unidades de longitud</string>
<string name="unit_of_length">Unidad de longitud</string>
<string name="si_mi_foots">Millas/pies</string>
<string name="si_mi_feet">Millas/pies</string>
<string name="si_mi_yard">Millas/yardas</string>
<string name="si_km_m">Kilómetros/metros</string>
<string name="yard">yarda</string>

2
OsmAnd/res/values-eu/strings.xml
View file

@ -937,7 +937,7 @@ Honek {1} MB behar ditu behin betiko.
<string name="shared_string_previous">Aurrekoa</string>
<string name="unit_of_length_descr">Aldatu luzera unitateak</string>
<string name="unit_of_length">Luzera unitatea</string>
<string name="si_mi_foots">Miliak/oinak</string>
<string name="si_mi_feet">Miliak/oinak</string>
<string name="si_mi_yard">Miliak/yardak</string>
<string name="si_km_m">Kilometroak/metroak</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-fa/strings.xml
View file

@ -829,7 +829,7 @@
<string name="si_mi_foots">مایل/پا</string>
<string name="si_mi_feet">مایل/پا</string>
<string name="si_mi_yard">مایل/یارد</string>
<string name="si_km_m">کیلومتر/متر</string>
<string name="yard">یارد</string>

2
OsmAnd/res/values-fi/strings.xml
View file

@ -627,7 +627,7 @@
<string name="recording_delete_confirm">Haluatko poistaa tämän nauhoituksen?</string>
<string name="unit_of_length">Mittayksiköt</string>
<string name="unit_of_length_descr">Vaihda pituuden ja nopeuden yksiköitä</string>
<string name="si_mi_foots">Mailia/jalkaa</string>
<string name="si_mi_feet">Mailia/jalkaa</string>
<string name="si_mi_yard">Mailia/jaardia</string>
<string name="si_km_m">Kilometrejä/metrejä</string>
<string name="shared_string_previous">Edellinen</string>

2
OsmAnd/res/values-fr/strings.xml
View file

@ -227,7 +227,7 @@ Actuellement {2} Mo sont disponibles.</string>
<string name="shared_string_previous">Précédent</string>
<string name="unit_of_length_descr">Modifier les unités de mesure des distances</string>
<string name="unit_of_length">Unités de distance</string>
<string name="si_mi_foots">Miles/pieds</string>
<string name="si_mi_feet">Miles/pieds</string>
<string name="si_mi_yard">Miles/yards</string>
<string name="si_km_m">Kilomètres/mètres</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-gl/strings.xml
View file

@ -1093,7 +1093,7 @@
<string name="shared_string_previous">Anterior</string>
<string name="unit_of_length_descr">Cambiar as unidades de distancia e de velocidade</string>
<string name="unit_of_length">Unidade de medida</string>
<string name="si_mi_foots">Millas/pés</string>
<string name="si_mi_feet">Millas/pés</string>
<string name="si_mi_yard">Millas/iardas</string>
<string name="si_km_m">Quilómetros/metros</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-he/strings.xml
View file

@ -516,7 +516,7 @@
<string name="shared_string_previous">הקודם</string>
<string name="unit_of_length_descr">שינוי יחידות האורך והמהירות</string>
<string name="unit_of_length">יחידת המידה</string>
<string name="si_mi_foots">מיילים/רגל</string>
<string name="si_mi_feet">מיילים/רגל</string>
<string name="si_mi_yard">מיילים/יארדים</string>
<string name="si_km_m">קילומטרים/מטרים</string>
<string name="yard">יארד</string>

2
OsmAnd/res/values-hr/strings.xml
View file

@ -541,7 +541,7 @@
<string name="send_location_way_choose_title">Dijelite lokaciju pomoću</string>
<string name="send_location_sms_pattern">Lokacija: %1$s\n%2$s</string>
<string name="unit_of_length">Mjerne jedinice</string>
<string name="si_mi_foots">Milje/stope</string>
<string name="si_mi_feet">Milje/stope</string>
<string name="si_mi_yard">Milje/jardi</string>
<string name="si_km_m">Kilometri/metri</string>
<string name="unit_of_length_descr">Promjenite jedinice duljine i brzine</string>

2
OsmAnd/res/values-hu/strings.xml
View file

@ -295,7 +295,7 @@ Jelenleg {2} MB érhető el.</string>
<string name="shared_string_previous">Előző</string>
<string name="unit_of_length_descr">Hosszúság mértékegységének megváltoztatása</string>
<string name="unit_of_length">Hosszmértékegység</string>
<string name="si_mi_foots">Mérföld/láb</string>
<string name="si_mi_feet">Mérföld/láb</string>
<string name="si_mi_yard">Mérföld/yard</string>
<string name="si_km_m">Kilométer/méter</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-it/strings.xml
View file

@ -207,7 +207,7 @@ Ora, sono disponibili solo {2} MB.</string>
<string name="unit_of_length_descr">Cambia le unità di misura di lunghezza</string>
<string name="unit_of_length">Unità di misura di lunghezza</string>
<string name="si_mi_foots">Miglia/piede</string>
<string name="si_mi_feet">Miglia/piede</string>
<string name="si_mi_yard">Miglia/iarde</string>
<string name="si_km_m">Chilometri/metri</string>
<string name="yard">iarda</string>

2
OsmAnd/res/values-ja/strings.xml
View file

@ -89,7 +89,7 @@
<string name="unit_of_length_descr">長さの単位を変更出来ます</string>
<string name="unit_of_length">長さの単位</string>
<string name="si_mi_foots">マイル/フィート</string>
<string name="si_mi_feet">マイル/フィート</string>
<string name="si_mi_yard">マイル/ヤード</string>
<string name="si_km_m">キロメートル/メートル</string>
<string name="yard">ヤード</string>

2
OsmAnd/res/values-ka/strings.xml
View file

@ -350,7 +350,7 @@
<string name="shared_string_previous">წინა</string>
<string name="unit_of_length_descr">სიგრძისა და სიჩქარის ერთეულები</string>
<string name="unit_of_length">გაზომვის ერთეული</string>
<string name="si_mi_foots">მილი/ფუტი</string>
<string name="si_mi_feet">მილი/ფუტი</string>
<string name="si_mi_yard">მილი/იარდი</string>
<string name="si_km_m">კილომეტრი/მეტრი</string>
<string name="yard">იარდი</string>

2
OsmAnd/res/values-ko/strings.xml
View file

@ -318,7 +318,7 @@
<string name="unit_of_length_descr">거리와 속도 단위를 변경합니다</string>
<string name="unit_of_length">측정 단위</string>
<string name="si_mi_foots">마일/피트</string>
<string name="si_mi_feet">마일/피트</string>
<string name="si_mi_yard">마일/야드</string>
<string name="si_km_m">킬로미터/미터</string>
<string name="yard">야드</string>

2
OsmAnd/res/values-lt/strings.xml
View file

@ -389,7 +389,7 @@ Dabar laisvos vietos yra {2} MB.</string>
<string name="shared_string_previous">Ankstesnis</string>
<string name="unit_of_length_descr">Pakeisti ilgio matavimo vienetus</string>
<string name="unit_of_length">Ilgio matavimo vienetai</string>
<string name="si_mi_foots">Mylios/pėdos</string>
<string name="si_mi_feet">Mylios/pėdos</string>
<string name="si_mi_yard">Mylios/jardai</string>
<string name="si_km_m">Kilometrai/metrai</string>
<string name="yard">jd</string>

2
OsmAnd/res/values-lv/strings.xml
View file

@ -328,7 +328,7 @@
<string name="shared_string_previous">Atpakaļ</string>
<string name="unit_of_length_descr">Mainīt garuma mērvienības</string>
<string name="unit_of_length">Garuma mērvienības</string>
<string name="si_mi_foots">Jūdzes/pēdas</string>
<string name="si_mi_feet">Jūdzes/pēdas</string>
<string name="si_mi_yard">Jūdzes/jardi</string>
<string name="si_km_m">Kilometri/metri</string>
<string name="yard">Jards</string>

2
OsmAnd/res/values-mr/strings.xml
View file

@ -138,7 +138,7 @@
<string name="shared_string_next">पुढे</string>
<string name="shared_string_previous">मागे</string>
<string name="si_mi_foots">मैल/फूट</string>
<string name="si_mi_feet">मैल/फूट</string>
<string name="si_mi_yard">मैल/यार्ड</string>
<string name="si_km_m">किमी/मी</string>
<string name="yard">यार्ड</string>

2
OsmAnd/res/values-nl/strings.xml
View file

@ -322,7 +322,7 @@ Er is nu {2} MB beschikbaar.</string>
<string name="unit_of_length_descr">Kies eenheid van afstand</string>
<string name="unit_of_length">Eenheid van afstand</string>
<string name="si_mi_foots">Mijlen/voeten</string>
<string name="si_mi_feet">Mijlen/voeten</string>
<string name="si_mi_yard">Mijlen/yards</string>
<string name="si_km_m">Kilometers/meters</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-pl/strings.xml
View file

@ -159,7 +159,7 @@
<string name="shared_string_previous">Wstecz</string>
<string name="unit_of_length_descr">Zmienia jednostki długości</string>
<string name="unit_of_length">Jednostki długości</string>
<string name="si_mi_foots">Mile/stopy</string>
<string name="si_mi_feet">Mile/stopy</string>
<string name="si_mi_yard">Mile/jardy</string>
<string name="si_km_m">Kilometry/metry</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -1312,7 +1312,7 @@
<string name="unit_of_length_descr">Alterar unidades de distância e velocidade</string>
<string name="unit_of_length">Unidade de medida</string>
<string name="si_mi_foots">Milhas/pés</string>
<string name="si_mi_feet">Milhas/pés</string>
<string name="si_mi_yard">Milhas/jardas</string>
<string name="si_km_m">Quilômetros/metros</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-pt/strings.xml
View file

@ -773,7 +773,7 @@
<string name="shared_string_previous">Anterior</string>
<string name="unit_of_length_descr">Alterar unidades de medida de distância e velocidade</string>
<string name="unit_of_length">Unidade de medida</string>
<string name="si_mi_foots">Milhas/Pés</string>
<string name="si_mi_feet">Milhas/Pés</string>
<string name="si_mi_yard">Milhas/Jardas</string>
<string name="si_km_m">Quilômetros/Metros</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-ro/strings.xml
View file

@ -523,7 +523,7 @@
<string name="shared_string_previous">Precedentul</string>
<string name="unit_of_length_descr">Schimbă unitățile de măsură ale distanței și vitezei</string>
<string name="unit_of_length">Unități de măsură</string>
<string name="si_mi_foots">Mile/picioare</string>
<string name="si_mi_feet">Mile/picioare</string>
<string name="si_mi_yard">Mile/yarzi</string>
<string name="si_km_m">Kilometri/metri</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-ru/strings.xml
View file

@ -317,7 +317,7 @@
<string name="shared_string_previous">Предыдущий</string>
<string name="unit_of_length_descr">Единицы измерения длины и скорости</string>
<string name="unit_of_length">Единицы измерения</string>
<string name="si_mi_foots">Мили/футы</string>
<string name="si_mi_feet">Мили/футы</string>
<string name="si_mi_yard">Мили/ярды</string>
<string name="si_km_m">Километры/метры</string>
<string name="yard">ярд</string>

2
OsmAnd/res/values-sc/strings.xml
View file

@ -1274,7 +1274,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="shared_string_previous">Pretzedente</string>
<string name="unit_of_length_descr">Muda sas unidades de longària</string>
<string name="unit_of_length">Unidade de longària</string>
<string name="si_mi_foots">Mìglios/pedes</string>
<string name="si_mi_feet">Mìglios/pedes</string>
<string name="si_mi_yard">Mìglios/iardas</string>
<string name="si_km_m">Chilòmetros/metros</string>
<string name="yard">iarda</string>

2
OsmAnd/res/values-sk/strings.xml
View file

@ -329,7 +329,7 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m
<string name="preferred_locale">Jazyk zobrazenia</string>
<string name="unit_of_length_descr">Zmeniť jednotky dĺžky</string>
<string name="unit_of_length">Jednotka dĺžky</string>
<string name="si_mi_foots">Míle/stopy</string>
<string name="si_mi_feet">Míle/stopy</string>
<string name="si_mi_yard">Míle/yardy</string>
<string name="si_km_m">Kilometre/metre</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-sl/strings.xml
View file

@ -218,7 +218,7 @@
<string name="unit_of_length_descr">Spremeni enote za dolžino</string>
<string name="unit_of_length">Enote dolžine</string>
<string name="si_mi_foots">Milje/Čevlji</string>
<string name="si_mi_feet">Milje/Čevlji</string>
<string name="si_mi_yard">Milje/Jardi</string>
<string name="si_km_m">Kilometri/Metri</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-sv/strings.xml
View file

@ -476,7 +476,7 @@ För tillfället finns det {2} MB ledigt.</string>
<string name="shared_string_previous">Föregående</string>
<string name="unit_of_length_descr">Ändra enheter för avstånd</string>
<string name="unit_of_length">Enhet för avstånd</string>
<string name="si_mi_foots">Eng. mil/fot</string>
<string name="si_mi_feet">Eng. mil/fot</string>
<string name="si_mi_yard">Eng. mil/yard</string>
<string name="si_km_m">Kilometer/meter</string>
<string name="yard">yd</string>

2
OsmAnd/res/values-tr/strings.xml
View file

@ -855,7 +855,7 @@
<string name="overlay_transparency">Katman şeffaflığı</string>
<string name="internet_not_available">İşlem için gerekli genel ağ (internet) bağlantısı mevcut değil</string>
<string name="install_more">Daha fazla yükle…</string>
<string name="si_mi_foots">Mil/metre</string>
<string name="si_mi_feet">Mil/metre</string>
<string name="mile_per_hour">mph</string>
<string name="send_location_way_choose_title">Konumu paylaş</string>
<string name="send_location_sms_pattern">Konum: %1$s\n%2$s</string>

2
OsmAnd/res/values-uk/strings.xml
View file

@ -364,7 +364,7 @@
<string name="shared_string_previous">Попередній</string>
<string name="unit_of_length_descr">Змінити одиниці вимірювання довжини</string>
<string name="unit_of_length">Одиниці вимірювання довжини</string>
<string name="si_mi_foots">Милі/фути</string>
<string name="si_mi_feet">Милі/фути</string>
<string name="si_mi_yard">Милі/ярди</string>
<string name="si_km_m">Кілометри/метри</string>
<string name="yard">ярд</string>

2
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -238,7 +238,7 @@
<string name="shared_string_previous">上一页</string>
<string name="unit_of_length_descr">变更单位的长度和速度</string>
<string name="unit_of_length">度量单位</string>
<string name="si_mi_foots">万里/英尺</string>
<string name="si_mi_feet">万里/英尺</string>
<string name="si_mi_yard">英里/码</string>
<string name="si_km_m">公里/米</string>
<string name="yard">码</string>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -510,7 +510,7 @@
<string name="shared_string_previous">上一頁</string>
<string name="unit_of_length_descr">更改長度單位</string>
<string name="unit_of_length">長度單位</string>
<string name="si_mi_foots">英哩/英呎</string>
<string name="si_mi_feet">英哩/英呎</string>
<string name="si_mi_yard">英哩/碼</string>
<string name="si_km_m">公里/公尺</string>
<string name="yard">碼</string>

2
OsmAnd/res/values/strings.xml
View file

@ -1908,7 +1908,7 @@ If you need help with OsmAnd application, please contact our support team: suppo
<string name="incomplete_locale">incomplete</string>
<string name="unit_of_length_descr">Change units of length</string>
<string name="unit_of_length">Unit of length</string>
<string name="si_mi_foots">Miles/feet</string>
<string name="si_mi_feet">Miles/feet</string>
<string name="si_mi_yard">Miles/yards</string>
<string name="si_km_m">Kilometers/meters</string>
<string name="yard">yd</string>

20
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -21,7 +21,7 @@ public class OsmAndFormatter {
public final static float METERS_IN_ONE_NAUTICALMILE = 1852f; // 1852
public final static float YARDS_IN_ONE_METER = 1.0936f;
public final static float FOOTS_IN_ONE_METER = YARDS_IN_ONE_METER * 3f;
public final static float FEET_IN_ONE_METER = YARDS_IN_ONE_METER * 3f;
private static final DecimalFormat fixed2 = new DecimalFormat("0.00");
private static final DecimalFormat fixed1 = new DecimalFormat("0.0");
{
@ -36,8 +36,8 @@ public class OsmAndFormatter {
MetricsConstants mc = settings.METRIC_SYSTEM.get();
double mainUnitInMeter = 1;
double metersInSecondUnit = METERS_IN_KILOMETER;
if (mc == MetricsConstants.MILES_AND_FOOTS) {
mainUnitInMeter = FOOTS_IN_ONE_METER;
if (mc == MetricsConstants.MILES_AND_FEET) {
mainUnitInMeter = FEET_IN_ONE_METER;
metersInSecondUnit = METERS_IN_ONE_MILE;
} else if (mc == MetricsConstants.MILES_AND_METERS) {
mainUnitInMeter = 1;
@ -74,9 +74,9 @@ public class OsmAndFormatter {
roundDist = 0.5f * METERS_IN_ONE_MILE;
} else if (mc == MetricsConstants.MILES_AND_METERS && roundDist == 500) {
roundDist = 0.25f * METERS_IN_ONE_MILE;
} else if (mc == MetricsConstants.MILES_AND_FOOTS && roundDist == 2000 / (double) FOOTS_IN_ONE_METER) {
} else if (mc == MetricsConstants.MILES_AND_FEET && roundDist == 2000 / (double) FEET_IN_ONE_METER) {
roundDist = 0.5f * METERS_IN_ONE_MILE;
} else if (mc == MetricsConstants.MILES_AND_FOOTS && roundDist == 1000 / (double) FOOTS_IN_ONE_METER) {
} else if (mc == MetricsConstants.MILES_AND_FEET && roundDist == 1000 / (double) FEET_IN_ONE_METER) {
roundDist = 0.25f * METERS_IN_ONE_MILE;
} else if (mc == MetricsConstants.MILES_AND_YARDS && roundDist == 1000 / (double) YARDS_IN_ONE_METER) {
roundDist = 0.5f * METERS_IN_ONE_MILE;
@ -120,7 +120,7 @@ public class OsmAndFormatter {
return MessageFormat.format("{0,number,#.#} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters).replace('\n', ' '); //$NON-NLS-1$
} else if (meters > 0.999f * mainUnitInMeters) {
return MessageFormat.format("{0,number,#.##} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters).replace('\n', ' '); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_FOOTS && meters > 0.249f * mainUnitInMeters) {
} else if (mc == MetricsConstants.MILES_AND_FEET && meters > 0.249f * mainUnitInMeters) {
return MessageFormat.format("{0,number,#.##} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters).replace('\n', ' '); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_METERS && meters > 0.249f * mainUnitInMeters) {
return MessageFormat.format("{0,number,#.##} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters).replace('\n', ' '); //$NON-NLS-1$
@ -131,9 +131,9 @@ public class OsmAndFormatter {
} else {
if (mc == MetricsConstants.KILOMETERS_AND_METERS || mc == MetricsConstants.MILES_AND_METERS) {
return ((int) (meters + 0.5)) + " " + ctx.getString(R.string.m); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_FOOTS) {
int foots = (int) (meters * FOOTS_IN_ONE_METER + 0.5);
return foots + " " + ctx.getString(R.string.foot); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_FEET) {
int feet = (int) (meters * FEET_IN_ONE_METER + 0.5);
return feet + " " + ctx.getString(R.string.foot); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_YARDS) {
int yards = (int) (meters * YARDS_IN_ONE_METER + 0.5);
return yards + " " + ctx.getString(R.string.yard); //$NON-NLS-1$
@ -148,7 +148,7 @@ public class OsmAndFormatter {
if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
return ((int) (alt + 0.5)) + " " + ctx.getString(R.string.m);
} else {
return ((int) (alt * FOOTS_IN_ONE_METER + 0.5)) + " " + ctx.getString(R.string.foot);
return ((int) (alt * FEET_IN_ONE_METER + 0.5)) + " " + ctx.getString(R.string.foot);
}
}

4
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -2885,7 +2885,7 @@ public class OsmandSettings {
public enum MetricsConstants {
KILOMETERS_AND_METERS(R.string.si_km_m, "km-m"),
MILES_AND_FOOTS(R.string.si_mi_foots, "mi-f"),
MILES_AND_FEET(R.string.si_mi_feet, "mi-f"),
MILES_AND_METERS(R.string.si_mi_meters, "mi-m"),
MILES_AND_YARDS(R.string.si_mi_yard, "mi-y"),
NAUTICAL_MILES(R.string.si_nm, "nm");
@ -2932,7 +2932,7 @@ public class OsmandSettings {
public enum DrivingRegion {
EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false, false),
US(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true),
US(R.string.driving_region_us, MetricsConstants.MILES_AND_FEET, false, true),
CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false, true),
UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_METERS, true, false),
JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true, false);

2
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -165,7 +165,7 @@ public class DownloadIndexesThread {
boolean americanSigns = "american".equals(params.getRegionRoadSigns());
boolean leftHand = "yes".equals(params.getRegionLeftHandDriving());
MetricsConstants mc = "miles".equals(params.getRegionMetric()) ?
MetricsConstants.MILES_AND_FOOTS : MetricsConstants.KILOMETERS_AND_METERS;
MetricsConstants.MILES_AND_FEET : MetricsConstants.KILOMETERS_AND_METERS;
for (DrivingRegion r : DrivingRegion.values()) {
if (r.americanSigns == americanSigns && r.leftHandDriving == leftHand &&
r.defMetrics == mc) {