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 2018-02-03 18:54:04 +01:00
commit 703c4e9dd2
9 changed files with 350 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -729,7 +729,7 @@ Punktaŭ maršrutu %2$s</string>
<string name="poi_filter_for_tourists">Dla turystaŭ</string> <string name="poi_filter_for_tourists">Dla turystaŭ</string>
<string name="poi_filter_fuel">Paliva</string> <string name="poi_filter_fuel">Paliva</string>
<string name="show_warnings_title">Pakazvać papiaredžvańnі…</string> <string name="show_warnings_title">Pakazvać papiaredžvańnі…</string>
<string name="show_warnings_descr">Naladzić papiaredžanni ruchu (abmiežavanni chutkasci, vymušanyja prypynki, štučnyja niaroŭnasci), kamiery chutkasci, infarmacyju ab palosach.</string> <string name="show_warnings_descr">Naladzić papiaredžanni ruchu (abmiežavanni chutkasci, vymušanyja prypynki, štučnyja niaroŭnasci, tuneli), kamiery chutkasci, infarmacyju ab palosach.</string>
<string name="use_compass_navigation_descr">Vykarystoŭvać kompas kali inakš niemahčyma vyznačyć napramak.</string> <string name="use_compass_navigation_descr">Vykarystoŭvać kompas kali inakš niemahčyma vyznačyć napramak.</string>
<string name="use_compass_navigation">Vykarystoŭvać kompas</string> <string name="use_compass_navigation">Vykarystoŭvać kompas</string>
<string name="avoid_motorway">Paźbiahać aŭtamahіstralaŭ</string> <string name="avoid_motorway">Paźbiahać aŭtamahіstralaŭ</string>
@ -2995,4 +2995,20 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="nautical_renderer">Marski</string> <string name="nautical_renderer">Marski</string>
<string name="copy_location_name">Kapijavać nazvu kropki/POI</string> <string name="copy_location_name">Kapijavać nazvu kropki/POI</string>
<string name="toast_empty_name_error">Miesca nie maje nazvy</string> <string name="toast_empty_name_error">Miesca nie maje nazvy</string>
<string name="shared_string_current">Ciapierašni</string>
<string name="last_intermediate_dest_description">Dadaje apošni prypynak na maršrucie</string>
<string name="first_intermediate_dest_description">Dadaje pieršy prypynak na maršrucie</string>
<string name="subsequent_dest_description">Pierasunuć praznačennie daliej i stvaryć pryznačennie</string>
<string name="show_closed_notes">Pakazać zakrytyja natatki</string>
<string name="switch_osm_notes_visibility_desc">Pakazać/schavać OSM-natatki na mapie.</string>
<string name="gpx_file_desc">GPX padychodzić dlia ekspartu ŭ JOSM i inšyja OSM-redaktary.</string>
<string name="osc_file_desc">OSC padychodzić dlia ekspartu ŭ OpenStreetMap.</string>
<string name="gpx_file">GPX-fajl</string>
<string name="osc_file">OSC-fajl</string>
<string name="choose_file_type">Abiarycie typ fajla</string>
<string name="osm_edits_export_desc">Abiarycie typ ekspartu: OSM-natatki, POI ci abodvyja.</string>
<string name="all_data">Usie danyja</string>
<string name="osm_notes">OSM-natatki</string>
<string name="tunnel_warning">Napieradzie tuneĺ</string>
<string name="show_tunnels">Tuneli</string>
</resources> </resources>

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

@ -254,7 +254,7 @@
<string name="poi_filter_for_tourists">Для турыстаў</string> <string name="poi_filter_for_tourists">Для турыстаў</string>
<string name="poi_filter_fuel">Паліва</string> <string name="poi_filter_fuel">Паліва</string>
<string name="show_warnings_title">Паказваць папярэджванні…</string> <string name="show_warnings_title">Паказваць папярэджванні…</string>
<string name="show_warnings_descr">Наладзіць папярэджанні руху (абмежаванні хуткасці, вымушаныя прыпынкі, штучныя няроўнасці), камеры хуткасці, інфармацыю аб палосах.</string> <string name="show_warnings_descr">Наладзіць папярэджанні руху (абмежаванні хуткасці, вымушаныя прыпынкі, штучныя няроўнасці, тунелі), камеры хуткасці, інфармацыю аб палосах.</string>
<string name="use_compass_navigation_descr">Выкарыстоўваць компас калі інакш немагчыма вызначыць напрамак.</string> <string name="use_compass_navigation_descr">Выкарыстоўваць компас калі інакш немагчыма вызначыць напрамак.</string>
<string name="use_compass_navigation">Выкарыстоўваць компас</string> <string name="use_compass_navigation">Выкарыстоўваць компас</string>
<string name="avoid_motorway">Пазьбягаць аўтамагістраляў</string> <string name="avoid_motorway">Пазьбягаць аўтамагістраляў</string>
@ -3044,4 +3044,20 @@
<string name="will_open_tomorrow_at">Адчыніцца заўтра а</string> <string name="will_open_tomorrow_at">Адчыніцца заўтра а</string>
<string name="copy_location_name">Капіяваць назву кропкі/POI</string> <string name="copy_location_name">Капіяваць назву кропкі/POI</string>
<string name="toast_empty_name_error">Месца не мае назвы</string> <string name="toast_empty_name_error">Месца не мае назвы</string>
<string name="shared_string_current">Цяперашні</string>
<string name="last_intermediate_dest_description">Дадае апошні прыпынак на маршруце</string>
<string name="first_intermediate_dest_description">Дадае першы прыпынак на маршруце</string>
<string name="subsequent_dest_description">Перасунуць празначэнне далей і стварыць прызначэнне</string>
<string name="show_closed_notes">Паказаць закрытыя нататкі</string>
<string name="switch_osm_notes_visibility_desc">Паказаць/схаваць OSM-нататкі на мапе.</string>
<string name="gpx_file_desc">GPX падыходзіць для экспарту ў JOSM і іншыя OSM-рэдактары.</string>
<string name="osc_file_desc">OSC падыходзіць для экспарту ў OpenStreetMap.</string>
<string name="gpx_file">GPX-файл</string>
<string name="osc_file">OSC-файл</string>
<string name="choose_file_type">Абярыце тып файла</string>
<string name="osm_edits_export_desc">Абярыце тып экспарту: OSM-нататкі, POI ці абодвыя.</string>
<string name="all_data">Усе даныя</string>
<string name="osm_notes">OSM-нататкі</string>
<string name="tunnel_warning">Наперадзе тунэль</string>
<string name="show_tunnels">Тунелі</string>
</resources> </resources>

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

@ -798,7 +798,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
<string name="avoid_in_routing_title">Vyhnout se…</string> <string name="avoid_in_routing_title">Vyhnout se…</string>
<string name="avoid_in_routing_descr">Vyhnout se trajektům, placeným a nezpevněným cestám.</string> <string name="avoid_in_routing_descr">Vyhnout se trajektům, placeným a nezpevněným cestám.</string>
<string name="show_warnings_title">Zobrazit upozornění…</string> <string name="show_warnings_title">Zobrazit upozornění…</string>
<string name="show_warnings_descr">Zobrazit omezení rychlosti, rychlostní radary, retardéry a řazení do pruhů.</string> <string name="show_warnings_descr">Nastavit dopravní varování (omezení rychlosti, značky stop, retardéry, tunely), rychlostní radary a jízdní pruhy.</string>
<string name="map_widget_show_ruler">Měřítko</string> <string name="map_widget_show_ruler">Měřítko</string>
<string name="map_widget_transparent">Průhledné nástroje</string> <string name="map_widget_transparent">Průhledné nástroje</string>
<string name="email">E-mail</string> <string name="email">E-mail</string>
@ -2860,11 +2860,7 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
<string name="empty_state_markers_active_desc">Klepnutím nebo přidržením označte místa, pak klepněte na tlačítko značky s vlajkou.</string> <string name="empty_state_markers_active_desc">Klepnutím nebo přidržením označte místa, pak klepněte na tlačítko značky s vlajkou.</string>
<string name="modify_the_search_query">Upravit vyhledávací dotaz.</string> <string name="modify_the_search_query">Upravit vyhledávací dotaz.</string>
<string name="one_tap_active">Jedním klepnutím aktivní</string> <string name="one_tap_active">Jedním klepnutím aktivní</string>
<string name="release_3_0">\\022 Detekce značek \"stop\" zohledňuje směr jízdy <string name="release_3_0">\\022
\n
\n • Nový algoritmus poskytuje smysluplné hodnoty pro stoupání/klesání v GPX trasách
\n
\n • Čas pěší trasy zohledňuje terén/stoupání (Naismithovo pravidlo)
\n \n
\n</string> \n</string>
<string name="rendering_attr_hidePOILabels_name">Popisky bodů</string> <string name="rendering_attr_hidePOILabels_name">Popisky bodů</string>
@ -2904,7 +2900,23 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
\n \n
\n • Nová obrazovka rychlých souřadnic pro rychlé vytváření značek \n • Nová obrazovka rychlých souřadnic pro rychlé vytváření značek
\n \n
\n • Detekce značek \"stop\" zohledňuje směr jízdy
\n
\n • Nový algoritmus poskytuje smysluplné hodnoty pro stoupání/klesání v GPX trasách
\n
\n • Čas pěší trasy zohledňuje terén/stoupání (Naismithovo pravidlo)
\n
\n</string> \n</string>
<string name="osm_recipient_stat">Počet úprav %1$s, součet %2$s mBTC</string> <string name="osm_recipient_stat">Počet úprav %1$s, součet %2$s mBTC</string>
<string name="lang_lo">Laosky</string> <string name="lang_lo">Laosky</string>
<string name="show_closed_notes">Zobrazit zavřené poznámky</string>
<string name="switch_osm_notes_visibility_desc">Zobrazit/skrýt OSM poznámky na mapě.</string>
<string name="gpx_file_desc">GPX - vhodné pro export do JOSM nebo jiných editorů OSM.</string>
<string name="osc_file_desc">OSC - vhodné pro export do OpenStreetMap.</string>
<string name="gpx_file">Soubor GPX</string>
<string name="osc_file">Soubor OSC</string>
<string name="choose_file_type">Zvolte typ souboru</string>
<string name="osm_edits_export_desc">Vyberte typ exportu: OSM poznámky, POI nebo obojí.</string>
<string name="all_data">Všechny údaje</string>
<string name="osm_notes">OSM poznámky</string>
</resources> </resources>

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

