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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-11-22 21:46:10 +01:00
commit e66646e606
26 changed files with 328 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/point_edit_layout" android:id="@+id/point_edit_layout"
android:layout_width="350dp" android:layout_width="366dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/transparent"> android:background="?attr/left_menu_view_bg">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -30,6 +30,14 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:src="@drawable/ic_action_delete_dark"/> android:src="@drawable/ic_action_delete_dark"/>
<ImageButton
android:id="@+id/ok_button"
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:src="@drawable/ic_action_done"/>
<Button <Button
android:id="@+id/save_button" android:id="@+id/save_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string> <?xml version='1.0' encoding='utf-8'?>
<resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
<string name="auto_zoom_close">Буйней</string> <string name="auto_zoom_close">Буйней</string>
<string name="auto_zoom_far">Для сярэдняга маштаба</string> <string name="auto_zoom_far">Для сярэдняга маштаба</string>
<string name="auto_zoom_farthest">Драбней</string> <string name="auto_zoom_farthest">Драбней</string>
@ -1790,7 +1791,7 @@
<string name="rendering_value_disabled_name">Адключана</string> <string name="rendering_value_disabled_name">Адключана</string>
<string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка згодна OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка згодна OSMC</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Афарбоўка згодна з праглядам маршруту</string> <string name="rendering_value_walkingRoutesScopeOSMC_name">Афарбоўка згодна з праглядам маршруту</string>
<string name="osm_edit_context_menu_delete">Выдаліць праўкі OSM</string> <string name="osm_edit_context_menu_delete">Выдаліць праўку OSM</string>
<string name="read_full_article">Чытаць артыкул цалкам (анлайн)</string> <string name="read_full_article">Чытаць артыкул цалкам (анлайн)</string>
<string name="local_indexes_cat_wiki">Вікіпэдыя</string> <string name="local_indexes_cat_wiki">Вікіпэдыя</string>
@ -2011,4 +2012,26 @@
<string name="save_poi_without_poi_type_message">Вы сапраўды хочаце захаваць POI бяз тыпу?</string> <string name="save_poi_without_poi_type_message">Вы сапраўды хочаце захаваць POI бяз тыпу?</string>
<string name="share_osm_edits_subject">Рэдагаваньні OSM апублікаваныя праз OsmAnd</string> <string name="share_osm_edits_subject">Рэдагаваньні OSM апублікаваныя праз OsmAnd</string>
<string name="shared_string_location">Месцазнаходжаньне</string> <string name="shared_string_location">Месцазнаходжаньне</string>
</resources> <string name="copied_to_clipboard">Скапіявана ў буфер абмену</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>
<string name="osm_edit_reopened_note">Нататка OSM адкрыта зноў</string>
<string name="osm_edit_commented_note">Да нататкі OSM дададзены камэнтар</string>
<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_success">Нататка пасьпяхова створана</string>
<string name="osn_add_dialog_error">Памылка: нататка не была створана</string>
<string name="osn_close_dialog_success">Нататка была пасьпяхова зачынена</string>
<string name="osn_close_dialog_error">Памылка: нататка ня была зачынена</string>
<string name="shared_string_commit">Адаслаць</string>
<string name="rendering_attr_roadStyle_description">Стыль адлюстраваньня дарог</string>
<string name="poi_context_menu_modify_osm_change">Рэдагаваць POI</string>
</resources>

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

@ -2028,4 +2028,18 @@ OsmAnd е с отворен код и активно да се развива.
<string name="osm_edit_modified_poi">Модифицирани OSM POI</string> <string name="osm_edit_modified_poi">Модифицирани OSM POI</string>
<string name="osm_edit_deleted_poi">Изтрити OSM POI</string> <string name="osm_edit_deleted_poi">Изтрити OSM POI</string>
<string name="context_menu_item_open_note">Отвори OSM бележка</string> <string name="context_menu_item_open_note">Отвори OSM бележка</string>
</resources> <string name="please_specify_poi_type_only_from_list">"Моля, задайте правилния тип POI или пропуснете. "</string>
<string name="access_from_map_description">Бутонът \'Меню\' стартира таблото за управление</string>
<string name="access_from_map">Достъп от картата</string>
<string name="show_on_start_description">Ако е изключено се стартира с екрана на картата</string>
<string name="osm_edit_reopened_note">Отворена отново бележка на OSM</string>
<string name="osm_edit_commented_note">Бележка на OSM с коментар</string>
<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_success">Бележката беше успешно създадена</string>
</resources>

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

@ -1934,4 +1934,64 @@
<string name="poi_surveillance_indoor">Vigilància: interior</string> <string name="poi_surveillance_indoor">Vigilància: interior</string>
<string name="poi_surveillance_outdoor">Vigilància: exterior</string> <string name="poi_surveillance_outdoor">Vigilància: exterior</string>
<string name="poi_clothes_hats">Barrets</string>
<string name="poi_clothes_sports">Roba esportiva</string>
<string name="poi_clothes_babies">Roba de nadons</string>
<string name="poi_clothes_denim">Roba texana</string>
<string name="poi_clothes_workwear">Roba de treball</string>
<string name="poi_clothes_fur">Pelleteria</string>
<string name="poi_clothes_leather">Roba de cuir</string>
<string name="poi_clothes_traditional">Roba tradicional</string>
<string name="poi_shoes_women">Sabates de dona</string>
<string name="poi_castle_type_stately">Tipus de castell: residencial</string>
<string name="poi_castle_type_defensive">Tipus de castell: defensiu</string>
<string name="poi_castle_type_fortress">Tipus de castell: fortalesa</string>
<string name="poi_castle_type_palace">Tipus de castell: palau</string>
<string name="poi_castle_type_kremlin">Tipus de castell: fortificació russa</string>
<string name="poi_castle_type_defensive_stately">Tipus de castell: residencial, defensiu</string>
<string name="poi_castle_type_castrum">Tipus de castell: romà</string>
<string name="poi_castle_type_shiro">Tipus de castell: japonès</string>
<string name="poi_massage_thai">Massatge: tailandès</string>
<string name="poi_massage_sexual">Massatge: sexual</string>
<string name="poi_massage_chinese">Massatge: xinès</string>
<string name="poi_massage_yes">Serveis de massatge</string>
<string name="poi_massage_therapeutic">Massatge: terapèutic</string>
<string name="poi_sauna_yes">Serveis de sauna</string>
<string name="poi_solarium_yes">Serveis de solàrium</string>
<string name="poi_tents_yes">Es permet l\'acampada</string>
<string name="poi_tents_no">No es permet l\'acampada</string>
<string name="poi_scout_yes">Camp escolta: sí</string>
<string name="poi_scout_no">Camp escolta: no</string>
<string name="poi_group_only_yes">Només per grups: sí</string>
<string name="poi_group_only_no">Només per grups: no</string>
<string name="poi_washing_machine_yes">Rentadora: sí</string>
<string name="poi_washing_machine_no">Rentadora: no</string>
<string name="poi_shower_yes">Dutxa: sí</string>
<string name="poi_shower_no">Dutxa: no</string>
<string name="poi_shower_hot">Dutxa: aigua calenta</string>
<string name="poi_shower_outdoor">Dutxa: exterior</string>
<string name="poi_shower_cold">Dutxa: aigua freda</string>
<string name="poi_shower_indoor">Dutxa: coberta</string>
<string name="poi_caravans_yes">Caravanes: sí</string>
<string name="poi_caravans_no">Caravanes: no</string>
<string name="poi_impromptu_yes">Acampada lliure: sí</string>
<string name="poi_impromptu_no">Acampada lliure: no</string>
<string name="poi_sanitary_dump_station_yes">Estació de buidatge sanitari: sí</string>
<string name="poi_sanitary_dump_station_no">Estació de buidatge sanitari: no</string>
<string name="poi_sanitary_dump_station_customers">Estació de buidatge sanitari: només clients</string>
<string name="poi_power_supply_yes">Subministrament elèctric: sí</string>
<string name="poi_power_supply_no">Subministrament elèctric: no</string>
<string name="poi_power_supply_cee_17_blue">Subministrament elèctric (endoll): CEE 17 blau</string>
<string name="poi_power_supply_cee_7_4">Subministrament elèctric (endoll): CEE 7/4</string>
<string name="poi_power_supply_cee_7_5">Subministrament elèctric (endoll): CEE 7/5</string>
<string name="poi_power_supply_nema_5_15">Subministrament elèctric (endoll): NEMA 5-15</string>
<string name="poi_capacity_tents">Capacitat de tendes</string>
<string name="poi_capacity_caravans">Capacitat de caravanes</string>
<string name="poi_dog_yes">Es permeten els gossos</string>
<string name="poi_dog_no">No es permeten els gossos</string>
</resources> </resources>

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

@ -1770,7 +1770,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="favorite_category_dublicate_message">El nom de categoria especificat ja existeix. Definiu un altre nom.</string> <string name="favorite_category_dublicate_message">El nom de categoria especificat ja existeix. Definiu un altre nom.</string>
<string name="favorite_category_name">Nom de categoria</string> <string name="favorite_category_name">Nom de categoria</string>
<string name="favorite_category_add_new_title">Afegeix una nova categoria</string> <string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
<string name="confirm_download_roadmaps">N\'esteu segur de baixar un mapa de carreteres quan teniu disponible un mapa complet?</string> <string name="confirm_download_roadmaps">N\'esteu segur de baixar el mapa amb només carreteres, quan ja teniu el mapa normal (complet)?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualitzeu tot (%1$s MB)</string> <string name="update_all">Actualitzeu tot (%1$s MB)</string>

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

File diff suppressed because one or more lines are too long

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

@ -2048,8 +2048,8 @@
<string name="poi_jersey_barrier">Jersey barriere</string> <string name="poi_jersey_barrier">Jersey barriere</string>
<string name="poi_fuel_91ul">91UL brændstof</string> <string name="poi_fuel_91ul">91UL brændstof</string>
<string name="poi_fuel_100ll">100LL brændstof</string> <string name="poi_fuel_100ll">100LL brændstof</string>
<string name="poi_autogas">Autogas</string> <string name="poi_fuel_autogas">Autogas</string>
<string name="poi_jeta1">Jet A-1 brændstof</string> <string name="poi_fuel_jeta1">Jet A-1 brændstof</string>
<string name="poi_fuel_adblue">AdBlue brændstof</string> <string name="poi_fuel_adblue">AdBlue brændstof</string>
<string name="poi_fuel_wood">Brændstof: træ</string> <string name="poi_fuel_wood">Brændstof: træ</string>

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

@ -2025,8 +2025,8 @@
<string name="poi_wetland_palsa_bog">Palsa (humedal)</string> <string name="poi_wetland_palsa_bog">Palsa (humedal)</string>
<string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string> <string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string>
<string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string> <string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string>
<string name="poi_autogas">Autogas (Etanol libre de plomo)</string> <string name="poi_fuel_autogas">Autogas (Etanol libre de plomo)</string>
<string name="poi_jeta1">Jet A-1 (diésel)</string> <string name="poi_fuel_jeta1">Jet A-1 (diésel)</string>
<string name="poi_fuel_adblue">AdBlue</string> <string name="poi_fuel_adblue">AdBlue</string>
<string name="poi_fuel_wood">Combustible: Madera</string> <string name="poi_fuel_wood">Combustible: Madera</string>

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

@ -19,7 +19,7 @@
<string name="shared_string_manage">Gestionar</string> <string name="shared_string_manage">Gestionar</string>
<string name="shared_string_edit">Editar</string> <string name="shared_string_edit">Editar</string>
<string name="shared_string_search">Buscar</string> <string name="shared_string_search">Buscar</string>
<string name="shared_string_show_description">Mostrar descripción</string> <string name="shared_string_show_description">Mostrar información</string>
<string name="shared_string_message">Mensaje</string> <string name="shared_string_message">Mensaje</string>
<string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string> <string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string>
<string name="confirm_usage_speed_cameras">En muchos países (Alemania, Francia, Italia y otros) el uso de avisos de radares no está permitido por la ley. OsmAnd no asume ninguna responsabilidad si usted viola la ley. Haga clic en si, sólo si es elegible para utilizar esta función.</string> <string name="confirm_usage_speed_cameras">En muchos países (Alemania, Francia, Italia y otros) el uso de avisos de radares no está permitido por la ley. OsmAnd no asume ninguna responsabilidad si usted viola la ley. Haga clic en si, sólo si es elegible para utilizar esta función.</string>
@ -51,7 +51,7 @@
<string name="your_edits">Sus ediciones</string> <string name="your_edits">Sus ediciones</string>
<string name="waypoint_visit_after">Visitar luego</string> <string name="waypoint_visit_after">Visitar luego</string>
<string name="waypoint_visit_before">Visitar antes</string> <string name="waypoint_visit_before">Visitar antes</string>
<string name="simulate_your_location">Simule su ubicación</string> <string name="simulate_your_location">Simular su ubicación</string>
<string name="short_location_on_map">Lat %1$s\nLon %2$s</string> <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
<string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string> <string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string>
<string name="routing_settings_2">Ajustes de navegación</string> <string name="routing_settings_2">Ajustes de navegación</string>
@ -1858,7 +1858,7 @@
<string name="are_you_sure">¿Está seguro?</string> <string name="are_you_sure">¿Está seguro?</string>
<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string> <string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
<string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string> <string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string>
<string name="simulate_your_location_descr">Simular usando una ruta calculada o una grabación GPX</string> <string name="simulate_your_location_descr">Simular ubicación, usando una ruta calculada o una grabación GPX</string>
<string name="downloads_left_template">Quedan %1$s descargas</string> <string name="downloads_left_template">Quedan %1$s descargas</string>
<string name="shared_string_trip_recording">Grabación de viaje</string> <string name="shared_string_trip_recording">Grabación de viaje</string>
<string name="shared_string_navigation">Navegación</string> <string name="shared_string_navigation">Navegación</string>
@ -1899,7 +1899,7 @@
<string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string> <string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string>
<string name="favorite_category_name">Nombre de categoría</string> <string name="favorite_category_name">Nombre de categoría</string>
<string name="favorite_category_add_new_title">Añadir nueva categoría</string> <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
<string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque tenga el mapa completo?</string> <string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque ya tenga el mapa estándar (completo)?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualizar todo (%1$s MB)</string> <string name="update_all">Actualizar todo (%1$s MB)</string>

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

@ -2030,8 +2030,8 @@
<string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string> <string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string>
<string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string> <string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string>
<string name="poi_autogas">Autogas (Etanol libre de plomo)</string> <string name="poi_fuel_autogas">Autogas (Etanol libre de plomo)</string>
<string name="poi_jeta1">Jet A-1 (diésel)</string> <string name="poi_fuel_jeta1">Jet A-1 (diésel)</string>
<string name="poi_fuel_adblue">AdBlue</string> <string name="poi_fuel_adblue">AdBlue</string>
<string name="poi_fuel_wood">Combustible: Madera</string> <string name="poi_fuel_wood">Combustible: Madera</string>

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

@ -34,7 +34,7 @@
<string name="show_current_gpx_title">Mostrar traza actual</string> <string name="show_current_gpx_title">Mostrar traza actual</string>
<string name="free_version_message">Esta versión libre de OsmAnd está limitada a %1$s descargas y no soporta artículos de Wikipedia sin conexión.</string> <string name="free_version_message">Esta versión libre de OsmAnd está limitada a %1$s descargas y no soporta artículos de Wikipedia sin conexión.</string>
<string name="free_version_title">Versión libre</string> <string name="free_version_title">Versión libre</string>
<string name="poi_context_menu_showdescription">Mostrar descripción</string> <string name="poi_context_menu_showdescription">Ver información del PDI</string>
<string name="index_name_north_america">Norteamérica</string> <string name="index_name_north_america">Norteamérica</string>
<string name="index_name_us">Norteamérica - Estados Unidos</string> <string name="index_name_us">Norteamérica - Estados Unidos</string>
<string name="index_name_central_america">Centroamérica</string> <string name="index_name_central_america">Centroamérica</string>
@ -1183,8 +1183,8 @@
<string name="auto_zoom_far">Para mediano alcance</string> <string name="auto_zoom_far">Para mediano alcance</string>
<string name="auto_zoom_farthest">Para largo alcance</string> <string name="auto_zoom_farthest">Para largo alcance</string>
<string name="animate_routing_route_not_calculated">Primero calcule la ruta</string> <string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
<string name="animate_routing_route">"Simular utilizando la ruta calculada "</string> <string name="animate_routing_route">"Simular, utilizando la ruta calculada "</string>
<string name="animate_routing_gpx">Simula utilizando traza GPX</string> <string name="animate_routing_gpx">Simular utilizando traza GPX</string>
<string name="app_mode_hiking">Senderismo</string> <string name="app_mode_hiking">Senderismo</string>
<string name="app_mode_motorcycle">Moto</string> <string name="app_mode_motorcycle">Moto</string>
<string name="app_mode_boat">Barco</string> <string name="app_mode_boat">Barco</string>
@ -1250,7 +1250,7 @@
<string name="lang_ka">Georgiano</string> <string name="lang_ka">Georgiano</string>
<string name="lang_de">Alemán</string> <string name="lang_de">Alemán</string>
<string name="lang_el">Griego</string> <string name="lang_el">Griego</string>
<string name="lang_iw">Hebreo</string> <string name="lang_iw">Hebreo (antiguo)</string>
<string name="lang_hi">Hindi</string> <string name="lang_hi">Hindi</string>
<string name="lang_hu">Húngaro</string> <string name="lang_hu">Húngaro</string>
<string name="lang_id">Indonesio</string> <string name="lang_id">Indonesio</string>
@ -1670,7 +1670,7 @@
<string name="your_edits">Tus ediciones</string> <string name="your_edits">Tus ediciones</string>
<string name="waypoint_visit_after">Visitar después</string> <string name="waypoint_visit_after">Visitar después</string>
<string name="waypoint_visit_before">Visitar antes</string> <string name="waypoint_visit_before">Visitar antes</string>
<string name="simulate_your_location">Simule su ubicación</string> <string name="simulate_your_location">Simular su ubicación</string>
<string name="drawer">Lista plana</string> <string name="drawer">Lista plana</string>
<string name="short_location_on_map">Lat %1$s\nLon %2$s</string> <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
<string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string> <string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string>
@ -1706,7 +1706,7 @@
<string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string> <string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string>
<string name="shared_string_do_not_use">No utilizar</string> <string name="shared_string_do_not_use">No utilizar</string>
<string name="shared_string_address">Dirección</string> <string name="shared_string_address">Dirección</string>
<string name="shared_string_show_description">Mostrar descripción</string> <string name="shared_string_show_description">Mostrar información</string>
<string name="shared_string_open">Abierto</string> <string name="shared_string_open">Abierto</string>
<string name="rendering_attr_OSMMapperAssistant_name">Asistente mapeador OSM</string> <string name="rendering_attr_OSMMapperAssistant_name">Asistente mapeador OSM</string>
<string name="shared_string_manage">Gestionar</string> <string name="shared_string_manage">Gestionar</string>
@ -1856,7 +1856,7 @@
<string name="are_you_sure">¿Está seguro?</string> <string name="are_you_sure">¿Está seguro?</string>
<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string> <string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
<string name="simulate_your_location_stop_descr">Parar simulación de posición</string> <string name="simulate_your_location_stop_descr">Parar simulación de posición</string>
<string name="simulate_your_location_descr">Simular utilizando una ruta calculada o una grabación GPX</string> <string name="simulate_your_location_descr">Simule su ubicación, utilizando una ruta calculada o una grabación GPX</string>
<string name="downloads_left_template">Quedan %1$s descargas</string> <string name="downloads_left_template">Quedan %1$s descargas</string>
<string name="default_speed_system_descr">Define el sistema de medición de velocidad</string> <string name="default_speed_system_descr">Define el sistema de medición de velocidad</string>
<string name="default_speed_system">Medición de la velocidad</string> <string name="default_speed_system">Medición de la velocidad</string>
@ -1897,7 +1897,7 @@
<string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string> <string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string>
<string name="favorite_category_name">Nombre de categoría</string> <string name="favorite_category_name">Nombre de categoría</string>
<string name="favorite_category_add_new_title">Añadir nueva categoría</string> <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
<string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque tenga el mapa completo?</string> <string name="confirm_download_roadmaps">¿Desea descargar el mapa de sólo carreteras, aunque ya tenga el mapa estándar (completo)?</string>
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Actualizar todo (%1$s MB)</string> <string name="update_all">Actualizar todo (%1$s MB)</string>

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

@ -2120,8 +2120,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="copied_to_clipboard">Copié dans le presse-papier</string> <string name="copied_to_clipboard">Copié dans le presse-papier</string>
<string name="use_dashboard_btn">Utiliser le tableau de bord</string> <string name="use_dashboard_btn">Utiliser le tableau de bord</string>
<string name="use_drawer_btn">Utiliser le menu</string> <string name="use_drawer_btn">Utiliser le menu</string>
<string name="dashboard_or_drawer_title"></string> <string name="dashboard_or_drawer_title">Lancement du Tableau de bord ou du Menu</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="dashboard_or_drawer_description">Nouvelle option permettant de définir le comportement du bouton Menu : lancement du Tableau de bord ou du Menu statique ? Ce paramètre peut être modifié par la suite dans les préférences.</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_description">Le bouton Menu lance le tableau de bord (plutôt que le Menu)</string>
<string name="access_from_map">Accès depuis la carte</string> <string name="access_from_map">Accès depuis la carte</string>
<string name="please_specify_poi_type_only_from_list">"Merci d\'indiquer un type pour ce PI ou d\'ignorer. "</string>
</resources> </resources>

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

@ -2079,4 +2079,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="use_dashboard_btn">Usa il pannello di controllo</string> <string name="use_dashboard_btn">Usa il pannello di controllo</string>
<string name="use_drawer_btn">Utilizza menu</string> <string name="use_drawer_btn">Utilizza menu</string>
<string name="dashboard_or_drawer_title">Pannello di controllo o menù</string> <string name="dashboard_or_drawer_title">Pannello di controllo o menù</string>
<string name="please_specify_poi_type_only_from_list">"Specifica il corretto tipo di PDI o salta questo passaggio "</string>
</resources> </resources>

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

File diff suppressed because one or more lines are too long

21
OsmAnd/res/values-nb/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="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string> <string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
<string name="rendering_attr_roadColors_name">Veifargeskjema</string> <string name="rendering_attr_roadColors_name">Veifargeskjema</string>
<string name="map_widget_show_destination_arrow">Vis retning til målet</string> <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@ -1410,7 +1411,7 @@
<string name="shared_string_qr_code">QR-kode</string> <string name="shared_string_qr_code">QR-kode</string>
<string name="basemap_was_selected_to_download">Basiskart er nødvendig for at programmet skal fungere riktig og ble valgt for å laste ned.</string> <string name="basemap_was_selected_to_download">Basiskart er nødvendig for at programmet skal fungere riktig og ble valgt for å laste ned.</string>
<string name="get_full_version">Fullversjon</string> <string name="get_full_version">Fullversjon</string>
<string name="confirm_download_roadmaps">Er du sikker på at du vil laste ned veikart, selv om du har fullstendig kart?</string> <string name="confirm_download_roadmaps">Er du sikker på at du vil laste ned et rent veikart, selv om du allerede har det fullstendige standardkartet?</string>
<string name="later">Senere</string> <string name="later">Senere</string>
<string name="activate_srtm_plugin">Aktiver programtillegg SRTM</string> <string name="activate_srtm_plugin">Aktiver programtillegg SRTM</string>
<string name="opening_at">Åpner</string> <string name="opening_at">Åpner</string>
@ -1439,4 +1440,18 @@
<string name="techical_articles_item">Tekniske artikler</string> <string name="techical_articles_item">Tekniske artikler</string>
<string name="feedback">Tilbakemelding</string> <string name="feedback">Tilbakemelding</string>
<string name="map_legend">Kartforklaring</string> <string name="map_legend">Kartforklaring</string>
</resources> <string name="please_specify_poi_type_only_from_list">"Spesifiser korrekt interessepunkttype eller hopp over. "</string>
<string name="access_from_map_description">Menyknapp viser dashbord, ikke meny</string>
<string name="access_from_map">Tilgang fra kart</string>
<string name="show_on_start">Vis ved start</string>
<string name="copied_to_clipboard">Kopiert til utklippstavle</string>
<string name="context_menu_item_delete_waypoint">Slette GPX-rutepunkt?</string>
<string name="context_menu_item_edit_waypoint">Rediger GPX-rutepunkt</string>
<string name="lang_nds">Lavtysk</string>
<string name="lang_mk">Makedonsk</string>
<string name="lang_fy">Frisisk</string>
<string name="lang_als">Albansk (Toskisk)</string>
<string name="use_dashboard_btn">Bruk dashbord</string>
<string name="use_drawer_btn">Bruk meny</string>
<string name="dashboard_or_drawer_title">Dashbord eller menystyring</string>
</resources>

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

@ -747,7 +747,7 @@
<string name="use_fluorescent_overlays">Odblaskowe nakładki</string> <string name="use_fluorescent_overlays">Odblaskowe nakładki</string>
<string name="use_fluorescent_overlays_descr">Użyj odblaskowych kolorów do wyświetlania ścieżek i tras</string> <string name="use_fluorescent_overlays_descr">Użyj odblaskowych kolorów do wyświetlania ścieżek i tras</string>
<string name="offline_edition">Edycja w trybie offline</string> <string name="offline_edition">Edycja w trybie offline</string>
<string name="offline_edition_descr">Zawsze edytuj w trybie offline</string> <string name="offline_edition_descr">Zawsze wprowadza modyfikacje w trybie offline</string>
<string name="local_openstreetmap_uploading">Wysyłanie…</string> <string name="local_openstreetmap_uploading">Wysyłanie…</string>
<string name="local_openstreetmap_were_uploaded">Wysłano {0} POI/notatek</string> <string name="local_openstreetmap_were_uploaded">Wysłano {0} POI/notatek</string>
@ -934,7 +934,7 @@
<string name="add_as_first_destination_point">Dodaj jako pierwszy punkt pośredni</string> <string name="add_as_first_destination_point">Dodaj jako pierwszy punkt pośredni</string>
<string name="replace_destination_point">Zamień punkt docelowy</string> <string name="replace_destination_point">Zamień punkt docelowy</string>
<string name="new_destination_point_dialog">Już wybrałeś punkt docelowy.</string> <string name="new_destination_point_dialog">Już wybrałeś punkt docelowy.</string>
<string name="target_points">Punkty pośrednie</string> <string name="target_points">Punkty trasy</string>
<string name="intermediate_point_too_far">Punkt pośredni %1$s jest zbyt daleko od najbliższej ulicy.</string> <string name="intermediate_point_too_far">Punkt pośredni %1$s jest zbyt daleko od najbliższej ulicy.</string>
<string name="arrived_at_intermediate_point">Dotarłeś do punktu pośredniego</string> <string name="arrived_at_intermediate_point">Dotarłeś do punktu pośredniego</string>
<string name="context_menu_item_intermediate_point">Dodaj jako punkt pośredni</string> <string name="context_menu_item_intermediate_point">Dodaj jako punkt pośredni</string>
@ -1057,7 +1057,7 @@
<string name="av_def_action_picture">Zrób zdjęcie</string> <string name="av_def_action_picture">Zrób zdjęcie</string>
<string name="recording_context_menu_precord">Zrób zdjęcie</string> <string name="recording_context_menu_precord">Zrób zdjęcie</string>
<string name="stop_routing_confirm">Czy na pewno chcesz zatrzymać nawigację?</string> <string name="stop_routing_confirm">Czy na pewno chcesz zatrzymać nawigację?</string>
<string name="clear_dest_confirm">Czy na pewno chcesz usunąć punkt docelowy (oraz punkty pośrednie)?</string> <string name="clear_dest_confirm">Usunąć cel podróży (oraz punkty trasy)?</string>
<string name="precise_routing_mode">Precyzyjne trasy (alpha)</string> <string name="precise_routing_mode">Precyzyjne trasy (alpha)</string>
<string name="precise_routing_mode_descr">Włącz obliczanie precyzyjnych tras w nawigacji. Funkcja dość powolna, nadal jest ograniczona odległością.</string> <string name="precise_routing_mode_descr">Włącz obliczanie precyzyjnych tras w nawigacji. Funkcja dość powolna, nadal jest ograniczona odległością.</string>
<string name="local_indexes_cat_av">Dane audio/video</string> <string name="local_indexes_cat_av">Dane audio/video</string>
@ -1997,7 +1997,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="favourites">Ulubione</string> <string name="favourites">Ulubione</string>
<string name="saved_at_time">Zapisano o: %1$s</string> <string name="saved_at_time">Zapisano o: %1$s</string>
<string name="poi_deleted_localy">POI zostanie usunięty gdy tylko wyślesz swoje zmiany</string> <string name="poi_deleted_localy">POI zostanie usunięty gdy tylko wyślesz swoje zmiany</string>
<string name="show_gpx">Pokaż GPX</string> <string name="show_gpx">Wyświetlanie GPX</string>
<string name="show_on_start">Wyświetlanie podczas uruchamiania</string> <string name="show_on_start">Wyświetlanie podczas uruchamiania</string>
<string name="count_of_lines">Liczba linii</string> <string name="count_of_lines">Liczba linii</string>
<string name="address_unknown">Adres nie jest jeszcze znany</string> <string name="address_unknown">Adres nie jest jeszcze znany</string>
@ -2072,7 +2072,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="simulate_initial_startup_descr">Ustaw flagę wskazującą pierwsze uruchomienie aplikacji, utrzymuje wszystkie inne ustawienia bez zmian</string> <string name="simulate_initial_startup_descr">Ustaw flagę wskazującą pierwsze uruchomienie aplikacji, utrzymuje wszystkie inne ustawienia bez zmian</string>
<string name="share_geo">wsp:</string> <string name="share_geo">wsp:</string>
<string name="confirm_download_roadmaps">Czy na pewno chcesz pobrać mapę dróg, nawet jeśli masz pełną wersję mapy?</string> <string name="confirm_download_roadmaps">Pobrać mapę samochodową, nawet jeśli pobrano już zwykłą mapę?</string>
<string name="free_downloads_used_description">Możesz ustawić ile razy pobrań użyłeś</string> <string name="free_downloads_used_description">Możesz ustawić ile razy pobrań użyłeś</string>
<string name="show_on_start_description">\'Wyłącz\' bezpośrednio uruchamia ekran mapy</string> <string name="show_on_start_description">\'Wyłącz\' bezpośrednio uruchamia ekran mapy</string>
@ -2097,7 +2097,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="contact_us">Kontakt z nami</string> <string name="contact_us">Kontakt z nami</string>
<string name="map_legend">Legenda mapy</string> <string name="map_legend">Legenda mapy</string>
<string name="save_poi_without_poi_type_message">Zapisać POI bez określonego rodzaju?</string> <string name="save_poi_without_poi_type_message">Zapisać POI bez określonego rodzaju?</string>
<string name="access_from_map_description">Uruchamia pulpit bezpośrednio z mapy</string> <string name="access_from_map_description">Wyświetla kokpit zamiast menu</string>
<string name="access_from_map">Dostęp z mapy</string> <string name="access_from_map">Dostęp z mapy</string>
<string name="copied_to_clipboard">Skopiowane do schowka</string> <string name="copied_to_clipboard">Skopiowane do schowka</string>
<string name="release_2_2">" • Nowe menu kontekstowe, przystosowane do wybierania lokacji na mapie oraz na innych wyświetlaczach\n\n• Mapa jest teraz wyświetlana bezpośrednio, o ile nie wybrano opcji \'Pokaż pulpit podczas startu aplikacji\'\n\n• Można skonfigurować które zakładki oraz jak będą wyświetlane na pulpicie\n\n• W celu pobrania map, interesujące nas regiony można wybrać bezpośrednio na mapie świata\n\n• Wyszukiwarka POI wspiera teraz bardziej precyzyjne zapytania\n\n• Poprawiona funkcjonalność POI oraz edytora OSM\n\n• Struktura oraz interfejs menu pobierania map zostały ulepszone\n\ni więcej ... "</string> <string name="release_2_2">" • Nowe menu kontekstowe, przystosowane do wybierania lokacji na mapie oraz na innych wyświetlaczach\n\n• Mapa jest teraz wyświetlana bezpośrednio, o ile nie wybrano opcji \'Pokaż pulpit podczas startu aplikacji\'\n\n• Można skonfigurować które zakładki oraz jak będą wyświetlane na pulpicie\n\n• W celu pobrania map, interesujące nas regiony można wybrać bezpośrednio na mapie świata\n\n• Wyszukiwarka POI wspiera teraz bardziej precyzyjne zapytania\n\n• Poprawiona funkcjonalność POI oraz edytora OSM\n\n• Struktura oraz interfejs menu pobierania map zostały ulepszone\n\ni więcej ... "</string>
@ -2118,4 +2118,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="use_drawer_btn">Pokaż mapę przy starcie</string> <string name="use_drawer_btn">Pokaż mapę przy starcie</string>
<string name="dashboard_or_drawer_description">Możesz wybrać sposób, w jakim aplikacja wystartuje: mapa lub pulpit. Możesz to zmienić później w ustawieniach.</string> <string name="dashboard_or_drawer_description">Możesz wybrać sposób, w jakim aplikacja wystartuje: mapa lub pulpit. Możesz to zmienić później w ustawieniach.</string>
<string name="osm_save_offline">Zapisz lokalnie</string> <string name="osm_save_offline">Zapisz lokalnie</string>
<string name="please_specify_poi_type_only_from_list">"Proszę określić rodzaj POI lub pominąć go. "</string>
<string name="osm_edit_modified_poi">Zmodyfikowano POI OSM</string>
<string name="osm_edit_deleted_poi">Usunięto POI OSM</string>
</resources> </resources>

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

@ -1862,7 +1862,7 @@
<string name="poi_aeroway_fuel">Авиационная заправка</string> <string name="poi_aeroway_fuel">Авиационная заправка</string>
<string name="poi_fuel_91ul">Топливо 91UL</string> <string name="poi_fuel_91ul">Топливо 91UL</string>
<string name="poi_fuel_100ll">Топливо 100LL</string> <string name="poi_fuel_100ll">Топливо 100LL</string>
<string name="poi_jeta1">Топливо Jet A-1</string> <string name="poi_fuel_jeta1">Топливо Jet A-1</string>
<string name="poi_fuel_adblue">Топливо AdBlue</string> <string name="poi_fuel_adblue">Топливо AdBlue</string>
<string name="poi_fuel_wood">Топливо: дрова</string> <string name="poi_fuel_wood">Топливо: дрова</string>
<string name="poi_fuel_charcoal">Топливо: древесный уголь</string> <string name="poi_fuel_charcoal">Топливо: древесный уголь</string>

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

@ -1842,7 +1842,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="favorite_category_dublicate_message">Zadaný názov kategórie už existuje. Prosím zadajte iný názov.</string> <string name="favorite_category_dublicate_message">Zadaný názov kategórie už existuje. Prosím zadajte iný názov.</string>
<string name="favorite_category_name">Názov kategórie</string> <string name="favorite_category_name">Názov kategórie</string>
<string name="favorite_category_add_new_title">Pridať novú kategóriu</string> <string name="favorite_category_add_new_title">Pridať novú kategóriu</string>
<string name="confirm_download_roadmaps">Naozaj chcete stiahnuť mapu ciest, keď už máte plnú mapu?</string> <string name="confirm_download_roadmaps">Naozaj chcete stiahnuť mapu obsahujúcu iba cesty, keď už máte štandardnú (plnú) mapu?</string>
<string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Aktualizovať všetko (%1$s MB)</string> <string name="update_all">Aktualizovať všetko (%1$s MB)</string>

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

@ -2009,4 +2009,5 @@
<string name="shared_string_commit">Skicka in</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> <string name="please_specify_poi_type_only_from_list">"Ange rätt POI-typ eller hoppa över det. "</string>
<string name="rendering_attr_roadStyle_description">Vägtyp</string>
</resources> </resources>

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

@ -2026,8 +2026,8 @@
<string name="poi_fuel_91ul">91UL 燃料</string> <string name="poi_fuel_91ul">91UL 燃料</string>
<string name="poi_fuel_100ll">100LL 燃料</string> <string name="poi_fuel_100ll">100LL 燃料</string>
<string name="poi_autogas">液化石油氣</string> <string name="poi_fuel_autogas">液化石油氣</string>
<string name="poi_jeta1">Jet A-1 燃料</string> <string name="poi_fuel_jeta1">Jet A-1 燃料</string>
<string name="poi_fuel_adblue">AdBlue 燃料</string> <string name="poi_fuel_adblue">AdBlue 燃料</string>
<string name="poi_fuel_wood">燃料：木材</string> <string name="poi_fuel_wood">燃料：木材</string>

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

@ -172,4 +172,10 @@
<color name="color_dialog_buttons">#2f7af5</color> <color name="color_dialog_buttons">#2f7af5</color>
<color name="dialog_inactive_text_color_dark">#78909c</color> <color name="dialog_inactive_text_color_dark">#78909c</color>
<!-- DownloadedRegionsLayer -->
<color name="region_uptodate">#5532C832</color>
<color name="region_updateable">#55FF8F00</color>
<color name="region_selected">#55FFFF00</color>
<color name="region_downloading">#2Acd2c33</color>
</resources> </resources>

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

@ -2004,8 +2004,8 @@
<string name="poi_fuel_91ul">91UL fuel</string> <string name="poi_fuel_91ul">91UL fuel</string>
<string name="poi_fuel_100ll">100LL fuel</string> <string name="poi_fuel_100ll">100LL fuel</string>
<string name="poi_autogas">Autogas</string> <string name="poi_fuel_autogas">Autogas</string>
<string name="poi_jeta1">Jet A-1 fuel</string> <string name="poi_fuel_jeta1">Jet A-1 fuel</string>
<string name="poi_fuel_adblue">AdBlue fuel</string> <string name="poi_fuel_adblue">AdBlue fuel</string>
<string name="poi_fuel_wood">Fuel: wood</string> <string name="poi_fuel_wood">Fuel: wood</string>

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

@ -10,7 +10,7 @@ import net.osmand.plus.helpers.AndroidUiHelper;
public abstract class BaseMenuController { public abstract class BaseMenuController {
public final static float LANDSCAPE_WIDTH_DP = 350f; public final static float LANDSCAPE_WIDTH_DP = 366f;
private MapActivity mapActivity; private MapActivity mapActivity;
private boolean portraitMode; private boolean portraitMode;

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

@ -219,6 +219,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
updateButtonsAndProgress(); updateButtonsAndProgress();
if (menu.isLandscapeLayout()) { if (menu.isLandscapeLayout()) {
final TypedValue typedValueAttr = new TypedValue();
getMapActivity().getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
mainView.setBackgroundResource(typedValueAttr.resourceId);
mainView.setLayoutParams(new FrameLayout.LayoutParams(dpToPx(menu.getLandscapeWidthDp()), mainView.setLayoutParams(new FrameLayout.LayoutParams(dpToPx(menu.getLandscapeWidthDp()),
ViewGroup.LayoutParams.MATCH_PARENT)); ViewGroup.LayoutParams.MATCH_PARENT));
View fabContainer = view.findViewById(R.id.context_menu_fab_container); View fabContainer = view.findViewById(R.id.context_menu_fab_container);
@ -330,6 +333,11 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
// FAB // FAB
fabView = (ImageView)view.findViewById(R.id.context_menu_fab_view); fabView = (ImageView)view.findViewById(R.id.context_menu_fab_view);
if (menu.fabVisible()) { if (menu.fabVisible()) {
if (menu.isLandscapeLayout()) {
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) fabView.getLayoutParams();
params.setMargins(0, 0, dpToPx(28f), 0);
fabView.setLayoutParams(params);
}
fabView.setOnClickListener(new View.OnClickListener() { fabView.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

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

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

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

@ -104,10 +104,14 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
rm = app.getResourceManager(); rm = app.getResourceManager();
osmandRegions = rm.getOsmandRegions(); osmandRegions = rm.getOsmandRegions();
paintDownloaded = getPaint(Color.argb(100, 50, 200, 50)); //paintDownloaded = getPaint(Color.argb(100, 50, 200, 50));
paintSelected = getPaint(Color.argb(100, 255, 143, 0)); //paintSelected = getPaint(Color.argb(100, 255, 143, 0));
paintDownloading = getPaint(Color.argb(40, 50, 200, 50)); //paintDownloading = getPaint(Color.argb(40, 50, 200, 50));
paintOutdated = getPaint(Color.argb(100, 0, 128, 255)); //paintOutdated = getPaint(Color.argb(100, 0, 128, 255));
paintDownloaded = getPaint(view.getResources().getColor(R.color.region_uptodate));
paintOutdated = getPaint(view.getResources().getColor(R.color.region_updateable));
paintSelected = getPaint(view.getResources().getColor(R.color.region_selected));
paintDownloading = getPaint(view.getResources().getColor(R.color.region_downloading));
textPaint = new TextPaint(); textPaint = new TextPaint();
final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE); final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE);