From b5e701f202bff8aaca1a32e71739eb5bf1f31586 Mon Sep 17 00:00:00 2001 From: MadWasp79 Date: Wed, 9 Oct 2019 15:09:34 +0300 Subject: [PATCH] fix for #7133 --- OsmAnd/res/values-af/strings.xml | 1 - OsmAnd/res/values-ar/strings.xml | 1 - OsmAnd/res/values-az/strings.xml | 1 - OsmAnd/res/values-b+be+Latn/strings.xml | 1 - OsmAnd/res/values-b+hsb/strings.xml | 1 - OsmAnd/res/values-b+sr+Latn/strings.xml | 1 - OsmAnd/res/values-be/strings.xml | 1 - OsmAnd/res/values-bg/strings.xml | 1 - OsmAnd/res/values-ca/strings.xml | 1 - OsmAnd/res/values-cs/strings.xml | 1 - OsmAnd/res/values-cy/strings.xml | 1 - OsmAnd/res/values-da/strings.xml | 1 - OsmAnd/res/values-de/strings.xml | 1 - OsmAnd/res/values-el/strings.xml | 1 - OsmAnd/res/values-eo/strings.xml | 1 - OsmAnd/res/values-es-rAR/strings.xml | 1 - OsmAnd/res/values-es-rUS/strings.xml | 1 - OsmAnd/res/values-es/strings.xml | 1 - OsmAnd/res/values-eu/strings.xml | 1 - OsmAnd/res/values-fa/strings.xml | 1 - OsmAnd/res/values-fi/strings.xml | 1 - OsmAnd/res/values-fr/strings.xml | 1 - OsmAnd/res/values-gl/strings.xml | 1 - OsmAnd/res/values-he/strings.xml | 1 - OsmAnd/res/values-hr/strings.xml | 1 - OsmAnd/res/values-hu/strings.xml | 1 - OsmAnd/res/values-hy/strings.xml | 1 - OsmAnd/res/values-is/strings.xml | 1 - OsmAnd/res/values-it/strings.xml | 1 - OsmAnd/res/values-ja/strings.xml | 1 - OsmAnd/res/values-ka/strings.xml | 1 - OsmAnd/res/values-ko/strings.xml | 1 - OsmAnd/res/values-lt/strings.xml | 1 - OsmAnd/res/values-lv/strings.xml | 1 - OsmAnd/res/values-ml/strings.xml | 1 - OsmAnd/res/values-nb/strings.xml | 1 - OsmAnd/res/values-nl/strings.xml | 1 - OsmAnd/res/values-pl/strings.xml | 1 - OsmAnd/res/values-pt-rBR/strings.xml | 1 - OsmAnd/res/values-pt/strings.xml | 1 - OsmAnd/res/values-ro/strings.xml | 1 - OsmAnd/res/values-ru/strings.xml | 1 - OsmAnd/res/values-sc/strings.xml | 1 - OsmAnd/res/values-sk/strings.xml | 1 - OsmAnd/res/values-sl/strings.xml | 1 - OsmAnd/res/values-sr/strings.xml | 1 - OsmAnd/res/values-sv/strings.xml | 1 - OsmAnd/res/values-tr/strings.xml | 1 - OsmAnd/res/values-uk/strings.xml | 1 - OsmAnd/res/values-zh-rCN/strings.xml | 1 - OsmAnd/res/values-zh-rTW/strings.xml | 1 - OsmAnd/res/values/strings.xml | 2 +- OsmAnd/res/xml/navigation_settings.xml | 2 +- .../osmand/plus/activities/SettingsNavigationActivity.java | 2 +- .../src/net/osmand/plus/settings/RouteParametersFragment.java | 4 ++-- 55 files changed, 5 insertions(+), 56 deletions(-) diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml index f4636428d5..c84b906ff5 100644 --- a/OsmAnd/res/values-af/strings.xml +++ b/OsmAnd/res/values-af/strings.xml @@ -896,7 +896,6 @@ Vermy ongeteerde paaie Vermy veerbote Vermy… - Vermy tolpaaie, grondpaaie, veerbote Helder roetes Liniaal diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index caabe49eaf..6a63063334 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -89,7 +89,6 @@ تجنب الطرق غير المعبدة تجنب العبارات التجنب - تجنب الطرق ذات الرسوم، وغير المعبدة، والعبارات GPS إيقاظ الفاصل الزمني: %s متواصل لفتح قفل الشاشة اضغط على أيقونة القفل diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml index 5c5169df16..79604ab5ff 100644 --- a/OsmAnd/res/values-az/strings.xml +++ b/OsmAnd/res/values-az/strings.xml @@ -992,7 +992,6 @@ Naviqasiya zamanı mövqeni yollara bərkit. Yola bərkit Asfaltsız yollardan yayın - Pullu və asfaltsız yollardan, bərələrdən yayın. Pullu yollardan yayın Başlanğıc nöqtə ən yaxın yoldan çox uzaqdır. Yollar diff --git a/OsmAnd/res/values-b+be+Latn/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml index bb20586859..e3c4dfed1c 100644 --- a/OsmAnd/res/values-b+be+Latn/strings.xml +++ b/OsmAnd/res/values-b+be+Latn/strings.xml @@ -631,7 +631,6 @@ Zachod: %2$s Paźbiahać daroh biez pakryćcia Paźbiahać paromaŭ Paźbiahać… - Pazbiahać, napryklad, platnych i daroh biez pakryccia, paromaŭ. Lumіniescentnyja maršruty Liniejka Kіrunak pohladu diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml index d50d50c7b7..ba52acc8fd 100644 --- a/OsmAnd/res/values-b+hsb/strings.xml +++ b/OsmAnd/res/values-b+hsb/strings.xml @@ -473,7 +473,6 @@ Njewobkrućene puće wobeńć Přewozy wobeńć Wobeńdź… - Wěsty typy pućow wobeńć. Měra Směr hladanja pokazać Słužbu w pozadku\n zapinyć diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml index 0d4c705078..ef24407d53 100644 --- a/OsmAnd/res/values-b+sr+Latn/strings.xml +++ b/OsmAnd/res/values-b+sr+Latn/strings.xml @@ -174,7 +174,6 @@ Bez rotacije (sever je gore) Orjentacija mape - Izbegavaj naplatne rampe, ne asfaltirane puteve, trajekte Lenjir Uvezi diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index f9537028c5..7b7f2743ca 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -294,7 +294,6 @@ Пазбягаць дарог без пакрыцця Пазбягаць паромаў Пазбягаць… - Пазбягаць, напрыклад, платных і дарог без пакрыцця, паромаў. Люмінесцэнтныя маршруты Лінейка Накірунак погляду diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml index 1f6d928dfe..badcfbd084 100644 --- a/OsmAnd/res/values-bg/strings.xml +++ b/OsmAnd/res/values-bg/strings.xml @@ -254,7 +254,6 @@ Само асфалтирани пътища Без фериботи Избягване на… - Избягване на платени пътища, пътища без настилка, фериботи Светещи маршрути Линийка diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 57643ca90f..857f7f6c70 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -192,7 +192,6 @@ S\'ocuparà una memòria de {1} MB Informació de dia/nit Carrils Evita els ferris - Evita p. ex. vies de peatge, no pavimentades, ferris. S\'ha afegit una notificació a la vostra agenda perquè traieu el vostre cotxe. Hi seguirà fins que l\'elimineu manualment. Mantingueu-vos a l\'esquerra i continueu Mantingueu-vos a la dreta i continueu diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index e5df0a8906..a342eb6f57 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -770,7 +770,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).Vyhnout se nezpevněným cestám Vyhnout se trajektům Vyhnout se… - Vyhnout se např. trajektům, placeným a nezpevněným cestám. Zobrazit upozornění… Nastavit dopravní varování (omezení rychlosti, značky stop, retardéry, tunely), rychlostní radary a jízdní pruhy. Měřítko diff --git a/OsmAnd/res/values-cy/strings.xml b/OsmAnd/res/values-cy/strings.xml index d0205bda5d..c802d35ce2 100644 --- a/OsmAnd/res/values-cy/strings.xml +++ b/OsmAnd/res/values-cy/strings.xml @@ -1,5 +1,4 @@ Osgoi… -Osgoi tollffyrdd, ffyrdd garw, fferïau Dangos larymau… Dangos cyfyngiad cyflymder, camerâu cyflymder a thwmpathau traffig Lliwiau fflwroleuol diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index cf7738b6b9..05dc4c4dd7 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -146,7 +146,6 @@ Undgå grusveje Undgå færger Undgå… - Undgå fx. betalingsveje, grusveje, færger. Fluorescerende ruter Lineal Synsretning diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index bbbd6b72ec..e3bb0900e8 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -928,7 +928,6 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).Unbefestigte Wege vermeiden Fähren vermeiden Vermeiden von … - Mautstraßen, unbefestigte Straßen, Fähren, usw. vermeiden. Routen in Leuchtfarbe Maßstab Blickrichtung einblenden diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 131e56bddb..5be73b9b6c 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -73,7 +73,6 @@ Αποφυγή χωματόδρομων Αποφυγή πορθμείων Αποφυγή… - Αποφυγή π.χ.: διοδίων, χωματόδρομων, πορθμείων. Φωτεινές διαδρομές Χάρακας Κατεύθυνση επισκόπησης diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml index 5ad8996afa..54360910d7 100644 --- a/OsmAnd/res/values-eo/strings.xml +++ b/OsmAnd/res/values-eo/strings.xml @@ -1103,7 +1103,6 @@ Lon: %2$s Eviti tervojojn Eviti pramojn Eviti… - Eviti ekz. pagendajn vojojn, tervojojn, pramojn. Rebrilaj kursoj Viddirekto Diafanaj fenestraĵoj diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 8e2949472e..4b31e7075c 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -809,7 +809,6 @@ Lon %2$s Evitar caminos sin pavimentar Evitar ferris Evitar… - Evita caminos con peajes, sin pavimentar, transbordadores o ferris y otros. Rutas fluorescentes Escala Dirección de visualización diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml index 98423307d6..775070b8f9 100644 --- a/OsmAnd/res/values-es-rUS/strings.xml +++ b/OsmAnd/res/values-es-rUS/strings.xml @@ -809,7 +809,6 @@ Lon %2$s Evitar caminos sin pavimentar Evitar ferris Evitar… - Evita caminos con peajes, sin pavimentar, transbordadores o ferris y otros. Rutas fluorescentes Escala Dirección de visualización diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 8783ff23b6..2f3e850ec5 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -5,7 +5,6 @@ Evitar caminos sin asfaltar Evitar ferris Evitar… - Evita caminos con peajes, sin pavimentar, transbordadores o ferris y otros. Mostrar alertas… Configura advertencias de tráfico (límites de velocidad, paradas forzosas, badenes, túneles), radares de velocidad, e información de carriles. Rutas fluorescentes diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index 0c82171577..e155db470d 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -295,7 +295,6 @@ Saihestu asfaltatu gabeko bideak Saihestu ferryak Saihestu… - Saihestu adibidez bidesariak, asfaltatu gabekoak, ferryak. Ibilbide fluoreszenteak Erregela Ikuspegiaren norabidea diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 06c051f9c6..b7275d4be6 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -109,7 +109,6 @@ دومین پیچ بعدی نقشه مسیر کوچک پرهیز از… - مثلاً، از جاده‌های عوارضی‌دار، جاده‌های روسازی‌نشده و فرابَرها پرهیز شود. صفحه قفل شد دوربین‌های کنترل سرعت هشدارهای ترافیکی diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index 80b06183ec..aa66aba14f 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -46,7 +46,6 @@ Vältä päällystämättömiä teitä Vältä lauttoja Vältä… - Vältä tietulleja, päällystämättömiä, lauttoja Valaistut tiet Viivoitin Katseen suunta diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 218b0df392..a7e201efaa 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -772,7 +772,6 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).Éviter les voies non revêtues Éviter les ferries Éviter - Éviter les routes à péage, les voies non revêtues, les bateaux ferries. Alertes visuelles… Paramétrer les avertissements de circulation (limites de vitesse, stops, ralentisseurs, tunnels), les radars et les informations sur les voies de circulation. Itinéraires fluorescents diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml index d1b3f82f4d..ea7f4cdcdf 100644 --- a/OsmAnd/res/values-gl/strings.xml +++ b/OsmAnd/res/values-gl/strings.xml @@ -560,7 +560,6 @@ Evita-las estradas sen asfaltar Evita-los ferris Evitar… - Evitar estradas de portaxe ou peaxe, sen asfaltar ou ferris e outros. Rotas fluorescentes Regra Dirección da vista diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml index 56f0154509..c665c97b16 100644 --- a/OsmAnd/res/values-he/strings.xml +++ b/OsmAnd/res/values-he/strings.xml @@ -64,7 +64,6 @@ המנעות מדרכים שאינן סלולות המנעות ממעבורות המנעות… - הימנעות מכבישי אגרה, בלתי סלולים ומעבורות למשל. סרגל כיוון הצפייה וידג׳טים שקופים diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml index 5bb2de8c59..7a27033da8 100644 --- a/OsmAnd/res/values-hr/strings.xml +++ b/OsmAnd/res/values-hr/strings.xml @@ -108,7 +108,6 @@ Izbjegavaj neasfaltirane ceste Izbjegavaj trajekte Izbjegavati… - Izbjegavaj ceste s naplatom cestarine, neasfaltirane ceste, trajekte Smjer kretanja Transparentna tema Omogući\n stanje mirovanja diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 561c52b246..d11bc76526 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -769,7 +769,6 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).Futtatás\n háttérben Háttérben futás\n leállítása Elkerülés… - Például fizetős utak, kompok, földutak elkerülése. Figyelmeztetések megjelenítése… Közlekedési figyelmeztetések (sebességkorlátozás, közúti ellenőrzés, fekvőrendőr, alagút), traffipaxriasztás és sávinformációk. Élénk színű utak diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml index 5355d99eb7..b3c86a16a0 100644 --- a/OsmAnd/res/values-hy/strings.xml +++ b/OsmAnd/res/values-hy/strings.xml @@ -1499,7 +1499,6 @@ Խուսափել չմշակված ճանապարհներից Խուսափել լաստանավերից Երթուղին կառուցման ժամանակ խուսափել… - Խուսափել վճարովի ճանապարհներից, երկաթգծերից և լաստանավերից։ Լյումինեսցենտային երթուղիներ Քանոն Տեսակետի ուղղությունը diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml index 12a65fc603..08b3385b1f 100644 --- a/OsmAnd/res/values-is/strings.xml +++ b/OsmAnd/res/values-is/strings.xml @@ -1139,7 +1139,6 @@ Sólsetur: %2$s Forðast vegi með óbundnu slitlagi Forðast ferjur Forðast… - Forðast t.d. gjaldskyldu, óbundið slitlag, ferjur. Gegnsæir viðmótshlutar Keyra forrit í bakgrunni diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 38facebf76..74d03db220 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -750,7 +750,6 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).Evita le strade non asfaltate Evita i traghetti Evita… - Evita es. strade a pagamento, sterrate, traghetti. Mostra avvisi… Configura gli avvisi sul traffico (limiti velocità, fermate forzate, dossi rallentatori, tunnel), avvisi autovelox e indicazioni di corsia. Itinerari fluorescenti diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 7645433704..62e6a10a29 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -716,7 +716,6 @@ POIの更新は利用できません 未舗装の道路を使用しない フェリーを使用しない 使用しない道路の指定… - 有料道路、未舗装道路、フェリー等、使用しない経路を設定します 使用ルートを明滅させる 距離測定 視線方向 diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml index e23c1359c7..c64c7f7acc 100644 --- a/OsmAnd/res/values-ka/strings.xml +++ b/OsmAnd/res/values-ka/strings.xml @@ -903,7 +903,6 @@ მოუკირწყლავი გზებისათვის თავის არიდება ბორნისათვის თავის არიდება თავის არიდება… -ცუდი გზებისათვის თავის არიდება გაფრთხილებების ჩვენება… სიჩქარის ლიმიტის, კამერებისა და საცობების ჩვენება მანათობელი გზები diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 3f46f1fa0d..3a9ef7c54e 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -945,7 +945,6 @@ 비포장 도로 회피 뱃길 회피 회피하기… - 유료도로, 비포장, 뱃길 회피하기 깜박이는 경로 축척(Ruler) 방향 보기 diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index f386df52eb..9ee16736af 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -773,7 +773,6 @@ Tam prireiks {1} MB pastoviam saugojimui. Vengti negrįstų kelių Vengti keltų Vengti… - Vengti mokamų, negrįstų kelių ir keltų. Rodyti įspėjimus… Rodyti srauto perspėjimus (greičio ribojimus, greičio ribojimo gūbrelius, tunelius), greičio matuoklių aptikimo pranešimus, kelio juostos informaciją. Fluorescenciniai maršrutai diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml index 167db631d7..a187f407fe 100644 --- a/OsmAnd/res/values-lv/strings.xml +++ b/OsmAnd/res/values-lv/strings.xml @@ -767,7 +767,6 @@ Izvairīties no grants ceļiem Izvairīties no pārceltuvēm Izvairīties no… - Izvairīties no maksas vai grants ceļiem un prāmjiem. Rādīt signālus… Satiksmes ierobežojumus (ātruma limitus, stopzīmes, rampas), gājēju pārejas, fotoradarus, ceļa joslas Fluorescējošs maršruts diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml index 5ca8c36a38..b389b80c6b 100644 --- a/OsmAnd/res/values-ml/strings.xml +++ b/OsmAnd/res/values-ml/strings.xml @@ -461,7 +461,6 @@ " ടാര്‍ ചെയ്യാത്ത(പാകാത്ത) റോഡുകള്‍ ഒഴിവാക്കുക " "കടത്ത് ഒഴിവാക്കുക" ഒഴിവാക്കുക… - "ടോള്‍ റോഡുകള്‍ , ടാര്‍ ചെയ്യാത്ത(പാകാത്ത) റോഡുകള്‍, കടത്ത് .... എന്നിവ ഒഴിവാക്കുക " ടോള്‍ റോഡുകള്‍ ഒഴിവാക്കുക "സംഭവ്യമായ അത്രയും വേഗതയില്‍ " പ്രാപ്യത വിധം diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 802114a7dc..29dbc66597 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -56,7 +56,6 @@ Unngå veier uten fast dekke Unngå ferger Unngå… - Unngå f.eks. bomveier, veier uten fast dekke, ferger. Fluorescerende ruter Målestokk Gatenavn diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index b51392e942..b46f7bb187 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -5,7 +5,6 @@ Vermijd onverharde wegen Vermijd veerboten Vermijd… - Wel of geen tolwegen, onverharde wegen, veerboten Toon waarschuwingen… Wel of geen rijstroken, snelheidslimieten, snelheidscamera\'s en verkeersdrempels Fluorescerende routes diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 0e361d884f..8b972c0d39 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -779,7 +779,6 @@ Dróg nieutwardzonych Promów Omijanie… - Unika m.in. dróg płatnych, nieutwardzonych, promów. Wyświetlanie ostrzeżeń… Wyświetla ostrzeżenia ruchu drogowego (ograniczenia prędkości, znaki \"stop\", progi zwalniające, tunele), ostrzeżenia o fotoradarach i informacje o pasach ruchu. Mapy dla całego świata i nawigacja działająca w oparciu o stacjonarne jak i sieciowe mapy OSM diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 054caf7471..5be1175228 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -612,7 +612,6 @@ Nascer do Sol: %1$s Pôr do Sol: %2$s Evitar vias não pavimentadas - Evitar p.ex. vias pedagiadas, não pavimentadas, balsas. Ativar\n modo segundo plano Radares Alertas de trânsito diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index a642ea4b0f..950ad58b03 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -786,7 +786,6 @@ Evitar estradas não pavimentadas Evite ferries Evitar… - Evitar por exemplo estradas com portagem, não pavimentadas, balsas. Rotas fluorescentes Regua A direção da visão diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index 2890c1314d..40b9e3a721 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -68,7 +68,6 @@ Evită drumurile nepavate Evită ferry Evitare drumuri… - Evită drumuri cu taxă, nepavate, ferry Rute fluorescente Scara hărții Direcția de deplasare diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index fb4a9dd05c..03258f785c 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1103,7 +1103,6 @@ Избегать проселочных дорог Избегать паромов Избегать при прокладке маршрута… - Избегать платных и проселочных дорог, паромов. Настройка оповещений (ограничения скорости, вынужденные остановки, искусственные неровности, тоннели), камеры скорости, информацию о полосах. Флуоресцентные маршруты Показывать сигналы… diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 763618b9db..0ea6f0902e 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -465,7 +465,6 @@ Instransi sos caminos no asfaltados Istransi sos traghetos Istransi… - Istransi pro es. sos caminos a pagamentu, sos isterrados, sos traghetos. Camineras fluorescentes Righellu Diretzione de sa visuale diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 60ac83e754..fe43c0a4c4 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -40,7 +40,6 @@ Nespevneným cestám Trajektom Vyhnúť sa… - Obísť napr. spoplatnené cesty, nespevnené cesty, trajekty. Zobraziť varovania… Nastaviť dopravné varovania (rýchlostné obmedzenia, značky stop, spomaľovače, tunely), rýchlostné radary a jazdné pruhy. Fluorescentné trasy diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 3ce345c6a1..3cb8a875ca 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -294,7 +294,6 @@ Izogibanje … Izogni se trajektom Izogni se neasfaltiranim potem - Izogibanje cestninam, makadamskim potem, trajektom. Fluorescentne poti Merilo Smer gledanja diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml index 3323f5e54e..c8eafdb170 100644 --- a/OsmAnd/res/values-sr/strings.xml +++ b/OsmAnd/res/values-sr/strings.xml @@ -150,7 +150,6 @@ Брисање POI Без ротације (север је увек горе) Оријентација карте - Избегавај на прм. наплатне рампе, неасфалтиране путеве, трајекте. Лењир Увези GPX не може да се учита diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 0e1fb690de..56ee8aed01 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -36,7 +36,6 @@ Undvik oasfalterade vägar Undvik färjor Undvik… - Undvik t.ex. vägtullar, oasfalterade vägar, färjor. Linjal Färdriktning Genomskinliga widgetar diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 9b221dcc74..0ed6b70887 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -210,7 +210,6 @@ Asfaltsız yollardan kaçın Feribotlardan kaçın Kaçın… - Örn. paralı yollardan, asfaltsız yollardan, feribotlardan kaçının. Floresan rotalar Cetvel Şeffaf widget\'lar diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index d1c84899fc..a8bdacbd0f 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -904,7 +904,6 @@ Уникати польових доріг Уникати поромів Уникати… - Уникати, наприклад, платні дороги, дороги без покриття, пороми. Флуоресцентні маршрути Лінійка Прозорі віджети diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml index 71b341930e..27f08b98b1 100644 --- a/OsmAnd/res/values-zh-rCN/strings.xml +++ b/OsmAnd/res/values-zh-rCN/strings.xml @@ -38,7 +38,6 @@ 運輸方式: 選擇傳輸模式 地图风格 - 避开收费公路、土路、渡轮 熒光路線 統治者 觀察方向 diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 49db039218..d19ae7897e 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -98,7 +98,6 @@ 避開未鋪面道路 避開渡輪 避開… - 避開例如收費道路、顛頗路面、渡輪。 螢光導航路線 比例尺 目視方向 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index adcafc1fb9..b7b9d29317 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,7 @@ Thx - Hardy --> + Avoid certain routes and road types Move OsmAnd data files to the new destination?\n%1$s > %2$s %1$s • Used %2$s GB Free %1$s • %2$s / %3$s GB @@ -2396,7 +2397,6 @@ Avoid unpaved roads Avoid ferries Avoid… - Avoid e.g. toll roads, unpaved, ferries. Fluorescent routes Ruler Viewing direction diff --git a/OsmAnd/res/xml/navigation_settings.xml b/OsmAnd/res/xml/navigation_settings.xml index 7b5910a321..9931f48368 100644 --- a/OsmAnd/res/xml/navigation_settings.xml +++ b/OsmAnd/res/xml/navigation_settings.xml @@ -10,7 +10,7 @@ android:title="@string/fast_route_mode"/> 0) { avoidRouting = new Preference(this); avoidRouting.setTitle(R.string.avoid_in_routing_title); - avoidRouting.setSummary(R.string.avoid_in_routing_descr); + avoidRouting.setSummary(R.string.avoid_in_routing_descr_); avoidRouting.setOnPreferenceClickListener(this); cat.addPreference(avoidRouting); } diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java index 3a16d9ef9b..6c4dd6ba70 100644 --- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java @@ -142,8 +142,8 @@ public class RouteParametersFragment extends BaseSettingsFragment { MultiSelectBooleanPreference avoidRouting = new MultiSelectBooleanPreference(app); avoidRouting.setKey(AVOID_ROUTING_PARAMETER_PREFIX); avoidRouting.setTitle(R.string.avoid_in_routing_title); - avoidRouting.setSummary(R.string.avoid_in_routing_descr); - avoidRouting.setDescription(R.string.avoid_in_routing_descr); + avoidRouting.setSummary(R.string.avoid_in_routing_descr_); + avoidRouting.setDescription(R.string.avoid_in_routing_descr_); avoidRouting.setLayoutResource(R.layout.preference_with_descr); avoidRouting.setIcon(getRoutingPrefIcon(AVOID_ROUTING_PARAMETER_PREFIX));