@ -2925,4 +2925,8 @@ Proporciona un código completo</string>
<string name="osm_notes">Notas de OSM</string> <string name="osm_notes">Notas de OSM</string>
<string name="tunnel_warning">Túnel adelante</string> <string name="tunnel_warning">Túnel adelante</string>
<string name="show_tunnels">Túneles</string> <string name="show_tunnels">Túneles</string>
<string name="shared_string_current">Actual</string>
<string name="last_intermediate_dest_description">Añade la última parada de la ruta</string>
<string name="first_intermediate_dest_description">Añade la primer parada de la ruta</string>
<string name="subsequent_dest_description">Sube el destino y crea el destino</string>
</resources> </resources>

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

@ -2939,4 +2939,8 @@ Proporciona un código completo</string>
<string name="osm_notes">Notas de OSM</string> <string name="osm_notes">Notas de OSM</string>
<string name="tunnel_warning">Túnel adelante</string> <string name="tunnel_warning">Túnel adelante</string>
<string name="show_tunnels">Túneles</string> <string name="show_tunnels">Túneles</string>
<string name="shared_string_current">Actual</string>
<string name="last_intermediate_dest_description">Añade la última parada en la ruta</string>
<string name="first_intermediate_dest_description">Añade la primer parada en la ruta</string>
<string name="subsequent_dest_description">Sube el destino y crear el destino</string>
</resources> </resources>

168
OsmAnd/res/values-eu/phrases.xml
View file

@ -2474,4 +2474,172 @@
<string name="poi_beds">Oheak</string> <string name="poi_beds">Oheak</string>
<string name="poi_boat_rental">Ontzien alokairua</string> <string name="poi_boat_rental">Ontzien alokairua</string>
<string name="poi_wiki_lang_sco">Wikia eskozieraz</string>
<string name="poi_wiki_lang_pnb">Wikia punjabieraz</string>
<string name="poi_provided_for_infant_yes">Haurtxoentzat: bai</string>
<string name="poi_provided_for_infant_no">Haurtxoentzat: ez</string>
<string name="poi_provided_for_toddler_yes">Ume txikientzat: bai</string>
<string name="poi_provided_for_toddler_no">Ume txikientzat: ez</string>
<string name="poi_provided_for_child_yes">Umeentzat: bai</string>
<string name="poi_provided_for_child_no">Umeentzat: ez</string>
<string name="poi_provided_for_adult_yes">Helduentzat: bai</string>
<string name="poi_provided_for_adult_no">Helduentzat: ez</string>
<string name="poi_provided_for_woman_yes">Emakumeentzat: bai</string>
<string name="poi_provided_for_woman_no">Emakumeentzat: ez</string>
<string name="poi_provided_for_senior_yes">Adinekoentzat: bai</string>
<string name="poi_provided_for_senior_no">Adinekoentzat: ez</string>
<string name="poi_provided_for_girl_yes">Neskentzat: bai</string>
<string name="poi_provided_for_girl_no">Neskentzat: ez</string>
<string name="poi_provided_for_man_yes">Gizonezkoentzat: bai</string>
<string name="poi_provided_for_man_no">Gizonezkoentzat: ez</string>
<string name="poi_provided_for_boy_yes">Mutilentzat: bai</string>
<string name="poi_provided_for_boy_no">Mutilentzat: ez</string>
<string name="poi_capacity_beds">Edukiera (oheak)</string>
<string name="poi_gambling_bingo">Bingoa</string>
<string name="poi_location_underground">Kokalekua: lurrazpikoa</string>
<string name="poi_location_underwater">Kokalekua: urazpikoa</string>
<string name="poi_location_overground">Kokalekua: azalean</string>
<string name="poi_location_overhead">Kokalekua: aireratua</string>
<string name="poi_location_roof">Kokalekua: teilatuan</string>
<string name="poi_location_outdoor">Kokalekua: kanpoan</string>
<string name="poi_location_indoor">Kokalekua: barruan</string>
<string name="poi_location_platform">Kokalekua: plataforma</string>
<string name="poi_location_kiosk">Kokalekua: kioskoa</string>
<string name="poi_location_bridge">Kokalekua: zubia</string>
<string name="poi_location_wall">Kokalekua: horma</string>
<string name="poi_location_entrance">Kokalekua: sarrera</string>
<string name="poi_visibility_house">Ikusgaitasuna: etxea</string>
<string name="poi_visibility_street">Ikusgaitasuna: kalea</string>
<string name="poi_visibility_area">Ikusgaitasuna: ingurua</string>
<string name="poi_operational_status_open">Irekia</string>
<string name="poi_operational_status_closed">Itxia</string>
<string name="poi_operational_status_restricted">Mugatua</string>
<string name="poi_operational_status_broken">Aupurtua</string>
<string name="poi_operational_status_needs_maintenance">Konponketak behar ditu</string>
<string name="poi_water_purification_none">Bat ere ez</string>
<string name="poi_water_purification_chlorine">Kloroa</string>
<string name="poi_water_purification_reverse_osmosis">Alderantziko osmosia</string>
<string name="poi_water_supply_water_well">Ur putzua</string>
<string name="poi_water_supply_pipeline">Hodia</string>
<string name="poi_water_supply_running_water">Ur korrontea</string>
<string name="poi_water_supply_pump">Bonba</string>
<string name="poi_water_supply_borehole">Zulaketa</string>
<string name="poi_water_supply_water_trucking">Ur-kamioia</string>
<string name="poi_water_supply_water_tank">"Ur-tankea "</string>
<string name="poi_water_supply_bottled_water">Botilaratutako ura</string>
<string name="poi_water_place_access_community">Komunitatea</string>
<string name="poi_water_place_access_family">Familia</string>
<string name="poi_water_place_access_multifamilies">Hainbat familia</string>
<string name="poi_socket_cee_blue">Konektorea: CEE urdina</string>
<string name="poi_socket_cee_blue_current">Konektorea: CEE urdina: korrontea</string>
<string name="poi_socket_cee_blue_output">Konektorea: CEE urdina: irteera</string>
<string name="poi_socket_cee_red_16a">Konektorea: CEE gorria 16A</string>
<string name="poi_socket_cee_red_16a_current">Konektorea: CEE gorria: korrontea</string>
<string name="poi_socket_cee_red_16a_output">Konektorea: CEE gorria: irteera</string>
<string name="poi_socket_cee_red_32a">Konektorea: CEE gorria 32A</string>
<string name="poi_socket_cee_red_32a_current">Konektorea: CEE gorria 32A: korrontea</string>
<string name="poi_socket_cee_red_32a_output">Konektorea: CEE gorria 32A: irteera</string>
<string name="poi_socket_cee_red_64a">Konektorea: CEE gorria 64A</string>
<string name="poi_socket_cee_red_64a_current">Konektorea: CEE gorria 64A: korrontea</string>
<string name="poi_socket_cee_red_64a_output">Konektorea: CEE gorria 64A: irteera</string>
<string name="poi_socket_cee_red_125a">Konektorea: CEE gorria 125A</string>
<string name="poi_socket_cee_red_125a_current">Konektorea: CEE gorria 125A: korrontea</string>
<string name="poi_socket_cee_red_125a_output">Konektorea: CEE gorria 125A: irteera</string>
<string name="poi_socket_type1">Konektorea: 1 mota</string>
<string name="poi_socket_type1_current">Konektorea: 1 mota: korrontea</string>
<string name="poi_socket_type1_output">Konektorea: 1 mota: irteera</string>
<string name="poi_socket_type1_combo">Konektorea: 1 mota konbinatua</string>
<string name="poi_socket_type1_combo_current">Konektorea: 1 mota konbinatua: korrontea</string>
<string name="poi_socket_type1_combo_output">Konektorea: 1 mota konbinatua: irteera</string>
<string name="poi_socket_type2">Konektorea: 2 mota</string>
<string name="poi_socket_type2_current">Konektorea: 2 mota: korrontea</string>
<string name="poi_socket_type2_output">Konektorea: 2 mota: irteera</string>
<string name="poi_socket_type2_combo">Konektorea: 2 mota konbinatua</string>
<string name="poi_socket_type2_combo_current">Konektorea: 2 mota: korrontea</string>
<string name="poi_socket_type2_combo_output">Konektorea: 2 mota: irteera</string>
<string name="poi_socket_type3">Konektorea: 3 mota</string>
<string name="poi_socket_type3_current">Konektorea: 2 mota: korrontea</string>
<string name="poi_socket_type3_output">Konektorea: 3 mota: irteera</string>
<string name="poi_socket_chademo">Konektorea: CHAdeMO</string>
<string name="poi_socket_chademo_current">Konektorea: CHAdeMO: korrontea</string>
<string name="poi_socket_chademo_output">Konektorea: CHAdeMO: irteera</string>
<string name="poi_socket_tesla_standard">Konektorea: Tesla estandarra</string>
<string name="poi_socket_tesla_standard_current">Konektorea: Tesla estandarra: korrontea</string>
<string name="poi_socket_tesla_standard_output">Konektorea: Tesla estandarra: irteera</string>
<string name="poi_socket_tesla_supercharger">Konektorea: Tesla superkargagailua</string>
<string name="poi_socket_tesla_supercharger_current">Konektorea: Tesla superkargagailua: korrontea</string>
<string name="poi_socket_tesla_supercharger_output">Konektorea: Tesla superkargagailua: irteera</string>
<string name="poi_socket_nema_5_15">Konektorea: NEMA 5-15R</string>
<string name="poi_socket_nema_5_15_current">Konektorea: NEMA 5-15R: korrontea</string>
<string name="poi_socket_nema_5_15_output">Konektorea: NEMA 5-15R: irteera</string>
<string name="poi_socket_nema_5_20">Konektorea: NEMA 5-20</string>
<string name="poi_socket_nema_5_20_current">Konektorea: NEMA 5-20: korrontea</string>
<string name="poi_socket_nema_5_20_output">Konektorea: NEMA 5-20: irteera</string>
<string name="poi_socket_nema_14_30">Konektorea: NEMA 14-30</string>
<string name="poi_socket_nema_14_30_current">Konektorea: NEMA 14-30: korrontea</string>
<string name="poi_socket_nema_14_30_output">Konektorea: NEMA 14-30: irteera</string>
<string name="poi_socket_nema_14_50">Konektorea: NEMA 14-50</string>
<string name="poi_socket_nema_14_50_current">Konektorea: NEMA 14-50: korrontea</string>
<string name="poi_socket_nema_14_50_output">Konektorea: NEMA 14-50: irteera</string>
<string name="poi_socket_schuko">Konektorea: Schuko</string>
<string name="poi_socket_schuko_current">Konektorea: Schuko: korrontea</string>
<string name="poi_socket_schuko_output">Konektorea: Schuko: irteera</string>
<string name="poi_socket_bs1363">Konektorea: BS 1363</string>
<string name="poi_socket_bs1363_current">Konektorea: BS 1363: korrontea</string>
<string name="poi_socket_bs1363_output">Konektorea: BS 1363: irteera</string>
<string name="poi_socket_as3112">Konektorea: AS/NZS 3112</string>
<string name="poi_socket_as3112_current">Konektorea: AS/NZS 3112: korrontea</string>
<string name="poi_socket_as3112_output">Konektorea: AS/NZS 3112: irteera</string>
<string name="poi_car_yes">Kotxea: bai</string>
<string name="poi_car_no">Kotxea: ez</string>
<string name="poi_bicycle_yes">Bizikleta: bai</string>
<string name="poi_bicycle_no">Bizikleta: ez</string>
<string name="poi_scooter_yes">Motozikleta: bai</string>
<string name="poi_scooter_no">Motozikleta: ez</string>
<string name="poi_truck_yes">Kamioia: bai</string>
<string name="poi_truck_no">Kamioia: ez</string>
<string name="poi_parking_fee_yes">Aparkatzeko ordainsaria: bai</string>
<string name="poi_parking_fee_no">Aparkatzeko ordainsaria: ez</string>
<string name="poi_parking_fee">Aparkatzeko ordainsaria</string>
<string name="poi_amperage">Anperioak</string>
<string name="poi_charging_station_output">Kargatze-estazioaren irteera</string>
<string name="poi_map_type_topo">Mapa mota: topografikoa</string>
<string name="poi_map_type_street">Mapa mota: kaletegia</string>
<string name="poi_map_type_scheme">Mapa mota: eskema</string>
<string name="poi_map_type_toposcope">Mapa mota: toposkopikoa</string>
<string name="poi_map_size_site">Mapa mota: tokia</string>
<string name="poi_map_size_city">Mapa mota: hiria</string>
<string name="poi_map_size_region">Mapa mota: eskualdea</string>
<string name="poi_charging_station_filter">Kargatze-estazioa</string>
<string name="poi_letter_box">Buzoia</string>
<string name="poi_post_street">Kalea</string>
<string name="poi_post_housenumber">Portal zenbakia</string>
<string name="poi_post_flats"></string>
<string name="poi_money_transfer">Diru-transferentzia</string>
<string name="poi_ref_post">Posta-kodea</string>
<string name="poi_climbing_sport_yes">Kirola: bai</string>
<string name="poi_climbing_sport_no">Kirola: ez</string>
<string name="poi_climbing_trad_yes">Tradizionala: bai</string>
<string name="poi_climbing_trad_no">Tradizionala: ez</string>
<string name="poi_climbing_ice_yes">Izotza: bai</string>
<string name="poi_climbing_ice_no">Izotza: ez</string>
<string name="poi_climbing_mixed_yes">Mistoa: bai</string>
<string name="poi_climbing_mixed_no">Mistoa: ez</string>
</resources> </resources>

3
OsmAnd/res/values-zh-rCN/phrases.xml
View file

@ -22,4 +22,7 @@
<string name="poi_animal_training_type">类型</string> <string name="poi_animal_training_type">类型</string>
<string name="poi_embassy_type">类型</string> <string name="poi_embassy_type">类型</string>
<string name="poi_clock_option">额外的</string> <string name="poi_clock_option">额外的</string>
<string name="poi_osmwiki">维基百科</string>
<string name="poi_user_defined_other">用户自定义</string>
</resources> </resources>

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

@ -1265,8 +1265,8 @@
<string name="select_city">选择城市</string> <string name="select_city">选择城市</string>
<string name="select_postcode">选择邮政编码</string> <string name="select_postcode">选择邮政编码</string>
<string name="quick_action_auto_zoom">地图自动缩放开关</string> <string name="quick_action_auto_zoom">地图自动缩放开关</string>
<string name="quick_action_auto_zoom_on">地图自动缩放开启</string> <string name="quick_action_auto_zoom_on">启用地图自动缩放</string>
<string name="quick_action_auto_zoom_off">地图自动缩放关闭</string> <string name="quick_action_auto_zoom_off">禁用地图自动缩放</string>
<string name="quick_action_add_destination">添加目的地</string> <string name="quick_action_add_destination">添加目的地</string>
<string name="quick_action_replace_destination">更换目的地</string> <string name="quick_action_replace_destination">更换目的地</string>
<string name="quick_action_add_first_intermediate">添加第一个途径地</string> <string name="quick_action_add_first_intermediate">添加第一个途径地</string>
@ -1369,7 +1369,7 @@
<string name="rendering_attr_showCycleRoutes_name">显示自行车路线</string> <string name="rendering_attr_showCycleRoutes_name">显示自行车路线</string>
<string name="rendering_attr_horseRoutes_name">马匹路线</string> <string name="rendering_attr_horseRoutes_name">马匹路线</string>
<string name="download_wikipedia_maps">维基百科</string> <string name="download_wikipedia_maps">维基百科</string>
<string name="do_not_show_startup_messages_desc">它显示应用折扣信息和特殊本地事件信息</string> <string name="do_not_show_startup_messages_desc">停止显示应用折扣信息和特殊本地事件信息。</string>
<string name="shared_string_max">最大</string> <string name="shared_string_max">最大</string>
<string name="shared_string_time">时间</string> <string name="shared_string_time">时间</string>
<string name="total_distance">总距离</string> <string name="total_distance">总距离</string>
@ -1483,7 +1483,7 @@
<string name="distance_moving">距离已修正</string> <string name="distance_moving">距离已修正</string>
<string name="no_photos_descr">我们没有该地点的照片。</string> <string name="no_photos_descr">我们没有该地点的照片。</string>
<string name="routing_attr_short_way_name">节油道路</string> <string name="routing_attr_short_way_name">节油道路</string>
<string name="routing_attr_short_way_description">使用节油道路（通常更短）</string> <string name="routing_attr_short_way_description">使用节油道路（通常更短）。</string>
<string name="configure_screen_quick_action">快捷操作</string> <string name="configure_screen_quick_action">快捷操作</string>
<string name="shared_string_show_all">显示全部</string> <string name="shared_string_show_all">显示全部</string>
<string name="osmand_plus_short_description_80_chars">全球移动地图浏览，以及使用离线和在线 OSM 地图进行导航</string> <string name="osmand_plus_short_description_80_chars">全球移动地图浏览，以及使用离线和在线 OSM 地图进行导航</string>
@ -1523,7 +1523,7 @@
<string name="favorite_group_name">组名称</string> <string name="favorite_group_name">组名称</string>
<string name="animate_my_location">动画处理我的位置</string> <string name="animate_my_location">动画处理我的位置</string>
<string name="animate_my_location_desc">在导航时为我的位置启用动画。</string> <string name="animate_my_location_desc">在导航时为我的位置启用动画。</string>
<string name="quick_action_add_destination_desc">轻点按鈕将在屏幕中心位置添加一个目的地。以前设定的目的地成为最后的中转点。</string> <string name="quick_action_add_destination_desc">轻点按钮将在屏幕中心位置添加一个目的地。以前设定的目的地成为最后的中转点。</string>
<string name="quick_action_replace_destination_desc">轻点动作按钮将吧屏幕中心的位置更换为目的地。</string> <string name="quick_action_replace_destination_desc">轻点动作按钮将吧屏幕中心的位置更换为目的地。</string>
<string name="quick_action_add_first_intermediate_desc">轻点动作按钮将在屏幕中心位置添加一个中转点。</string> <string name="quick_action_add_first_intermediate_desc">轻点动作按钮将在屏幕中心位置添加一个中转点。</string>
<string name="no_overlay">无覆盖层</string> <string name="no_overlay">无覆盖层</string>
@ -1543,7 +1543,7 @@
<string name="routing_attr_driving_style_speed_name">更短的路径</string> <string name="routing_attr_driving_style_speed_name">更短的路径</string>
<string name="routing_attr_driving_style_balance_name">平衡</string> <string name="routing_attr_driving_style_balance_name">平衡</string>
<string name="routing_attr_driving_style_safety_name">偏好背街小路</string> <string name="routing_attr_driving_style_safety_name">偏好背街小路</string>
<string name="relief_smoothness_factor_descr">首选的地形︰ 平坦或丘陵</string> <string name="relief_smoothness_factor_descr">首选的地形︰ 平坦或丘陵。</string>
<string name="shared_string_slope">坡度</string> <string name="shared_string_slope">坡度</string>
<string name="add_new_folder">添加新文件夹</string> <string name="add_new_folder">添加新文件夹</string>
<string name="route_points_category_name">转到这条路线上</string> <string name="route_points_category_name">转到这条路线上</string>
@ -1560,8 +1560,8 @@
<string name="average_altitude">平均海拔</string> <string name="average_altitude">平均海拔</string>
<string name="routing_attr_relief_smoothness_factor_name">选择海拔波动</string> <string name="routing_attr_relief_smoothness_factor_name">选择海拔波动</string>
<string name="routing_attr_height_obstacles_name">使用标高数据</string> <string name="routing_attr_height_obstacles_name">使用标高数据</string>
<string name="routing_attr_height_obstacles_description">使用提供 SRTM、 ASTER 和 EU-DEM 的地形标高数据</string> <string name="routing_attr_height_obstacles_description">使用 SRTM、ASTER 和 EU-DEM 提供的地形标高数据。</string>
<string name="rendering_attr_depthContours_description">显示等深线和标记</string> <string name="rendering_attr_depthContours_description">显示等深线和标记。</string>
<string name="rendering_attr_depthContours_name">航海等深线</string> <string name="rendering_attr_depthContours_name">航海等深线</string>
<string name="auto_split_recording_title">自动拆分录音后的间隙</string> <string name="auto_split_recording_title">自动拆分录音后的间隙</string>
<string name="auto_split_recording_descr">如果日期已更改，开始新区段在6分钟后的间隙，新轨迹在2小时后的间隙，或新文件在更长的间隙之后。</string> <string name="auto_split_recording_descr">如果日期已更改，开始新区段在6分钟后的间隙，新轨迹在2小时后的间隙，或新文件在更长的间隙之后。</string>
@ -2740,4 +2740,20 @@
<string name="will_open_tomorrow_at">明日开始营业时间</string> <string name="will_open_tomorrow_at">明日开始营业时间</string>
<string name="rendering_attr_hidePOILabels_name">兴趣点（POI）标签</string> <string name="rendering_attr_hidePOILabels_name">兴趣点（POI）标签</string>
<string name="show_number_pad">显示数字盘</string> <string name="show_number_pad">显示数字盘</string>
<string name="switch_osm_notes_visibility_desc">在地图上显示/隐藏 OSM 笔记。</string>
<string name="gpx_file_desc">GPX - 适合导出到 JOSM 或其它 OSM 编辑器。</string>
<string name="osc_file_desc">OSC - 适合导出到 OpenStreetMap。</string>
<string name="gpx_file">GPX 文件</string>
<string name="osc_file">OSC 文件</string>
<string name="choose_file_type">选择文件类型</string>
<string name="osm_edits_export_desc">选择导出类型：OSM 笔记、POI（兴趣点）或者同时使用两者。</string>
<string name="all_data">所有数据</string>
<string name="osm_notes">OSM 笔记</string>
<string name="shared_string_paste">粘贴</string>
<string name="tap_on_map_to_hide_interface">全屏模式</string>
<string name="import_file">导入文件</string>
<string name="mappilary_no_internet_desc">您需要互联网连接以查看来自 Mapillary 的图片。</string>
<string name="retry">重试</string>
<string name="save_gpx_waypoint">保存 GPX 航点</string>
<string name="import_track">导入轨迹</string>
</resources> </resources>

122
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -71,7 +71,6 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
public static final float ZOOM_PADDING_TOP_DP = 4f; public static final float ZOOM_PADDING_TOP_DP = 4f;
public static final float MARKER_PADDING_DP = 20f; public static final float MARKER_PADDING_DP = 20f;
public static final float MARKER_PADDING_X_DP = 50f; public static final float MARKER_PADDING_X_DP = 50f;
public static final float SKIP_HALF_SCREEN_STATE_KOEF = .21f;
public static final int ZOOM_IN_STANDARD = 17; public static final int ZOOM_IN_STANDARD = 17;
public static final int CURRENT_Y_UNDEFINED = Integer.MAX_VALUE; public static final int CURRENT_Y_UNDEFINED = Integer.MAX_VALUE;
@ -128,8 +127,6 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
private boolean wasDrawerDisabled; private boolean wasDrawerDisabled;
private boolean zoomIn; private boolean zoomIn;
private float skipScreenStateLimit;
private int screenOrientation; private int screenOrientation;
private boolean created; private boolean created;
@ -353,8 +350,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
hasMoved = true; hasMoved = true;
float y = event.getY(); float y = event.getY();
float newY = getViewY() + (y - dy); float newY = getViewY() + (y - dy);
if (menu.isLandscapeLayout() && newY > 0) { if (menu.isLandscapeLayout() && newY > topScreenPosY) {
newY = 0; newY = topScreenPosY;
} }
setViewY((int) newY, false, false); setViewY((int) newY, false, false);
@ -391,8 +388,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
scroller.abortAnimation(); scroller.abortAnimation();
scroller.fling(0, currentY, 0, initialVelocity, 0, 0, scroller.fling(0, currentY, 0, initialVelocity, 0, 0,
viewHeight - menuFullHeightMax, Math.min(viewHeight - menuFullHeightMax, getFullScreenTopPosY()),
minHalfY, screenHeight,
0, 0); 0, 0);
currentY = scroller.getFinalY(); currentY = scroller.getFinalY();
scroller.abortAnimation(); scroller.abortAnimation();
@ -404,8 +401,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
slidingDown = false; slidingDown = false;
} }
boolean skipScreenState = Math.abs(getViewY() - dyMain) > skipScreenStateLimit; changeMenuState(currentY, slidingUp, slidingDown);
changeMenuState(currentY, skipScreenState, slidingUp, slidingDown);
} }
recycleVelocityTracker(); recycleVelocityTracker();
break; break;
@ -740,59 +736,90 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
private void processScreenHeight(ViewParent parent) { private void processScreenHeight(ViewParent parent) {
View container = (View) parent; View container = (View) parent;
screenHeight = container.getHeight() + AndroidUtils.getStatusBarHeight(getActivity()); screenHeight = container.getHeight() + AndroidUtils.getStatusBarHeight(getActivity());
skipScreenStateLimit = screenHeight * SKIP_HALF_SCREEN_STATE_KOEF;
viewHeight = screenHeight - AndroidUtils.getStatusBarHeight(getMapActivity()); viewHeight = screenHeight - AndroidUtils.getStatusBarHeight(getMapActivity());
} }
public void openMenuFullScreen() { public void openMenuFullScreen() {
changeMenuState(getViewY(), true, true, false); changeMenuState(getMenuStatePosY(MenuState.FULL_SCREEN), false, false);
} }
public void openMenuHeaderOnly() { public void openMenuHeaderOnly() {
changeMenuState(getViewY(), true, false, true); if (!menu.isLandscapeLayout()) {
changeMenuState(getMenuStatePosY(MenuState.HEADER_ONLY), false, false);
}
} }
public void openMenuHalfScreen() { public void openMenuHalfScreen() {
int oldMenuState = menu.getCurrentMenuState(); if (!menu.isLandscapeLayout()) {
if (oldMenuState == MenuState.HEADER_ONLY) { changeMenuState(getMenuStatePosY(MenuState.HALF_SCREEN), false, false);
changeMenuState(getViewY(), false, true, false);
} else if (oldMenuState == MenuState.FULL_SCREEN && !menu.isLandscapeLayout()) {
changeMenuState(getViewY(), false, false, true);
} }
} }
private void changeMenuState(int currentY, boolean skipScreenState, private void changeMenuState(int currentY, boolean slidingUp, boolean slidingDown) {
boolean slidingUp, boolean slidingDown) {
boolean needCloseMenu = false; boolean needCloseMenu = false;
int oldMenuState = menu.getCurrentMenuState(); int currentMenuState = menu.getCurrentMenuState();
if (!menu.isLandscapeLayout()) { if (!menu.isLandscapeLayout()) {
if (slidingDown && oldMenuState == MenuState.FULL_SCREEN && getViewY() < getFullScreenTopPosY()) { int headerDist = Math.abs(currentY - getMenuStatePosY(MenuState.HEADER_ONLY));
int halfDist = Math.abs(currentY - getMenuStatePosY(MenuState.HALF_SCREEN));
int fullDist = Math.abs(currentY - getMenuStatePosY(MenuState.FULL_SCREEN));
int newState;
if (headerDist < halfDist && headerDist < fullDist) {
newState = MenuState.HEADER_ONLY;
} else if (halfDist < headerDist && halfDist < fullDist) {
newState = MenuState.HALF_SCREEN;
} else {
newState = MenuState.FULL_SCREEN;
}
if (slidingDown && currentMenuState == MenuState.FULL_SCREEN && getViewY() < getFullScreenTopPosY()) {
slidingDown = false; slidingDown = false;
newState = MenuState.FULL_SCREEN;
} }
if (menuBottomViewHeight > 0 && slidingUp) { if (menuBottomViewHeight > 0 && slidingUp) {
menu.slideUp(); while (menu.getCurrentMenuState() != newState) {
if (skipScreenState) { if (!menu.slideUp()) {
menu.slideUp(); break;
}
} }
} else if (slidingDown) { } else if (slidingDown) {
needCloseMenu = !menu.slideDown(); if (currentMenuState == MenuState.HEADER_ONLY) {
if (!needCloseMenu && skipScreenState) { needCloseMenu = true;
menu.slideDown(); } else {
while (menu.getCurrentMenuState() != newState) {
if (!menu.slideDown()) {
needCloseMenu = true;
break;
}
}
}
} else {
if (currentMenuState < newState) {
while (menu.getCurrentMenuState() != newState) {
if (!menu.slideUp()) {
break;
}
}
} else {
while (menu.getCurrentMenuState() != newState) {
if (!menu.slideDown()) {
break;
}
}
} }
} }
} }
int newMenuState = menu.getCurrentMenuState(); int newMenuState = menu.getCurrentMenuState();
boolean needMapAdjust = oldMenuState != newMenuState && newMenuState != MenuState.FULL_SCREEN; boolean needMapAdjust = currentMenuState != newMenuState && newMenuState != MenuState.FULL_SCREEN;
if (newMenuState != oldMenuState) { if (newMenuState != currentMenuState) {
restoreCustomMapRatio(); restoreCustomMapRatio();
menu.updateControlsVisibility(true); menu.updateControlsVisibility(true);
doBeforeMenuStateChange(oldMenuState, newMenuState); doBeforeMenuStateChange(currentMenuState, newMenuState);
toggleDetailsHideButton(); toggleDetailsHideButton();
} }
applyPosY(currentY, needCloseMenu, needMapAdjust, oldMenuState, newMenuState, 0); applyPosY(currentY, needCloseMenu, needMapAdjust, currentMenuState, newMenuState, 0);
} }
private void restoreCustomMapRatio() { private void restoreCustomMapRatio() {
@ -1466,6 +1493,22 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
return -menuTitleHeight + menuButtonsHeight + bottomToolbarPosY; return -menuTitleHeight + menuButtonsHeight + bottomToolbarPosY;
} }
private int getMenuStatePosY(int menuState) {
if (menu.isLandscapeLayout()) {
return topScreenPosY;
}
switch (menuState) {
case MenuState.HEADER_ONLY:
return getHeaderOnlyTopY();
case MenuState.HALF_SCREEN:
return minHalfY;
case MenuState.FULL_SCREEN:
return getFullScreenTopPosY();
default:
return 0;
}
}
private int getPosY() { private int getPosY() {
return getPosY(CURRENT_Y_UNDEFINED, false); return getPosY(CURRENT_Y_UNDEFINED, false);
} }
@ -1491,20 +1534,15 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
int posY = 0; int posY = 0;
switch (destinationState) { switch (destinationState) {
case MenuState.HEADER_ONLY: case MenuState.HEADER_ONLY:
posY = getHeaderOnlyTopY(); posY = getMenuStatePosY(MenuState.HEADER_ONLY);
break; break;
case MenuState.HALF_SCREEN: case MenuState.HALF_SCREEN:
posY = minHalfY; posY = getMenuStatePosY(MenuState.HALF_SCREEN);
break; break;
case MenuState.FULL_SCREEN: case MenuState.FULL_SCREEN:
if (currentY != CURRENT_Y_UNDEFINED) { if (currentY != CURRENT_Y_UNDEFINED) {
int maxPosY = viewHeight - menuFullHeightMax; int maxPosY = viewHeight - menuFullHeightMax;
int minPosY; int minPosY = getMenuStatePosY(MenuState.FULL_SCREEN);
if (menu.isLandscapeLayout()) {
minPosY = topScreenPosY;
} else {
minPosY = getFullScreenTopPosY();
}
if (maxPosY > minPosY) { if (maxPosY > minPosY) {
maxPosY = minPosY; maxPosY = minPosY;
} }
@ -1516,11 +1554,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
posY = currentY; posY = currentY;
} }
} else { } else {
if (menu.isLandscapeLayout()) { posY = getMenuStatePosY(MenuState.FULL_SCREEN);
posY = topScreenPosY;
} else {
posY = getFullScreenTopPosY();
}
} }
break; break;
default: default: