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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-11-24 01:40:38 +01:00
commit fbaba5997b
43 changed files with 142 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/warnings_toll_bridge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_toll_bridge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_toll_bridge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_toll_bridge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

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

@ -1957,7 +1957,7 @@
<string name="favorite_category_add_new_title">Дадаць новую катэгорыю</string>
<string name="favorite_category_dublicate_message">Катэгорыя з пазначанай назвай ужо існуе. Калі ласка, падайце іншую назву.</string>
<string name="confirm_download_roadmaps">Вы ўпэўненыя, што хочаце сьцягнуць мапу аўтадарог, нават калі ў вас ёсць поўная мапа?</string>
<string name="value_downloaded_from_max">%1$.1f з %2$.1f Мб</string>
<string name="value_downloaded_of_max">%1$.1f з %2$.1f Мб</string>
<string name="file_size_in_mb">%.1f Мб</string>
<string name="update_all">Абнавіць усе (%1$s МБ)</string>
<string name="free_downloads_used">Выкарыстана бясплатных загрузак</string>

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

@ -1263,7 +1263,7 @@
<string name="poi_pump_manual">Bomba manual</string>
<string name="poi_pump_powered">Bomba motoritzada</string>
<string name="poi_pump_no">Sense bomba</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_water_characteristic_mineral">Característica de l\'aigua: mineral</string>
<string name="poi_water_characteristic_mud">Característica de l\'aigua: argilosa</string>

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

@ -1771,7 +1771,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="favorite_category_name">Nom de categoria</string>
<string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
<string name="confirm_download_roadmaps">N\'esteu segur de baixar el mapa amb només carreteres, quan ja teniu el mapa normal (complet)?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualitzeu tot (%1$s MB)</string>
<string name="free_downloads_used">Baixades gratuïtes realitzades</string>

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

@ -1767,7 +1767,7 @@
<string name="later">Později</string>
<string name="get_full_version">Plná verze</string>
<string name="downloads">Stahování</string>
<string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f z %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Aktualizovat vše (%1$s MB)</string>
<string name="free_downloads_used">Použito volných stáhnutí</string>

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

@ -1368,7 +1368,7 @@
<string name="poi_rtsa_scale">RTSA skala</string>
<string name="poi_pump">Pumpe</string>
<string name="poi_pump_yes">Pumpe</string>
<string name="poi_piste_difficulty_easy">Pistesværhedsgrad: let</string>
<string name="poi_piste_difficulty_intermediate">Pistesværhedsgrad: medium</string>

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

@ -2011,7 +2011,7 @@
<string name="favorite_category_name">Kategorinavn</string>
<string name="favorite_category_add_new_title">Tilføj ny kategori</string>
<string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet standardkort allerede er hentet?</string>
<string name="value_downloaded_from_max">%1$.1f af %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f af %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Opdater alle (%1$s MB)</string>
<string name="free_downloads_used_description">Indstil hvormange gratis filhentninger der er brugt</string>

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

@ -2176,7 +2176,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="activate_srtm_plugin">Bitte das SRTM-Plugin aktivieren</string>
<string name="get_full_version">Vollversion</string>
<string name="confirm_download_roadmaps">Soll wirklich die reine Straßenkarte heruntergeladen werden, obwohl bereits die vollständige Standardkarte vorhanden ist?</string>
<string name="value_downloaded_from_max">%1$.1f von %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f von %2$.1f MB</string>
<string name="update_all">Alles aktualisieren (%1$s MB)</string>
<string name="free_downloads_used">Verbrauchte freie Downloads</string>
<string name="enter_country_name">Name des Landes eingeben</string>

4
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -1347,7 +1347,7 @@
<string name="poi_windfall">Fruto caído</string>
<string name="poi_rtsa_scale">Escala RTSA</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_piste_difficulty_easy">Dificultad de la pista: Fácil</string>
<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: Intermedia</string>
@ -2400,7 +2400,7 @@
<string name="poi_bathing_no">Prohibido bañarse</string>
<string name="poi_traffic_calming_island">Mediana (tráfico)</string>
<string name="poi_boat_storage">Almacén de botes (marina)</string>
<string name="poi_boat_storage">Guardería náutica</string>
<string name="poi_conveying_yes">Transportadora: Si</string>

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

@ -1900,7 +1900,7 @@
<string name="favorite_category_name">Nombre de categoría</string>
<string name="favorite_category_add_new_title">Añadir nueva categoría</string>
<string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque ya tenga el mapa estándar (completo)?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualizar todo (%1$s MB)</string>
<string name="free_downloads_used">Descargas gratis usadas</string>

8
OsmAnd/res/values-es/phrases.xml
View file

@ -1351,7 +1351,7 @@
<string name="poi_windfall">Fruto caído</string>
<string name="poi_rtsa_scale">Escala RTSA</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_piste_difficulty_easy">Dificultad de la pista: Fácil</string>
<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: Intermedia</string>
@ -1934,7 +1934,7 @@
<string name="poi_surface_salt">Superficie: Sal</string>
<string name="poi_surface_snow">Superficie: Nieve</string>
<string name="poi_route_bus_ref">Colectivo</string>
<string name="poi_route_bus_ref">Autobús</string>
<string name="poi_route_share_taxi_ref">Taxi compartido</string>
<string name="poi_route_trolleybus_ref">Trolebús</string>
<string name="poi_route_tram_ref">Tranvía</string>
@ -2404,7 +2404,7 @@
<string name="poi_bathing_no">Prohibido bañarse</string>
<string name="poi_traffic_calming_island">Mediana (tráfico)</string>
<string name="poi_boat_storage">Almacén de botes</string>
<string name="poi_boat_storage">Guardería náutica</string>
<string name="poi_conveying_yes">Transportadora: Sí</string>
@ -2477,7 +2477,7 @@
<string name="poi_wiki_lang_mn">Wiki mongol</string>
<string name="poi_wiki_lang_nap">Wiki napolitana</string>
<string name="poi_craft_electronics">Reparación de electrodomésticos</string>
<string name="poi_craft_electronics">Reparación de electrónicos</string>
<string name="poi_wiki_lang_sco">Wiki escocesa</string>
<string name="poi_wiki_lang_pnb">Wiki punyabí</string>

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

@ -1898,7 +1898,7 @@
<string name="favorite_category_name">Nombre de categoría</string>
<string name="favorite_category_add_new_title">Añadir nueva categoría</string>
<string name="confirm_download_roadmaps">¿Desea descargar el mapa de sólo carreteras, aunque ya tenga el mapa estándar (completo)?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualizar todo (%1$s MB)</string>
<string name="free_downloads_used">Descargas gratis usadas</string>

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

@ -1147,7 +1147,7 @@
<string name="poi_pump_manual">Pompe manuelle</string>
<string name="poi_pump_no">Sans pompe</string>
<string name="poi_pump">Pompe</string>
<string name="poi_pump_yes">Pompe</string>
<string name="poi_pump_powered">Pompe automatique</string>
<string name="poi_water_point">Point d\'eau</string>

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

@ -2028,7 +2028,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="favorite_category_add_new_title">Ajouter une catégorie</string>
<string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'indiquer un autre nom.</string>
<string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Tout mettre à jour (%1$s MB)</string>
<string name="free_downloads_used">Téléchargements gratuits effectués</string>

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

@ -1905,7 +1905,7 @@
<string name="get_full_version">Versión completa</string>
<string name="downloads">Descargas</string>
<string name="confirm_download_roadmaps">Confirma que desexa descargar un mapa de estradas, aínda que ten o mapa completo?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualizar todo (%1$s MB)</string>
<string name="free_downloads_used">Descargas gratuítas empregadas</string>

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

@ -1142,7 +1142,7 @@
<string name="poi_pump_manual">Kézipumpa</string>
<string name="poi_pump_powered">Szivattyú</string>
<string name="poi_pump_no">Pumpa nélkül</string>
<string name="poi_pump">Pumpa</string>
<string name="poi_pump_yes">Pumpa</string>
<string name="poi_water_characteristic_mineral">Víz jelleg: ásványvíz</string>
<string name="poi_water_characteristic_mud">Víz jelleg: iszapos</string>

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

@ -1944,7 +1944,7 @@
<string name="favorite_category_name">Kategórianév</string>
<string name="favorite_category_add_new_title">Új kategória létrehozása</string>
<string name="confirm_download_roadmaps">Biztosan letöltesz csak utakat tartalmazó térképet, annak ellenére, hogy már van teljes térképed?</string>
<string name="value_downloaded_from_max">%1$.1f / %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f / %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Összes frissítése (%1$s MB)</string>
<string name="free_downloads_used">Elhasznált ingyenes letöltés</string>

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

@ -1989,7 +1989,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="favorite_category_name">Nome della categoria</string>
<string name="favorite_category_add_new_title">Aggiungi una nuova categoria</string>
<string name="confirm_download_roadmaps">Sei sicuro di volere scaricare mappe solo stradali anche se disponi di mappe complete?</string>
<string name="value_downloaded_from_max">%1$.1f di %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f di %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Aggiorna tutto (%1$s MB)</string>
<string name="free_downloads_used">Download gratuiti utilizzati</string>

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

@ -2030,7 +2030,7 @@ POIの更新は利用できません</string>
<string name="get_full_version">フルバージョンを入手</string>
<string name="downloads">ダウンロード</string>
<string name="confirm_download_roadmaps">標準の(完全な)マップがありますが、道路のみのマップをダウンロードしてよろしいですか？</string>
<string name="value_downloaded_from_max">%1$.1f ／ %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f ／ %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">全て更新(%1$s MB)</string>
<string name="free_downloads_used">使用済み無料ダウンロード枠</string>

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

@ -2213,5 +2213,5 @@
<string name="downloads">다운로드</string>
<string name="confirm_download_roadmaps">모든 지도를 가지고 있더러도 지도를 다운로드 하시겠습니까?</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="value_downloaded_from_max">%2$.1f MB 에서 %1$.1f</string>
<string name="value_downloaded_of_max">%2$.1f MB 에서 %1$.1f</string>
</resources>

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

@ -1934,7 +1934,7 @@
<string name="favorite_category_add_new_title">Pridėti naują kategoriją</string>
<string name="get_full_version">Visa versija</string>
<string name="downloads">Atsisiuntimai</string>
<string name="value_downloaded_from_max">%1$.1f iš %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f iš %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Atnaujinti viską (%1$s MB)</string>
<string name="srtm_plugin_disabled">Kontūro linijos išjungtos</string>

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

@ -1401,7 +1401,7 @@
<string name="map_downloaded_descr">Kart over %1$s har blitt lastet ned. Gå tilbake til kartet for å begynne å bruke det.</string>
<string name="go_to_map">Gå til kartet</string>
<string name="downloads">Nedlastinger</string>
<string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f av %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Oppdater alle (%1$s MB)</string>
<string name="free_downloads_used">Gratis nedlastinger brukt</string>

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

@ -2162,7 +2162,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="later">Later</string>
<string name="downloads">Downloads</string>
<string name="confirm_download_roadmaps">U heeft de volledige kaart al. Wilt u echt de kaart met alleen wegen downloaden?</string>
<string name="value_downloaded_from_max">%1$.1f van %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f van %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Alles updaten (%1$s MB)</string>
<string name="free_downloads_used">Gebruikte gratis downloads</string>

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

File diff suppressed because one or more lines are too long

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

@ -1351,7 +1351,7 @@
<string name="poi_wheelchair_no">Cadeira de rodas: não permitido</string>
<string name="poi_wheelchair_limited">Cadeira de rodas: limitado</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_debris">Escombros</string>
<string name="poi_jersey_barrier">Barreira de Nova Jersey</string>

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

@ -1044,7 +1044,7 @@
<string name="poi_pump_manual">Ручной насос</string>
<string name="poi_pump_powered">Автоматический насос</string>
<string name="poi_pump_no">Без насоса</string>
<string name="poi_pump">Насос</string>
<string name="poi_pump_yes">Насос</string>
<string name="poi_water_characteristic_mineral">Характеристика воды: минеральная</string>
<string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>

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

@ -1792,7 +1792,7 @@
<string name="show_free_version_banner">Показывать баннер бесплатной версии</string>
<string name="show_free_version_banner_description">Даже если у вас купленная версия вы также можете видеть баннер для бесплатной версии</string>
<string name="confirm_download_roadmaps">Вы уверены, что хотите скачать карту автодорог, даже если у вас есть полная карта?</string>
<string name="value_downloaded_from_max">%1$.1f из %2$.1f Мб</string>
<string name="value_downloaded_of_max">%1$.1f из %2$.1f Мб</string>
<string name="file_size_in_mb">%.1f МБ</string>
<string name="update_all">Обновить все (%1$s МБ)</string>
<string name="free_downloads_used">Использовано бесплатных загрузок</string>

73
OsmAnd/res/values-sc/phrases.xml
View file

@ -1296,7 +1296,7 @@
<string name="poi_pump_manual">Pompa manuale</string>
<string name="poi_pump_powered">Pompa automàtica</string>
<string name="poi_pump_no">Chene pompa</string>
<string name="poi_pump">Pompa</string>
<string name="poi_pump_yes">Pompa</string>
<string name="poi_building">Edifìtziu</string>
<string name="poi_information_guidepost">Indicadore istradale</string>
@ -1784,4 +1784,75 @@
<string name="poi_payment_mastercard_yes">Atzetat cartas MasterCard</string>
<string name="poi_payment_mastercard_no">No atzetat cartas MasterCard</string>
<string name="poi_payment_none">De badas</string>
<string name="poi_seats">Banchinas</string>
<string name="poi_backrest_yes">Ischinale: eja</string>
<string name="poi_backrest_no">Ischinale: nono</string>
<string name="poi_intermittent">Intermittente</string>
<string name="poi_deadlock">Puntu mortu (deadlock)</string>
<string name="poi_information_trail_blaze">Marcadura de sas camineras</string>
<string name="poi_piste_grooming_classic">Ammaniamentu pista: clàssicu</string>
<string name="poi_piste_grooming_classic_skating">Ammaniamentu pista: clàssicu + patinàgiu</string>
<string name="poi_piste_grooming_backcountry">Ammaniamentu pista: fora de pista</string>
<string name="poi_piste_grooming_scooter">Ammaniamentu pista: motoreta (scooter)</string>
<string name="poi_piste_grooming_skating">Ammaniamentu pista: patinàgiu</string>
<string name="poi_piste_grooming_no">Ammaniamentu pista: perunu</string>
<string name="poi_piste_grooming_mogul">Ammaniamentu pista: tzumbas/gobbas</string>
<string name="poi_stars_1">Isteddas: 1 (turista)</string>
<string name="poi_payment_cash_yes">Atzetat dinare contante</string>
<string name="poi_payment_cash_no">No atzetat dinare contante</string>
<string name="poi_payment_debit_cards_yes">Atzetat cartas de dèpidu</string>
<string name="poi_payment_debit_cards_no">No atzetat cartas de dèpidu</string>
<string name="poi_payment_account_cards_yes">Atzetat cartas de contu</string>
<string name="poi_payment_account_cards_no">No atzetat cartas de contu</string>
<string name="poi_payment_maestro_yes">Atzetat cartas Maestro</string>
<string name="poi_payment_maestro_no">No atzetat cartas Maestro</string>
<string name="poi_payment_american_express_yes">Atzetat cartas American Express (AMEX)</string>
<string name="poi_payment_american_express_no">No atzetat cartas American Express (AMEX)</string>
<string name="poi_payment_diners_club_yes">Atzetat cartas Diners Club</string>
<string name="poi_payment_diners_club_no">No atzetat cartas Diners Club</string>
<string name="poi_payment_dkv_yes">Atzetat cartas DKV</string>
<string name="poi_payment_dkv_no">No atzetat cartas DKV</string>
<string name="poi_payment_uta_yes">Atzetat cartas UTA</string>
<string name="poi_payment_uta_no">No atzetat cartas UTA</string>
<string name="poi_payment_efectivo_yes">Atzetat \"efectivo\"</string>
<string name="poi_payment_efectivo_no">No atzetat \"efectivo\"</string>
<string name="poi_payment_girocard_yes">Atzetat cartas Girocard</string>
<string name="poi_payment_girocard_no">No atzetat cartas Girocard</string>
<string name="poi_payment_discover_card_yes">Atzetat cartas Discover Card</string>
<string name="poi_payment_discover_card_no">No atzetat cartas Discover Card</string>
<string name="poi_payment_visa_electron_yes">Atzetat cartas Visa Electron</string>
<string name="poi_payment_visa_electron_no">No atzetat cartas Visa Electron</string>
<string name="poi_payment_litecoin_yes">Atzetat Litecoin</string>
<string name="poi_payment_litecoin_no">No atzetat Litecoin</string>
<string name="poi_payment_cheque_yes">Atzetat assegnos</string>
<string name="poi_payment_cheque_no">No atzetat assegnos</string>
<string name="poi_payment_pikepass_yes">Atzetat PIKEPASS</string>
<string name="poi_payment_pikepass_no">No atzetat PIKEPASS</string>
<string name="poi_payment_pikepass_designated">Atzetat PIKEPASS (desinnadu)</string>
<string name="poi_payment_visa_debit_yes">Atzetat cartas Visa Debit</string>
<string name="poi_payment_visa_debit_no">No atzetat cartas Visa Debit</string>
<string name="poi_payment_cryptocurrencies_no">No atzetat criptomonedas</string>
<string name="poi_payment_others_yes">Atzetat àteras maneras de pagamentu</string>
<string name="poi_payment_others_no">No atzetat àteras maneras de pagamentu</string>
<string name="poi_payment_routex_yes">Atzetat cartas Routex pro su combustìbile</string>
<string name="poi_payment_routex_no">No atzetat cartas Routex pro su combustìbile</string>
<string name="poi_payment_bancomat_yes">Atzetat cartas Bàncomat</string>
<string name="poi_payment_bancomat_no">No atzetat cartas Bàncomat</string>
<string name="poi_payment_dogecoin_yes">Atzetat Dogecoins</string>
<string name="poi_payment_dogecoin_no">No atzetat Dogecoins</string>
<string name="poi_payment_paypal_yes">Atzetat PayPal</string>
<string name="poi_payment_paypal_no">No atzetat PayPal</string>
<string name="poi_payment_yandexmoney_yes">Atzetat Yandex.Money</string>
<string name="poi_payment_yandexmoney_no">No atzetat Yandex.Money</string>
<string name="poi_description_payment">Informatziones de pagamentu</string>
<string name="poi_internet_access_fee_yes">Atzessu a ìnternet - a pagamentu</string>
<string name="poi_internet_access_fee_no">Atzessu a ìnternet - de badas</string>
<string name="poi_payment_laser_yes">Atzetat cartas Laser</string>
<string name="poi_payment_laser_no">No atzetat cartas Laser</string>
</resources>

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

@ -1931,7 +1931,7 @@
<string name="favorite_category_name">Nùmene de sa categoria</string>
<string name="favorite_category_add_new_title">Annanghe una categoria noa</string>
<string name="confirm_download_roadmaps">Seguru ses de bòlere iscarrigare sa mapa cun petzi sas istradas, fintzas si tenes giai cussa cumprida?</string>
<string name="value_downloaded_from_max">%1$.1f dae %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f dae %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Agiorna totu (%1$s MB)</string>
<string name="free_downloads_used">Iscarrigamentos gratùitos impreados</string>

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

@ -1319,7 +1319,7 @@
<string name="poi_wheelchair_no">Invalidný vozík: nepovolený</string>
<string name="poi_wheelchair_limited">Invalidný vozík: obmedzene</string>
<string name="poi_pump">Čerpadlo</string>
<string name="poi_pump_yes">Čerpadlo</string>
<string name="poi_garden_type_residential">Typ záhrady: v obytnej oblasti</string>
<string name="poi_garden_type_community">Typ záhrady: spoločenstvo</string>

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

@ -1843,7 +1843,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="favorite_category_name">Názov kategórie</string>
<string name="favorite_category_add_new_title">Pridať novú kategóriu</string>
<string name="confirm_download_roadmaps">Naozaj chcete stiahnuť mapu obsahujúcu iba cesty, keď už máte štandardnú (plnú) mapu?</string>
<string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f z %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Aktualizovať všetko (%1$s MB)</string>
<string name="free_downloads_used">Počet použitých voľných stiahnutí</string>

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

@ -1935,7 +1935,7 @@
<string name="favorite_category_name">Ime kategorije</string>
<string name="favorite_category_add_new_title">Dodaj kategorijo</string>
<string name="confirm_download_roadmaps">Ali ste prepričani, da želite prejeti zemljevid le s podatki cest, čeprav je nameščen že polni zemljevid?</string>
<string name="value_downloaded_from_max">%1$.1f od %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f od %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Posodobi vse (%1$s MB)</string>
<string name="free_downloads_used">Omejitev brezplačnih prejemov je dosežena.</string>

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

@ -1920,7 +1920,7 @@
<string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="confirm_download_roadmaps">Är du säker på att du vill hämta kartan med enbart vägar trots att du redan har den fullständiga kartan?</string>
<string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f av %2$.1f MB</string>
<string name="update_all">Uppdatera alla (%1$s MB)</string>
<string name="free_downloads_used">Gratis nedladdningar hämtade</string>
<string name="free_downloads_used_description">Du kan ange hur många gratis nedladdningar som du har gjort</string>

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

@ -1347,7 +1347,7 @@
<string name="poi_rtsa_scale">RTSA 的難度</string>
<string name="poi_pump">泵浦</string>
<string name="poi_pump_yes">泵浦</string>
<string name="poi_piste_difficulty_easy">滑雪道難度：容易</string>
<string name="poi_piste_difficulty_intermediate">滑雪道難度：中等</string>

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

@ -1917,7 +1917,7 @@
<string name="favorite_category_name">類別名稱</string>
<string name="favorite_category_add_new_title">增加新的類別</string>
<string name="confirm_download_roadmaps">您確定要下載只有道路的地圖，即使您已經擁有標準(完整的)地圖？</string>
<string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f 從 %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">全部更新 (%1$s MB)</string>
<string name="free_downloads_used">免費下載使用</string>

8
OsmAnd/res/values/colors.xml
View file

@ -174,8 +174,8 @@
<color name="dialog_inactive_text_color_dark">#78909c</color>
<!-- DownloadedRegionsLayer -->
<color name="region_uptodate">#6632C832</color>
<color name="region_updateable">#66FF8F00</color>
<color name="region_selected">#66FFFF00</color>
<color name="region_downloading">#2Acd2c33</color>
<color name="region_uptodate">#5532C832</color>
<color name="region_updateable">#55FF8F00</color>
<color name="region_selected">#55FFFF00</color>
<color name="region_downloading">#44FF61FF</color>
</resources>

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

@ -1253,7 +1253,7 @@
<string name="poi_pump_manual">Manual pump</string>
<string name="poi_pump_powered">Powered pump</string>
<string name="poi_pump_no">No pump</string>
<string name="poi_pump">Pump</string>
<string name="poi_pump_yes">Pump</string>
<string name="poi_water_characteristic_mineral">Water characteristic: mineral</string>
<string name="poi_water_characteristic_mud">Water characteristic: mud</string>

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

@ -1693,7 +1693,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="osmand_net_previously_installed">A previous OsmAnd version is installed. All offline data will be supported by the new application. But Favorite points should be exported in the old application and later imported by the new one.</string>
<string name="build_installed">Build {0} successfully installed ({1}).</string>
<string name="downloading_build">Downloading build…</string>
<string name="install_selected_build">Do you want to install OsmAnd - {0} from {1} {2} MB ?</string>
<string name="install_selected_build">Do you want to install OsmAnd - {0} of {1} {2} MB ?</string>
<string name="loading_builds_failed">Retrieving the list of OsmAnd builds failed</string>
<string name="loading_builds">Loading OsmAnd builds…</string>
<string name="select_build_to_install">Select an OsmAnd build to install</string>
@ -2063,7 +2063,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="get_full_version">Full version</string>
<string name="downloads">Downloads</string>
<string name="confirm_download_roadmaps">Are you sure you want to download the roads-only map, even though you already have the standard (full) map?</string>
<string name="value_downloaded_from_max">%1$.1f from %2$.1f MB</string>
<string name="value_downloaded_of_max">%1$.1f of %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Update all (%1$s MB)</string>
<string name="free_downloads_used">Free downloads used</string>

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

@ -189,7 +189,7 @@ public class ItemViewHolder {
double mb = indexItem.getArchiveSizeMB();
String v ;
if (progress != -1) {
v = context.getString(R.string.value_downloaded_from_max, mb * progress / 100, mb);
v = context.getString(R.string.value_downloaded_of_max, mb * progress / 100, mb);
} else {
v = context.getString(R.string.file_size_in_mb, mb);
}

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
View file

@ -260,7 +260,7 @@ public class MapDataMenuController extends MenuController {
double mb = indexItem.getArchiveSizeMB();
String v ;
if (titleProgressController.progress != -1) {
v = getMapActivity().getString(R.string.value_downloaded_from_max, mb * titleProgressController.progress / 100, mb);
v = getMapActivity().getString(R.string.value_downloaded_of_max, mb * titleProgressController.progress / 100, mb);
} else {
v = getMapActivity().getString(R.string.file_size_in_mb, mb);
}