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

Merge branch 'master' into r2.2

Browse source 
Conflicts:
	OsmAnd/res/values/strings.xml
This commit is contained in:
Victor Shcherb 2015-11-22 20:33:33 +03:00
commit 404bf0e805
73 changed files with 745 additions and 300 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout-land/map_hud_bottom.xml
View file

@ -62,7 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_marginTop="3dp"
android:gravity="center_horizontal"
android:textSize="@dimen/map_button_text_size" />
</FrameLayout>

2
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -78,7 +78,7 @@
android:id="@+id/button_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:textColor="?attr/contextMenuButtonColor"
android:text="@string/update_existing"
android:visibility="gone"/>

3
OsmAnd/res/layout-xlarge/first_usage_fragment.xml
View file

@ -9,10 +9,11 @@
android:theme="@style/OsmandLightTheme">
<ImageView
android:id="@+id/background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/bg_first_usage"/>
android:background="@color/osmand_orange"/>
<LinearLayout
android:layout_width="wrap_content"

2
OsmAnd/res/layout/favorite_category_dialog_item.xml
View file

@ -11,7 +11,7 @@
android:drawableLeft="@drawable/ic_action_folder"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:text="Restaurant"
android:gravity="left|center_vertical"
android:textSize="@dimen/default_list_text_size"

3
OsmAnd/res/layout/first_usage_fragment.xml
View file

@ -9,10 +9,11 @@
android:theme="@style/OsmandLightTheme">
<ImageView
android:id="@+id/background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/bg_first_usage"/>
android:background="@color/osmand_orange"/>
<LinearLayout
android:layout_width="wrap_content"

8
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -92,7 +92,7 @@
android:id="@+id/title_button_top_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:gravity="center"
android:paddingLeft="@dimen/context_menu_button_padding_x"
android:paddingRight="@dimen/context_menu_button_padding_x"
@ -183,7 +183,7 @@
android:id="@+id/title_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/context_menu_button_padding_x"
android:paddingRight="@dimen/context_menu_button_padding_x"
@ -206,7 +206,7 @@
android:id="@+id/title_button_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:drawableLeft="@drawable/ic_action_delete_dark"
android:gravity="center"
android:paddingLeft="@dimen/context_menu_button_padding_x"
@ -267,7 +267,7 @@
android:layout_width="@dimen/context_menu_progress_cancel_button_size"
android:layout_height="@dimen/context_menu_progress_cancel_button_size"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:scaleType="center"
tools:src="@drawable/map_action_cancel"/>

2
OsmAnd/res/layout/map_hud_bottom.xml
View file

@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_marginTop="3dp"
android:gravity="center_horizontal"
android:textSize="@dimen/map_button_text_size" />
</FrameLayout>

2
OsmAnd/res/layout/point_editor_fragment.xml
View file

@ -80,7 +80,7 @@
android:id="@+id/button_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:textColor="?attr/contextMenuButtonColor"
android:text="@string/update_existing"
android:visibility="gone"/>

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

@ -147,7 +147,7 @@
<string name="poi_bus_station">Аўтобусная станцыя</string>
<string name="poi_railway_station">Чыгуначная станцыя</string>
<string name="poi_railway_platform">Чыгуначная плятформа</string>
<string name="poi_railway_subway_entrance">Уваход у мэтро</string>
<string name="poi_subway_entrance">Уваход у мэтро</string>
<string name="poi_subway_station">Станцыя мэтро</string>
<string name="poi_taxi">Стаянка таксі</string>

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

@ -230,7 +230,7 @@
<string name="poi_fuel_biogas">E85</string>
<string name="poi_vehicle_ramp">Рампа за МПС</string>
<string name="poi_parking_entrance">Вход към паркинг</string>
<string name="poi_railway_subway_entrance">Вход към метро</string>
<string name="poi_subway_entrance">Вход към метро</string>
<string name="poi_bicycle_parking">Паркинг за велосипеди</string>
<string name="poi_aerialway_gondola">Гондола</string>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="osb_author_or_password_not_specified">Моля, въведете потребителско име и парола за сайта на OSM</string>
<string name="clear_intermediate_points">Изчистване на междинните точки</string>
<string name="keep_intermediate_points">Запази междинните точки</string>
@ -2020,4 +2021,11 @@ OsmAnd е с отворен код и активно да се развива.
<string name="shared_string_navigation">Навигация</string>
<string name="osmand_running_in_background">Работи във фонов режим</string>
<string name="favourites_edit_dialog_title">Предпочитана информация</string>
<string name="show_on_start">Да се показва при стартиране</string>
<string name="copied_to_clipboard">Копирано</string>
<string name="release_2_2">" • Нов контекстно-ориентиран интерфейс\n\n • При стартиране на приложението се извежда картата, освен ако не е избрано \'Показване на таблото при стартиране\'\n\n • Настройване на контролите върху таблото за управление\n\n • Пропускане на таблото, ако предпочитате приложение с меню\n\n • To download maps, regions can be directly selected by tapping on the world map\n\n • POI Search now supports more specific queries\n\n • Improved POI and OSM editing functionality\n\n • Map data download structure and interface reworked\n\n и още... "</string>
<string name="osm_save_offline">Запази офлайн</string>
<string name="osm_edit_modified_poi">Модифицирани OSM POI</string>
<string name="osm_edit_deleted_poi">Изтрити OSM POI</string>
<string name="context_menu_item_open_note">Отвори OSM бележка</string>
</resources>

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

@ -123,7 +123,7 @@
<string name="poi_railway_station">Estació de tren</string>
<string name="poi_railway_platform">Andana</string>
<string name="poi_halt">Parada de tren (obsolet)</string>
<string name="poi_railway_subway_entrance">Entrada de metro</string>
<string name="poi_subway_entrance">Entrada de metro</string>
<string name="poi_subway_station">Estació de metro</string>
<string name="poi_taxi">Parada de taxis</string>
@ -1887,4 +1887,51 @@
<string name="poi_bridge_structure_simple_wooden">Estructura del pont: fusta senzilla</string>
<string name="poi_bridge_structure_viaduct">Estructura del pont: viaducte</string>
<string name="poi_bridge_structure_aqueduct">Estructura del pont: aqüeducte</string>
<string name="poi_service_bicycle_chaintool_yes">Eines per la cadena de la bicicleta: sí</string>
<string name="poi_service_bicycle_chaintool_no">Eines per la cadena de la bicicleta: no</string>
<string name="poi_service_bicycle_second_hand_yes">Venda al detall de bicicletes de segona mà: sí</string>
<string name="poi_service_bicycle_second_hand_no">Venda al detall de bicicletes de segona mà: no</string>
<string name="poi_training_language">Formació: idioma</string>
<string name="poi_training_music">Formació: música</string>
<string name="poi_training_dance">Formació: dansa</string>
<string name="poi_training_sport">Formació: esport</string>
<string name="poi_training_art">Formació: art</string>
<string name="poi_training_cooking">Formació: cuina</string>
<string name="poi_training_computer">Formació: informàtica</string>
<string name="poi_training_yoga">Formació: ioga</string>
<string name="poi_training_martial_art">Formació: arts marcials</string>
<string name="poi_training_aviation">Formació: aviació</string>
<string name="poi_training_hairdressing">Formació: perruqueria</string>
<string name="poi_escape_lane">Zona de frenada d\'emergència</string>
<string name="poi_crop_rice">Cultiu: arròs</string>
<string name="poi_crop_grass">Cultiu: gespa</string>
<string name="poi_crop_corn">Cultiu: moresc</string>
<string name="poi_crop_cereal">Cultiu: cereals</string>
<string name="poi_crop_sugarcane">Cultiu: canya de sucre</string>
<string name="poi_crop_wheat">Cultiu: blat</string>
<string name="poi_crop_soy">Cultiu: soja</string>
<string name="poi_crop_barley">Cultiu: ordi</string>
<string name="poi_crop_vegetables">Cultiu: verdures</string>
<string name="poi_crop_hop">Cultiu: llúpol</string>
<string name="poi_crop_rape">Cultiu: colza</string>
<string name="poi_crop_beet">Cultiu: remolatxa</string>
<string name="poi_crop_lavender">Cultiu: espígol</string>
<string name="poi_crop_tea">Cultiu: te</string>
<string name="poi_crop_coffee">Cultiu: cafè</string>
<string name="poi_crop_poultry">Producció: aviram</string>
<string name="poi_crop_sunflower">Cultiu: gira-sol</string>
<string name="poi_crop_raspberry">Cultiu: gerd</string>
<string name="poi_crop_tobacco">Cultiu: tabac</string>
<string name="poi_crop_strawberry">Cultiu: maduixa</string>
<string name="poi_crop_vegetables_flowers">Cultiu: verdures i flors</string>
<string name="poi_crop_cassava">Cultiu: mandioca</string>
<string name="poi_crop_cranberry">Cultiu: nabiu de grua</string>
<string name="poi_crop_asparagus">Cultiu: espàrrecs</string>
<string name="poi_crop_flowers">Cultiu: flors</string>
<string name="poi_surveillance_indoor">Vigilància: interior</string>
<string name="poi_surveillance_outdoor">Vigilància: exterior</string>
</resources>

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

@ -1612,7 +1612,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="rendering_value_disabled_name">Desactivat</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Acoloreix les rutes segons la seva importància</string>
<string name="rendering_value_walkingRoutesOSMC_name">Acoloreix segons l\'OSMC</string>
<string name="osm_edit_context_menu_delete">Suprimeix l\'edició d\'OSM</string>
<string name="osm_edit_context_menu_delete">Suprimeix edició d\'OSM</string>
<string name="read_full_article">Llegiu l\'article complet (en línia)</string>
<string name="shared_string_wikipedia">Viquipèdia</string>
<string name="local_indexes_cat_wiki">Viquipèdia</string>
@ -1828,7 +1828,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="shared_string_location">Localització</string>
<string name="poi_context_menu_modify_osm_change">Modifica el canvi OSM</string>
<string name="copied_to_clipboard">S\'ha copiat al \tporta-retalls</string>
<string name="release_2_2">" • Una nova IU contextual per designar ubicacions en el mapa i en altres pantalles\n\n • La pantalla del mapa s\'obre directament excepte quan es selecciona \'Mostra el tauler en iniciar\'\n\n • Configura el tauler amb quines targetes es mostraran i com\n\n • En la baixada de mapes, les regions es poden seleccionar directament tocant sobre el mapa mundial\n\n • Ara, la cerca de PDI admet consultes més específiques\n\n • S\'ha millorat la funcionalitat d\'edició OSM i PDI\n\n • S\'ha tornat a fer l\'estructura i la interfície de la baixada de mapes\n\n i encara més... "</string>
<string name="release_2_2">" • Una nova IU contextual per designar ubicacions en el mapa i en altres pantalles\n\n • La pantalla del mapa s\'obre directament excepte quan es selecciona \'Mostra el tauler en iniciar\'\n\n • Configura el tauler amb quines targetes es mostraran i com\n\n • Prescindeix del tauler si preferiu un control de l\'aplicació mitjançant menú\n\n • En la baixada de mapes, les regions es poden seleccionar directament tocant sobre el mapa mundial\n\n • Ara, la cerca de PDI admet consultes més específiques\n\n • S\'ha millorat la funcionalitat d\'edició OSM i PDI\n\n • S\'ha tornat a fer l\'estructura i la interfície de la baixada de mapes\n\n i encara més... "</string>
<string name="osm_save_offline">Desa en local</string>
<string name="osm_edit_modified_poi">S\'ha modificat PDI d\'OSM</string>
<string name="osm_edit_deleted_poi">S\'ha eliminat PDI d\'OSM</string>
@ -1844,7 +1844,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="osn_close_dialog_title">Tanca nota</string>
<string name="osn_add_dialog_success">La nota s\'ha creat correctament</string>
<string name="osn_add_dialog_error">S\'ha produït una excepció: la nota no s\'ha creat</string>
<string name="osn_close_dialog_success">L\'error es va tancar amb èxit</string>
<string name="osn_close_dialog_success">La nota es va tancar amb èxit</string>
<string name="osn_close_dialog_error">S\'ha produït una excepció: la nota no s\'ha tancat</string>
<string name="shared_string_commit">Valida</string>
@ -1854,10 +1854,11 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="poi_dialog_reopen">Reobre</string>
<string name="dashboard_or_drawer_title">Opció d\'inici nova</string>
<string name="dashboard_or_drawer_description">Ara podeu escollir si l\'aplicació comença a la pantalla del mapa o si primer sempre mostra el tauler. La vostra opció es podrà modificar en qualsevol moment a la configuració del tauler.</string>
<string name="access_from_map_description">Situa un botó del tauler a la pantalla del mapa</string>
<string name="dashboard_or_drawer_title">Control per tauler o per menú</string>
<string name="dashboard_or_drawer_description">Hi ha una nova opció per controlar l\'aplicació amb el tauler flexible o amb un menú estàtic. La vostra opció es podrà modificar en qualsevol moment a la configuració del tauler.</string>
<string name="access_from_map_description">El botó del menú inicia el tauler, no el menú</string>
<string name="access_from_map">Accés des el mapa</string>
<string name="use_dashboard_btn">Obre sempre el tauler</string>
<string name="use_drawer_btn">Obre sempre el mapa</string>
<string name="use_dashboard_btn">Utilitza el tauler</string>
<string name="use_drawer_btn">Utilitza el menú</string>
<string name="please_specify_poi_type_only_from_list">"Especifiqueu el tipus de PDI adient o deixeu-ho buit. "</string>
</resources>

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

@ -352,7 +352,7 @@
<string name="poi_railway_station">Železniční stanice</string>
<string name="poi_railway_platform">Železniční nástupiště</string>
<string name="poi_halt">Železniční zastávka</string>
<string name="poi_railway_subway_entrance">Vchod do metra</string>
<string name="poi_subway_entrance">Vchod do metra</string>
<string name="poi_subway_station">Stanice metra</string>
<string name="poi_railway_buffer_stop">Železniční zarážka</string>
<string name="poi_taxi">Stanoviště taxi</string>

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

@ -142,7 +142,7 @@
<string name="poi_bus_station">Busstation</string>
<string name="poi_railway_station">Banegård</string>
<string name="poi_railway_platform">Perron</string>
<string name="poi_railway_subway_entrance">Metroindgang</string>
<string name="poi_subway_entrance">Metroindgang</string>
<string name="poi_subway_station">Metrostation</string>
<string name="poi_taxi">Taxaholdeplads</string>

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

@ -237,7 +237,7 @@
<string name="osmand_parking_position_description_add">Afhent bilen:</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Parkeringssted</string>
<string name="osmand_parking_plugin_description">Parkeringsplads udvidelsen kan huske hvor bilen er parkeret, og hvor meget parkeringstid der er tilbage (hvis der er en tidsfrist).\nBåde placering og tid er synlige på oversigtspanelet samt i modul på kortskærmen. En alarm kan tilføjes til Android kalenderen, som en påmindelse.</string>
<string name="osmand_parking_plugin_description">Parkeringsplads udvidelsen kan huske hvor bilen er parkeret, og hvor meget parkeringstid der er tilbage (hvis der er en tidsfrist).\nBåde placering og tid er synlige på betjeningspanel samt i modul på kortskærmen. En alarm kan tilføjes til Android kalenderen, som en påmindelse.</string>
<string name="osmand_parking_plugin_name">Parkering</string>
<string name="context_menu_item_add_parking_point">Marker som parkeringsplads</string>
<string name="context_menu_item_delete_parking_point">Slet en parkeringsmarkør</string>
@ -1484,7 +1484,7 @@
<string name="lang_sw">Swahili</string>
<string name="lang_he">Hebræisk</string>
<string name="forward">Frem</string>
<string name="home">Oversigtspanel</string>
<string name="home">Betjeningspanel</string>
<string name="live_monitoring_m_descr">Send sporing til en bestemt webtjeneste, hvis GPX logning er aktiveret.</string>
<string name="live_monitoring_m">Online sporing (GPX nødvendig)</string>
<string name="live_monitoring_start">Start online sporing</string>
@ -1925,7 +1925,7 @@
<string name="we_really_care_about_your_opinion">Vi er meget interesseret i din mening, og det er vigtigt for os at høre fra dig.</string>
<string name="rendering_value_boldOutline_name">Fed kontur</string>
<string name="traffic_warning_hazard">Fare</string>
<string name="dahboard_options_dialog_title">Konfigurer oversigtspanel</string>
<string name="dahboard_options_dialog_title">Konfigurer betjeningspanel</string>
<string name="shared_string_card_was_hidden">Kortet blev skjult</string>
<string name="shared_string_undo">FORTRYD</string>
<string name="shared_string_skip">Spring over</string>
@ -2010,7 +2010,7 @@
<string name="favorite_category_dublicate_message">Kategorinavnet findes allerede. Angiv et andet navn.</string>
<string name="favorite_category_name">Kategorinavn</string>
<string name="favorite_category_add_new_title">Tilføj ny kategori</string>
<string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet kort allerede er hentet?</string>
<string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet standardkort allerede er hentet?</string>
<string name="value_downloaded_from_max">%1$.1f af %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Opdater alle (%1$s MB)</string>
@ -2095,7 +2095,7 @@
<string name="osn_close_dialog_success">Note lukket</string>
<string name="osm_edit_modified_poi">Ændret OSM IP</string>
<string name="osm_edit_deleted_poi">Slettet OSM IP</string>
<string name="release_2_2">" • Ny kontekstafhængig brugergrænseflade når der vælges lokationer på kortet og på andre skærme\n\n • Kortskærmen vises direkte, medmindre \'Vis oversigtpanel ved start\' er valgt\n\n • Konfigurer hvordan og hvilket indhold der vises på oversigtspanelet\n\n • Hent kort, regioner ved at trykke direkte på verdenskortet\n\n • IP søgning understøtter nu mere specifikke forespørgsler\n\n • Forbedret IP og OSM redigeringsfunktionalitet\n\n • Administration af kortfiler struktur og grænseflade er omarbejdet\n\n og mere... "</string>
<string name="release_2_2">" • Ny kontekstafhængig brugergrænseflade når der vælges lokationer på kortet og på andre skærme\n\n • Kortskærmen vises direkte, medmindre \'Vis betjeningspanel ved start\' er valgt\n\n • Konfigurer hvordan og hvilket indhold der vises på betjeningspanelet\n\n • Forbigå betjeningspanel hvis der ønskes menuen-baserede app-kontrol\n\n • Hent kort, regioner ved at trykke direkte på verdenskortet\n\n • IP søgning understøtter nu mere specifikke forespørgsler\n\n • Forbedret IP og OSM redigeringsfunktionalitet\n\n • Administration af kortfiler struktur og grænseflade er omarbejdet\n\n og mere... "</string>
<string name="osm_save_offline">Gem offline</string>
<string name="rendering_attr_currentTrackColor_description">GPX-farve</string>
<string name="rendering_attr_currentTrackWidth_description">GPX-bredde</string>
@ -2103,10 +2103,11 @@
<string name="copied_to_clipboard">Kopieret til udklipsholder</string>
<string name="dashboard_or_drawer_title">Nyt valg for opstart</string>
<string name="dashboard_or_drawer_description">Vælg om programmet starter med at vise korter eller oversigtspanel først. Kan ændres i indstillinger for oversigtspanel.</string>
<string name="use_dashboard_btn">Start med oversigtspanel</string>
<string name="use_drawer_btn">Start med kortet</string>
<string name="access_from_map_description">Placerer en knap til oversigtspanelet på kortskærmen</string>
<string name="dashboard_or_drawer_title">Betjeningspanel eller menu kontrol</string>
<string name="dashboard_or_drawer_description">Der er et nyt valg til at betjene app via det fleksibel betjeningspanel eller en statisk menu. Kan ændres i indstillinger for betjeningspanel .</string>
<string name="use_dashboard_btn">Brug betjeningspanel</string>
<string name="use_drawer_btn">Brug menuen</string>
<string name="access_from_map_description">Menuknappen viser betjeningspanel, ikke menuen</string>
<string name="access_from_map">Adgang fra kort</string>
<string name="please_specify_poi_type_only_from_list">"Angiv korrekt IP type eller spring over. "</string>
</resources>

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

@ -508,7 +508,7 @@
<string name="poi_stripclub">Stripclub</string>
<string name="poi_studio">Studio</string>
<string name="poi_suburb">Stadtteil</string>
<string name="poi_railway_subway_entrance">U-Bahnhofeingang</string>
<string name="poi_subway_entrance">U-Bahnhofeingang</string>
<string name="poi_subway_station">U-Bahnhof</string>
<string name="poi_craft_sun_protection">Lichtschutz</string>
<string name="poi_supermarket">Supermarkt</string>

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

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="regions">Regionen</string>
<string name="region_maps">Regionsweite Karten</string>
@ -2138,10 +2138,10 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="feedback">Feedback</string>
<string name="contact_us">Kontakt</string>
<string name="map_legend">Kartenlegende</string>
<string name="access_from_map_description">Plaziert einen Dashboard-Knopf auf dem Bildschirm</string>
<string name="access_from_map_description">Menü-Knopf zeigt Dashboard, nicht Menü</string>
<string name="show_on_start_description">\"Aus\" startet direkt die Kartenansicht.</string>
<string name="copied_to_clipboard">in die Zwischenablage kopiert</string>
<string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr ... "</string>
<string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Dashboard kann umgangen werden, falls menü-basierte App-Steuerung gewünscht ist\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr ... "</string>
<string name="osm_save_offline">offline speichern</string>
<string name="osm_edit_modified_poi">geänderter OSM-POI</string>
<string name="osm_edit_deleted_poi">OSM-POI löschen</string>
@ -2175,18 +2175,18 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="activate_seamarks_plugin">Bitte das Seezeichen-Plugin aktivieren</string>
<string name="activate_srtm_plugin">Bitte das SRTM-Plugin aktivieren</string>
<string name="get_full_version">Vollversion</string>
<string name="confirm_download_roadmaps">Soll die reine Straßenkarte wirklich heruntergeladen werden, obwohl die vollständige Karte vorhanden ist?</string>
<string name="confirm_download_roadmaps">Soll wirklich die reine Straßenkarte heruntergeladen werden, obwohl bereits die vollständige Standardkarte vorhanden ist?</string>
<string name="value_downloaded_from_max">%1$.1f von %2$.1f MB</string>
<string name="update_all">Alles aktualisieren (%1$s MB)</string>
<string name="free_downloads_used">Verbrauchte freie Downloads</string>
<string name="enter_country_name">Name des Landes eingeben</string>
<string name="save_poi_without_poi_type_message">Soll der POI wirklich ohne Art des POI gespeichert werden?</string>
<string name="poi_context_menu_modify_osm_change">OSM-Änderung bearbeiten</string>
<string name="use_dashboard_btn">Dashboard starten</string>
<string name="use_drawer_btn">Kartenansicht starten</string>
<string name="dashboard_or_drawer_title">Neue Auswahl des Startvorgangs</string>
<string name="dashboard_or_drawer_description">Es ist nun auswählbar, ob beim Start der App gleich die Kartenansicht oder das Dashboard angezeigt wird. (Jederzeit in den Dashboard-Einstellungen änderbar)</string>
<string name="access_from_map">Aufruf von der Karte aus</string>
<string name="use_dashboard_btn">Dashboard verwenden</string>
<string name="use_drawer_btn">Menü verwenden</string>
<string name="dashboard_or_drawer_title">Auswahl der App-Bedienung</string>
<string name="dashboard_or_drawer_description">Es ist nun auswählbar, ob die App primär über das flexible Dashboard oder über ein statisches Menü bedient werden soll. (Jederzeit in den Dashboard-Einstellungen änderbar)</string>
<string name="access_from_map">Aufruf von der Karte aus</string>
<string name="favorite_category_add_new">neu erstellen</string>
<string name="next_proceed">Weiter</string>
<string name="file_size_in_mb">%.1f MB</string>

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

@ -214,7 +214,7 @@
<string name="poi_railway_station">Estación de tren</string>
<string name="poi_railway_platform">Andén de tren</string>
<string name="poi_halt">Parada de tren</string>
<string name="poi_railway_subway_entrance">Entrada de subte</string>
<string name="poi_subway_entrance">Entrada de subte</string>
<string name="poi_subway_station">Estación de subte</string>
<string name="poi_railway_buffer_stop">Fin de vía</string>
<string name="poi_taxi">Parada de taxi</string>

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

@ -1979,12 +1979,13 @@
<string name="rendering_attr_roadStyle_description">Estilo de carretera</string>
<string name="poi_dialog_reopen">Reabrir</string>
<string name="osm_save_offline">Guardar sin conexión</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de control\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente)\n\n• La búsqueda de PDI, ahora soporta consultas más específicas\n\n• Mejoras en PDI y funcionalidad de edición OSM\n\n• Se rediseñó la estructura e interfaz de los datos de mapas\n\n y más... "</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas.\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado.\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de control.\n\n• Omitir el panel del control, si quieres controlar la aplicación desde el menú.\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial.\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente).\n\n• La búsqueda de PDI, ahora soporta consultas más específicas.\n\n• Mejoras en PDI y funcionalidad de edición OSM.\n\n• Se rediseñó la estructura e interfaz de los datos de mapas.\n\n y más... "</string>
<string name="copied_to_clipboard">Copiado al portapapeles</string>
<string name="use_dashboard_btn">Panel de control</string>
<string name="use_drawer_btn">Mapa</string>
<string name="dashboard_or_drawer_title">Nueva opción de inicio</string>
<string name="dashboard_or_drawer_description">Ahora, puedes elegir si la aplicación inicia directamente mostrando el mapa o el panel de control. Puedes cambiar esto luego, en los ajustes del panel.</string>
<string name="access_from_map_description">Ubica un botón del panel de control en la pantalla del mapa</string>
<string name="use_dashboard_btn">Usar panel de control</string>
<string name="use_drawer_btn">Usar menú</string>
<string name="dashboard_or_drawer_title">Panel de control o menú de control</string>
<string name="dashboard_or_drawer_description">Nueva opción para controlar principalmente la aplicación a través del panel de control flexible o un menú estático. Puedes cambiar esto luego, en los ajustes del panel.</string>
<string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
<string name="access_from_map">Acceso desde el mapa</string>
<string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
</resources>

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

@ -143,7 +143,7 @@
<string name="poi_bus_station">Estación de autobús</string>
<string name="poi_railway_station">Estación de tren</string>
<string name="poi_halt">Parada de tren</string>
<string name="poi_railway_subway_entrance">Entrada de metro</string>
<string name="poi_subway_entrance">Entrada de metro</string>
<string name="poi_subway_station">Estación de metro</string>
<string name="poi_aerodrome">Aeropuerto</string>
<string name="poi_helipad">Helipuerto</string>

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

@ -1976,14 +1976,15 @@
<string name="rendering_attr_currentTrackWidth_description">Ancho del GPX</string>
<string name="rendering_attr_roadStyle_description">Estilo de carretera</string>
<string name="osm_save_offline">Guardar sin conexión</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de instrumentos\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente)\n\n• La búsqueda de PDI, ahora soporta consultas más específicas\n\n• Mejoras en PDI y funcionalidad de edición OSM\n\n• Se rediseñó la estructura e interfaz de los datos de mapas\n\n y más... "</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas.\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado.\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de instrumentos.\n\n• Omitir el panel de control, si quieres controlar la aplicación desde el menú.\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial.\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente).\n\n• La búsqueda de PDI, ahora soporta consultas más específicas.\n\n• Mejoras en PDI y funcionalidad de edición OSM.\n\n• Se rediseñó la estructura e interfaz de los datos de mapas.\n\n y más... "</string>
<string name="copied_to_clipboard">Copiado al portapapeles</string>
<string name="dashboard_or_drawer_title">Nueva opción de inicio</string>
<string name="dashboard_or_drawer_description">Ahora, puedes elegir si la aplicación inicia directamente mostrando el mapa o el panel de control. Puedes cambiar esto luego, en los ajustes del panel.</string>
<string name="use_dashboard_btn">Panel de control</string>
<string name="use_drawer_btn">Mapa</string>
<string name="access_from_map_description">Coloca un botón del panel de control, en la pantalla de mapa</string>
<string name="dashboard_or_drawer_title">Panel de control o menú de control</string>
<string name="dashboard_or_drawer_description">Nueva opción para controlar principalmente la aplicación a través del panel de control flexible o un menú estático. Puedes cambiar esto luego, en los ajustes del panel.</string>
<string name="use_dashboard_btn">Usar panel de control</string>
<string name="use_drawer_btn">Usar menú</string>
<string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
<string name="access_from_map">Acceso desde el mapa</string>
<string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
</resources>

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

@ -147,7 +147,7 @@
<string name="poi_railway_station">ایستگاه راه آهن (منسوخ)</string>
<string name="poi_railway_platform">پلت فرم راه آهن (منسوخ)</string>
<string name="poi_halt">ایستگاه راه آهن (منسوخ)</string>
<string name="poi_railway_subway_entrance">ورودی مترو</string>
<string name="poi_subway_entrance">ورودی مترو</string>
<string name="poi_subway_station">ایستگاه مترو</string>
<string name="poi_taxi">ایستگاه تاکسی</string>

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

@ -318,7 +318,7 @@
<string name="poi_stripclub">Club de strip-tease</string>
<string name="poi_studio">Studio d\'enregistrement</string>
<string name="poi_suburb">Quartier</string>
<string name="poi_railway_subway_entrance">Bouche de métro</string>
<string name="poi_subway_entrance">Bouche de métro</string>
<string name="poi_supermarket">Supermarché</string>
<string name="poi_survey_point">Point géodésique</string>
<string name="poi_swimming">Natation</string>

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

@ -2027,7 +2027,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="favorite_category_name">Nom de la catégorie</string>
<string name="favorite_category_add_new_title">Ajouter une catégorie</string>
<string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'indiquer un autre nom.</string>
<string name="confirm_download_roadmaps">Êtes-vous certains de vouloir télécharger les routes alors que vous disposez d\'une carte complète ?</string>
<string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Tout mettre à jour (%1$s MB)</string>
@ -2118,9 +2118,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="rendering_attr_currentTrackWidth_description">Largeur GPX</string>
<string name="rendering_attr_roadStyle_description">Style pour les routes</string>
<string name="copied_to_clipboard">Copié dans le presse-papier</string>
<string name="use_dashboard_btn">Démarrer avec le tableau de bord</string>
<string name="use_drawer_btn">Démarrer avec la carte</string>
<string name="dashboard_or_drawer_title">Nouvelle option de démarrage</string>
<string name="use_dashboard_btn">Utiliser le tableau de bord</string>
<string name="use_drawer_btn">Utiliser le menu</string>
<string name="dashboard_or_drawer_title"></string>
<string name="dashboard_or_drawer_description">Définissez comment démarrer l\'application : avec la carte ou avec le tableau de bord ? Ce paramètre peut être modifié par la suite.</string>
<string name="access_from_map_description">Afficher le bouton d\'accès au tableau de bord sur la carte</string>
<string name="access_from_map">Accès depuis la carte</string>

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

@ -78,7 +78,7 @@
<string name="poi_public_transport_platform_trolleybus">Parada de trolebús</string>
<string name="poi_public_transport_platform_tram">Parada de tranvía</string>
<string name="poi_public_transport_station">Estación de transporte público</string>
<string name="poi_railway_subway_entrance">Entrada de metro</string>
<string name="poi_subway_entrance">Entrada de metro</string>
<string name="poi_subway_station">Estación de metro</string>
<string name="poi_taxi">Parada de taxis</string>

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

@ -67,7 +67,7 @@
<string name="poi_public_transport_platform_bus">Buszmegálló</string>
<string name="poi_public_transport_platform_trolleybus">Trolimegálló</string>
<string name="poi_public_transport_platform_tram">Villamosmegálló</string>
<string name="poi_railway_subway_entrance">Metró lejárat</string>
<string name="poi_subway_entrance">Metró lejárat</string>
<string name="poi_subway_station">Metrómegálló</string>
<string name="poi_taxi">Taxidroszt</string>
@ -1388,4 +1388,60 @@
<string name="poi_waste_basket_yes">Szemetessel</string>
<string name="poi_waste_basket_no">Szemetes nélkül</string>
<string name="poi_resource_antimony">Antimon</string>
<string name="poi_resource_asbestos">Azbeszt</string>
<string name="poi_resource_barite">Barit</string>
<string name="poi_resource_basalt">Bazalt</string>
<string name="poi_resource_bauxite">Bauxit</string>
<string name="poi_resource_beryl">Berill</string>
<string name="poi_resource_bismuth">Bizmut</string>
<string name="poi_resource_cereal">Gabona</string>
<string name="poi_resource_chromite">Kromit</string>
<string name="poi_resource_clay">Agyag</string>
<string name="poi_resource_coal">Szén</string>
<string name="poi_resource_copper">Réz</string>
<string name="poi_resource_diamond">Gyémánt</string>
<string name="poi_resource_dimension_stone">Vágott kő</string>
<string name="poi_resource_dolomite">Dolomit</string>
<string name="poi_resource_gas">Gáz</string>
<string name="poi_resource_gold">Arany</string>
<string name="poi_resource_graphite">Grafit</string>
<string name="poi_resource_gravel">Kavics</string>
<string name="poi_resource_gypsum">Gipsz</string>
<string name="poi_resource_iron_ore">Vasérc</string>
<string name="poi_resource_lead">Ólom</string>
<string name="poi_resource_lignite">Lignit</string>
<string name="poi_resource_limestone">Mészkő</string>
<string name="poi_resource_marble">Márvány</string>
<string name="poi_resource_mercury">Higany</string>
<string name="poi_resource_mica">Csillám</string>
<string name="poi_resource_mineral_oil">Ásványolaj</string>
<string name="poi_resource_nickel">Nikkel</string>
<string name="poi_resource_oil">Olaj</string>
<string name="poi_resource_opal">Opál</string>
<string name="poi_resource_peat">Tőzeg</string>
<string name="poi_resource_platinum">Platina</string>
<string name="poi_resource_radium">Rádium</string>
<string name="poi_resource_ruby">Rubin</string>
<string name="poi_resource_rutile">Rutil</string>
<string name="poi_resource_salt">Só</string>
<string name="poi_resource_sand">Homok</string>
<string name="poi_resource_sandstone">Homokkő</string>
<string name="poi_resource_silica">Kova</string>
<string name="poi_resource_silver">Ezüst</string>
<string name="poi_resource_slate_iron_ore_copper">Pala; vasérc; réz</string>
<string name="poi_resource_slate">Pala</string>
<string name="poi_resource_stone">Kő</string>
<string name="poi_resource_tin">Ón</string>
<string name="poi_resource_tuff">Tufa</string>
<string name="poi_resource_uranium">Uránium</string>
<string name="poi_resource_vanadium">Vanádium</string>
<string name="poi_resource_water">Víz</string>
<string name="poi_resource_zinc">Cink</string>
<string name="poi_resource_zircon">Cirkon</string>
<string name="poi_beach_sand">Part típus: homokos</string>
<string name="poi_beach_shingle">Part típus: kavicsos</string>
<string name="poi_beach_rocky">Part típus: köves</string>
</resources>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
<string name="gpx_visibility_txt">Láthatóság</string>
<string name="gpx_tags_txt">Címkék</string>
@ -2025,6 +2026,14 @@
<string name="poi_dialog_reopen">Újranyitás</string>
<string name="save_poi_without_poi_type_message">Biztosan elmented a POI-t típus nélkül?</string>
<string name="poi_context_menu_modify_osm_change">OSM szerkesztés módosítása</string>
<string name="release_2_2">" • Új környezetérzékeny felhasználói felület térképre tapintáskor\n\n • Az alkalmazás már közvetlenül a térkép képernyővel indul a Műszerfal helyett\n\n • A Műszerfal kártyái elrejthetőek, testre szabhatóak\n\n • Térkép letöltéséhez elég a világtérkép régióira tapintani\n\n • A POI kereső már sokkal speciálisabb kérdéseket is megért\n\n • Továbbfejlesztett OSM POI szerkesztés\n\n • A térképletöltő felület felépítése és kezelőfelülete át lett dolgozva\n\n és sok egyéb fejlesztés… "</string>
<string name="release_2_2">" • Új, környezetérzékeny menü térképre tapintáskor\n\n • Az alkalmazás már közvetlenül a térkép képernyővel indul a műszerfal helyett\n\n • A műszerfal kártyái elrejthetőek, testre szabhatóak\n\n • Kiválasztható, hogy a térkép menü gombja a műszerfalat, vagy az oldalsávot hozza be\n\n • Térkép letöltéséhez elég a világtérkép régióira tapintani\n\n • A POI kereső már sokkal speciálisabb kérdéseket is megért\n\n • Továbbfejlesztett POI és OSM szerkesztési lehetőségek\n\n • A térképletöltő felület felépítése és kezelőfelülete át lett dolgozva\n\n és sok egyéb fejlesztés… "</string>
<string name="shared_string_card_was_hidden">Kártya el volt rejtve</string>
</resources>
<string name="please_specify_poi_type_only_from_list">"Kérlek add meg a helyes POI típust, vagy hagyd ki. "</string>
<string name="access_from_map_description">A menü gomb a menü helyett a műszerfalat indítja</string>
<string name="access_from_map">Elérés a térképről</string>
<string name="copied_to_clipboard">Vágólapra másolva</string>
<string name="use_dashboard_btn">Műszerfal használata</string>
<string name="use_drawer_btn">Menü használata</string>
<string name="dashboard_or_drawer_title">Menü működés meghatározása</string>
<string name="dashboard_or_drawer_description">Eldöntheted, hogy az alkalmazást az interaktív műszerfalon, vagy a statikus oldalsáv menün keresztül szeretnéd vezérelni. A működést bármikor módosíthatod a műszerfal beállításokban.</string>
</resources>

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

@ -71,7 +71,7 @@
<string name="poi_public_transport_platform_tram">Fermata tram</string>
<string name="poi_public_transport_station">Stazione trasporto pubblico</string>
<string name="poi_bus_station">Stazione bus (obsoleto)</string>
<string name="poi_railway_subway_entrance">Entrata metropolitana</string>
<string name="poi_subway_entrance">Entrata metropolitana</string>
<string name="poi_subway_station">Stazione metropolitana</string>
<string name="poi_aerodrome">Aeroporto</string>
<string name="poi_helipad">Eliporto</string>

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

@ -1823,7 +1823,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="rendering_value_disabled_name">Disabilitato</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Colorazione in base al tipo di percorso</string>
<string name="rendering_value_walkingRoutesOSMC_name">Colorazione in base a OSMC</string>
<string name="osm_edit_context_menu_delete">Cancella le modifiche OSM</string>
<string name="osm_edit_context_menu_delete">Cancella modifica OSM</string>
<string name="archive_wikipedia_data">Ci sono dati Wikipedia scaricati desueti e incompatibili. Vuoi archiviarli?</string>
<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>
@ -2050,7 +2050,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="context_menu_item_edit_waypoint">Modifica i waypoint del GPX</string>
<string name="shared_string_location">Localizzazione</string>
<string name="poi_context_menu_modify_osm_change">Modifica gli edit OSM</string>
<string name="access_from_map_description">"Metti il pulsante del pannello di controllo nello schermo della mappa"</string>
<string name="access_from_map_description">"Il pulsante del menu apre il pannello di controllo non il menu"</string>
<string name="access_from_map">Accedi dalla mappa</string>
<string name="copied_to_clipboard">Copiato negli appunti</string>
<string name="osm_save_offline">Salva offline</string>
@ -2076,7 +2076,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="rendering_attr_currentTrackWidth_description">Larghezza del GPX</string>
<string name="rendering_attr_roadStyle_description">Stile delle strade</string>
<string name="poi_dialog_reopen">Riapri</string>
<string name="use_dashboard_btn">Avvia sempre il pannello di controllo</string>
<string name="use_drawer_btn">Avvia sempre la mappa</string>
<string name="dashboard_or_drawer_title">Nuove opzioni di avvio</string>
<string name="use_dashboard_btn">Usa il pannello di controllo</string>
<string name="use_drawer_btn">Utilizza menu</string>
<string name="dashboard_or_drawer_title">Pannello di controllo o menù</string>
</resources>

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

@ -207,7 +207,7 @@
<string name="poi_railway_station">鉄道駅(Railway station)</string>
<string name="poi_railway_platform">鉄道プラットホーム(Railway platform)</string>
<string name="poi_halt">鉄道停車位置(Railway stop)</string>
<string name="poi_railway_subway_entrance">地下鉄入り口(Subway entrance)</string>
<string name="poi_subway_entrance">地下鉄入り口(Subway entrance)</string>
<string name="poi_subway_station">地下鉄駅(Subway station)</string>
<string name="poi_railway_buffer_stop">鉄道用車止め(Railway buffer stop)</string>
<string name="poi_helipad">ヘリポート(Helipad)</string>

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

@ -141,7 +141,7 @@
<string name="poi_bus_station">버스 정류장</string>
<string name="poi_railway_station">기차역</string>
<string name="poi_railway_platform">철도 플랫폼</string>
<string name="poi_railway_subway_entrance">지하철 입구</string>
<string name="poi_subway_entrance">지하철 입구</string>
<string name="poi_subway_station">지하철 역</string>
<string name="poi_taxi">택시 승차장</string>

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

File diff suppressed because one or more lines are too long

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

@ -135,7 +135,7 @@
<string name="poi_bus_station">Busstation</string>
<string name="poi_railway_station">Treinstation</string>
<string name="poi_railway_platform">Perron</string>
<string name="poi_railway_subway_entrance">Metro-ingang</string>
<string name="poi_subway_entrance">Metro-ingang</string>
<string name="poi_subway_station">Metrostation</string>
<string name="poi_taxi">Taxistandplaats</string>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="layer_map_appearance">Configureer scherm</string>
<string name="show_lanes">Toon rijstroken</string>
@ -2213,13 +2214,13 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="osn_close_dialog_title">Sluit notitie</string>
<string name="osn_add_dialog_success">Notitie aangemaakt</string>
<string name="osn_add_dialog_error">Er was een probleem: notitie niet aangemaakt</string>
<string name="osn_close_dialog_success">Bug is gesloten</string>
<string name="osn_close_dialog_success">Notitie is gesloten</string>
<string name="osn_close_dialog_error">Er was een probleem: notitie is niet afgesloten</string>
<string name="osm_save_offline">Bewaar voor off-line gebruik</string>
<string name="dashboard_or_drawer_description">U kunt kiezen tussen het dashboard of het uitklapmenu. Via de instellingen kunt u dit altijd wijzigen.</string>
<string name="dashboard_or_drawer_description">Kies tussen het flexibele dashboard of een vast menu. Dit is altijd te wijzigen via de dashboard-instellingen.</string>
<string name="copied_to_clipboard">Gekopieerd naar klembord</string>
<string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer... "</string>
<string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te grbuiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer... "</string>
<string name="shared_string_commit">Verstuur</string>
<string name="context_menu_item_delete_waypoint">GPX routepunt wissen?</string>
@ -2234,5 +2235,10 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="save_poi_without_poi_type_message">Deze POI echt bewaren zonder het type aan te geven?</string>
<string name="poi_context_menu_modify_osm_change">Verander OSM-wijziging</string>
<string name="dashboard_or_drawer_title">Nieuw menu</string>
<string name="dashboard_or_drawer_title">Kies tussen dashboard of menu</string>
<string name="please_specify_poi_type_only_from_list">"Geef een correct type POI of sla dit over "</string>
<string name="access_from_map_description">Menu-knop toont dashboard in plaats van menu</string>
<string name="access_from_map">Toegang vanaf kaart</string>
<string name="use_dashboard_btn">Gebruik dashboard</string>
<string name="use_drawer_btn">Gebruik menu</string>
</resources>

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

@ -142,7 +142,7 @@
<string name="poi_bus_station">Dworzec autobusowy</string>
<string name="poi_railway_station">Stacja kolejowa</string>
<string name="poi_railway_platform">Peron kolejowy</string>
<string name="poi_railway_subway_entrance">Metro - wejście</string>
<string name="poi_subway_entrance">Metro - wejście</string>
<string name="poi_subway_station">Stacja metra</string>
<string name="poi_taxi">Postój TAXI</string>

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

@ -219,7 +219,7 @@
<string name="poi_railway_station">Estação ferroviária</string>
<string name="poi_railway_platform">Plataforma ferroviária</string>
<string name="poi_halt">Parada ferroviária</string>
<string name="poi_railway_subway_entrance">Entrada do metrô</string>
<string name="poi_subway_entrance">Entrada do metrô</string>
<string name="poi_subway_station">Estação de metrô</string>
<string name="poi_vacuum_cleaner">Loja de aspiradores de pó</string>
<string name="poi_variety_store">Loja de variedades</string>

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

@ -171,7 +171,7 @@
<string name="poi_bus_station">Автобусная станция</string>
<string name="poi_railway_station">Железнодорожная станция</string>
<string name="poi_railway_platform">Железнодорожная платформа</string>
<string name="poi_railway_subway_entrance">Вход в метро</string>
<string name="poi_subway_entrance">Вход в метро</string>
<string name="poi_subway_station">Станция метро</string>
<string name="poi_taxi">Стоянка такси</string>

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

@ -6,10 +6,10 @@
<string name="osm_edit_removed_note">Заметка OSM удалена</string>
<string name="osm_edit_created_note">Заметка OSM создана</string>
<string name="osn_bug_name">Заметка OSM</string>
<string name="osn_add_dialog_title">Создание заметки</string>
<string name="osn_comment_dialog_title">Добавление комментария</string>
<string name="osn_reopen_dialog_title">Повторное открытие заметки</string>
<string name="osn_close_dialog_title">Закрытие заметки</string>
<string name="osn_add_dialog_title">Создать заметку</string>
<string name="osn_comment_dialog_title">Добавить комментарий</string>
<string name="osn_reopen_dialog_title">Повторное открыть заметку</string>
<string name="osn_close_dialog_title">Закрыть заметку</string>
<string name="osn_add_dialog_success">Заметка успешно создана</string>
<string name="osn_add_dialog_error">Ошибка: заметка не была создана</string>
<string name="osn_close_dialog_success">Заметка было успешно закрыта</string>

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

@ -120,7 +120,7 @@
<string name="poi_bus_station">Istatzione bus</string>
<string name="poi_railway_station">Istatzione de sos trenos</string>
<string name="poi_railway_platform">Piattaredda ferroviària</string>
<string name="poi_railway_subway_entrance">Intrada de sa metropolitana</string>
<string name="poi_subway_entrance">Intrada de sa metropolitana</string>
<string name="poi_subway_station">Istatzione de sa metropolitana</string>
<string name="poi_taxi">Postèggiu de sos taxi</string>
@ -527,7 +527,7 @@
<string name="poi_cape">Ispuntone/promontòriu</string>
<string name="poi_reef">Costera</string>
<string name="poi_anchorage">Ancoràggiu</string>
<string name="poi_beacon">Faru/fogu de sinnalatzione</string>
<string name="poi_beacon">Sinnale marinu</string>
<string name="poi_berth">Atracu</string>
<string name="poi_dyke">Àrgine</string>
<string name="poi_floating_dock">Pontinu gallegiante</string>
@ -921,7 +921,7 @@
<string name="poi_landfill_waste_nuclear">Arga nucleare</string>
<string name="poi_allotments">Giardinos familiares</string>
<string name="poi_basin">Bacinu</string>
<string name="poi_basin">Batzinu</string>
<string name="poi_monitoring_station">Istatzione de cuntrollu</string>
<string name="poi_brownfield">Terrinu abbandonadu</string>
<string name="poi_greenfield">Terrinu egadu</string>
@ -1090,7 +1090,7 @@
<string name="poi_internet_access_yes">Atzessu a ìnternet: eja</string>
<string name="poi_internet_access_no">Atzessu a ìnternet: nono</string>
<string name="poi_seamark_building">Edifìtziu nàutico</string>
<string name="poi_seamark_building">Edifìtziu nàuticu</string>
<string name="poi_seamark_bridge">Ponte nàuticu</string>
<string name="poi_highway_crossing">Coladòrgiu pedonale</string>
@ -1708,4 +1708,35 @@
<string name="poi_fireworks">Butega de fogos de artifìtziu</string>
<string name="poi_craft_electronics">Acontzadura de eletrodomèsticos</string>
<string name="poi_sewing">Mertzeria</string>
<string name="poi_craft_carpenter">Mastru de carros (carpentiere)</string>
<string name="poi_funeral_directors">Pompas fùnebres</string>
<string name="poi_dock">Dársena</string>
<string name="poi_rapids">Tràinos</string>
<string name="poi_strait">Astrintura</string>
<string name="poi_anchor_berth">Logu de ancoràgiu</string>
<string name="poi_beacon_cardinal">Sinnale cardinale</string>
<string name="poi_beacon_lateral">Sinnale laterale</string>
<string name="poi_beacon_safe_water">Sinnale de abbas seguras</string>
<string name="poi_beacon_special_purpose">Sinnale ispetziale</string>
<string name="poi_buoy_cardinal">Boa cardinale</string>
<string name="poi_buoy_installation">Boa de càrrigu e iscàrrigu</string>
<string name="poi_buoy_isolated_danger">Boa de perìgulu isuladu</string>
<string name="poi_buoy_lateral">Boa laterale</string>
<string name="poi_buoy_safe_water">Boa de abbas seguras</string>
<string name="poi_buoy_special_purpose">Boa ispetziale</string>
<string name="poi_daymark">Sinnale diurnu</string>
<string name="poi_distance_mark">Sinnale de distàntzia</string>
<string name="poi_dry_dock">Batzinu de carenàgiu</string>
<string name="poi_harbour_basin">Batzinu portuale</string>
<string name="poi_full_height_turnstile">Tornellu a tota artària</string>
<string name="poi_bump_gate">Cantzellu a corfu</string>
<string name="poi_stile">Iscalita</string>
<string name="poi_debris">Carràrgiu</string>
<string name="poi_jersey_barrier">Blocos prefabricados (jersey barrier)</string>
<string name="poi_horse_stile">Iscalita pro caddos</string>
<string name="poi_kissing_gate">Cantzellu \"a zigzag\" o \"a V\"</string>
<string name="poi_sally_port">Barriera coberta cun ghenna dòpia</string>
<string name="poi_swing_gate">Cantzellu girèvole</string>
<string name="poi_kent_carriage_gap">Coladòrgiu pro carros a caddu</string>
</resources>

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

File diff suppressed because one or more lines are too long

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

@ -158,7 +158,7 @@
<string name="poi_railway_platform">Železničné nástupište</string>
<string name="poi_halt">Železničná zastávka</string>
<string name="poi_bus_station">Autobusová stanica</string>
<string name="poi_railway_subway_entrance">Vchod do metra</string>
<string name="poi_subway_entrance">Vchod do metra</string>
<string name="poi_subway_station">Stanica metra</string>
<string name="poi_railway_buffer_stop">Železničná zarážka</string>
<string name="poi_taxi">Stanovište taxíkov</string>

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

@ -1901,7 +1901,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="context_menu_item_delete_waypoint">Odstrániť bod GPX?</string>
<string name="context_menu_item_edit_waypoint">Upraviť bod GPX</string>
<string name="copied_to_clipboard">Skopírované do schránky</string>
<string name="release_2_2">" • Nové kontextovo závislé rozhranie pre označenie umiestnení na mape a iných obrazovkách\n\n • Obrazovka mapy je priamo spustená ak nie je zvolené \'Zobraziť úvodný panel pri štarte\'\n\n • Je možné nastaviť ktoré karty sú zobrazené na úvodnom paneli\n\n • Pre stiahnutie máp je možne priamo označiť oblasť na mape sveta\n\n • Hľadanie bodov záujmu (POI) umožňuje presnejšie špecifikácie\n\n • Vylepšené možnosti úpravy POI a OSM poznámok\n\n • Prepracované rozhranie sťahovania máp\n\n a ďalšie vylepšenia... "</string>
<string name="release_2_2">" • Nové kontextovo závislé rozhranie pre označenie umiestnení na mape a iných obrazovkách\n\n • Obrazovka mapy je priamo spustená ak nie je zvolené \'Zobraziť úvodný panel pri štarte\'\n\n • Je možné nastaviť ktoré karty sú zobrazené na úvodnom paneli\n\n • Úvodný panel je možné obísť, ak preferujete ovládanie aplikácie cez menu\n\n • Pre stiahnutie máp je možne priamo označiť oblasť na mape sveta\n\n • Hľadanie bodov záujmu (POI) umožňuje presnejšie špecifikácie\n\n • Vylepšené možnosti úpravy POI a OSM poznámok\n\n • Prepracované rozhranie sťahovania máp\n\n a ďalšie vylepšenia... "</string>
<string name="osm_save_offline">Uložiť offline</string>
<string name="osm_edit_modified_poi">Upravený OSM POI</string>
<string name="osm_edit_deleted_poi">Odstránený OSM POI</string>
@ -1927,10 +1927,11 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="poi_dialog_reopen">Znovuotvoriť</string>
<string name="dashboard_or_drawer_title">Nová možnosť spustenia</string>
<string name="dashboard_or_drawer_description">Teraz si môžete zvoliť či aplikácia po štarte spustí obrazovku mapy alebo úvodný panel. Toto nastavenie môžete neskôr zmeniť v nastaveniach panela.</string>
<string name="access_from_map_description">Umiestni na obrazovku mapy tlačidlo úvodného panela</string>
<string name="dashboard_or_drawer_title">Úvodný panel alebo menu</string>
<string name="dashboard_or_drawer_description">Nová voľba umožňuje ovládať aplikáciu pomocou úvodného panelu alebo statické menu. Toto nastavenie môžete neskôr zmeniť v nastaveniach panela.</string>
<string name="access_from_map_description">Tlačidlo menu spustí úvodný panel, nie menu</string>
<string name="access_from_map">Prístup z mapy</string>
<string name="use_dashboard_btn">Spustiť úvodný panel</string>
<string name="use_drawer_btn">Spustiť mapu</string>
<string name="use_dashboard_btn">Použiť úvodný panel</string>
<string name="use_drawer_btn">Použiť menu</string>
<string name="please_specify_poi_type_only_from_list">"Prosím zadajte správny typ POI alebo ho preskočte. "</string>
</resources>

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

File diff suppressed because one or more lines are too long

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

@ -1919,7 +1919,7 @@
<string name="favorite_category_name">Kategorinamn</string>
<string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="confirm_download_roadmaps">Är du säker på att du vill hämta vägkartan trots att du redan har en fullständig karta?</string>
<string name="confirm_download_roadmaps">Är du säker på att du vill hämta kartan med enbart vägar trots att du redan har den fullständiga kartan?</string>
<string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
<string name="update_all">Uppdatera alla (%1$s MB)</string>
<string name="free_downloads_used">Gratis nedladdningar hämtade</string>
@ -1996,16 +1996,17 @@
<string name="osn_close_dialog_error">Ett undantag uppstod: anteckningen stängdes inte</string>
<string name="context_menu_item_delete_waypoint">Ta bort GPX-waypoint?</string>
<string name="context_menu_item_edit_waypoint">Redigera GPX-waypoint</string>
<string name="access_from_map_description">Placerar en panelknapp på kartskärmen</string>
<string name="access_from_map_description">Menyknapp visar panelen och inte menyn</string>
<string name="access_from_map">Tillgång från kartan</string>
<string name="rendering_attr_currentTrackColor_description">GPX-färg</string>
<string name="rendering_attr_currentTrackWidth_description">GPX-bredd</string>
<string name="release_2_2">" • Nytt kontextkänsligt gränssnitt för att peta på platser på kartan och på andra skärmar\n\n • Kartskärmen startar nu automatiskt om inte \'Visa panelen vid appstart\' är vald\n\n • Konfigurera vilka kort och hur de ska visas i panelen\n\n • För att hämta kartor kan regioner väljas direkt genom att peta på världskartan\n\n • Sökning efter intressepunkter (POI) understöder nu mer specifika frågor\n\n • Förbättrad funktion för POI- och OSM-redigering\n\n • Strukturen för hämtning av kartdata och gränssnittet har omarbetats\n\n och mer ... "</string>
<string name="dashboard_or_drawer_description">Du kan nu välja om appen ska starta direkt med kartskärmen eller alltid visa panelen först. Detta val kan du alltid ändra på under inställningarna i panelen.</string>
<string name="use_dashboard_btn">Öppna panelen</string>
<string name="use_drawer_btn">Visa kartan</string>
<string name="dashboard_or_drawer_title">Nytt val för uppstarten</string>
<string name="release_2_2">" • Nytt kontextkänsligt gränssnitt för att peta på platser på kartan och på andra skärmar\n\n • Kartskärmen startar nu automatiskt om inte \'Visa panelen vid appstart\' är vald\n\n • Konfigurera vilka kort och hur de ska visas i panelen\n\n • Gå förbi panelen om du föredrar en menybaserad kontroll över appen\n\n • För att hämta kartor kan regioner väljas direkt genom att peta på världskartan\n\n • Sökning efter intressepunkter (POI) understöder nu mer specifika frågor\n\n • Förbättrad funktion för POI- och OSM-redigering\n\n • Strukturen för hämtning av kartdata och gränssnittet har omarbetats\n\n och mer ... "</string>
<string name="dashboard_or_drawer_description">Det finns ett nytt val att primärt kontrollera appen via den flexibla panelen eller via en statisk meny. Detta val kan du alltid ändra på under inställningarna i panelen.</string>
<string name="use_dashboard_btn">Använd panelen</string>
<string name="use_drawer_btn">Använd menyn</string>
<string name="dashboard_or_drawer_title">Panel- eller menykontroll</string>
<string name="poi_dialog_reopen">Öppna igen</string>
<string name="shared_string_commit">Skicka in</string>
<string name="please_specify_poi_type_only_from_list">"Ange rätt POI-typ eller hoppa över det. "</string>
</resources>

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

@ -242,7 +242,7 @@
<string name="poi_railway_station">Tren İstasyonu</string>
<string name="poi_railway_platform">Demiryolu Platformu</string>
<string name="poi_halt">Tren durağı</string>
<string name="poi_railway_subway_entrance">Metro giriş</string>
<string name="poi_subway_entrance">Metro giriş</string>
<string name="poi_subway_station">Metro İstasyonu</string>
<string name="poi_railway_buffer_stop">Demir yolu tampon durağı</string>
<string name="poi_taxi">Taksi durağı</string>

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

@ -238,7 +238,7 @@
<string name="poi_garden_furniture">Магазин садових меблів</string>
<string name="poi_fuel_biogas">Біопаливо(Е85)</string>
<string name="poi_halt">Зупинка поїздів</string>
<string name="poi_railway_subway_entrance">Вхід в метро</string>
<string name="poi_subway_entrance">Вхід в метро</string>
<string name="poi_subway_station">Станція метро</string>
<string name="poi_taxi">Стоянка таксі</string>

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

@ -215,7 +215,7 @@
<string name="poi_railway_station">火車站</string>
<string name="poi_railway_platform">鐵路月台</string>
<string name="poi_halt">火車站</string>
<string name="poi_railway_subway_entrance">捷運入口</string>
<string name="poi_subway_entrance">捷運入口</string>
<string name="poi_subway_station">捷運車站</string>
<string name="poi_railway_buffer_stop">鐵路止衝擋</string>
<string name="poi_taxi">計程車站</string>

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

@ -408,7 +408,7 @@
<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已順利停用。</string>
<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已順利刪除。</string>
<string name="local_index_items_restored">%2$d 項中的 %1$d 項已順利啟動。</string>
<string name="local_index_action_do">您即將要 %2$s %1$s 個項目，要繼續嗎？</string>
<string name="local_index_action_do">您即將要 %1$s %2$s 個項目，要繼續嗎？</string>
<string name="local_index_descr_title">管理地圖檔案</string>
<string name="local_index_mi_restore">啟用</string>
<string name="local_index_mi_backup">停用</string>
@ -1916,7 +1916,7 @@
<string name="favorite_category_dublicate_message">已有指定的類別名稱。請定義其它名稱。</string>
<string name="favorite_category_name">類別名稱</string>
<string name="favorite_category_add_new_title">增加新的類別</string>
<string name="confirm_download_roadmaps">您確定要下載地圖的道路，即使您已擁有完整的地圖？</string>
<string name="confirm_download_roadmaps">您確定要下載只有道路的地圖，即使您已經擁有標準(完整的)地圖？</string>
<string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">全部更新 (%1$s MB)</string>
@ -2003,14 +2003,15 @@
<string name="rendering_attr_roadStyle_description">道路樣式</string>
<string name="poi_dialog_reopen">重新開啟</string>
<string name="osm_save_offline">離線儲存</string>
<string name="release_2_2">" •在地圖上和其它螢幕上，為點擊位置做了新的敏捷內容選單使用者界面\n\n•地圖螢幕上現在除了直接啟動外，還有\'在應用程式時啟動顯示儀表板\'可選\n\n •組態哪些以及何種卡可以在儀表板上顯示\n\n •要下載地圖，可以直接在全球地圖上點選區域\n\n •更好的重新計算路線（現在引擎經過反復的嘗試，建議一條不同的路線）\n\n •興趣點搜尋現在支援更具體的查詢\n\n •改善過的興趣點和 OSM 編輯功能\n\n •地圖資料下載結構和界面重新設計\n\n 還有更多... "</string>
<string name="release_2_2">" •在地圖上和其它螢幕上，為點擊位置做了新的敏捷內容選單使用者界面\n\n•地圖螢幕上現在除了直接啟動外，還有\'在應用程式時啟動顯示儀表板\'可選\n\n •組態哪些以及何種卡可以在儀表板上顯示\n\n•如果您喜歡基本選單的應用程式控制，繞過儀表板方式\n\n •要下載地圖，可以直接在全球地圖上點選區域\n\n •更好的重新計算路線（現在引擎經過反復的嘗試，建議一條不同的路線）\n\n •興趣點搜尋現在支援更具體的查詢\n\n •改善過的興趣點和 OSM 編輯功能\n\n •地圖資料下載結構和界面重新設計\n\n 還有更多... "</string>
<string name="copied_to_clipboard">複製到剪貼簿</string>
<string name="dashboard_or_drawer_title">新的起始選擇</string>
<string name="dashboard_or_drawer_description">您現在可以選擇，如果應用程式直接啟動在地圖螢幕或是永遠先顯示儀表板。您稍後也可以在設定中更改。</string>
<string name="access_from_map_description">將儀表板按鈕放置在地圖螢幕上</string>
<string name="dashboard_or_drawer_title">儀表板或選單控制</string>
<string name="dashboard_or_drawer_description">還有一種新的選擇，透過具彈性的儀表板或固定的選單優先控制應用程式。在儀表板中也可以更改您的選擇。</string>
<string name="access_from_map_description">選單按鈕啟動儀表板，無選單</string>
<string name="access_from_map">從地圖進入</string>
<string name="use_dashboard_btn">開始儀表板</string>
<string name="use_drawer_btn">開始地圖</string>
<string name="use_dashboard_btn">使用儀表板</string>
<string name="use_drawer_btn">使用地圖</string>
<string name="please_specify_poi_type_only_from_list">"請指定正確的興趣點類型或跳過它。 "</string>
</resources>

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

@ -247,7 +247,7 @@
<string name="poi_railway_station">Railway station</string>
<string name="poi_railway_platform">Railway platform</string>
<string name="poi_halt">Railway stop</string>
<string name="poi_railway_subway_entrance">Subway entrance</string>
<string name="poi_subway_entrance">Subway entrance</string>
<string name="poi_subway_station">Subway station</string>
<string name="poi_railway_buffer_stop">Railway buffer stop</string>
<string name="poi_taxi">Taxi stand</string>

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

@ -9,8 +9,8 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="access_from_map_description">Places a dashboard button on the map screen</string>
<string name="please_specify_poi_type_only_from_list">Please specify correct POI type or skip it. </string>
<string name="access_from_map_description">Menu button launches dashboard, not menu</string>
<string name="access_from_map">Access from map</string>
<string name="show_on_start_description">\'Off\' directly launches the map screen</string>
<string name="show_on_start">Show on start</string>
@ -19,6 +19,7 @@
\u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n
\u2022 Map screen is now launched directly unless \'Show dashboard on app start\' is selected\n\n
\u2022 Configure which and how cards are displayed on the dashboard\n\n
\u2022 Bypass the dashboard if you like menu-based app control\n\n
\u2022 To download maps, regions can be directly selected by tapping on the world map\n\n
\u2022 POI Search now supports more specific queries\n\n
\u2022 Improved POI and OSM editing functionality\n\n
@ -2060,7 +2061,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="later">Later</string>
<string name="get_full_version">Full version</string>
<string name="downloads">Downloads</string>
<string name="confirm_download_roadmaps">Are you sure you want to download map of roads, even though you have full map?</string>
<string name="confirm_download_roadmaps">Are you sure you want to download the roads-only map, even though you already have the standard (full) map?</string>
<string name="value_downloaded_from_max">%1$.1f from %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Update all (%1$s MB)</string>
@ -2092,8 +2093,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="map_legend">Map legend</string>
<string name="save_poi_without_poi_type_message">Do you really want to save poi without POI type?</string>
<string name="poi_context_menu_modify_osm_change">Modify OSM change</string>
<string name="use_dashboard_btn">Launch dashboard</string>
<string name="use_drawer_btn">Launch map</string>
<string name="dashboard_or_drawer_title">New startup choice</string>
<string name="dashboard_or_drawer_description">You can now select if the app directly launches the map screen or always displays the dashboard first. Your choice can always be changed in the dashboard settings.</string>
<string name="use_dashboard_btn">Use dashboard</string>
<string name="use_drawer_btn">Use menu</string>
<string name="dashboard_or_drawer_title">Dashboard or menu control</string>
<string name="dashboard_or_drawer_description">There is a new choice to primarily control the app via the flexible dashboard or a static menu. Your choice can always be changed in the dashboard settings.</string>
</resources>

5
OsmAnd/src/net/osmand/data/PointDescription.java
View file

@ -41,6 +41,7 @@ public class PointDescription {
public static final String POINT_TYPE_OSM_BUG = "bug";
public static final String POINT_TYPE_WORLD_REGION = "world_region";
public static final String POINT_TYPE_GPX_ITEM = "gpx_item";
public static final String POINT_TYPE_WORLD_REGION_SHOW_ON_MAP = "world_region_show_on_map";
public static final PointDescription LOCATION_POINT = new PointDescription(POINT_TYPE_LOCATION, "");
@ -149,6 +150,10 @@ public class PointDescription {
}
}
public boolean contextMenuDisabled() {
return POINT_TYPE_WORLD_REGION_SHOW_ON_MAP.equals(type);
}
public boolean isLocation() {
return POINT_TYPE_LOCATION.equals(type);
}

7
OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
View file

@ -14,6 +14,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivity;
@ -24,6 +25,12 @@ public class FirstUsageFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.first_usage_fragment, container, false);
ImageView backgroundImage = (ImageView) view.findViewById(R.id.background_image);
if (Build.VERSION.SDK_INT >= 14) {
backgroundImage.setImageResource(R.drawable.bg_first_usage);
} else {
backgroundImage.setImageDrawable(null);
}
final EditText editText = (EditText) view.findViewById(R.id.searchEditText);
Drawable searchIcon = ((MapActivity) getActivity()).getMyApplication().getIconsCache()
.getIcon(R.drawable.ic_action_search_dark, true);

8
OsmAnd/src/net/osmand/plus/NavigationService.java
View file

@ -19,6 +19,7 @@ import android.os.IBinder;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
import android.support.v4.app.NotificationCompat.Builder;
import android.util.Log;
import android.widget.Toast;
@ -32,6 +33,7 @@ public class NavigationService extends Service implements LocationListener {
public static int USED_BY_NAVIGATION = 1;
public static int USED_BY_GPX = 2;
public static int USED_BY_LIVE = 4;
public static int USED_BY_WAKE_UP = 8;
public final static String USAGE_INTENT = "SERVICE_USED_BY";
private NavigationServiceBinder binder = new NavigationServiceBinder();
@ -154,8 +156,10 @@ public class NavigationService extends Service implements LocationListener {
// registering icon at top level
// Leave icon visible even for navigation for proper display
startForeground(NotificationHelper.NOTIFICATION_SERVICE_ID,
app.getNotificationHelper().buildNotificationInStatusBar().build());
Builder ntf = app.getNotificationHelper().buildNotificationInStatusBar();
if (ntf != null) {
startForeground(NotificationHelper.NOTIFICATION_SERVICE_ID, ntf.build());
}
return START_REDELIVER_INTENT;
}

7
OsmAnd/src/net/osmand/plus/NotificationHelper.java
View file

@ -69,10 +69,7 @@ public class NotificationHelper {
String notificationText ;
int icon = R.drawable.bgs_icon;
OsmandMonitoringPlugin monitoringPlugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
if(monitoringPlugin == null && service == null) {
return null;
}
if (service != null && service.getUsedBy() != NavigationService.USED_BY_GPX) {
if (service != null) {
int soi = service.getServiceOffInterval();
notificationText = app.getString(R.string.osmand_running_in_background);
String s = "";
@ -94,7 +91,9 @@ public class NotificationHelper {
}
s += app.getString(R.string.osmo);
}
if(s.length() > 0) {
notificationText += " (" + s + "). ";
}
notificationText += app.getString(R.string.gps_wake_up_timer) + ": ";
if (soi == 0) {
notificationText = notificationText + app.getString(R.string.int_continuosly);

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -550,7 +550,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
if (dashboardOnMap.isVisible()) {
dashboardOnMap.hideDashboard();
}
if (mapLabelToShow != null) {
if (mapLabelToShow != null && !mapLabelToShow.contextMenuDisabled()) {
mapContextMenu.setMapCenter(latLonToShow);
mapContextMenu.setMapPosition(mapView.getMapPosition());
mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);

2
OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
View file

@ -107,7 +107,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
currentTask.cancel(true);
}
currentTask = new SearchPoiByNameTask();
currentTask.execute(s.toString());
currentTask.execute(s.toString().trim());
}
});
}

6
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -507,6 +507,12 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_EDIT
|| force) {
updateListAdapter();
} else if (visibleType == DashboardType.CONFIGURE_MAP) {
int index = listView.getFirstVisiblePosition();
View v = listView.getChildAt(0);
int top = (v == null) ? 0 : (v.getTop() - listView.getPaddingTop());
updateListAdapter();
listView.setSelectionFromTop(index, top);
} else {
listAdapter.notifyDataSetChanged();
}

2
OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
View file

@ -17,6 +17,7 @@ import android.widget.ArrayAdapter;
import android.widget.CompoundButton;
import android.widget.ListView;
import android.widget.TextView;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
@ -101,6 +102,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
((CompoundButton) showDashboardOnStart.findViewById(R.id.check_item)).isChecked());
settings.SHOW_DASHBOARD_ON_MAP_SCREEN.set(
((CompoundButton) accessFromMap.findViewById(R.id.check_item)).isChecked());
mapActivity.getMapLayers().getMapControlsLayer().initDasboardRelatedControls();
}
})
.setNegativeButton(R.string.shared_string_cancel, null);

10
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -23,7 +23,7 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.Space;
import android.support.v4.widget.Space;
import android.widget.TextView;
import android.widget.Toast;
@ -31,6 +31,7 @@ import net.osmand.IProgress;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.map.WorldRegion;
import net.osmand.map.WorldRegion.RegionParams;
import net.osmand.plus.OsmandApplication;
@ -793,7 +794,12 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
@Override
public void onClick(View v) {
OsmandApplication app = (OsmandApplication) getActivity().getApplication();
app.getSettings().setMapLocationToShow(regionCenter.getLatitude(), regionCenter.getLongitude(), 5, null);
app.getSettings().setMapLocationToShow(
regionCenter.getLatitude(),
regionCenter.getLongitude(),
5,
new PointDescription(PointDescription.POINT_TYPE_WORLD_REGION_SHOW_ON_MAP, ""));
dismiss();
MapActivity.launchMapActivityMoveToTop(getActivity());
}

1
OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
View file

@ -62,6 +62,7 @@ public class DownloadActivityType {
public DownloadActivityType(int stringResource, String tag, int orderIndex) {
this.stringResource = stringResource;
this.tag = tag;
this.orderIndex = orderIndex;
byTag.put(tag, this);
iconResource = R.drawable.ic_map;
}

40
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -1,7 +1,9 @@
package net.osmand.plus.mapcontextmenu;
import android.content.DialogInterface;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AlertDialog.Builder;
import android.view.View;
import android.widget.LinearLayout;
import net.osmand.CallbackWithObject;
@ -354,8 +356,41 @@ public class MapContextMenu extends MenuTitleController {
public void fabPressed() {
hide();
final TargetPointsHelper targets = mapActivity.getMyApplication().getTargetPointsHelper();
targets.navigateToPoint(latLon, true, targets.getIntermediatePoints().size() + 1, getPointDescription());
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, false);
if(targets.getIntermediatePoints().isEmpty()) {
targets.navigateToPoint(latLon, true, -1, getPointDescription());
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true);
} else {
Builder bld = new AlertDialog.Builder(mapActivity);
bld.setTitle(R.string.new_directions_point_dialog);
final int[] defaultVls = new int[] {0};
bld.setSingleChoiceItems(new String[]{
mapActivity.getString(R.string.clear_intermediate_points),
mapActivity.getString(R.string.keep_intermediate_points)
// mapActivity.getString(R.string.keep_and_add_destination_point)
}, 0, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
defaultVls[0] = which;
}
});
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if(defaultVls[0] == 0) {
targets.removeAllWayPoints(false);
targets.navigateToPoint(latLon, true, -1, getPointDescription());
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true);
} else {
//targets.navigateToPoint(latLon, true, targets.getIntermediatePoints().size() + 1, getPointDescription());
targets.navigateToPoint(latLon, true, -1, getPointDescription());
mapActivity.getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, true);
}
}
});
bld.setNegativeButton(R.string.shared_string_cancel,null);
bld.show();
}
// mapActivity.getMapLayers().getMapControlsLayer().showRouteInfoControlDialog();
}
@ -625,5 +660,4 @@ public class MapContextMenu extends MenuTitleController {
}
});
}
}

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

@ -948,7 +948,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
mapActivity.getSupportFragmentManager().beginTransaction()
.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
.add(R.id.fragmentContainer, fragment, TAG)
.addToBackStack(TAG).commit();
.addToBackStack(TAG).commitAllowingStateLoss();
}
//DownloadEvents

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
View file

@ -132,11 +132,11 @@ public class MenuBuilder {
ll.addView(llIcon);
ImageView iconView = new ImageView(view.getContext());
LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(dpToPx(24f), dpToPx(24f));
llIconParams.setMargins(dpToPx(16f), dpToPx(12f), dpToPx(32f), dpToPx(12f));
llIconParams.gravity = Gravity.CENTER_VERTICAL;
iconView.setLayoutParams(llIconParams);
iconView.setScaleType(ImageView.ScaleType.CENTER);
iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
iconView.setImageDrawable(icon);
llIcon.addView(iconView);

16
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.LinearLayout;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.data.Amenity;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon;
@ -15,26 +14,27 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNoteMenuController;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
import net.osmand.plus.helpers.SearchHistoryHelper;
import net.osmand.plus.mapcontextmenu.controllers.AmenityMenuController;
import net.osmand.plus.audionotes.AudioVideoNoteMenuController;
import net.osmand.plus.osmedit.EditPOIMenuController;
import net.osmand.plus.mapcontextmenu.controllers.FavouritePointMenuController;
import net.osmand.plus.mapcontextmenu.controllers.GpxItemMenuController;
import net.osmand.plus.mapcontextmenu.controllers.HistoryMenuController;
import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController;
import net.osmand.plus.osmo.OsMoMenuController;
import net.osmand.plus.osmedit.OsmBugMenuController;
import net.osmand.plus.parkingpoint.ParkingPositionMenuController;
import net.osmand.plus.mapcontextmenu.controllers.PointDescriptionMenuController;
import net.osmand.plus.mapcontextmenu.controllers.TargetPointMenuController;
import net.osmand.plus.mapcontextmenu.controllers.WptPtMenuController;
import net.osmand.plus.mapcontextmenu.other.ShareMenu;
import net.osmand.plus.osmedit.EditPOIMenuController;
import net.osmand.plus.osmedit.OsmBugMenuController;
import net.osmand.plus.osmedit.OsmBugsLayer.OpenStreetNote;
import net.osmand.plus.osmedit.OsmPoint;
import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoDevice;
import net.osmand.plus.osmo.OsMoMenuController;
import net.osmand.plus.parkingpoint.ParkingPositionMenuController;
import net.osmand.plus.views.DownloadedRegionsLayer.DownloadMapObject;
public abstract class MenuController extends BaseMenuController {
@ -92,8 +92,8 @@ public abstract class MenuController extends BaseMenuController {
menuController = new EditPOIMenuController(app, mapActivity, pointDescription, (OsmPoint) object);
} else if (object instanceof WptPt) {
menuController = new WptPtMenuController(app, mapActivity, pointDescription, (WptPt) object);
} else if (object instanceof BinaryMapDataObject) {
menuController = new MapDataMenuController(app, mapActivity, pointDescription, (BinaryMapDataObject) object);
} else if (object instanceof DownloadMapObject) {
menuController = new MapDataMenuController(app, mapActivity, pointDescription, (DownloadMapObject) object);
} else if (object instanceof OpenStreetNote) {
menuController = new OsmBugMenuController(app, mapActivity, pointDescription, (OpenStreetNote) object);
} else if (object instanceof GpxDisplayItem) {

50
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -23,6 +23,8 @@ import net.osmand.util.Algorithms;
import net.osmand.util.OpeningHoursParser;
import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
public class AmenityMenuBuilder extends MenuBuilder {
@ -73,11 +75,11 @@ public class AmenityMenuBuilder extends MenuBuilder {
ll.addView(llIcon);
ImageView iconView = new ImageView(view.getContext());
LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(dpToPx(24f), dpToPx(24f));
llIconParams.setMargins(dpToPx(16f), dpToPx(12f), dpToPx(32f), dpToPx(12f));
llIconParams.gravity = Gravity.CENTER_VERTICAL;
iconView.setLayoutParams(llIconParams);
iconView.setScaleType(ImageView.ScaleType.CENTER);
iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
iconView.setImageDrawable(icon);
llIcon.addView(iconView);
@ -141,6 +143,12 @@ public class AmenityMenuBuilder extends MenuBuilder {
public void buildInternal(View view) {
boolean hasWiki = false;
MapPoiTypes poiTypes = app.getPoiTypes();
String preferredLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
if (Algorithms.isEmpty(preferredLang)) {
preferredLang = app.getLanguage();
}
List<AmenityDescription> descriptions = new LinkedList<>();
for (Map.Entry<String, String> e : amenity.getAdditionalInfo().entrySet()) {
int iconId;
Drawable icon = null;
@ -156,10 +164,6 @@ public class AmenityMenuBuilder extends MenuBuilder {
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";
@ -224,11 +228,43 @@ public class AmenityMenuBuilder extends MenuBuilder {
}
}
if (icon != null) {
if (isText && iconId == R.drawable.ic_action_note_dark) {
descriptions.add(new AmenityDescription(key, textPrefix, vl));
} else if (icon != null) {
buildRow(view, icon, vl, textPrefix, textColor, isWiki, isText, needLinks);
} else {
buildRow(view, iconId, vl, textPrefix, textColor, isWiki, isText, needLinks);
}
}
String langSuffix = ":" + preferredLang;
AmenityDescription descInPrefLang = null;
for (AmenityDescription desc : descriptions) {
if (desc.key.length() > langSuffix.length()
&& desc.key.substring(desc.key.length() - langSuffix.length(), desc.key.length()).equals(langSuffix)) {
descInPrefLang = desc;
break;
}
}
if (descInPrefLang != null) {
descriptions.remove(descInPrefLang);
descriptions.add(0, descInPrefLang);
}
for (AmenityDescription desc : descriptions) {
buildRow(view, R.drawable.ic_action_note_dark, desc.text, desc.textPrefix, 0, false, true, true);
}
}
private static class AmenityDescription {
private String key;
private String textPrefix;
private String text;
public AmenityDescription(String key, String textPrefix, String text) {
this.key = key;
this.textPrefix = textPrefix;
this.text = text;
}
}
}

16
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AmenityMenuController.java
View file

@ -89,7 +89,21 @@ public class AmenityMenuController extends MenuController {
@Override
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
if (!Algorithms.isEmpty(typeStr)) {
addPlainMenuItem(R.drawable.ic_action_info_dark, typeStr, false);
int resId = 0;
PoiCategory pc = amenity.getType();
if (!Algorithms.isEmpty(getNameStr())) {
resId = getLeftIconId();
}
if (resId == 0) {
resId = RenderingIcons.getBigIconResourceId(pc.getIconKeyName());
}
if (resId == 0) {
resId = getLeftIconId();
}
if (resId == 0) {
resId = R.drawable.ic_action_folder_stroke;
}
addPlainMenuItem(resId, typeStr, false);
}
addMyLocationToPlainItems(pointDescription, amenity.getLocation());
}

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

@ -3,54 +3,87 @@ package net.osmand.plus.mapcontextmenu.controllers;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.support.v7.app.AlertDialog;
import android.widget.Toast;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.access.AccessibleToast;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.map.OsmandRegions;
import net.osmand.map.WorldRegion;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadIndexesThread;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadValidationManager;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.helpers.FileNameTranslationHelper;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
import net.osmand.plus.views.DownloadedRegionsLayer.DownloadMapObject;
import net.osmand.util.Algorithms;
import java.io.File;
import java.text.DateFormat;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
public class MapDataMenuController extends MenuController {
private WorldRegion region;
private DownloadMapObject mapObject;
private IndexItem indexItem;
private List<IndexItem> otherIndexItems;
private boolean srtmDisabled;
private boolean srtmNeedsInstallation;
private DownloadIndexesThread downloadThread;
public MapDataMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, BinaryMapDataObject dataObject) {
public MapDataMenuController(OsmandApplication app, final MapActivity mapActivity, PointDescription pointDescription, final DownloadMapObject mapObject) {
super(new MenuBuilder(app), pointDescription, mapActivity);
initData(app, dataObject);
this.mapObject = mapObject;
indexItem = mapObject.getIndexItem();
downloadThread = app.getDownloadThread();
if (indexItem != null) {
otherIndexItems = new LinkedList<>(downloadThread.getIndexes().getIndexItems(mapObject.getWorldRegion()));
otherIndexItems.remove(indexItem);
}
srtmDisabled = OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) == null;
OsmandPlugin srtmPlugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
srtmNeedsInstallation = srtmPlugin == null || srtmPlugin.needsInstallation();
leftTitleButtonController = new TitleButtonController() {
@Override
public void buttonPressed() {
if (indexItem != null) {
if ((indexItem.getType() == DownloadActivityType.SRTM_COUNTRY_FILE
|| indexItem.getType() == DownloadActivityType.HILLSHADE_FILE)
&& srtmDisabled) {
getMapActivity().getContextMenu().close();
if (srtmNeedsInstallation) {
OsmandPlugin plugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
if (plugin != null) {
mapActivity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));
}
} else {
mapActivity.startActivity(new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
.getPluginsActivity()));
AccessibleToast.makeText(mapActivity, mapActivity.getString(R.string.activate_srtm_plugin),
Toast.LENGTH_SHORT).show();
}
} else {
new DownloadValidationManager(getMapActivity().getMyApplication())
.startDownload(getMapActivity(), indexItem);
}
}
}
};
leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_download);
leftTitleButtonController.leftIconId = R.drawable.ic_action_import;
@ -71,14 +104,15 @@ public class MapDataMenuController extends MenuController {
public void buttonPressed() {
getMapActivity().getContextMenu().close();
DownloadResourceGroup group = downloadThread.getIndexes().getRegionGroup(region);
if (group != null) {
final Intent intent = new Intent(getMapActivity(), getMapActivity().getMyApplication()
.getAppCustomization().getDownloadIndexActivity());
intent.putExtra(DownloadActivity.FILTER_GROUP, group.getUniqueId());
intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
getMapActivity().startActivity(intent);
Map<Object, IContextMenuProvider> selectedObjects = new HashMap<>();
IContextMenuProvider provider = mapActivity.getMapLayers().getDownloadedRegionsLayer();
for (IndexItem item : otherIndexItems) {
selectedObjects.put(
new DownloadMapObject(mapObject.getDataObject(), mapObject.getWorldRegion(), item),
provider);
}
mapActivity.getContextMenu().getMultiSelectionMenu().show(
mapActivity.getContextMenu().getLatLon(), selectedObjects);
}
};
topRightTitleButtonController.caption = getMapActivity().getString(R.string.download_select_map_types);
@ -99,16 +133,10 @@ public class MapDataMenuController extends MenuController {
updateData();
}
private void initData(OsmandApplication app, BinaryMapDataObject dataObject) {
OsmandRegions osmandRegions = app.getRegions();
String fullName = osmandRegions.getFullName(dataObject);
this.region = osmandRegions.getRegionData(fullName);
}
@Override
protected void setObject(Object object) {
if (object instanceof BinaryMapDataObject) {
initData(getMapActivity().getMyApplication(), (BinaryMapDataObject) object);
if (object instanceof DownloadMapObject) {
this.mapObject = (DownloadMapObject) object;
updateData();
}
}
@ -125,14 +153,20 @@ public class MapDataMenuController extends MenuController {
@Override
public Drawable getLeftIcon() {
return getIcon(R.drawable.ic_map, R.color.osmand_orange);
int iconResId;
if (indexItem != null) {
iconResId = indexItem.getType().getIconResource();
} else {
iconResId = R.drawable.ic_map;
}
return getIcon(iconResId, R.color.osmand_orange);
}
@Override
public String getTypeStr() {
String res;
if (region != null && region.getSuperregion() != null) {
res = region.getSuperregion().getLocaleName();
if (mapObject.getWorldRegion().getSuperregion() != null) {
res = mapObject.getWorldRegion().getSuperregion().getLocaleName();
} else {
res = getMapActivity().getString(R.string.shared_string_map);
}
@ -150,10 +184,11 @@ public class MapDataMenuController extends MenuController {
@Override
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
if (indexItem != null) {
addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getType().getString(getMapActivity()), false);
addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getSizeDescription(getMapActivity()), false);
}
if (region != null && !Algorithms.isEmpty(region.getParams().getWikiLink())) {
String[] items = region.getParams().getWikiLink().split(":");
if (!Algorithms.isEmpty(mapObject.getWorldRegion().getParams().getWikiLink())) {
String[] items = mapObject.getWorldRegion().getParams().getWikiLink().split(":");
String url;
if (items.length > 1) {
url = "https://" + items[0] + ".wikipedia.org/wiki/" + items[1].replace(' ', '_');
@ -181,7 +216,7 @@ public class MapDataMenuController extends MenuController {
@Override
public void updateData() {
if (indexItem == null) {
otherIndexItems = new LinkedList<>(downloadThread.getIndexes().getIndexItems(region));
otherIndexItems = new LinkedList<>(downloadThread.getIndexes().getIndexItems(mapObject.getWorldRegion()));
Iterator<IndexItem> it = otherIndexItems.iterator();
while (it.hasNext()) {
IndexItem i = it.next();
@ -193,15 +228,22 @@ public class MapDataMenuController extends MenuController {
}
}
topRightTitleButtonController.visible = otherIndexItems.size() > 0;
leftTitleButtonController.leftIconId = R.drawable.ic_action_import;
if (indexItem != null) {
if (indexItem.isOutdated()) {
if ((indexItem.getType() == DownloadActivityType.SRTM_COUNTRY_FILE
|| indexItem.getType() == DownloadActivityType.HILLSHADE_FILE)
&& srtmDisabled) {
leftTitleButtonController.caption = getMapActivity().getString(R.string.get_plugin);
leftTitleButtonController.leftIconId = 0;
} else if (indexItem.isOutdated()) {
leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_update);
} else {
leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_download);
}
}
rightTitleButtonController.visible = indexItem != null && indexItem.isDownloaded();
topRightTitleButtonController.visible = otherIndexItems.size() > 0;
boolean hasIndexes = downloadThread.getIndexes().isDownloadedFromInternet;
boolean isDownloading = indexItem != null && downloadThread.isDownloading(indexItem);

34
OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java
View file

@ -2,9 +2,12 @@ package net.osmand.plus.osmedit;
import android.view.View;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.render.RenderingIcons;
import java.util.Map;
@ -29,12 +32,35 @@ public class EditPOIMenuBuilder extends MenuBuilder {
OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint;
for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) {
String text;
if (EditPoiData.POI_TYPE_TAG.equals(e.getKey())) {
text = e.getValue();
} else {
text = e.getKey() + "=" + e.getValue();
String poiTranslation = e.getValue();
Map<String, PoiType> poiTypeMap = MapPoiTypes.getDefault().getAllTranslatedNames(false);
PoiType poiType = poiTypeMap.get(poiTranslation.toLowerCase());
int resId = 0;
if (poiType != null) {
String id = null;
if (RenderingIcons.containsBigIcon(poiType.getIconKeyName())) {
id = poiType.getIconKeyName();
} else if (RenderingIcons.containsBigIcon(poiType.getOsmTag() + "_" + poiType.getOsmValue())) {
id = poiType.getOsmTag() + "_" + poiType.getOsmValue();
}
if (id != null) {
resId = RenderingIcons.getBigIconResourceId(id);
}
}
if (resId == 0) {
resId = R.drawable.ic_action_folder_stroke;
}
buildRow(view, resId, poiTranslation, 0, false, 0);
break;
}
}
for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) {
if (EditPoiData.POI_TYPE_TAG.equals(e.getKey())) {
continue;
}
String text = e.getKey() + "=" + e.getValue();
buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, 0);
}
}

3
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -214,9 +214,6 @@ public class ContextMenuLayer extends OsmandMapLayer {
l.collectObjectsFromPoint(point, tileBox, s);
for (Object o : s) {
selectedObjects.put(o, l);
// if (l instanceof IContextMenuProviderSelection) {
// ((IContextMenuProviderSelection) l).setSelectedObject(o);
// }
}
}
}

99
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -73,6 +73,30 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
private static int ZOOM_TO_SHOW_SELECTION_ST = 3;
private static int ZOOM_TO_SHOW_SELECTION = 10;
public static class DownloadMapObject {
private BinaryMapDataObject dataObject;
private WorldRegion worldRegion;
private IndexItem indexItem;
public BinaryMapDataObject getDataObject() {
return dataObject;
}
public WorldRegion getWorldRegion() {
return worldRegion;
}
public IndexItem getIndexItem() {
return indexItem;
}
public DownloadMapObject(BinaryMapDataObject dataObject, WorldRegion worldRegion, IndexItem indexItem) {
this.dataObject = dataObject;
this.worldRegion = worldRegion;
this.indexItem = indexItem;
}
}
@Override
public void initLayer(final OsmandMapTileView view) {
this.view = view;
@ -277,7 +301,11 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
if (region != null && region.getRegionDownloadName() != null) {
List<IndexItem> indexItems = app.getDownloadThread().getIndexes().getIndexItems(region);
for (IndexItem item : indexItems) {
if (item.getType() == DownloadActivityType.NORMAL_FILE) {
if (item.getType() == DownloadActivityType.NORMAL_FILE
|| item.getType() == DownloadActivityType.ROADS_FILE
|| item.getType() == DownloadActivityType.SRTM_COUNTRY_FILE
|| item.getType() == DownloadActivityType.HILLSHADE_FILE
|| item.getType() == DownloadActivityType.WIKIPEDIA_FILE) {
if (app.getDownloadThread().isDownloading(item)) {
downloadingObjects.add(o);
} else if (item.isOutdated()) {
@ -421,12 +449,9 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
@Override
public LatLon getObjectLocation(Object o) {
if (o instanceof BinaryMapDataObject) {
String fullName = osmandRegions.getFullName((BinaryMapDataObject) o);
final WorldRegion region = osmandRegions.getRegionData(fullName);
if (region != null) {
return region.getRegionCenter();
}
if (o instanceof DownloadMapObject) {
DownloadMapObject mapObject = ((DownloadMapObject) o);
return mapObject.worldRegion.getRegionCenter();
}
return null;
}
@ -438,16 +463,10 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
@Override
public PointDescription getObjectName(Object o) {
if (o instanceof BinaryMapDataObject) {
String fullName = osmandRegions.getFullName((BinaryMapDataObject) o);
final WorldRegion region = osmandRegions.getRegionData(fullName);
if (region != null) {
if (o instanceof DownloadMapObject) {
DownloadMapObject mapObject = ((DownloadMapObject) o);
return new PointDescription(PointDescription.POINT_TYPE_WORLD_REGION,
view.getContext().getString(R.string.shared_string_map), region.getLocaleName());
} else {
return new PointDescription(PointDescription.POINT_TYPE_WORLD_REGION,
view.getContext().getString(R.string.shared_string_map), ((BinaryMapDataObject) o).getName());
}
view.getContext().getString(R.string.shared_string_map), mapObject.worldRegion.getLocaleName());
}
return new PointDescription(PointDescription.POINT_TYPE_WORLD_REGION,
view.getContext().getString(R.string.shared_string_map), "");
@ -463,7 +482,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
return false;
}
private void getWorldRegionFromPoint(RotatedTileBox tb, PointF point, List<? super BinaryMapDataObject> dataObjects) {
private void getWorldRegionFromPoint(RotatedTileBox tb, PointF point, List<? super DownloadMapObject> dataObjects) {
int zoom = tb.getZoom();
if (zoom >= ZOOM_TO_SHOW_SELECTION_ST && zoom < ZOOM_TO_SHOW_SELECTION && osmandRegions.isInitialized()) {
LatLon pointLatLon = tb.getLatLonFromPixel(point.x, point.y);
@ -481,32 +500,60 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
selectedObjects = result;
OsmandRegions osmandRegions = app.getRegions();
for (BinaryMapDataObject o : result) {
dataObjects.add(o);
String fullName = osmandRegions.getFullName(o);
WorldRegion region = osmandRegions.getRegionData(fullName);
if (region != null) {
List<IndexItem> indexItems = app.getDownloadThread().getIndexes().getIndexItems(region);
List<IndexItem> dataItems = new LinkedList<>();
IndexItem regularMapItem = null;
for (IndexItem item : indexItems) {
if (item.isDownloaded() || app.getDownloadThread().isDownloading(item)) {
dataItems.add(item);
if (item.getType() == DownloadActivityType.NORMAL_FILE) {
regularMapItem = item;
}
}
}
if (dataItems.isEmpty() && regularMapItem != null) {
dataItems.add(regularMapItem);
}
if (!dataItems.isEmpty()) {
for (IndexItem item : dataItems) {
dataObjects.add(new DownloadMapObject(o, region, item));
}
} else {
dataObjects.add(new DownloadMapObject(o, region, null));
}
}
}
}
}
@Override
public int getOrder(Object o) {
if (o instanceof BinaryMapDataObject) {
String fullName = osmandRegions.getFullName((BinaryMapDataObject) o);
final WorldRegion region = osmandRegions.getRegionData(fullName);
if (region != null) {
return region.getLevel() - 1000;
int order = 0;
if (o instanceof DownloadMapObject) {
DownloadMapObject mapObject = ((DownloadMapObject) o);
order = mapObject.worldRegion.getLevel() * 1000 - 100000;
if (mapObject.indexItem != null) {
order += mapObject.indexItem.getType().getOrderIndex();
}
}
return 0;
return order;
}
@Override
public void setSelectedObject(Object o) {
if (o instanceof BinaryMapDataObject) {
if (o instanceof DownloadMapObject) {
DownloadMapObject mapObject = ((DownloadMapObject) o);
List<BinaryMapDataObject> list = new LinkedList<>();
if (selectedObjects. size() > 0) {
list.addAll(selectedObjects);
}
list.add((BinaryMapDataObject) o);
list.add(mapObject.dataObject);
selectedObjects = list;
}
}

21
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -10,6 +10,7 @@ import android.graphics.PointF;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.view.MotionEvent;
import android.view.View;
@ -95,6 +96,7 @@ public class MapControlsLayer extends OsmandMapLayer {
private MapHudButton mapZoomIn;
private MapHudButton layersHud;
private MapHudButton mapDashControl;
private long lastZoom;
public MapControlsLayer(MapActivity activity) {
this.mapActivity = activity;
@ -114,9 +116,13 @@ public class MapControlsLayer extends OsmandMapLayer {
initTopControls();
initTransparencyBar();
initZooms();
initDasboardRelatedControls();
updateControls(view.getCurrentRotatedTileBox(), null);
}
public void initDasboardRelatedControls() {
initControls();
initRouteControls();
updateControls(view.getCurrentRotatedTileBox(), null);
}
private class CompassDrawable extends Drawable {
@ -580,7 +586,7 @@ public class MapControlsLayer extends OsmandMapLayer {
private void updateControls(RotatedTileBox tileBox, DrawSettings nightMode) {
private void updateControls(@NonNull RotatedTileBox tileBox, DrawSettings nightMode) {
boolean isNight = nightMode != null && nightMode.isNightMode();
int shadw = isNight ? Color.TRANSPARENT : Color.WHITE;
int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : Color.BLACK;
@ -619,16 +625,21 @@ public class MapControlsLayer extends OsmandMapLayer {
if(routeFollowingMode || routePlanningMode) {
mapAppModeShadow.setVisibility(View.GONE);
} else {
if (mapView.isZooming()) {
lastZoom = System.currentTimeMillis();
}
mapAppModeShadow.setVisibility(View.VISIBLE);
if (!mapView.isZooming() || !OsmandPlugin.isDevelopment()) {
//if (!mapView.isZooming() || !OsmandPlugin.isDevelopment()) {
if ((System.currentTimeMillis()-lastZoom > 1000) || !OsmandPlugin.isDevelopment()) {
zoomText.setVisibility(View.GONE);
appModeIcon.setVisibility(View.VISIBLE);
appModeIcon.setImageDrawable(
app.getIconsCache().getIcon(
settings.getApplicationMode().getSmallIconDark(), !isNight));
} else {
zoomText.setVisibility(View.VISIBLE);
appModeIcon.setVisibility(View.GONE);
zoomText.setVisibility(View.VISIBLE);
zoomText.setTextColor(textColor);
zoomText.setText(getZoomLevel(tileBox));
}
}
@ -930,7 +941,7 @@ public class MapControlsLayer extends OsmandMapLayer {
mQuickAction.show();
}
private String getZoomLevel(RotatedTileBox tb) {
private String getZoomLevel(@NonNull RotatedTileBox tb) {
String zoomText = tb.getZoom() + "";
double frac = tb.getMapDensity();
if (frac != 0) {

2
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -148,7 +148,7 @@ public class MapInfoWidgetsFactory {
@Override
public void onClick(DialogInterface dialog, int which) {
app.getSettings().SERVICE_OFF_INTERVAL.set(vs.value);
app.startNavigationService(NavigationService.USED_BY_GPX);
app.startNavigationService(NavigationService.USED_BY_WAKE_UP);
}
});
dlg.setNegativeButton(R.string.shared_string_cancel, null);