Merge branch 'master' of github.com:osmandapp/Osmand
This commit is contained in:
Victor Shcherb
commit
f0fe1c66df
35 changed files with 517 additions and 179 deletions
|
|
@ -6,13 +6,6 @@
|
|||
android:layout_height="match_parent"
|
||||
android:background="@android:color/transparent">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/context_menu_shadow_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/context_menu_main"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -187,7 +187,13 @@
|
|||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" >
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1px"/>
|
||||
</FrameLayout>
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" >
|
||||
|
|
|
|||
|
|
@ -1156,4 +1156,75 @@
|
|||
<string name="poi_ford_stepping_stones">Рудыментарны мост з камянёў</string>
|
||||
<string name="poi_services">Зона паслуг, прылеглая да шашы</string>
|
||||
|
||||
</resources>
|
||||
<string name="poi_brownfield">Землі пад забудову (выкарыстаныя раней)</string>
|
||||
<string name="poi_greenfield">Зямля пад забудову</string>
|
||||
<string name="poi_bunker_silo">Збудаваньне для захоўваньня сіласу</string>
|
||||
<string name="poi_paediatrics">Пэдыятар</string>
|
||||
|
||||
<string name="poi_office_religion">Офіс рэлігійнай арганізацыі</string>
|
||||
<string name="poi_association">Офіс таварыства, асацыяцыі</string>
|
||||
<string name="poi_financial">Фінансавая кантора</string>
|
||||
<string name="poi_political_party">Офіс палітычнай партыі</string>
|
||||
<string name="poi_foundation">Офіс фонду (грамадзкай арганізацыі)</string>
|
||||
<string name="poi_tax_advisor">Спэцыяліст па падрыхтоўцы падатковых дэклярацый</string>
|
||||
|
||||
<string name="poi_religion_spiritualist">Спірытуалізм</string>
|
||||
<string name="poi_religion_tenrikyo">Тэнрыкё</string>
|
||||
<string name="poi_rtsa_scale">Катэгорыя складанасьці перавала</string>
|
||||
|
||||
<string name="poi_garden">Сад</string>
|
||||
|
||||
<string name="poi_heath">Пустка</string>
|
||||
<string name="poi_grass">Газон</string>
|
||||
<string name="poi_grassland">Луг</string>
|
||||
<string name="poi_scrub">Хмызьняк</string>
|
||||
<string name="poi_farmland">Сельскагаспадарчыя ўгодзьдзі</string>
|
||||
<string name="poi_logging">Высечкі</string>
|
||||
<string name="poi_sand">Пясок</string>
|
||||
|
||||
<string name="poi_dead_wood">Сухастой</string>
|
||||
|
||||
<string name="poi_passing_place">Месца разьезду</string>
|
||||
<string name="poi_level">Паверх</string>
|
||||
<string name="poi_generator_source_coal">Крыніца энергіі: вугаль</string>
|
||||
<string name="poi_generator_source_gas">Крыніца энэргіі: газ</string>
|
||||
<string name="poi_generator_source_nuclear">Крыніца энэргіі: ядзернае паліва</string>
|
||||
<string name="poi_generator_source_solar">Крыніца энэргіі: сонца</string>
|
||||
<string name="poi_generator_source_hydro">Крыніца энэргіі: вада</string>
|
||||
<string name="poi_generator_source_wind">Крыніца энэргіі: вецер</string>
|
||||
<string name="poi_generator_source_geothermal">Крыніца энэргіі: геатэрмальны</string>
|
||||
<string name="poi_generator_source_oil">Крыніца энэргіі: мазут</string>
|
||||
<string name="poi_generator_source_diesel">Крыніца энэргіі: дызельнае паліва</string>
|
||||
|
||||
<string name="poi_car_wash_self_service">Самаабслугоўваньне</string>
|
||||
|
||||
<string name="poi_int_name">Міжнародная назва</string>
|
||||
<string name="poi_nat_name">Агульнанацыянальная назва</string>
|
||||
<string name="poi_reg_name">Рэгіянальная назва</string>
|
||||
<string name="poi_loc_name">Мясцовая назва</string>
|
||||
<string name="poi_old_name">Гістарычная назва</string>
|
||||
<string name="poi_alt_name">Альтэрнатыўная назва</string>
|
||||
|
||||
<string name="poi_pump_manual">Ручная помпа</string>
|
||||
<string name="poi_pump_powered">Аўтаматычная помпа</string>
|
||||
<string name="poi_pump_no">Бяз помпы</string>
|
||||
|
||||
<string name="poi_water_characteristic_mineral">Характарыстыка вады: мінэральная</string>
|
||||
<string name="poi_water_characteristic_mud">Характарыстыка вады: брудная</string>
|
||||
<string name="poi_water_characteristic_sulfuric">Характарыстыка вады: серная</string>
|
||||
|
||||
<string name="poi_water_point">Пункт водазабесьпячэньня</string>
|
||||
|
||||
<string name="poi_cuisine">Кухня</string>
|
||||
|
||||
<string name="poi_information_guidepost">Паказальнік</string>
|
||||
<string name="poi_information_board">Інфармацыйны шчыт</string>
|
||||
<string name="poi_information_map">Мапа</string>
|
||||
<string name="poi_information_office">Інфармацыйны офіс</string>
|
||||
<string name="poi_information_terminal">Інфармацыйны тэрмінал</string>
|
||||
<string name="poi_information_nature">Інфармацыя пра прыроду</string>
|
||||
<string name="poi_information_wildlife">Інфармацыя аб дзікай прыродзе</string>
|
||||
<string name="poi_information_history">Гістарычная інфармацыя</string>
|
||||
<string name="poi_information_sign">Знак</string>
|
||||
<string name="poi_information_audioguide">Аўдыягід</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@
|
|||
<string name="driving_region_uk">Вялікабрытанія, Індыія, Аўстралія ды іншыя</string>
|
||||
|
||||
|
||||
<string name="announce_gpx_waypoints">Агалошваць маршрутныя пункты GPX</string>
|
||||
<string name="announce_gpx_waypoints">Маршрутныя пункты GPX</string>
|
||||
<string name="speak_title">Агалошваць…</string>
|
||||
<string name="speak_descr">Агалошваць назвы вуліц, дарожныя перасьцярогі (вымушаныя прыпынкі, ляжачыя паліцэйскія), перасьцярогі аб камерах хуткасьці, абмежаваньні хуткасьці</string>
|
||||
<string name="speak_street_names">Агалошваць назвы вуліц (TTS)</string>
|
||||
<string name="speak_speed_limit">Папярэджваць пра абмежаваньне хуткасьці</string>
|
||||
<string name="speak_cameras">Папярэджваць пра камэры хуткасьці</string>
|
||||
<string name="speak_traffic_warnings">Папярэджваць пра перашкоды руху</string>
|
||||
<string name="speak_street_names">Назвы вуліц (TTS)</string>
|
||||
<string name="speak_speed_limit">Абмежаваньне хуткасьці</string>
|
||||
<string name="speak_cameras">Камэры хуткасьці</string>
|
||||
<string name="speak_traffic_warnings">Перасьцярогі руху</string>
|
||||
<string name="tip_recent_changes_1_5_t">Зьмены ў 1.5:
|
||||
\n\t* Галасавыя папярэджваньні аб абмежаваньні хуткасьці і камерах
|
||||
\n\t* Больш галасавых падказкак (агалошэньне назваў вуліц)
|
||||
|
|
@ -375,7 +375,7 @@
|
|||
<string name="bg_service_interval">Задайце інтэрвал абуджэньня:</string>
|
||||
<string name="show_cameras">Камэры хуткасьці</string>
|
||||
<string name="show_traffic_warnings">Абмежаваньне руху</string>
|
||||
<string name="avoid_toll_roads">Платныя дарогі</string>
|
||||
<string name="avoid_toll_roads">Пазьбягаць платныя дарогі</string>
|
||||
<string name="continue_follow_previous_route_auto">Папярэдняя навігацыя не была скончаная. Працягваць кіравацца ёю? (%1$s сэкундаў)</string>
|
||||
<string name="route_updated_loc_found">Маршрут будзе разлічвацца як толькі вызначыцца становішча</string>
|
||||
<string name="osmand_parking_hours">Гадзін</string>
|
||||
|
|
@ -1313,13 +1313,13 @@
|
|||
<string name="routing_attr_prefer_motorway_name">Аддаваць перавагу аўтамагістралям</string>
|
||||
<string name="routing_attr_short_way_name">Самы кароткі шлях</string>
|
||||
<string name="routing_attr_short_way_description">Выкарыстоўваць кароткі шлях</string>
|
||||
<string name="routing_attr_avoid_toll_name">Платныя дарогі</string>
|
||||
<string name="routing_attr_avoid_toll_name">Пазьбягаць платныя дарогі</string>
|
||||
<string name="routing_attr_avoid_toll_description">Пазьбягаць платных дарог</string>
|
||||
<string name="routing_attr_avoid_unpaved_name">Грунтавыя дарогі</string>
|
||||
<string name="routing_attr_avoid_unpaved_name">Пазьбягаць грунтавыя дарогі</string>
|
||||
<string name="routing_attr_avoid_unpaved_description">Пазбягаць грунтавыя дарогі</string>
|
||||
<string name="routing_attr_avoid_ferries_name">Паромныя пераправы</string>
|
||||
<string name="routing_attr_avoid_ferries_name">Пазьбягаць паромныя пераправы</string>
|
||||
<string name="routing_attr_avoid_ferries_description">Пазбягаць пераправы</string>
|
||||
<string name="routing_attr_avoid_motorway_name">Аўтамагістралі</string>
|
||||
<string name="routing_attr_avoid_motorway_name">Пазьбягаць аўтамагістралі</string>
|
||||
<string name="routing_attr_avoid_motorway_description">Пазьбягаць аўтамагістралі</string>
|
||||
<string name="routing_attr_weight_name">Абмежаваньне вагі</string>
|
||||
<string name="routing_attr_weight_description">Задайце вагу аўтамабіля для пракладаньня маршрутаў</string>
|
||||
|
|
@ -1669,8 +1669,8 @@
|
|||
|
||||
<string name="waypoints">Кропкі шляху</string>
|
||||
<string name="way_alarms">Дарожныя папярэджаньні</string>
|
||||
<string name="speak_favorites">Абвяшчаць выбраныя паблізу</string>
|
||||
<string name="speak_poi">Абвяшчаць навакольныя POI</string>
|
||||
<string name="speak_favorites">Упадабаныя паблізу</string>
|
||||
<string name="speak_poi">Навакольныя POI</string>
|
||||
<string name="targets">Цэлі</string>
|
||||
<string name="shared_string_all">Усе</string>
|
||||
<string name="index_tours">Паездкі</string>
|
||||
|
|
@ -1769,7 +1769,7 @@
|
|||
<string name="traffic_warning_pedestrian">Пешаходны пераход</string>
|
||||
<string name="traffic_warning_railways">Чыгуначны пераезд</string>
|
||||
<string name="show_railway_warnings">Паказваць чыгуначныя пераезды</string>
|
||||
<string name="speak_pedestrian">Папярэджваць пра пешаходныя пераходы</string>
|
||||
<string name="speak_pedestrian">Пешаходныя пераходы</string>
|
||||
|
||||
<string name="save_track_to_gpx_globally_headline">Запіс сьледу па запатрабаваньні</string>
|
||||
<string name="avoid_roads_msg">Вы можаце абраць іншы маршрут, пазначыўшы дарогі, якія варта пазьбягаць</string>
|
||||
|
|
@ -1966,7 +1966,7 @@
|
|||
<string name="storage_directory_multiuser">Агульнае сховішча</string>
|
||||
<string name="application_dir_change_warning3">Вы хочаце, каб OsmAnd таксама скапіяваў свае файлы дадзеных у новае месца прызначэньня?</string>
|
||||
<string name="rendering_attr_hideHouseNumbers_name">Схаваць нумары дамоў</string>
|
||||
<string name="routing_attr_avoid_borders_name">Перасячэньне мяжы</string>
|
||||
<string name="routing_attr_avoid_borders_name">Пазьбягаць перасячэньне мяжы</string>
|
||||
<string name="routing_attr_avoid_borders_description">Пазьбягаць перасячэньня мяжы іншай краіны</string>
|
||||
<string name="routing_attr_height_name">Абмежаваньне па вышыні</string>
|
||||
<string name="routing_attr_height_description">Пазначце вышыню транспартнага сродку для разьліку маршруту</string>
|
||||
|
|
@ -2066,7 +2066,7 @@
|
|||
<string name="shared_string_skip">Прапусьціць</string>
|
||||
<string name="plugin_settings">Модулі</string>
|
||||
<string name="commit_poi">Укласьці POI</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Трансфер-цягнік</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Пазьбягаць трансфер-цягнік</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_description">Пазьбягаць трансфер-цягнікоў</string>
|
||||
<string name="tab_title_basic">Асноўнае</string>
|
||||
<string name="building_number">Нумар будынка</string>
|
||||
|
|
@ -2094,4 +2094,6 @@
|
|||
<string name="show_on_start">Паказваць пры запуску</string>
|
||||
<string name="count_of_lines">Колькасьць радкоў</string>
|
||||
<string name="address_unknown">Адрас пакуль невядомы</string>
|
||||
</resources>
|
||||
<string name="are_you_sure">Вы ўпэўненыя?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Усе незахаваныя зьмены будуць страчаны. Працягваць?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1001,8 +1001,8 @@
|
|||
<string name="poi_cooling_tower">Chladicí věž</string>
|
||||
<string name="poi_lighting_tower">Osvětlovací věž</string>
|
||||
<string name="poi_landfill_waste_nuclear">Jaderný odpad</string>
|
||||
<string name="poi_brownfield">Brownfield</string>
|
||||
<string name="poi_greenfield">Greenfield</string>
|
||||
<string name="poi_brownfield">Zanedbaná plocha</string>
|
||||
<string name="poi_greenfield">Nezastavěná plocha</string>
|
||||
<string name="poi_office_religion">Náboženský úřad</string>
|
||||
<string name="poi_financial">Finanční úřad</string>
|
||||
<string name="poi_political_party">Kancelář politické strany</string>
|
||||
|
|
@ -1010,7 +1010,7 @@
|
|||
<string name="poi_foundation">Kancelář nadace</string>
|
||||
<string name="poi_tax_advisor">Kancelář daňového poradce</string>
|
||||
|
||||
<string name="poi_religion_voodoo">Voodoo</string>
|
||||
<string name="poi_religion_voodoo">Vúdú (Voodoo)</string>
|
||||
<string name="poi_religion_unitarian_universalist">Unitární univerzalismus</string>
|
||||
<string name="poi_religion_multifaith">Mnohonáboženství</string>
|
||||
<string name="poi_religion_jain">Džinismus</string>
|
||||
|
|
@ -1125,7 +1125,7 @@
|
|||
|
||||
<string name="poi_node_networks">Body turistických/cyklistických sítí</string>
|
||||
<string name="poi_doors">Dveře</string>
|
||||
<string name="poi_free_flying">Obchod se zbožím pro volné létání</string>
|
||||
<string name="poi_free_flying">Obchod freeflyingového zboží</string>
|
||||
<string name="poi_power_tower">Stožár elektrického vedení</string>
|
||||
<string name="poi_power_pole">Sloup elektrického vedení</string>
|
||||
|
||||
|
|
@ -1269,4 +1269,12 @@
|
|||
<string name="poi_dead_wood">Mrtvé dřevo</string>
|
||||
|
||||
<string name="poi_passing_place">Výhybna</string>
|
||||
<string name="poi_traffic_enforcement">Dopravní kontrola</string>
|
||||
<string name="poi_ford_stepping_stones">Přechod po kamenech pro pěší</string>
|
||||
<string name="poi_aerialway_pylon">Stožár lanovky</string>
|
||||
|
||||
<string name="poi_recycling_hardcore">Stavební suť</string>
|
||||
<string name="poi_denomination_sunni">Sunnitství</string>
|
||||
<string name="poi_denomination_protestant">Protestantské</string>
|
||||
<string name="poi_denomination_methodist">Metodistické</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1989,7 +1989,7 @@ s často kladenými otázkami.</string>
|
|||
<string name="download_wikipedia_files">Chcete stáhnout dodatečná Wikipedia data (%1$s MB) ?</string>
|
||||
<string name="gps_network_not_enabled">Služba zjištění polohy není zapnuta. Chcete ji aktivovat?</string>
|
||||
<string name="disable_recording_once_app_killed">Zabránit samostatnému logování</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">Pozastaví záznam trasy pokud je aplikace ukončena (přes nedávné aplikace). (OsmAnd indikátor zmizí ze stavového řádku Androidu.)</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">Pozastaví záznam GPX trasy pokud je aplikace ukončena (přes nedávné aplikace). (OsmAnd indikátor zmizí ze stavového řádku Androidu.)</string>
|
||||
<string name="download_live_updates">Živé aktualizace</string>
|
||||
<string name="no_updates_available">Nejsou dostupné žádné aktualizace</string>
|
||||
<string name="traffic_warning_hazard">Nebezpečí</string>
|
||||
|
|
@ -2070,4 +2070,6 @@ s často kladenými otázkami.</string>
|
|||
<string name="count_of_lines">Počet řádků</string>
|
||||
<string name="show_on_start">Zobrazit po spuštění</string>
|
||||
<string name="address_unknown">Adresa ještě není známa</string>
|
||||
</resources>
|
||||
<string name="are_you_sure">Jste si jisti?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Neuložené změny budou ztraceny. Pokračovat?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -974,8 +974,8 @@
|
|||
<string name="poi_animal_shelter_bird">Fugleinternat</string>
|
||||
|
||||
<string name="poi_shower">Bruser</string>
|
||||
<string name="poi_recycling_centre">Centrum</string>
|
||||
<string name="poi_recycling_container">Container</string>
|
||||
<string name="poi_recycling_centre">Type: genanvendelse centre</string>
|
||||
<string name="poi_recycling_container">Type: container</string>
|
||||
<string name="poi_recycling_glass">Glas</string>
|
||||
<string name="poi_recycling_paper">Papir</string>
|
||||
<string name="poi_recycling_clothes">Tøj</string>
|
||||
|
|
@ -1366,4 +1366,8 @@
|
|||
<string name="poi_leisure_common">Fælles rekreativt område</string>
|
||||
<string name="poi_level">Niveau</string>
|
||||
|
||||
</resources>
|
||||
<string name="poi_rtsa_scale">Vanskeligt bjergpas</string>
|
||||
|
||||
<string name="poi_pump">Pumpe</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1345,4 +1345,6 @@
|
|||
<string name="poi_leisure_common">Área de ocio común</string>
|
||||
<string name="poi_heath">Brezal</string>
|
||||
<string name="poi_windfall">Fruto caído</string>
|
||||
</resources>
|
||||
<string name="poi_rtsa_scale">Dificultad del paso de montaña</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2055,4 +2055,6 @@
|
|||
<string name="count_of_lines">Número de líneas</string>
|
||||
<string name="show_on_start">Mostrar al inicio</string>
|
||||
<string name="address_unknown">Dirección desconocida</string>
|
||||
</resources>
|
||||
<string name="are_you_sure">¿Está seguro?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1349,4 +1349,6 @@
|
|||
<string name="poi_heath">Brezal</string>
|
||||
<string name="poi_logging">Inicio de sesión</string>
|
||||
<string name="poi_windfall">Fruto caído</string>
|
||||
</resources>
|
||||
<string name="poi_rtsa_scale">Dificultad del paso de montaña</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2192,4 +2192,6 @@
|
|||
<string name="count_of_lines">Número de líneas</string>
|
||||
<string name="show_on_start">Mostrar al inicio</string>
|
||||
<string name="address_unknown">Dirección desconocida</string>
|
||||
</resources>
|
||||
<string name="are_you_sure">¿Está seguro?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
|
||||
</resources>
|
||||
|
|
|
|||
15
OsmAnd/res/values-fi/phrases.xml
Normal file
15
OsmAnd/res/values-fi/phrases.xml
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="poi_shop">Kauppa</string>
|
||||
<string name="poi_shop_food">Ruokakauppa</string>
|
||||
<string name="poi_emergency">Hätätapaus</string>
|
||||
<string name="poi_filling_station">Huoltoasema</string>
|
||||
<string name="poi_man_made">Rakennelma</string>
|
||||
<string name="poi_education">Koulutus</string>
|
||||
<string name="poi_healthcare">Terveydenhuolto</string>
|
||||
<string name="poi_office">Toimisto</string>
|
||||
<string name="poi_sport">Urheilu</string>
|
||||
<string name="poi_tourism">Turismi</string>
|
||||
<string name="poi_sightseeing">Nähtävyys</string>
|
||||
<string name="poi_accomodation">Majoitus</string>
|
||||
<string name="poi_entertainment">Vapaa-aika</string>
|
||||
</resources>
|
||||
|
|
@ -876,4 +876,20 @@
|
|||
<string name="tag_poi_name">nimi</string>
|
||||
<string name="closing_at">Sulkeutuu</string>
|
||||
<string name="opening_at">Avautuu</string>
|
||||
</resources>
|
||||
<string name="address_unknown">Osoitetta ei tiedetä vielä</string>
|
||||
<string name="no_updates_available">Ei päivityksiä saatavilla</string>
|
||||
<string name="days_behind">päivää jäljessä</string>
|
||||
<string name="download_tab_updates">Päivitykset</string>
|
||||
<string name="download_tab_downloads">Lataukset</string>
|
||||
<string name="free">"Vapaana %1$s "</string>
|
||||
<string name="local_index_mi_restore">Ota käyttöön</string>
|
||||
<string name="local_index_mi_backup">Poista käytöstä</string>
|
||||
<string name="dash_download_msg_none">Haluatko ladata offline-karttoja?</string>
|
||||
<string name="available_downloads_left">%1$d latausta jäljellä</string>
|
||||
<string name="rendering_category_others">Muut kartan ominaisuudet</string>
|
||||
<string name="gps_network_not_enabled">Sijaintipalvelu poistettu käytöstä. Haluatko ottaa sen käyttöön?</string>
|
||||
<string name="shared_string_import2osmand">Tuo OsmAndiin</string>
|
||||
<string name="read_full_article">Lue koko artikkeli (online)</string>
|
||||
<string name="download_wikipedia_item">Wikipedia</string>
|
||||
<string name="shared_string_show_details">Näytä tiedot</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -972,8 +972,8 @@
|
|||
<string name="poi_animal_shelter_dog_cat">Refuge pour chiens et chats</string>
|
||||
<string name="poi_animal_shelter_bird">Refuge pour oiseaux</string>
|
||||
|
||||
<string name="poi_recycling_centre">Centre</string>
|
||||
<string name="poi_recycling_container">Containeur</string>
|
||||
<string name="poi_recycling_centre">Type : centre de tri</string>
|
||||
<string name="poi_recycling_container">Type : containeur</string>
|
||||
<string name="poi_recycling_plastic_packaging">Emballage plastique</string>
|
||||
<string name="poi_recycling_paper_packaging">Emballage en papier</string>
|
||||
<string name="poi_recycling_fluorescent_tubes">Tubes fluorescents</string>
|
||||
|
|
@ -1034,4 +1034,10 @@
|
|||
|
||||
<string name="poi_political_party">Bureau de parti politique</string>
|
||||
<string name="poi_notary">Notaire</string>
|
||||
<string name="poi_doors">Portes</string>
|
||||
<string name="poi_landfill_waste_nuclear">Déchet nucléaire</string>
|
||||
<string name="poi_capital">Capitale</string>
|
||||
<string name="poi_office_religion">Lieu de culte</string>
|
||||
<string name="poi_association">Bureau d\'association</string>
|
||||
<string name="poi_financial">Bureau financier</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
<string name="user_password">Password in OSM</string>
|
||||
<string name="user_password_descr">Necessaria per inviare contributi a openstreetmap.org</string>
|
||||
<string name="osmand_service">"Modalità backgraund"</string>
|
||||
<string name="osmand_service_descr">OsmAnd a schermo spento è eseguito in background</string>
|
||||
<string name="osmand_service_descr">OsmAnd, a schermo spento, è eseguito in background</string>
|
||||
<string name="tip_rotation_switching">Orientamento della mappa</string>
|
||||
|
||||
<string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in Impostazioni (Gestisci i file mappe), o passa alle mappe online (abilita il plugin delle mappe online).</string>
|
||||
|
|
@ -970,8 +970,8 @@
|
|||
<string name="bg_service_interval">Imposta l\'intervallo di risveglio:</string>
|
||||
<string name="screen_is_locked">Per sbloccare lo schermo tocca l\'icona del lucchetto</string>
|
||||
<string name="bg_service_screen_unlock">Sblocca schermo</string>
|
||||
<string name="bg_service_sleep_mode_off">Esegui l\'app in\n modalità quiescente</string>
|
||||
<string name="bg_service_sleep_mode_on">Interrompi l\'esecuzione dell\'app in modalità quiescente</string>
|
||||
<string name="bg_service_sleep_mode_off">Esegui\n l\'app in background</string>
|
||||
<string name="bg_service_sleep_mode_on">Interrompi\n l\'esecuzione dell\'app in background</string>
|
||||
<string name="filterpoi_activity">Crea un filtro per i PDI</string>
|
||||
<string name="select_navigation_mode">Scelta del mezzo di trasporto</string>
|
||||
<string name="day_night_info_description">Alba: %1$s
|
||||
|
|
@ -1099,7 +1099,7 @@
|
|||
<string name="safe_mode_description">Avvia l\'applicazione in modalità sicura (usando il più lento Android invece del codice nativo).</string>
|
||||
<string name="safe_mode">Modalità sicura</string>
|
||||
<string name="native_library_not_running">L\'applicazione è in esecuzione in modalità sicura (disabilitala nelle Impostazioni).</string>
|
||||
<string name="background_service_is_enabled_question">Il servizio OsmAnd modalità quiescente è ancora in esecuzione. Si desidera arrestarlo?</string>
|
||||
<string name="background_service_is_enabled_question">Il servizio OsmAnd è ancora in esecuzione in background. Si desidera arrestarlo?</string>
|
||||
<string name="tip_recent_changes_1_0_0_t">Cambiamenti nella versione 1.0.0:
|
||||
\n\t* Migliorata la navigazione: più veloce e precisa, fino a 250 kilometri
|
||||
\n\t* Aggiunte le mappe solo-strade
|
||||
|
|
@ -1714,7 +1714,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="stop_navigation_service">Interrompi</string>
|
||||
<string name="enable_sleep_mode">Abilita la modalità GPS in background</string>
|
||||
<string name="gps_wake_up_timer">Intervallo di risveglio del GPS</string>
|
||||
<string name="sleep_mode_stop_dialog">Interrompere la modalità GPS quiescente?</string>
|
||||
<string name="sleep_mode_stop_dialog">Interrompere la modalità GPS in background?</string>
|
||||
<string name="lang_al">Albanese</string>
|
||||
<string name="lang_ar">Arabo</string>
|
||||
<string name="lang_sc">Sardo</string>
|
||||
|
|
@ -2064,7 +2064,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="download_wikipedia_files">Vuoi scaricare i dati aggiuntivi di Wikipedia (%1$s MB) ?</string>
|
||||
<string name="gps_network_not_enabled">Il servizio di localizzazione non è attivo. Vuoi avviarlo?</string>
|
||||
<string name="disable_recording_once_app_killed">Previeni il login remoto</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). (L\'indicatore della modalità quiescente di OsmAnd sparisce dalla barra delle notifiche di Android.)</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). (L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android.)</string>
|
||||
<string name="shared_string_import2osmand">Importa in OsmAnd</string>
|
||||
<string name="read_full_article">Leggi l\'articolo intero (online)</string>
|
||||
<string name="download_wikipedia_item">Wikipedia</string>
|
||||
|
|
@ -2119,7 +2119,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="rendering_value_purple_name">Porpora</string>
|
||||
<string name="rendering_value_translucent_purple_name">Porpora traslucido</string>
|
||||
<string name="restart_is_required">Per applicare le modifiche è necessario un riavvio manuale.</string>
|
||||
<string name="rendering_value_default13_name">Default (13)</string>
|
||||
<string name="rendering_value_default13_name">Predefinito (13)</string>
|
||||
<string name="rendering_value_defaultTranslucentCyan_name">Default (Ciano traslucido)</string>
|
||||
<string name="rendering_value_red_name">Rosso</string>
|
||||
<string name="lang_ht">Haitiano</string>
|
||||
|
|
@ -2166,7 +2166,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="poi_dialog_poi_type">Tipo di PDI</string>
|
||||
<string name="number_of_rows_in_dash">Numero di righe del cruscotto %1$s</string>
|
||||
<string name="please_specify_poi_type">Per favore specifica il tipo si PDI.</string>
|
||||
<string name="poi_action_delete">Elimina</string>
|
||||
<string name="poi_action_delete">elimina</string>
|
||||
<string name="working_days">Giorni lavorativi</string>
|
||||
<string name="recent_places">Luoghi recenti</string>
|
||||
<string name="favourites">Preferiti</string>
|
||||
|
|
|
|||
|
|
@ -2239,4 +2239,6 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="show_on_start">Wyświetlaj przy starcie</string>
|
||||
<string name="count_of_lines">Liczba linii</string>
|
||||
<string name="address_unknown">Adres nie jest jeszcze znany</string>
|
||||
</resources>
|
||||
<string name="unsaved_changes_will_be_lost">Wszelkie niezapisane zmiany zostaną utracone. Kontynuować?</string>
|
||||
<string name="are_you_sure">Czy na pewno?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1823,4 +1823,6 @@
|
|||
<string name="address_unknown">Endereço ainda não é conhecido</string>
|
||||
<string name="show_on_start">Mostrar no início</string>
|
||||
<string name="count_of_lines">Número de linhas</string>
|
||||
<string name="are_you_sure">Tem certeza?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Quaisquer alterações não salvas serão perdidas. Continuar?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -240,8 +240,8 @@
|
|||
<string name="poi_waste_disposal">Мусорный контейнер</string>
|
||||
<string name="poi_waste_basket">Урна для мусора</string>
|
||||
|
||||
<string name="poi_recycling_centre">Пункт приёма</string>
|
||||
<string name="poi_recycling_container">Контейнер</string>
|
||||
<string name="poi_recycling_centre">Тип: пункт приёма</string>
|
||||
<string name="poi_recycling_container">Тип: контейнер</string>
|
||||
<string name="poi_recycling_glass">Стекло</string>
|
||||
<string name="poi_recycling_paper">Бумага</string>
|
||||
<string name="poi_recycling_clothes">Одежда</string>
|
||||
|
|
@ -1036,6 +1036,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_water_characteristic_mineral">Характеристика воды: минеральная</string>
|
||||
<string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>
|
||||
|
|
@ -1183,4 +1184,6 @@
|
|||
<string name="poi_religion_tenrikyo">Тэнрикё</string>
|
||||
<string name="poi_religion_zoroastrian">Зороастризм</string>
|
||||
|
||||
<string name="poi_rtsa_scale">Категория сложности перевала</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -851,8 +851,8 @@
|
|||
|
||||
<string name="poi_cooling_tower">Turre de isfritamentu</string>
|
||||
<string name="poi_lighting_tower">Turre de illuminadura</string>
|
||||
<string name="poi_recycling_centre">Tzentru</string>
|
||||
<string name="poi_recycling_container">Cuntenidore</string>
|
||||
<string name="poi_recycling_centre">Casta: tzentru de ritziclu</string>
|
||||
<string name="poi_recycling_container">Casta: cuntenidore</string>
|
||||
<string name="poi_recycling_glass">Bidru</string>
|
||||
<string name="poi_recycling_paper">Paperi</string>
|
||||
<string name="poi_recycling_clothes">Bestires</string>
|
||||
|
|
@ -1060,4 +1060,31 @@
|
|||
<string name="poi_seasonal_summer">Istiu</string>
|
||||
<string name="poi_seasonal_autumn">Atòngiu</string>
|
||||
<string name="poi_seasonal_winter">Ierru</string>
|
||||
<string name="poi_paediatrics">Pediatra</string>
|
||||
|
||||
<string name="poi_sand">Arena</string>
|
||||
|
||||
<string name="poi_smoking_isolated">Si podet pipare in un’aposentu indipendente e iscrobadu de su totu</string>
|
||||
<string name="poi_smoking_dedicated">Pipadores ebbia</string>
|
||||
|
||||
<string name="poi_toll_yes">B’est de pagare unu pedàgiu</string>
|
||||
<string name="poi_toll_no">Non b’est perunu pedàgiu</string>
|
||||
<string name="poi_toll_hgv_yes">B’est de pagare unu pedàgiu pro veìculos pesantes</string>
|
||||
<string name="poi_information_bicyclemap">Mapa tziclìstica</string>
|
||||
<string name="poi_water_characteristic_mineral">Caraterìstica de s’abba: minerale</string>
|
||||
<string name="poi_water_characteristic_mud">Caraterìsica de s’abba: ludu</string>
|
||||
<string name="poi_water_characteristic_sulfuric">Caraterìstica de s’abba: solfòrica</string>
|
||||
|
||||
<string name="poi_water_point">Puntu de abba</string>
|
||||
|
||||
<string name="poi_cuisine">Coghina</string>
|
||||
|
||||
<string name="poi_information_board">Vetrinedda de informatziones</string>
|
||||
<string name="poi_information_map">Mapa</string>
|
||||
<string name="poi_information_office">Ufìtziu de informatziones</string>
|
||||
<string name="poi_information_terminal">Tèrminal de informatziones</string>
|
||||
<string name="poi_information_hikingmap">Mapa pro escursionismu</string>
|
||||
<string name="poi_information_history">Informatziones istòricas</string>
|
||||
<string name="poi_information_sign">Sinnu</string>
|
||||
<string name="poi_information_audioguide">Audioghia</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -68,13 +68,13 @@
|
|||
<string name="routing_attr_prefer_motorway_description">Preferre sas autostradas</string>
|
||||
<string name="routing_attr_short_way_name">Istrada prus curtza</string>
|
||||
<string name="routing_attr_short_way_description">Imprea sa caminera prus curtza</string>
|
||||
<string name="routing_attr_avoid_toll_name">Istradas a pagamentu</string>
|
||||
<string name="routing_attr_avoid_toll_name">Istransi sas istradas a pagamentu</string>
|
||||
<string name="routing_attr_avoid_toll_description">Istransi sas istradas a pagamentu</string>
|
||||
<string name="routing_attr_avoid_unpaved_name">Istradas non apamentadas</string>
|
||||
<string name="routing_attr_avoid_unpaved_name">Istransi sas istradas non apamentadas</string>
|
||||
<string name="routing_attr_avoid_unpaved_description">Istransi sas istradas non apamentadas</string>
|
||||
<string name="routing_attr_avoid_ferries_name">Naviles</string>
|
||||
<string name="routing_attr_avoid_ferries_name">Istransi sos naviles</string>
|
||||
<string name="routing_attr_avoid_ferries_description">Istransi sos naviles</string>
|
||||
<string name="routing_attr_avoid_motorway_name">Autostradas</string>
|
||||
<string name="routing_attr_avoid_motorway_name">Istransi sas autostradas</string>
|
||||
<string name="routing_attr_avoid_motorway_description">Istransi sas autostradas</string>
|
||||
<string name="routing_attr_weight_name">Lìmite de pesu</string>
|
||||
<string name="routing_attr_weight_description">Dislinda su lìmite de pesu de su veìculu</string>
|
||||
|
|
@ -182,13 +182,13 @@
|
|||
|
||||
<string name="driving_region_descr">Issèbera sa regione de ghia: USA, Europa, UK, Àsia e Àteras</string>
|
||||
<string name="driving_region_japan">Giappone</string>
|
||||
<string name="announce_gpx_waypoints">Annuntzia sos puntos de coladòrgiu GPX</string>
|
||||
<string name="announce_gpx_waypoints">Puntos de coladòrgiu GPX</string>
|
||||
<string name="speak_title">Annuntzia…</string>
|
||||
<string name="speak_descr">Cunfigura pro annuntziare sos nùmenes de sas istradas, sos avèrtimentos (pasadas fortzadas, dossos), sos annuntzios de s’autovelox, sos lìmites de lestresa</string>
|
||||
<string name="speak_street_names">Annuntzia sos nùmenes de sas istradas (TTS)</string>
|
||||
<string name="speak_speed_limit">Annuntzia sos lìmites de lestresa</string>
|
||||
<string name="speak_cameras">Annuntzia sos autovelox</string>
|
||||
<string name="speak_traffic_warnings">Annuntzia avisos de tràfficu</string>
|
||||
<string name="speak_street_names">Nùmenes de sas istradas (TTS)</string>
|
||||
<string name="speak_speed_limit">Lìmites de lestresa</string>
|
||||
<string name="speak_cameras">Autovelox</string>
|
||||
<string name="speak_traffic_warnings">Avisos de tràfficu</string>
|
||||
<string name="tip_recent_changes_1_5_t">"Mudas in sa 1.5:
|
||||
\n\t* Annuntzios vocales pro sos lìmites de lestresa e sos autovelox
|
||||
\n\t* Prus capabilidade de frunire annuntzios bogales (annuntziamentu de sos nùmenes de sas istradas)
|
||||
|
|
@ -285,7 +285,7 @@
|
|||
<string name="osmo_settings">OsMo</string>
|
||||
|
||||
|
||||
<string name="osmand_background_plugin_description">Ammustrat sas impostaduras pro abilitare s’arrastamentu e su nàvigu in modalidade a reposu (ischermu istudadu) pro mèdiu de ischidaduras periòdicas de su GPS.</string>
|
||||
<string name="osmand_background_plugin_description">Ammustrat sas impostaduras pro abilitare s’arrastamentu e su nàvigu in modalidade de isfundu (ischermu istudadu) pro mèdiu de ischidaduras periòdicas de su GPS.</string>
|
||||
<string name="contribution_activity">Installa sa versione</string>
|
||||
<string name="choose_osmand_theme_descr">Issèbera su tema de s’aplicu</string>
|
||||
<string name="choose_osmand_theme">Tema de s’aplicu</string>
|
||||
|
|
@ -426,18 +426,16 @@
|
|||
<string name="safe_mode_description">Avia s’aplicu in modalidade segura (impreande Android, prus lentu, imbetzes de su còdighe nativu).</string>
|
||||
<string name="safe_mode">Modalidade segura</string>
|
||||
<string name="native_library_not_running">S’aplicu est traballande in modalidade segura (la podes disabilitare in sas Impostaduras).</string>
|
||||
<string name="background_service_is_enabled_question">Su servitziu OsmAnd in modalidade "a reposu" est galu in esecutzione. Lu boles firmare?</string>
|
||||
<string name="tip_recent_changes_1_0_0_t">Mudas in sa 1.0.0:
|
||||
\n\t* Nàvigu megiorau: prus lestru, prus pretzisu, finas a 250 km
|
||||
\n\t* Mapas "petzi istradas" annangadas.
|
||||
\n\t* Sa mapa non pèrdet su positzionamentu a pustis de sas interrutziones
|
||||
\n\t* Abilitatzione de sa modalidade "a reposu" durante su nàvigu
|
||||
</string>
|
||||
<string name="tip_recent_changes_0_8_4_t">Mudas in sa 0.8.4:
|
||||
\n\t* Curretziones de errores
|
||||
\n\t* Sa Mapa non pèrdet sa positzione a pustis de sas interrutziones
|
||||
\n\t* Abilitatzione de sa modalidade "a reposu" durante su nàvigu.
|
||||
</string>
|
||||
<string name="background_service_is_enabled_question">Su servitziu OsmAnd de isfundu est galu in esecutzione. Lu boles firmare?</string>
|
||||
<string name="tip_recent_changes_1_0_0_t">"Mudas in sa 1.0.0:
|
||||
\n\t* Nàvigu megiorau: prus lestru, prus pretzisu, finas a 250 km
|
||||
\n\t* Mapas petzi istradas annangadas.
|
||||
\n\t* Sa mapa non pèrdet su positzionamentu a pustis de sas interrutziones
|
||||
\n\t* Abilitatzione de sa modalidade de isfundu durante su nàvigu "</string>
|
||||
<string name="tip_recent_changes_0_8_4_t">"Mudas in sa 0.8.4:
|
||||
\n\t* Curretziones de errores
|
||||
\n\t* Sa Mapa non pèrdet sa positzione a pustis de sas interrutziones
|
||||
\n\t* Abilitatzione de sa modalidade de isfundu durante su nàvigu. "</string>
|
||||
<string name="close_changeset">Serra sas modìficas</string>
|
||||
<string name="zxing_barcode_scanner_not_found">S’aplicu ZXing Barcode Scanner non est installadu. Lu boles chircare in su Market?</string>
|
||||
<string name="rendering_attr_roadColors_description">Issèbera una cumbinatzione de colores pro sas istradas:</string>
|
||||
|
|
@ -520,9 +518,9 @@
|
|||
<string name="map_widget_day_night">Mapa die/note</string>
|
||||
<string name="keep_navigation_service">Mantènne</string>
|
||||
<string name="stop_navigation_service">Firma</string>
|
||||
<string name="enable_sleep_mode">Abìlita sa modalidade GPS \"a reposu\"</string>
|
||||
<string name="enable_sleep_mode">Abìlita sa modalidade GPS \"de isfundu\"</string>
|
||||
<string name="gps_wake_up_timer">Intervallu ischidada GPS</string>
|
||||
<string name="sleep_mode_stop_dialog">Firmare sa modalidade GPS \"a reposu\"?</string>
|
||||
<string name="sleep_mode_stop_dialog">Firmare sa modalidade GPS \"de isfundu\"?</string>
|
||||
<string name="map_preferred_locale_descr">Limba preferida pro sas etichettas de sa mapa (si no est disponìbile at a colare a s’inglesu o sos nùmenes locales)</string>
|
||||
<string name="map_preferred_locale">Limba prefèrrida de sa mapa</string>
|
||||
<string name="local_map_names">Nùmenes locales</string>
|
||||
|
|
@ -695,8 +693,8 @@
|
|||
<string name="map_widget_show_ruler">Iscala gràfica</string>
|
||||
<string name="map_widget_view_direction">Diretzione de sa visuale</string>
|
||||
<string name="map_widget_transparent">Bisura trasparente</string>
|
||||
<string name="bg_service_sleep_mode_off">Abìlita\n modalidade \"a reposu\"</string>
|
||||
<string name="bg_service_sleep_mode_on">Firma\n modalidade \"a reposu\"</string>
|
||||
<string name="bg_service_sleep_mode_off">Abìlita\n modalidade \"de isfundu\"</string>
|
||||
<string name="bg_service_sleep_mode_on">Firma\n modalidade \"de isfundu\"</string>
|
||||
<string name="gps_wakeup_interval">Intervallu de ischidada GPS: %s</string>
|
||||
<string name="int_continuosly">Sighidu</string>
|
||||
<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s’ischeda de su telèfono pro èssere impreadas sena lìnia. OsmAnd offridi fintzas sa funtzionalidade de su càlculu de s’àndala in lìnia (online) e sena lìnia (offline) cumpresa sa boghe de ghia curva pro curva. Calicunas de sas caraterìsticas printzipales: - Funtzionalidade cumprida sena lìnia (Sarba sas mapas vetoriales o a tasseddos in sa memòria de su dispositivu) - Mapas sena lìnia cumpatas isgarrigàbiles pro totu su mundu - Igariiramentu de sas mapas de regiones o istados deretamente dae sa mapa - Possibilidade de sovrapposizione de diferentes istratos, comente rastas GPX o de nàvigu, puntos de interesse, preffèrridos, curvas de livellu, firmadas de sos mezos pùblicos, mapas annangàbiles cun trasparentzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s’àndala pro distàntzias curtzas (isperimentale) - Modalidades màchina, bitzicleta, e pedone cun: - Muda automàtica optzionale de sa vista die/note - Zoom automàticu optzionale basau in supra de sa lestresa - Allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS - Limitatziones de custa versione gratùita de OsmAnd: - Nùmeru limitadu de isgarrigamentu de mapas - Atzessu a Wikipedia pro sos PDI sena lìnia fartante- OsmAnd est totora in fase de isvilupu e su progetu nostru e su progressu suo si basada in supra de sos contributos finantziarios pro s’isvilupu e s’iscumprou (sa prova) de funtzionalidades noas. Pro piaghere cunsidera s’optzione de comporare OsmAnd+, de finantziare novas funtziones didlindadas o de fàghere una donatzione generale a osmand.net. "</string>
|
||||
|
|
@ -755,7 +753,7 @@
|
|||
<string name="bg_service_interval">Imposta s’intervallu de ischidada:</string>
|
||||
<string name="show_cameras">Ammustra autovelox</string>
|
||||
<string name="show_traffic_warnings">Ammustra lìmites de lestresa</string>
|
||||
<string name="avoid_toll_roads">Istradas a pedàgiu</string>
|
||||
<string name="avoid_toll_roads">Istransi sas istradas a pedàgiu</string>
|
||||
<string name="continue_follow_previous_route_auto">Su nàvigu pretzedente no est istadu cumpridu. Sighire cun cussu? (%1$s segundos)</string>
|
||||
<string name="route_updated_loc_found">S’àndala at a èssere calculada a positzione achirida</string>
|
||||
<string name="osmand_parking_hours">Oras</string>
|
||||
|
|
@ -1074,8 +1072,8 @@
|
|||
<string name="index_settings">Amministra sos documentos de sas mapas</string>
|
||||
<string name="user_name_descr">Netzessàriu pro imbiare contributos a openstreetmap.org</string>
|
||||
<string name="user_password_descr">Netzessària pro imbiare contributos a openstreetmap.org</string>
|
||||
<string name="osmand_service">Servìtziu \"a reposu\"</string>
|
||||
<string name="osmand_service_descr">Impreadu pro esecutare OsmAnd cun s’ischermu mortu</string>
|
||||
<string name="osmand_service">Modalidade de isfundu</string>
|
||||
<string name="osmand_service_descr">OsmAnd funtzionat in s’isfundu, cun s’ischermu mortu</string>
|
||||
<string name="tip_rotation_switching_t_v2">"Podes mudare comente boles sa rotatzione de s’immàgine de sa mapa carcande in s’icona de sa bùssola in s’ischermu de sa mapa.
|
||||
\n\nSas optziones sunt:
|
||||
\n\t* \'Non rotare (nord in supra)\': Sa mapa no at a èssere rotada. Su nord at a èssere semper in artu
|
||||
|
|
@ -1373,7 +1371,7 @@
|
|||
<string name="int_seconds">segundos</string>
|
||||
<string name="int_min">min.</string>
|
||||
<string name="background_service_int">Intervallu de ischidada GPS</string>
|
||||
<string name="background_router_service">Funtzionamentu a reposu</string>
|
||||
<string name="background_router_service">Funtzionamentu de isfundu</string>
|
||||
<string name="hide_poi_filter">Cua filtru</string>
|
||||
<string name="show_poi_filter">Ammustra filtru</string>
|
||||
<string name="search_poi_filter">Filtru</string>
|
||||
|
|
@ -1405,9 +1403,9 @@
|
|||
<string name="poi_namefinder_query_empty">Inserta sos paràmetros de chirca pro agatare unu PDI</string>
|
||||
<string name="background_service_wait_int_descr">Ischerta s’intervallu de tempus pro determinare sa positzione</string>
|
||||
<string name="background_service_wait_int">Isetu màssimu pro sa determinatzione</string>
|
||||
<string name="service_stop_background_service">Istuda su servìtziu de nàvigu a reposu</string>
|
||||
<string name="background_service_int_descr">Ischerta s’intervallu de tempus pro s’ischidada de su servìtziu a reposu</string>
|
||||
<string name="background_service_provider_descr">Issèbera su frunidore de positzione finas a cando si est impreande sa modalidade \"a reposu\"</string>
|
||||
<string name="service_stop_background_service">Istuda su servìtziu de nàvigu de isfundu</string>
|
||||
<string name="background_service_int_descr">Ischerta s’intervallu de tempus pro s’ischidada de su servìtziu de isfundu</string>
|
||||
<string name="background_service_provider_descr">Issèbera su frunidore de positzione finas a cando si est impreande sa modalidade \"de isfundu\"</string>
|
||||
<string name="background_service_provider">Frunidore de positzionamentu</string>
|
||||
<string name="voice_provider_descr">Ischerta sa boghe da impreare pro su nàvigu</string>
|
||||
<string name="voice_provider">Ghia vocale</string>
|
||||
|
|
@ -1670,7 +1668,7 @@
|
|||
\n\nUn’introduida base, cussigios de impreu e agiudu avantzadu sunt cullegados tramite \'Menù\' → \'Impòsitos\' dae s’ischermu mapa. "</string>
|
||||
<string name="use_high_res_maps_descr">Non allonghiare (ne inghelare) sos tasseddos de sa mapa in sos dispositivos a carchesa arta</string>
|
||||
<string name="background_router_service_descr">Allughe su servìtziu a reposu de OsmAnd pro s’arrastamentu de sa positzione cando s’ischermu est istudadu</string>
|
||||
<string name="off_router_service_no_gps_available">Su servìtziu de nàvigu a reposu de OsmAnd netzèssitat de su sistema de positzionamentu ativadu.</string>
|
||||
<string name="off_router_service_no_gps_available">Su servìtziu de nàvigu de isfundu de OsmAnd netzèssitat de su sistema de positzionamentu ativadu.</string>
|
||||
<string name="tip_recent_changes_0_6_7_t">"Mudas in sa 0.6.7:
|
||||
\n\t- Gestore datos non in lìnia (iscàrriga, burra, allue / istuda datos sena lìnia deretamente dae OsmAnd)
|
||||
\n\t- Puntos prefèrridos e grupos (categoriza, burra, amministra sos prefèrridos)
|
||||
|
|
@ -1712,8 +1710,8 @@
|
|||
<string name="waypoints">Puntos mesanos</string>
|
||||
<string name="targets">Destinatziones</string>
|
||||
<string name="way_alarms">Avisos de tràficu</string>
|
||||
<string name="speak_favorites">Annùntzia sos Prefèrridos a curtzu</string>
|
||||
<string name="speak_poi">Annùntzia PDI a curtzu</string>
|
||||
<string name="speak_favorites">Prefèrridos a curtzu</string>
|
||||
<string name="speak_poi">PDI a curtzu</string>
|
||||
<string name="shared_string_all">Totus</string>
|
||||
<string name="index_tours">Itineràrios</string>
|
||||
<string name="record_plugin_description">"Custu plugin ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s’ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.
|
||||
|
|
@ -1816,7 +1814,7 @@
|
|||
<string name="traffic_warning_pedestrian">Atraessamentu pedonale</string>
|
||||
<string name="show_railway_warnings">Ammustra sas rugradas ferroviàrias</string>
|
||||
<string name="show_pedestrian_warnings">Ammustra sas istrìscias pedonales</string>
|
||||
<string name="speak_pedestrian">Annùntzia sos atraessamentos pedonales</string>
|
||||
<string name="speak_pedestrian">Atraessamentos pedonales</string>
|
||||
|
||||
<string name="navigation_over_track">Incumentzare su nàvigu in sa rasta?</string>
|
||||
<string name="avoid_roads_msg">Podes cambiare s’àndala ischertande sas istradas de istransire</string>
|
||||
|
|
@ -1965,7 +1963,7 @@
|
|||
<string name="routing_attr_avoid_borders_description">Non rugrare sas fronteras intre sos istados</string>
|
||||
<string name="use_fast_recalculation">Recàlculu intelligente de s’àndala</string>
|
||||
<string name="use_fast_recalculation_desc">Torra a calculare petzi su cantu initziale de s’àndala pro biàgios longos</string>
|
||||
<string name="routing_attr_avoid_borders_name">Fronteras</string>
|
||||
<string name="routing_attr_avoid_borders_name">Non rugres sas fronteras</string>
|
||||
<string name="rendering_value_disabled_name">Disabilitadu</string>
|
||||
<string name="osmo_share_my_location">Cumpartzi sa positzione</string>
|
||||
<string name="shared_string_logoff">Essi</string>
|
||||
|
|
@ -2015,7 +2013,7 @@
|
|||
<string name="lang_ceb">Cebuanu</string>
|
||||
<string name="archive_wikipedia_data">Bi sunt datos Wikipedia bècios e non cumpatìbiles. Los boles archiviare?</string>
|
||||
<string name="download_wikipedia_files">Boles iscarrigare àteros datos Wikipedia in prus (%1$s MB) ?</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">At a pònnere in pàusa sa registratzione GPX cando OsmAnd at a èssere istudadu (tràmite sas aplicatziones reghentes). (S\'indicatore de sa modalidade OsmAnd a reposu at a iscumpàrrere dae sa barra de notìfica de Android.)</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">At a pònnere in pàusa sa registratzione GPX cando OsmAnd at a èssere istudadu (pro mèdiu de sas aplicatziones reghentes). (S\'indicatore de sa modalidade OsmAnd de isfundu at a iscumpàrrere dae sa barra de notìfica de Android.)</string>
|
||||
<string name="rendering_attr_currentTrackColor_name">Colore GPX</string>
|
||||
<string name="rendering_attr_currentTrackWidth_name">Largària GPX</string>
|
||||
<string name="rendering_value_red_name">Ruju</string>
|
||||
|
|
@ -2060,7 +2058,7 @@
|
|||
<string name="commit_poi">Imbia PDI</string>
|
||||
<string name="shared_string_card_was_hidden">S’ischeda fiat cuada</string>
|
||||
<string name="plugin_settings">Plugins (estensiones)</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Trenu ispola</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Istransi trenu ispola</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_description">Istransi trenu ispola</string>
|
||||
<string name="tab_title_basic">Bàsicu</string>
|
||||
<string name="tab_title_advanced">Estesu</string>
|
||||
|
|
@ -2086,4 +2084,8 @@
|
|||
<string name="show_gpx">Ammustra GPX</string>
|
||||
<string name="saved_at_time">Sarbada resèssida in: %1$s</string>
|
||||
<string name="show_on_start">Ammustra in su cumintzu</string>
|
||||
</resources>
|
||||
<string name="address_unknown">Indiritzu galu disconnotu</string>
|
||||
<string name="count_of_lines">Contu de sas lìnias</string>
|
||||
<string name="are_you_sure">Seguru ses?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Totu sas modìficas non sarbadas s’ant a pèrdere. Sighire?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -920,8 +920,8 @@
|
|||
<string name="poi_hiking_routes">Turistické trasy</string>
|
||||
<string name="poi_traffic_enforcement">Dopravné vynútenie</string>
|
||||
<string name="poi_free_flying">Obchod pre voľné lietanie</string>
|
||||
<string name="poi_recycling_centre">Stredisko</string>
|
||||
<string name="poi_recycling_container">Kontajner</string>
|
||||
<string name="poi_recycling_centre">Typ: recyklačné stredisko</string>
|
||||
<string name="poi_recycling_container">Typ: kontajner</string>
|
||||
<string name="poi_recycling_glass">Sklo</string>
|
||||
<string name="poi_recycling_paper">Papier</string>
|
||||
<string name="poi_recycling_clothes">Oblečenie</string>
|
||||
|
|
@ -1298,4 +1298,6 @@
|
|||
<string name="poi_religion_zoroastrian">Zoroastrizmus</string>
|
||||
|
||||
<string name="poi_bicycle_parking_anchors">Držiaky</string>
|
||||
</resources>
|
||||
<string name="poi_rtsa_scale">Náročnosť horského priesmyku</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2287,4 +2287,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="count_of_lines">Počet riadkov</string>
|
||||
<string name="show_on_start">Zobraziť po štarte</string>
|
||||
<string name="address_unknown">Adresa ešte nie je známa</string>
|
||||
</resources>
|
||||
<string name="are_you_sure">Ste si istí?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Všetky neuložené zmeny budú stratené. Pokračovať?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
<string name="bg_service_interval">Ställ in väckningsintervall:</string>
|
||||
<string name="show_cameras">Visa fartkameror</string>
|
||||
<string name="show_traffic_warnings">Visa hastighetsgränser</string>
|
||||
<string name="avoid_toll_roads">Betalvägar</string>
|
||||
<string name="avoid_toll_roads">Undvik betalvägar</string>
|
||||
<string name="continue_follow_previous_route_auto">En tidigare navigering avbröts. Fortsätta att följa den? (%1$s sekunder)</string>
|
||||
<string name="route_updated_loc_found">Resvägen kommer att beräknas så snart positionen hittas</string>
|
||||
<string name="osmand_parking_hours">timmar</string>
|
||||
|
|
@ -1162,9 +1162,9 @@
|
|||
<string name="context_menu_item_destination_point">Ange som destination</string>
|
||||
|
||||
|
||||
<string name="speak_speed_limit">Meddela om hastighetsbegränsningar</string>
|
||||
<string name="speak_cameras">Meddela om fartkameror</string>
|
||||
<string name="speak_traffic_warnings">Meddela om trafikvarningar</string>
|
||||
<string name="speak_speed_limit">Hastighetsbegränsningar</string>
|
||||
<string name="speak_cameras">Fartkameror</string>
|
||||
<string name="speak_traffic_warnings">Trafikvarningar</string>
|
||||
|
||||
|
||||
<string name="plugin_distance_point_hdop">noggrannhet</string>
|
||||
|
|
@ -1187,8 +1187,8 @@
|
|||
<string name="route_from">Från:</string>
|
||||
<string name="speak_title">Läs upp …</string>
|
||||
<string name="speak_descr">Konfigurera för att läsa upp gatunamn, trafikvarningar (t.ex. fartbulor), varningar för fartkameror, hastighetsbegränsningar</string>
|
||||
<string name="speak_street_names">Läs upp gatunamn (TTS)</string>
|
||||
<string name="announce_gpx_waypoints">Meddela om GPX-waypoints</string>
|
||||
<string name="speak_street_names">Gatunamn (TTS)</string>
|
||||
<string name="announce_gpx_waypoints">GPX-waypoints</string>
|
||||
|
||||
|
||||
<string name="map_widget_fps_info">FPS-avbuggningsinfo</string>
|
||||
|
|
@ -1284,13 +1284,13 @@
|
|||
<string name="app_mode_truck">Lastbil</string>
|
||||
<string name="routing_attr_prefer_motorway_name">Föredra motorvägar</string>
|
||||
<string name="routing_attr_prefer_motorway_description">Föredra motorvägar</string>
|
||||
<string name="routing_attr_avoid_toll_name">Betalvägar</string>
|
||||
<string name="routing_attr_avoid_toll_name">Undvik betalvägar</string>
|
||||
<string name="routing_attr_avoid_toll_description">Undvik betalvägar</string>
|
||||
<string name="routing_attr_avoid_unpaved_name">Oasfalterade vägar</string>
|
||||
<string name="routing_attr_avoid_unpaved_name">Undvik oasfalterade vägar</string>
|
||||
<string name="routing_attr_avoid_unpaved_description">Undvik oasfalterade vägar</string>
|
||||
<string name="routing_attr_avoid_ferries_name">Färjor</string>
|
||||
<string name="routing_attr_avoid_ferries_name">Undvik färjor</string>
|
||||
<string name="routing_attr_avoid_ferries_description">Undvik färjor</string>
|
||||
<string name="routing_attr_avoid_motorway_name">Motorvägar</string>
|
||||
<string name="routing_attr_avoid_motorway_name">Undvik motorvägar</string>
|
||||
<string name="routing_attr_avoid_motorway_description">Undvik motorvägar</string>
|
||||
<string name="routing_attr_weight_name">Viktgräns</string>
|
||||
<string name="routing_attr_weight_description">Ange fordonsvikt tillåten på rutter</string>
|
||||
|
|
@ -1591,8 +1591,8 @@
|
|||
<string name="waypoints">Waypoints</string>
|
||||
<string name="targets">Mål</string>
|
||||
<string name="way_alarms">Trafikskyltar</string>
|
||||
<string name="speak_favorites">Meddela om närbelägna favoriter</string>
|
||||
<string name="speak_poi">Meddela om närbelägna intresssepunkter</string>
|
||||
<string name="speak_favorites">Närbelägna favoriter</string>
|
||||
<string name="speak_poi">Närbelägna intresssepunkter</string>
|
||||
<string name="index_tours">Rundturer</string>
|
||||
<string name="shared_string_all">Alla</string>
|
||||
<string name="record_plugin_description">"Denna modul aktiverar funktionen att antingen spela in och spara dina spår genom att du trycker på widgeten GPX-loggning på kartskärmen eller alla dina rutter sparas automatiskt i en GPX-fil.
|
||||
|
|
@ -1692,7 +1692,7 @@
|
|||
<string name="download_tab_local">Hämtat</string>
|
||||
<string name="route_descr_destination">Destination</string>
|
||||
<string name="voices">Röstprompter</string>
|
||||
<string name="speak_pedestrian">Meddela om övergångsställen</string>
|
||||
<string name="speak_pedestrian">Övergångsställen</string>
|
||||
|
||||
<string name="avoid_roads_msg">Du kan ändra till en alternativ rutt genom att välja vägar att undvika</string>
|
||||
|
||||
|
|
@ -1876,7 +1876,7 @@
|
|||
<string name="routing_attr_height_name">Höjdgräns</string>
|
||||
<string name="use_fast_recalculation">Smart omräkning av rutt</string>
|
||||
<string name="use_fast_recalculation_desc">Räkna om endast början av rutten för långa resor</string>
|
||||
<string name="routing_attr_avoid_borders_name">Gränsövergångar</string>
|
||||
<string name="routing_attr_avoid_borders_name">Undvik gränsövergångar</string>
|
||||
<string name="routing_attr_height_description">Ange tillåten fordonshöjd på rutter</string>
|
||||
<string name="osmo_share_my_location">Dela ut min plats</string>
|
||||
<string name="shared_string_logoff">Logga ut</string>
|
||||
|
|
@ -1966,7 +1966,7 @@
|
|||
<string name="shared_string_undo">ÅNGRA</string>
|
||||
<string name="shared_string_skip">Hoppa över</string>
|
||||
<string name="app_name_osmand">OsmAnd</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Pendeltåg</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Undvik pendeltåg</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_description">Undvik pendeltåg</string>
|
||||
<string name="plugin_settings">Insticksprogram</string>
|
||||
<string name="traffic_warning_hazard">Varning</string>
|
||||
|
|
@ -1996,4 +1996,7 @@
|
|||
<string name="poi_deleted_localy">POI tas bort så snart du laddat upp dina ändringar</string>
|
||||
<string name="show_gpx">Visa GPX</string>
|
||||
<string name="show_on_start">Visa vid start</string>
|
||||
</resources>
|
||||
<string name="address_unknown">Adressen är inte känd än</string>
|
||||
<string name="are_you_sure">Är du säker?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Alla osparade ändringar kommer att förloras. Fortsätta ändå?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -956,8 +956,8 @@
|
|||
<string name="poi_animal_shelter_bird">野鳥庇護所</string>
|
||||
|
||||
<string name="poi_shower">淋浴</string>
|
||||
<string name="poi_recycling_centre">中心</string>
|
||||
<string name="poi_recycling_container">貨櫃</string>
|
||||
<string name="poi_recycling_centre">類型：資源回收中心</string>
|
||||
<string name="poi_recycling_container">類型：貨櫃</string>
|
||||
<string name="poi_recycling_glass">玻璃</string>
|
||||
<string name="poi_recycling_paper">紙</string>
|
||||
<string name="poi_recycling_clothes">衣服</string>
|
||||
|
|
@ -1345,4 +1345,8 @@
|
|||
<string name="poi_passing_place">避讓車處</string>
|
||||
<string name="poi_level">等級</string>
|
||||
|
||||
</resources>
|
||||
<string name="poi_rtsa_scale">隘口的艱難度</string>
|
||||
|
||||
<string name="poi_pump">泵浦</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2111,4 +2111,6 @@
|
|||
<string name="count_of_lines">計算行數</string>
|
||||
<string name="show_on_start">在開始上顯示</string>
|
||||
<string name="address_unknown">還不知道地址</string>
|
||||
</resources>
|
||||
<string name="are_you_sure">您確定嗎？</string>
|
||||
<string name="unsaved_changes_will_be_lost">任何未儲存的變更將會失去。要繼續嗎?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -321,8 +321,8 @@
|
|||
|
||||
<string name="poi_recycling">Recycling</string>
|
||||
|
||||
<string name="poi_recycling_centre">Centre</string>
|
||||
<string name="poi_recycling_container">Container</string>
|
||||
<string name="poi_recycling_centre">Type: recycling centre</string>
|
||||
<string name="poi_recycling_container">Type: container</string>
|
||||
<string name="poi_recycling_glass">Glass</string>
|
||||
<string name="poi_recycling_paper">Paper</string>
|
||||
<string name="poi_recycling_clothes">Clothes</string>
|
||||
|
|
@ -1247,6 +1247,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_water_characteristic_mineral">Water characteristic: mineral</string>
|
||||
<string name="poi_water_characteristic_mud">Water characteristic: mud</string>
|
||||
|
|
@ -1328,5 +1329,6 @@
|
|||
|
||||
<string name="poi_passing_place">Passing place</string>
|
||||
<string name="poi_level">Level</string>
|
||||
<string name="poi_rtsa_scale">Difficulty of mountain pass</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ public class MapContextMenu {
|
|||
|
||||
private static final String KEY_CTX_MENU_OBJECT = "key_ctx_menu_object";
|
||||
private static final String KEY_CTX_MENU_POINT_DESC = "key_ctx_menu_point_desc";
|
||||
private static final String KEY_CTX_MENU_NAME_STR = "key_ctx_menu_name_str";
|
||||
private static final String KEY_CTX_MENU_TYPE_STR = "key_ctx_menu_type_str";
|
||||
private static final String KEY_CTX_MENU_STREET_STR = "key_ctx_menu_street_str";
|
||||
|
||||
public boolean isMenuVisible(MapActivity mapActivity) {
|
||||
return mapActivity.getSupportFragmentManager().findFragmentByTag("MapContextMenuFragment") != null;
|
||||
|
|
@ -60,8 +63,13 @@ public class MapContextMenu {
|
|||
|
||||
public void show(MapActivity mapActivity, PointDescription pointDescription, Object object) {
|
||||
|
||||
if (isMenuVisible(mapActivity))
|
||||
hide(mapActivity);
|
||||
if (isMenuVisible(mapActivity)) {
|
||||
if (this.object == null || !this.object.equals(object)) {
|
||||
hide(mapActivity);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.pointDescription = pointDescription;
|
||||
this.object = object;
|
||||
|
|
@ -187,6 +195,10 @@ public class MapContextMenu {
|
|||
}
|
||||
|
||||
if (streetStr != null) {
|
||||
if (getObject() == null) {
|
||||
nameStr = streetStr;
|
||||
streetStr = null;
|
||||
}
|
||||
activity.runOnUiThread(new Runnable() {
|
||||
public void run() {
|
||||
refreshMenuTitle(activity);
|
||||
|
|
@ -256,6 +268,9 @@ public class MapContextMenu {
|
|||
bundle.putSerializable(KEY_CTX_MENU_OBJECT, (Amenity)object);
|
||||
}
|
||||
bundle.putSerializable(KEY_CTX_MENU_POINT_DESC, pointDescription);
|
||||
bundle.putSerializable(KEY_CTX_MENU_NAME_STR, nameStr);
|
||||
bundle.putSerializable(KEY_CTX_MENU_TYPE_STR, typeStr);
|
||||
bundle.putSerializable(KEY_CTX_MENU_STREET_STR, streetStr);
|
||||
}
|
||||
|
||||
public void restoreMenuState(Bundle bundle) {
|
||||
|
|
@ -263,5 +278,17 @@ public class MapContextMenu {
|
|||
Object pDescObj = bundle.getSerializable(KEY_CTX_MENU_POINT_DESC);
|
||||
if (pDescObj != null)
|
||||
pointDescription = (PointDescription)pDescObj;
|
||||
Object nameStrObj = bundle.getSerializable(KEY_CTX_MENU_NAME_STR);
|
||||
if (nameStrObj != null) {
|
||||
nameStr = nameStrObj.toString();
|
||||
}
|
||||
Object typeStrObj = bundle.getSerializable(KEY_CTX_MENU_TYPE_STR);
|
||||
if (typeStrObj != null) {
|
||||
typeStr = typeStrObj.toString();
|
||||
}
|
||||
Object streetStrObj = bundle.getSerializable(KEY_CTX_MENU_STREET_STR);
|
||||
if (streetStrObj != null) {
|
||||
streetStr = streetStrObj.toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import android.animation.AnimatorListenerAdapter;
|
|||
import android.annotation.TargetApi;
|
||||
import android.app.Activity;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.PointF;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
|
|
@ -30,10 +29,11 @@ import net.osmand.PlatformUtil;
|
|||
import net.osmand.data.RotatedTileBox;
|
||||
import net.osmand.plus.IconsCache;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.sections.MenuController;
|
||||
import net.osmand.plus.views.ContextMenuLayer;
|
||||
import net.osmand.plus.views.AnimateDraggingMapThread;
|
||||
import net.osmand.plus.views.OsmandMapTileView;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
|
@ -50,8 +50,6 @@ public class MapContextMenuFragment extends Fragment {
|
|||
|
||||
private View view;
|
||||
private View mainView;
|
||||
private View bottomView;
|
||||
private View shadowView;
|
||||
|
||||
MenuController menuController;
|
||||
|
||||
|
|
@ -183,25 +181,7 @@ public class MapContextMenuFragment extends Fragment {
|
|||
|
||||
});
|
||||
|
||||
shadowView = view.findViewById(R.id.context_menu_shadow_view);
|
||||
final GestureDetector singleTapDetector = new GestureDetector(view.getContext(), new SingleTapConfirm());
|
||||
shadowView.setOnTouchListener(new View.OnTouchListener() {
|
||||
public boolean onTouch(View view, MotionEvent event) {
|
||||
|
||||
if (singleTapDetector.onTouchEvent(event)) {
|
||||
MapActivity mapActivity = getMapActivity();
|
||||
ContextMenuLayer contextMenuLayer = mapActivity.getMapLayers().getContextMenuLayer();
|
||||
|
||||
PointF point = new PointF(event.getX(), event.getY());
|
||||
RotatedTileBox tileBox = mapActivity.getMapView().getCurrentRotatedTileBox();
|
||||
if (!contextMenuLayer.pressedContextMarker(tileBox, point.x, point.y) &&
|
||||
!contextMenuLayer.onSingleTap(point, tileBox)) {
|
||||
dismissMenu();
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
final View.OnTouchListener slideTouchListener = new View.OnTouchListener() {
|
||||
private float dy;
|
||||
|
|
@ -219,9 +199,7 @@ public class MapContextMenuFragment extends Fragment {
|
|||
public boolean onTouch(View v, MotionEvent event) {
|
||||
|
||||
if (singleTapDetector.onTouchEvent(event)) {
|
||||
OsmandMapTileView mapView = getMapActivity().getMapView();
|
||||
mapView.getAnimatedDraggingThread().startMoving(getCtxMenu().getPointDescription().getLat(), getCtxMenu().getPointDescription().getLon(),
|
||||
mapView.getZoom(), true);
|
||||
showOnMap(getCtxMenu().getPointDescription().getLat(), getCtxMenu().getPointDescription().getLon());
|
||||
|
||||
if (hasMoved) {
|
||||
applyPosY(getViewY());
|
||||
|
|
@ -408,7 +386,7 @@ public class MapContextMenuFragment extends Fragment {
|
|||
});
|
||||
|
||||
// Menu controller
|
||||
bottomView = view.findViewById(R.id.context_menu_bottom_view);
|
||||
View bottomView = view.findViewById(R.id.context_menu_bottom_view);
|
||||
if (menuController != null) {
|
||||
bottomView.setOnTouchListener(new View.OnTouchListener() {
|
||||
@Override
|
||||
|
|
@ -422,9 +400,33 @@ public class MapContextMenuFragment extends Fragment {
|
|||
bottomView.measure(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||
menuBottomViewHeight = bottomView.getMeasuredHeight();
|
||||
|
||||
getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(false);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroyView() {
|
||||
super.onDestroyView();
|
||||
getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true);
|
||||
}
|
||||
|
||||
private void showOnMap(double latitude, double longitude) {
|
||||
MapActivity ctx = getMapActivity();
|
||||
AnimateDraggingMapThread thread = ctx.getMapView().getAnimatedDraggingThread();
|
||||
int fZoom = ctx.getMapView().getZoom();
|
||||
double flat = latitude;
|
||||
double flon = longitude;
|
||||
|
||||
RotatedTileBox cp = ctx.getMapView().getCurrentRotatedTileBox().copy();
|
||||
cp.setCenterLocation(0.5f, ctx.getMapView().getMapPosition() == OsmandSettings.BOTTOM_CONSTANT ? 0.15f : 0.5f);
|
||||
cp.setLatLonCenter(flat, flon);
|
||||
flat = cp.getLatFromPixel(cp.getPixWidth() / 2, cp.getPixHeight() / 2);
|
||||
flon = cp.getLonFromPixel(cp.getPixWidth() / 2, cp.getPixHeight() / 2);
|
||||
|
||||
thread.startMoving(flat, flon, fZoom, true);
|
||||
}
|
||||
|
||||
private void setAddressLocation() {
|
||||
// Text line 1
|
||||
TextView line1 = (TextView) view.findViewById(R.id.context_menu_line1);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package net.osmand.plus.mapcontextmenu.sections;
|
|||
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.text.Html;
|
||||
import android.text.util.Linkify;
|
||||
import android.util.TypedValue;
|
||||
import android.view.Gravity;
|
||||
|
|
@ -17,6 +18,7 @@ import net.osmand.osm.MapPoiTypes;
|
|||
import net.osmand.osm.PoiType;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.views.POIMapLayer;
|
||||
import net.osmand.util.Algorithms;
|
||||
import net.osmand.util.OpeningHoursParser;
|
||||
|
||||
|
|
@ -35,11 +37,11 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
|
|||
this.amenity = amenity;
|
||||
}
|
||||
|
||||
private void buildRow(View view, int iconId, String text, int textColor) {
|
||||
buildRow(view, getRowIcon(iconId), text, textColor);
|
||||
private void buildRow(View view, int iconId, String text, int textColor, boolean isDescription) {
|
||||
buildRow(view, getRowIcon(iconId), text, textColor, isDescription);
|
||||
}
|
||||
|
||||
private void buildRow(View view, Drawable icon, String text, int textColor) {
|
||||
private void buildRow(final View view, Drawable icon, String text, int textColor, final boolean isDescription) {
|
||||
boolean light = app.getSettings().isLightContent();
|
||||
|
||||
LinearLayout ll = new LinearLayout(view.getContext());
|
||||
|
|
@ -78,11 +80,24 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
|
|||
|
||||
textView.setAutoLinkMask(Linkify.ALL);
|
||||
textView.setLinksClickable(true);
|
||||
if (isDescription) {
|
||||
textView.setMinLines(1);
|
||||
textView.setMaxLines(5);
|
||||
}
|
||||
textView.setText(text);
|
||||
if (textColor > 0) {
|
||||
textView.setTextColor(view.getResources().getColor(textColor));
|
||||
}
|
||||
//textView.setText("sdf dsaf fsdasdfg adsf asdsfd asdf sdf adsfg asdf sdfa sdf dsf agsfdgd fgsfd sdf asdf adg adf sdf asdf dfgdfsg sdfg adsf asdf asdf sdf SDF ASDF ADSF ASDF ASDF DAF SDAF dfg dsfg dfg sdfg rg rth sfghs dfgs dfgsdfg adfg dfg sdfg dfs ");
|
||||
if (isDescription) {
|
||||
textView.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (isDescription) {
|
||||
POIMapLayer.showDescriptionDialog(view.getContext(), app, amenity);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
LinearLayout.LayoutParams llTextViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||
llTextViewParams.setMargins(0, 0, dpToPx(10f), 0);
|
||||
|
|
@ -117,9 +132,10 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
|
|||
public void build(View view) {
|
||||
|
||||
firstRow = true;
|
||||
boolean hasWiki = false;
|
||||
|
||||
for (PlainMenuItem item : plainMenuItems) {
|
||||
buildRow(view, item.getIconId(), item.getText(), 0);
|
||||
buildRow(view, item.getIconId(), item.getText(), 0, false);
|
||||
}
|
||||
|
||||
MapPoiTypes poiTypes = app.getPoiTypes();
|
||||
|
|
@ -127,9 +143,34 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
|
|||
int iconId = 0;
|
||||
Drawable icon = null;
|
||||
int textColor = 0;
|
||||
boolean isDescription = false;
|
||||
String key = e.getKey();
|
||||
String vl = e.getValue();
|
||||
if (key.startsWith("name:")) {
|
||||
|
||||
if (amenity.getType().isWiki()) {
|
||||
if (!hasWiki) {
|
||||
iconId = R.drawable.ic_action_note_dark;
|
||||
String preferredLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
|
||||
if (Algorithms.isEmpty(preferredLang)) {
|
||||
preferredLang = app.getLanguage();
|
||||
}
|
||||
String lng = amenity.getContentSelected("content", preferredLang, "en");
|
||||
if (Algorithms.isEmpty(lng)) {
|
||||
lng = "en";
|
||||
}
|
||||
|
||||
final String langSelected = lng;
|
||||
String content = amenity.getDescription(langSelected);
|
||||
vl = Html.fromHtml(content).toString();
|
||||
if (vl.length() > 300) {
|
||||
vl = vl.substring(0, 300);
|
||||
}
|
||||
hasWiki = true;
|
||||
isDescription = true;
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
} else if (key.startsWith("name:")) {
|
||||
continue;
|
||||
} else if (Amenity.OPENING_HOURS.equals(key)) {
|
||||
iconId = R.drawable.ic_action_time;
|
||||
|
|
@ -154,6 +195,7 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
|
|||
} else {
|
||||
if (Amenity.DESCRIPTION.equals(key)) {
|
||||
iconId = R.drawable.ic_action_note_dark;
|
||||
isDescription = true;
|
||||
} else {
|
||||
iconId = R.drawable.ic_action_info_dark;
|
||||
}
|
||||
|
|
@ -175,9 +217,9 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
|
|||
}
|
||||
|
||||
if (icon != null) {
|
||||
buildRow(view, icon, vl, textColor);
|
||||
buildRow(view, icon, vl, textColor, isDescription);
|
||||
} else {
|
||||
buildRow(view, iconId, vl, textColor);
|
||||
buildRow(view, iconId, vl, textColor, isDescription);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ import android.widget.LinearLayout;
|
|||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.PlatformUtil;
|
||||
import net.osmand.StringMatcher;
|
||||
import net.osmand.osm.AbstractPoiType;
|
||||
import net.osmand.osm.MapPoiTypes;
|
||||
import net.osmand.osm.PoiCategory;
|
||||
import net.osmand.osm.PoiFilter;
|
||||
import net.osmand.osm.PoiType;
|
||||
import net.osmand.osm.edit.OSMSettings;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
|
|
@ -32,9 +37,9 @@ import net.osmand.plus.osmedit.data.Tag;
|
|||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
public class AdvancedDataFragment extends Fragment {
|
||||
private static final String TAG = "AdvancedDataFragment";
|
||||
|
|
@ -72,7 +77,7 @@ public class AdvancedDataFragment extends Fragment {
|
|||
(LinearLayout) view.findViewById(R.id.editTagsList);
|
||||
mAdapter = new TagAdapterLinearLayoutHack(editTagsLineaLayout, getData(),
|
||||
nameTextView, amenityTagTextView, amenityTextView,
|
||||
((OsmandApplication) getActivity().getApplication()).getPoiTypes().getAllTranslatedNames());
|
||||
((OsmandApplication) getActivity().getApplication()).getPoiTypes());
|
||||
// setListViewHeightBasedOnChildren(editTagsLineaLayout);
|
||||
Button addTagButton = (Button) view.findViewById(R.id.addTagButton);
|
||||
addTagButton.setOnClickListener(new View.OnClickListener() {
|
||||
|
|
@ -127,19 +132,28 @@ public class AdvancedDataFragment extends Fragment {
|
|||
private final TextView amenityTagTextView;
|
||||
private final TextView amenityTextView;
|
||||
private final Map<String, PoiType> allTranslatedSubTypes;
|
||||
private final Map<String, AbstractPoiType> allTypes;
|
||||
private final MapPoiTypes mapPoiTypes;
|
||||
|
||||
public TagAdapterLinearLayoutHack(LinearLayout linearLayout,
|
||||
EditPoiData editPoiData,
|
||||
TextView nameTextView,
|
||||
TextView amenityTagTextView,
|
||||
TextView amenityTextView,
|
||||
Map<String, PoiType> allTranslatedSubTypes) {
|
||||
MapPoiTypes mapPoiTypes) {
|
||||
this.linearLayout = linearLayout;
|
||||
this.editPoiData = editPoiData;
|
||||
this.nameTextView = nameTextView;
|
||||
this.amenityTagTextView = amenityTagTextView;
|
||||
this.amenityTextView = amenityTextView;
|
||||
this.allTranslatedSubTypes = allTranslatedSubTypes;
|
||||
this.allTranslatedSubTypes = mapPoiTypes.getAllTranslatedNames();
|
||||
this.allTypes = mapPoiTypes.getAllTypesTranslatedNames(new StringMatcher() {
|
||||
@Override
|
||||
public boolean matches(String name) {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
this.mapPoiTypes = mapPoiTypes;
|
||||
}
|
||||
|
||||
public void addTag(Tag tag) {
|
||||
|
|
@ -185,14 +199,10 @@ public class AdvancedDataFragment extends Fragment {
|
|||
deleteItemImageButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
LOG.debug("onClick(" + "v=" + v + ") tag=" + tag
|
||||
+ "; editPoiData.tags" + editPoiData.tags);
|
||||
linearLayout.removeView((View) v.getParent());
|
||||
editPoiData.tags.remove(tag);
|
||||
LOG.debug("editPoiData.tags" + editPoiData.tags + " mIsUserInput=" + mIsUserInput);
|
||||
if (mIsUserInput)
|
||||
editPoiData.notifyDatasetChanged(null);
|
||||
LOG.debug("editPoiData.tags" + editPoiData.tags);
|
||||
}
|
||||
});
|
||||
tagEditText.addTextChangedListener(new TextWatcher() {
|
||||
|
|
@ -213,12 +223,13 @@ public class AdvancedDataFragment extends Fragment {
|
|||
editPoiData.notifyDatasetChanged(mTagsChangedListener);
|
||||
}
|
||||
});
|
||||
final Set<String> tagKeys = new TreeSet<>();
|
||||
for (OSMSettings.OSMTagKey t : OSMSettings.OSMTagKey.values()) {
|
||||
if (t != OSMSettings.OSMTagKey.NAME) {
|
||||
tagKeys.add(t.getValue());
|
||||
}
|
||||
final Set<String> tagKeys = new HashSet<>();
|
||||
for (String s : allTypes.keySet()) {
|
||||
AbstractPoiType abstractPoiType = allTypes.get(s);
|
||||
addPoiToStringSet(abstractPoiType, tagKeys);
|
||||
}
|
||||
// addPoiToStringSet(mapPoiTypes.getOtherPoiCategory(), tagKeys);
|
||||
addPoiToStringSet(mapPoiTypes.getOtherMapCategory(), tagKeys);
|
||||
|
||||
ArrayAdapter<Object> adapter = new ArrayAdapter<>(linearLayout.getContext(),
|
||||
R.layout.list_textview, tagKeys.toArray());
|
||||
|
|
@ -262,4 +273,36 @@ public class AdvancedDataFragment extends Fragment {
|
|||
return convertView;
|
||||
}
|
||||
}
|
||||
|
||||
private static void addPoiToStringSet(AbstractPoiType abstractPoiType, Set<String> stringSet) {
|
||||
if (abstractPoiType instanceof PoiType) {
|
||||
PoiType poiType = (PoiType) abstractPoiType;
|
||||
if (poiType.getOsmTag() != null &&
|
||||
!poiType.getOsmTag().equals(OSMSettings.OSMTagKey.NAME.getValue())) {
|
||||
stringSet.add(poiType.getOsmTag());
|
||||
if (poiType.getOsmTag2() != null) {
|
||||
stringSet.add(poiType.getOsmTag2());
|
||||
}
|
||||
}
|
||||
} else if (abstractPoiType instanceof PoiCategory) {
|
||||
PoiCategory poiCategory = (PoiCategory) abstractPoiType;
|
||||
for (PoiFilter filter : poiCategory.getPoiFilters()) {
|
||||
addPoiToStringSet(filter, stringSet);
|
||||
}
|
||||
for (PoiType poiType : poiCategory.getPoiTypes()) {
|
||||
addPoiToStringSet(poiType, stringSet);
|
||||
}
|
||||
for (PoiType poiType : poiCategory.getPoiAdditionals()) {
|
||||
addPoiToStringSet(poiType, stringSet);
|
||||
}
|
||||
} else if (abstractPoiType instanceof PoiFilter) {
|
||||
PoiFilter poiFilter = (PoiFilter) abstractPoiType;
|
||||
for (PoiType poiType : poiFilter.getPoiTypes()) {
|
||||
addPoiToStringSet(poiType, stringSet);
|
||||
}
|
||||
} else {
|
||||
throw new IllegalArgumentException("abstractPoiType can't be instance of class "
|
||||
+ abstractPoiType.getClass());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import net.osmand.osm.PoiCategory;
|
|||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.osmedit.EditPoiFragment;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PoiTypeDialogFragment extends DialogFragment {
|
||||
|
|
@ -25,11 +26,14 @@ public class PoiTypeDialogFragment extends DialogFragment {
|
|||
final Amenity amenity = (Amenity) getArguments().getSerializable(KEY_AMENITY);
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
final List<PoiCategory> categories = poiTypes.getCategories(false);
|
||||
String[] vals = new String[categories.size()];
|
||||
for (int i = 0; i < vals.length; i++) {
|
||||
vals[i] = categories.get(i).getTranslation();
|
||||
ArrayList<String> vals = new ArrayList<>(categories.size());
|
||||
// TODO replace with constants
|
||||
for (PoiCategory category : categories) {
|
||||
if (category.getKeyName().equals("user_defined_other")
|
||||
|| category.getKeyName().equals("osmwiki")) continue;
|
||||
vals.add(category.getTranslation());
|
||||
}
|
||||
builder.setItems(vals, new Dialog.OnClickListener() {
|
||||
builder.setItems(vals.toArray(new String[vals.size()]), new Dialog.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
PoiCategory aType = categories.get(which);
|
||||
|
|
|
|||
|
|
@ -500,9 +500,12 @@ public class VoiceRouter {
|
|||
if(isTargetPoint(nextInfo) && (!playedAndArriveAtTarget || repeat)) {
|
||||
if(next.getTurnType().goAhead()) {
|
||||
playGoAhead(nextInfo.distanceTo, getSpeakableStreetName(currentSegment, next));
|
||||
andSpeakArriveAtPoint(nextInfo);
|
||||
playedAndArriveAtTarget = true;
|
||||
} else if(nextInfo.distanceTo <= 2 * TURN_IN_DISTANCE) {
|
||||
andSpeakArriveAtPoint(nextInfo);
|
||||
playedAndArriveAtTarget = true;
|
||||
}
|
||||
andSpeakArriveAtPoint(nextInfo);
|
||||
playedAndArriveAtTarget = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import android.graphics.PointF;
|
|||
import android.graphics.Rect;
|
||||
import android.os.Build;
|
||||
import android.text.Html;
|
||||
import android.view.GestureDetector;
|
||||
import android.view.Gravity;
|
||||
import android.view.MotionEvent;
|
||||
import android.widget.FrameLayout.LayoutParams;
|
||||
|
|
@ -77,8 +78,11 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
private boolean showContextMarker;
|
||||
private ImageView contextMarker;
|
||||
|
||||
private GestureDetector movementListener;
|
||||
|
||||
public ContextMenuLayer(MapActivity activity){
|
||||
this.activity = activity;
|
||||
movementListener = new GestureDetector(activity, new MenuLayerOnGestureListener());
|
||||
if(activity.getLastNonConfigurationInstanceByKey(KEY_LAT_LAN) != null) {
|
||||
latLon = (LatLon) activity.getLastNonConfigurationInstanceByKey(KEY_LAT_LAN);
|
||||
description = (String) activity.getLastNonConfigurationInstanceByKey(KEY_DESCRIPTION);
|
||||
|
|
@ -464,6 +468,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
activity.getContextMenu().hide(activity);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -515,6 +521,13 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
|
||||
@Override
|
||||
public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
|
||||
|
||||
if (movementListener.onTouchEvent(event)) {
|
||||
if (activity.getContextMenu().isMenuVisible(activity)) {
|
||||
activity.getContextMenu().hide(activity);
|
||||
}
|
||||
}
|
||||
|
||||
if (latLon != null) {
|
||||
if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
||||
int vl = pressedInTextView(tileBox, event.getX(), event.getY());
|
||||
|
|
@ -564,4 +577,16 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
map.put(KEY_DESCRIPTION, textView.getText().toString());
|
||||
}
|
||||
|
||||
private class MenuLayerOnGestureListener extends GestureDetector.SimpleOnGestureListener {
|
||||
|
||||
@Override
|
||||
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
clickRouteCancel();
|
||||
}
|
||||
|
||||
|
||||
|
||||
});
|
||||
mapRouteInfoControlDialog = new MapRouteInfoControl(mapActivity.getMapLayers().getContextMenuLayer(),
|
||||
mapActivity, this);
|
||||
|
|
@ -278,7 +278,7 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
public void updateRouteButtons(View main, boolean routeInfo) {
|
||||
ImageView dashButton = (ImageView) main.findViewById(R.id.map_dashboard_route_button);
|
||||
dashButton.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.map_dashboard));
|
||||
dashButton.setVisibility(AndroidUiHelper.isOrientationPortrait(mapActivity) ?
|
||||
dashButton.setVisibility(AndroidUiHelper.isOrientationPortrait(mapActivity) ?
|
||||
View.GONE : View.VISIBLE);
|
||||
dashButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
|
|
@ -328,7 +328,13 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public void setControlsClickable(boolean clickable) {
|
||||
for (MapHudButton mb : controls) {
|
||||
mb.iv.setClickable(clickable);
|
||||
}
|
||||
}
|
||||
|
||||
protected void clickRouteParams() {
|
||||
notifyClicked();
|
||||
mapRouteInfoControlDialog.hideDialog();
|
||||
|
|
|
|||
|
|
@ -396,6 +396,10 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
|
|||
refreshMap();
|
||||
}
|
||||
|
||||
public int getMapPosition() {
|
||||
return mapPosition;
|
||||
}
|
||||
|
||||
public void setMapPosition(int type) {
|
||||
this.mapPosition = type;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue