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

Merge

Browse source
This commit is contained in:
GaidamakUA 2015-11-04 15:37:00 +02:00
commit 9d45bf2f22
31 changed files with 2062 additions and 1630 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,10 +85,23 @@
<LinearLayout <LinearLayout
android:id="@+id/context_menu_close_btn_layout" android:id="@+id/context_menu_close_btn_layout"
android:layout_width="66dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="66dp"
android:orientation="horizontal"> android:orientation="horizontal">
<Button
android:id="@+id/title_button_top_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:gravity="center"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/shared_string_others"
android:textColor="?attr/contextMenuButtonColor"
android:textSize="@dimen/default_desc_text_size"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -101,6 +114,7 @@
android:layout_marginRight="2dp" android:layout_marginRight="2dp"
android:layout_marginTop="-16dp" android:layout_marginTop="-16dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:clickable="true"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button
@ -111,7 +125,7 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/osmand_parking_delete" android:text="@string/recording_context_menu_play"
android:textColor="?attr/contextMenuButtonColor" android:textColor="?attr/contextMenuButtonColor"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"/>
@ -126,6 +140,19 @@
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
android:text="— 00:26"/> android:text="— 00:26"/>
<Button
android:id="@+id/title_button_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:gravity="center"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:drawableLeft="@drawable/ic_action_delete_dark"
android:text="@string/shared_string_delete"
android:textColor="?attr/contextMenuButtonColor"
android:textSize="@dimen/default_desc_text_size"/>
</LinearLayout> </LinearLayout>
<View <View

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

@ -883,22 +883,22 @@
<string name="poi_sally_port">Vstup do pevnosti</string> <string name="poi_sally_port">Vstup do pevnosti</string>
<string name="poi_swing_gate">Otočná závora</string> <string name="poi_swing_gate">Otočná závora</string>
<string name="poi_turnstile">Turniket</string> <string name="poi_turnstile">Turniket</string>
<string name="poi_barrier_entrance">Vstup</string> <string name="poi_barrier_entrance">Průchod ve zdi nebo plotu</string>
<string name="poi_entrance_main">Hlavní vchod</string> <string name="poi_entrance_main">Hlavní vchod</string>
<string name="poi_entrance">Vchod</string> <string name="poi_entrance">Vchod</string>
<string name="poi_entrance_exit">Východ</string> <string name="poi_entrance_exit">Východ</string>
<string name="poi_highway_crossing">Přechod pro chodce</string> <string name="poi_highway_crossing">Přechod pro chodce</string>
<string name="poi_icn_ref">Mezinárodní cyklistická síť</string> <string name="poi_icn_ref">Bod mezinárodní cyklistické sítě</string>
<string name="poi_ncn_ref">Národní cyklistická síť</string> <string name="poi_ncn_ref">Bod národní cyklistické sítě</string>
<string name="poi_rcn_ref">Regionální cyklistická síť</string> <string name="poi_rcn_ref">Bod regionální cyklistické sítě</string>
<string name="poi_lcn_ref">Lokální cyklistická síť</string> <string name="poi_lcn_ref">Bod lokální cyklistické sítě</string>
<string name="poi_iwn_ref">Mezinárodní pěší síť</string> <string name="poi_iwn_ref">Bod mezinárodní pěší sítě</string>
<string name="poi_nwn_ref">Národní pěší síť</string> <string name="poi_nwn_ref">Bod národní pěší sítě</string>
<string name="poi_rwn_ref">Regionální pěší síť</string> <string name="poi_rwn_ref">Bod regionální pěší sítě</string>
<string name="poi_lwn_ref">Lokální pěší síť</string> <string name="poi_lwn_ref">Bod lokální pěší sítě</string>
<string name="poi_opening_hours">Otevírací hodiny</string> <string name="poi_opening_hours">Otevírací hodiny</string>
<string name="poi_description">Popis</string> <string name="poi_description">Popis</string>
@ -913,7 +913,7 @@
<string name="poi_operator">Provozovatel</string> <string name="poi_operator">Provozovatel</string>
<string name="poi_brand">Značka</string> <string name="poi_brand">Značka</string>
<string name="poi_enforcement_traffic_signals">Vynucení:semafory</string> <string name="poi_enforcement_traffic_signals">Vynucení: světelná signalizace</string>
<string name="poi_enforcement_maxspeed">Vynucení: maximální rychlost</string> <string name="poi_enforcement_maxspeed">Vynucení: maximální rychlost</string>
<string name="poi_enforcement_maxheight">Vynucení: maximální výška</string> <string name="poi_enforcement_maxheight">Vynucení: maximální výška</string>
<string name="poi_enforcement_mindistance">Vynucení: minimální vzdálenost</string> <string name="poi_enforcement_mindistance">Vynucení: minimální vzdálenost</string>
@ -1026,20 +1026,20 @@
<string name="poi_denomination_roman_catholic">Římskokatolicismus</string> <string name="poi_denomination_roman_catholic">Římskokatolicismus</string>
<string name="poi_denomination_orthodox">Pravoslaví</string> <string name="poi_denomination_orthodox">Pravoslaví</string>
<string name="poi_denomination_lutheran">Luteránství</string> <string name="poi_denomination_lutheran">Luteránství</string>
<string name="poi_board_type_astronomy">Informace o astronomii</string> <string name="poi_board_type_astronomy">Informační značení: astronomie</string>
<string name="poi_board_type_technology">Informace o technologii</string> <string name="poi_board_type_technology">Informační značení: technologie</string>
<string name="poi_board_type_public_transport">Informace o veřejné dopravě</string> <string name="poi_board_type_public_transport">Informační značení: veřejná doprava</string>
<string name="poi_board_type_geology">Informace o geologii</string> <string name="poi_board_type_geology">Informační značení: geologie</string>
<string name="poi_board_type_plants">Informace o rostlinách</string> <string name="poi_board_type_plants">Informační značení: rostliny</string>
<string name="poi_board_type_notice">Deska s oznámením</string> <string name="poi_board_type_notice">Vývěska</string>
<string name="poi_information_tactile_map">Haptická mapa</string> <string name="poi_information_tactile_map">Haptická mapa</string>
<string name="poi_information_tactile_model">Dotykový model</string> <string name="poi_information_tactile_model">Dotykový model</string>
<string name="poi_information_bicyclemap">Cyklistická mapa</string> <string name="poi_information_bicyclemap">Cyklistická mapa</string>
<string name="poi_information_audioguide">Audioprůvodce</string> <string name="poi_information_audioguide">Audioprůvodce</string>
<string name="poi_information_history">Informace o historii</string> <string name="poi_information_history">Informační značení: historie</string>
<string name="poi_information_wildlife">Informace o divočině</string> <string name="poi_information_wildlife">Informační značení: živočich</string>
<string name="poi_information_nature">Informace o přírodě</string> <string name="poi_information_nature">Informační značení: příroda</string>
<string name="poi_information_hikingmap">Turistická mapa</string> <string name="poi_information_hikingmap">Turistická mapa</string>
<string name="poi_information_terminal">Informační terminál</string> <string name="poi_information_terminal">Informační terminál</string>
<string name="poi_information_office">Informační kancelář</string> <string name="poi_information_office">Informační kancelář</string>
@ -1089,8 +1089,8 @@
<string name="poi_height">Výška</string> <string name="poi_height">Výška</string>
<string name="poi_ele">Nadmořská výška</string> <string name="poi_ele">Nadmořská výška</string>
<string name="poi_fee_no">Žádný poplatek</string> <string name="poi_fee_no">Žádný poplatek</string>
<string name="poi_drinking_water_yes">Pitná voda</string> <string name="poi_drinking_water_yes">Pitná voda: ano</string>
<string name="poi_drinking_water_no">Nepitná voda</string> <string name="poi_drinking_water_no">Pitná voda: ne</string>
<string name="poi_seasonal_yes">Sezónní</string> <string name="poi_seasonal_yes">Sezónní</string>
<string name="poi_seasonal_no">Nesezónní</string> <string name="poi_seasonal_no">Nesezónní</string>
<string name="poi_seasonal_dry_season">Období sucha</string> <string name="poi_seasonal_dry_season">Období sucha</string>
@ -1146,7 +1146,7 @@
<string name="poi_collection_times">Čas vybírání pošty</string> <string name="poi_collection_times">Čas vybírání pošty</string>
<string name="poi_supervised_yes">Střežené</string> <string name="poi_supervised_yes">Střežené</string>
<string name="poi_supervised_no">Nestřežené</string> <string name="poi_supervised_no">Nestřežené</string>
<string name="poi_crossing_traffic_signals">Se semafory</string> <string name="poi_crossing_traffic_signals">Se světelnou signalizací</string>
<string name="poi_crossing_uncontrolled">Neřízený</string> <string name="poi_crossing_uncontrolled">Neřízený</string>
<string name="poi_crossing_unmarked">Nevyznačený</string> <string name="poi_crossing_unmarked">Nevyznačený</string>
<string name="poi_access_destination">Přístup jen k cíli</string> <string name="poi_access_destination">Přístup jen k cíli</string>
@ -1155,21 +1155,21 @@
<string name="poi_access_delivery">Přístup jen pro zásobování</string> <string name="poi_access_delivery">Přístup jen pro zásobování</string>
<string name="poi_access_agricultural">Přístup pro zemědělské účely</string> <string name="poi_access_agricultural">Přístup pro zemědělské účely</string>
<string name="poi_content_silage">Siláž (obsah)</string> <string name="poi_content_silage">Obsah: siláž</string>
<string name="poi_content_water">Voda (obsah)</string> <string name="poi_content_water">Obsah: voda</string>
<string name="poi_content_oil">Ropa (obsah)</string> <string name="poi_content_oil">Obsah: ropa</string>
<string name="poi_content_fuel">Palivo (obsah)</string> <string name="poi_content_fuel">Obsah: palivo</string>
<string name="poi_content_manure">Hnůj (obsah)</string> <string name="poi_content_manure">Obsah: hnůj</string>
<string name="poi_content_wine">Víno (obsah)</string> <string name="poi_content_wine">Obsah: víno</string>
<string name="poi_content_sewage">Kanalizace (obsah)</string> <string name="poi_content_sewage">Obsah: splašky</string>
<string name="poi_content_gas">Plyn (obsah)</string> <string name="poi_content_gas">Obsah: plyn</string>
<string name="poi_content_biomass">Biomasa (obsah)</string> <string name="poi_content_biomass">Obsah: biomasa</string>
<string name="poi_content_wastewater">Odpadní vody (obsah)</string> <string name="poi_content_wastewater">Obsah: odpadní voda</string>
<string name="poi_content_crop">Plodiny (obsah)</string> <string name="poi_content_crop">Obsah: plodiny</string>
<string name="poi_content_fodder">Krmivo (obsah)</string> <string name="poi_content_fodder">Obsah: krmivo</string>
<string name="poi_content_beer">Pivo (obsah)</string> <string name="poi_content_beer">Obsah: pivo</string>
<string name="poi_content_salt">Sůl (obsah)</string> <string name="poi_content_salt">Obsah: sůl</string>
<string name="poi_content_grain">Zrno (obsah)</string> <string name="poi_content_grain">Obsah: zrno</string>
<string name="poi_trade_wood">Dřevo</string> <string name="poi_trade_wood">Dřevo</string>
<string name="poi_trade_tile">Kachličky</string> <string name="poi_trade_tile">Kachličky</string>
@ -1213,10 +1213,10 @@
<string name="poi_urban">Město</string> <string name="poi_urban">Město</string>
<string name="poi_rural">Venkov</string> <string name="poi_rural">Venkov</string>
<string name="poi_animal_shelter_dog">Útulek pro psy</string> <string name="poi_animal_shelter_dog">Typ útulku: pes</string>
<string name="poi_animal_shelter_cat">Útulek pro kočky</string> <string name="poi_animal_shelter_cat">Typ útulku: kočky</string>
<string name="poi_animal_shelter_dog_cat">Útulek pro psy a kočky</string> <string name="poi_animal_shelter_dog_cat">Typ útulku: pes, kočka</string>
<string name="poi_animal_shelter_bird">Útočiště pro ptáky</string> <string name="poi_animal_shelter_bird">Typ útulku: pták</string>
<string name="poi_seats">Sedačky</string> <string name="poi_seats">Sedačky</string>
<string name="poi_backrest_yes">Opěradlo: ano</string> <string name="poi_backrest_yes">Opěradlo: ano</string>
@ -1234,20 +1234,20 @@
<string name="poi_covered_no">Bez přístřešku</string> <string name="poi_covered_no">Bez přístřešku</string>
<string name="poi_smoking_no">Zákaz kouření</string> <string name="poi_smoking_no">Zákaz kouření</string>
<string name="poi_smoking_outside">Kouření je povoleno pouze venku</string> <string name="poi_smoking_outside">Kouření povoleno pouze venku</string>
<string name="poi_smoking_yes">Kouření je povoleno</string> <string name="poi_smoking_yes">Kouření povoleno</string>
<string name="poi_smoking_separated">Kouření je povoleno v samostatné neoddělené místnosti</string> <string name="poi_smoking_separated">Kouření povoleno v samostatné místnosti</string>
<string name="poi_smoking_isolated">Kouření je povoleno v samostatné oddělené místnosti</string> <string name="poi_smoking_isolated">Kouření povoleno v oddělené místnosti</string>
<string name="poi_smoking_dedicated">Výhradně pro kuřáky</string> <string name="poi_smoking_dedicated">Výhradně pro kuřáky</string>
<string name="poi_toll_yes">Účtována platba mýtného</string> <string name="poi_toll_yes">Mýto</string>
<string name="poi_toll_no">Není účtována platba mýtného</string> <string name="poi_toll_no">Žádné mýto</string>
<string name="poi_toll_hgv_yes">Platba mýtného je účtována jen pro nákladní vozidla</string> <string name="poi_toll_hgv_yes">Mýto jen pro nákladní vozidla</string>
<string name="poi_tactile_paving_yes">Se značením pro nevidomé</string> <string name="poi_tactile_paving_yes">Se značením pro nevidomé</string>
<string name="poi_tactile_paving_no">Bez značení pro nevidomé</string> <string name="poi_tactile_paving_no">Bez značení pro nevidomé</string>
<string name="poi_traffic_signals_sound_yes">Se zvukovou signalizací</string> <string name="poi_traffic_signals_sound_yes">Se zvukovou signalizací</string>
<string name="poi_traffic_signals_sound_no">Bez zvukové signalizace</string> <string name="poi_traffic_signals_sound_no">Bez zvukové signalizace</string>
<string name="poi_traffic_signals_sound_walk">"Se zvukovou signalizací v případě, že je chůze povolena"</string> <string name="poi_traffic_signals_sound_walk">Se zvukovou signalizací pokud je chůze povolena</string>
<string name="poi_rescue_station">Záchranná stanice</string> <string name="poi_rescue_station">Záchranná stanice</string>

4
OsmAnd/res/values-cs/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" standalone="no"?>
<resources>
<string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string> <string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
<string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string> <string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string>
@ -1982,4 +1983,5 @@
<string name="contact_us">Kontaktujte nás</string> <string name="contact_us">Kontaktujte nás</string>
<string name="osm_edit_created_poi">Vytvořen OSM POI</string> <string name="osm_edit_created_poi">Vytvořen OSM POI</string>
<string name="osm_edit_created_bug">Vytvořena OSM chyba</string> <string name="osm_edit_created_bug">Vytvořena OSM chyba</string>
<string name="map_legend">Legenda mapy</string>
</resources> </resources>

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

@ -2422,4 +2422,7 @@
<string name="poi_bathing_yes">Badning: ja</string> <string name="poi_bathing_yes">Badning: ja</string>
<string name="poi_bathing_no">Badning: nej</string> <string name="poi_bathing_no">Badning: nej</string>
<string name="poi_wiki_link">Wiki</string>
</resources> </resources>

5
OsmAnd/res/values-da/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" standalone="no"?>
<resources>
<string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string> <string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
<string name="av_def_action_video">Optag video</string> <string name="av_def_action_video">Optag video</string>
<string name="av_def_action_audio">Optag audio</string> <string name="av_def_action_audio">Optag audio</string>
@ -2001,5 +2002,5 @@
<string name="contact_us">Kontakt os</string> <string name="contact_us">Kontakt os</string>
<string name="osm_edit_created_poi">Oprettede OSM IP</string> <string name="osm_edit_created_poi">Oprettede OSM IP</string>
<string name="osm_edit_created_bug">Oprettede OSM fejlregistrering</string> <string name="osm_edit_created_bug">Oprettede OSM fejlregistrering</string>
<string name="map_legend">Kortforklaring</string> <string name="map_legend">Signaturforklaring</string>
</resources> </resources>

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

@ -2388,7 +2388,7 @@
<string name="poi_cross">Cruz</string> <string name="poi_cross">Cruz</string>
<string name="poi_summit_cross">Cumbre a la cruz: Si</string> <string name="poi_summit_cross">Cumbre a la cruz: Si</string>
<string name="poi_prison_camp">Campamento de prisioneros</string> <string name="poi_prison_camp">Ex campo de prisioneros</string>
<string name="poi_concentration_camp">Tipo: Campo de concentración</string> <string name="poi_concentration_camp">Tipo: Campo de concentración</string>
<string name="poi_pow_camp">Tipo: Prisioneros de guerra</string> <string name="poi_pow_camp">Tipo: Prisioneros de guerra</string>
<string name="poi_labor_camp">Tipo: Trabajos forzados</string> <string name="poi_labor_camp">Tipo: Trabajos forzados</string>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string> <?xml version='1.0' encoding='utf-8'?>
<resources><string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
<string name="copying_osmand_file_failed">Falló al copiar archivos</string> <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
<string name="storage_directory_external">Almacenamiento externo</string> <string name="storage_directory_external">Almacenamiento externo</string>
<string name="storage_directory_multiuser">Almacenamiento multiusuario</string> <string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
@ -2014,5 +2015,6 @@
<string name="feedback">Encuesta</string> <string name="feedback">Encuesta</string>
<string name="contact_us">Contáctenos</string> <string name="contact_us">Contáctenos</string>
<string name="osm_edit_created_poi">PDI de OSM creado</string> <string name="osm_edit_created_poi">PDI de OSM creado</string>
<string name="osm_edit_created_bug">Reporte de OSM creado</string> <string name="osm_edit_created_bug">Nota OSM creada</string>
<string name="map_legend">Leyenda del mapa</string>
</resources> </resources>

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

@ -2392,7 +2392,7 @@
<string name="poi_cross">Cruz</string> <string name="poi_cross">Cruz</string>
<string name="poi_summit_cross">Cumbre a la cruz: Si</string> <string name="poi_summit_cross">Cumbre a la cruz: Si</string>
<string name="poi_prison_camp">Campamento de prisioneros</string> <string name="poi_prison_camp">Ex campo de prisioneros</string>
<string name="poi_concentration_camp">Tipo: Campo de concentración</string> <string name="poi_concentration_camp">Tipo: Campo de concentración</string>
<string name="poi_pow_camp">Tipo: Prisioneros de guerra</string> <string name="poi_pow_camp">Tipo: Prisioneros de guerra</string>
<string name="poi_labor_camp">Tipo: Trabajos forzados</string> <string name="poi_labor_camp">Tipo: Trabajos forzados</string>

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

@ -1,5 +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">Configurar pantalla</string> <string name="layer_map_appearance">Configurar pantalla</string>
<string name="show_lanes">Mostrar carriles</string> <string name="show_lanes">Mostrar carriles</string>
<string name="avoid_unpaved">Evitar carreteras no pavimentadas</string> <string name="avoid_unpaved">Evitar carreteras no pavimentadas</string>
@ -2133,5 +2133,6 @@
<string name="feedback">Encuesta</string> <string name="feedback">Encuesta</string>
<string name="contact_us">Contáctenos</string> <string name="contact_us">Contáctenos</string>
<string name="osm_edit_created_poi">PDI de OSM creado</string> <string name="osm_edit_created_poi">PDI de OSM creado</string>
<string name="osm_edit_created_bug">Nota de OSM creada</string> <string name="osm_edit_created_bug">Nota OSM creada</string>
<string name="map_legend">Leyenda del mapa</string>
</resources> </resources>

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

@ -532,7 +532,7 @@
<string name="poi_motorcycle">Magasin de motos</string> <string name="poi_motorcycle">Magasin de motos</string>
<string name="poi_frame">Magasin d\'encadrement</string> <string name="poi_frame">Magasin d\'encadrement</string>
<string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string> <string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string>
<string name="poi_bed">Magasin d\'équipement pour la chambre</string> <string name="poi_bed">Magasin de literie</string>
<string name="poi_clothes_children">Vêtements pour enfants</string> <string name="poi_clothes_children">Vêtements pour enfants</string>
<string name="poi_curtain">Boutique de rideaux</string> <string name="poi_curtain">Boutique de rideaux</string>
<string name="poi_dairy">Crèmerie</string> <string name="poi_dairy">Crèmerie</string>
@ -719,7 +719,7 @@
<string name="poi_fuel_ethanol">Éthanol</string> <string name="poi_fuel_ethanol">Éthanol</string>
<string name="poi_fuel_methanol">Méthanol</string> <string name="poi_fuel_methanol">Méthanol</string>
<string name="poi_fuel_e85">E85</string> <string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string> <string name="poi_fuel_biogas">Biogaz</string>
<string name="poi_fuel_e20">E20</string> <string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_lh2">Hydrogène liquide</string> <string name="poi_fuel_lh2">Hydrogène liquide</string>
<string name="poi_fuel_electricity">Électricité</string> <string name="poi_fuel_electricity">Électricité</string>
@ -1227,7 +1227,7 @@
<string name="poi_memorial_obelisk">Obélisque</string> <string name="poi_memorial_obelisk">Obélisque</string>
<string name="poi_memorial_cross">Carrefour</string> <string name="poi_memorial_cross">Croix</string>
<string name="poi_memorial_vehicle">Véhicule</string> <string name="poi_memorial_vehicle">Véhicule</string>
<string name="poi_bicycle_parking_wall_loops">Boucles murales</string> <string name="poi_bicycle_parking_wall_loops">Boucles murales</string>
<string name="poi_species">Espèces</string> <string name="poi_species">Espèces</string>
@ -1529,4 +1529,280 @@
<string name="poi_social_facility_for_child">Public ciblé : enfants</string> <string name="poi_social_facility_for_child">Public ciblé : enfants</string>
<string name="poi_social_facility_for_orphan">Public ciblé : orphelins</string> <string name="poi_social_facility_for_orphan">Public ciblé : orphelins</string>
<string name="poi_social_facility_for_disabled">Public ciblé : handicapés</string> <string name="poi_social_facility_for_disabled">Public ciblé : handicapés</string>
<string name="poi_memorial_column">Colonne</string>
<string name="poi_historic_quarry">Carrière historique</string>
<string name="poi_resource_slate">Ardoise</string>
<string name="poi_surface_gravel">Surface : gravier</string>
<string name="poi_surface_fine_gravel">Surface : gravier fin</string>
<string name="poi_route_monorail_ref">Monorail</string>
<string name="poi_service_bicycle_retail_no">Vente de cycles : non</string>
<string name="poi_service_bicycle_repair_yes">Réparation de cycles : oui</string>
<string name="poi_service_bicycle_retail_yes">Vente de cycles : oui</string>
<string name="poi_service_bicycle_repair_no">Réparation de cycles : non</string>
<string name="poi_service_bicycle_rental_yes">Location de cycles : oui</string>
<string name="poi_service_bicycle_rental_no">Location de cycles : non</string>
<string name="poi_service_bicycle_pump_yes">Pompe à vélo : oui</string>
<string name="poi_service_bicycle_pump_no">Pompe à vélo : non</string>
<string name="poi_service_bicycle_diy_yes">Outils en libre service : oui</string>
<string name="poi_service_bicycle_diy_no">Outils en libre service : non</string>
<string name="poi_service_bicycle_cleaning_yes">Nettoyage de cycles : oui</string>
<string name="poi_service_bicycle_cleaning_no">Nettoyage de cycles : non</string>
<string name="poi_service_bicycle_chaintool_yes">Dérive chaine : oui</string>
<string name="poi_service_bicycle_chaintool_no">Dérive chaine : non</string>
<string name="poi_training_language">Enseignement : langue</string>
<string name="poi_training_music">Enseignement : musique</string>
<string name="poi_training_dance">Enseignement : danse</string>
<string name="poi_training_sport">Enseignement : sport</string>
<string name="poi_training_art">Enseignement : art</string>
<string name="poi_training_computer">Enseignement : informatique</string>
<string name="poi_training_yoga">Enseignement : yoga</string>
<string name="poi_training_cooking">Enseignement : cuisine</string>
<string name="poi_training_martial_art">Enseignement : arts martiaux</string>
<string name="poi_training_aviation">Enseignement : aviation</string>
<string name="poi_training_hairdressing">Enseignement : coiffure</string>
<string name="poi_monument_yes">Objet monumental</string>
<string name="poi_payment_cheque_yes">Chèques acceptés</string>
<string name="poi_payment_cheque_no">Chèques non acceptés</string>
<string name="poi_microbrewery_yes">Micro brasserie</string>
<string name="poi_microbrewery_no">Pas de micro brasserie</string>
<string name="poi_takeaway_no">Pas de vente à emporter</string>
<string name="poi_outdoor_seating_yes">Terrasse</string>
<string name="poi_outdoor_seating_no">Pas de terrasse</string>
<string name="poi_car_wash_no">Lavage auto : non</string>
<string name="poi_maxstay">Stationnement limité dans le temps</string>
<string name="poi_vending_parking_tickets">Tickets de stationnement</string>
<string name="poi_vending_sweets">Bonbons</string>
<string name="poi_vending_bicycle_tube">Chambres à air pour vélo</string>
<string name="poi_vending_drinks_sweets">Boissons et confiserie</string>
<string name="poi_clothes_maternity">Vêtements de grossesse</string>
<string name="poi_clothes_vintage">Vêtements vintage</string>
<string name="poi_clothes_traditional">Vêtements traditionnels</string>
<string name="poi_clothes_men">Vêtements pour homme</string>
<string name="poi_clothes_wedding">Robes de mariée</string>
<string name="poi_clothes_women">Vêtements pour femme</string>
<string name="poi_clothes_underwear">Sous-vêtements</string>
<string name="poi_clothes_babies">Vêtements de naissance</string>
<string name="poi_clothes_denim">Vêtements en jean</string>
<string name="poi_clothes_workwear">Vêtements de travail</string>
<string name="poi_clothes_hats">Chapeaux</string>
<string name="poi_clothes_leather">Cuir</string>
<string name="poi_clothes_costumes">Costumes</string>
<string name="poi_clothes_suits">Costumes</string>
<string name="poi_clothes_oversize">Vêtements de grandes tailles</string>
<string name="poi_clothes_swimwear">Tenue de natation</string>
<string name="poi_clothes_socks">Chaussettes</string>
<string name="poi_clothes_shirts">Chemises</string>
<string name="poi_clothes_dance">Vêtements de danse</string>
<string name="poi_shoes_men">Chaussures pour homme</string>
<string name="poi_tents_yes">Tentes autorisées</string>
<string name="poi_tents_no">Tentes interdites</string>
<string name="poi_openfire_yes">Feu autorisé</string>
<string name="poi_openfire_no">Feu interdit</string>
<string name="poi_scout_yes">Camp scout : oui</string>
<string name="poi_scout_no">Camp scout : non</string>
<string name="poi_group_only_yes">Groupe seulement : oui</string>
<string name="poi_group_only_no">Groupe seulement : non</string>
<string name="poi_washing_machine_yes">Machine à laver le linge : oui</string>
<string name="poi_washing_machine_no">Machine à laver le linge : non</string>
<string name="poi_shower_yes">Douche : oui</string>
<string name="poi_shower_no">Douche : non</string>
<string name="poi_shower_hot">Douche : chaude</string>
<string name="poi_shower_outdoor">Douche : extérieur</string>
<string name="poi_shower_cold">Douche : froide</string>
<string name="poi_shower_indoor">Douche : intérieur</string>
<string name="poi_caravans_yes">Caravanes: oui</string>
<string name="poi_caravans_no">Caravanes: non</string>
<string name="poi_power_supply_yes">Alimentation électrique : oui</string>
<string name="poi_power_supply_no">Alimentation électrique : non</string>
<string name="poi_capacity_tents">Nombre maximum de tentes</string>
<string name="poi_capacity_caravans">Nombre maximum de caravanes</string>
<string name="poi_dog_yes">Chiens autorisés</string>
<string name="poi_dog_no">Chiens interdits</string>
<string name="poi_theatre_genre_opera">Genre: opéra</string>
<string name="poi_theatre_genre_philharmonic">Genre : philharmonique</string>
<string name="poi_theatre_genre_musical">Genre : musical</string>
<string name="poi_theatre_genre_drama">Genre : drame</string>
<string name="poi_theatre_genre_cabaret">Genre : cabaret</string>
<string name="poi_theatre_genre_puppet">Genre : marionnettes</string>
<string name="poi_theatre_genre_comedy">Genre : comédie</string>
<string name="poi_theatre_genre_chamber_music">Genre : musique de chambre</string>
<string name="poi_theatre_genre_marionette">Genre: marionnettes</string>
<string name="poi_theatre_genre_ballet">Genre : ballet</string>
<string name="poi_theatre_genre_shadow_play">Genre : ombres chinoises</string>
<string name="poi_bandstand">Kiosque à musique</string>
<string name="poi_product_brick">Produit : brique</string>
<string name="poi_product_leather">Produit : cuir</string>
<string name="poi_product_lime">Produit : citron vert</string>
<string name="poi_product_beer">Produit : bière</string>
<string name="poi_product_meat">Produit : viande</string>
<string name="poi_wheelchair_description">Description pour les utilisateurs de chaises roulantes</string>
<string name="poi_blind_description">Description pour les aveugles</string>
<string name="poi_deaf_description">Description pour les sourds</string>
<string name="poi_highway_steps">Escaliers</string>
<string name="poi_handrail_yes">Rambarde : oui</string>
<string name="poi_handrail_no">Rambarde : non</string>
<string name="poi_ramp_yes">Plan incliné : oui</string>
<string name="poi_ramp_no">Plan incliné : non</string>
<string name="poi_ramp_wheelchair_yes">Rampe pour les chaises roulantes : oui</string>
<string name="poi_ramp_wheelchair_no">Rampe pour les chaises roulantes : non</string>
<string name="poi_ramp_stroller_yes">Rampe (poussette) : oui</string>
<string name="poi_ramp_stroller_no">Rampe (poussette) : non</string>
<string name="poi_ramp_bicycle_yes">Rampe pour vélo : oui</string>
<string name="poi_ramp_bicycle_no">Rampe pour vélo : non</string>
<string name="poi_ramp_luggage_yes">Rampe pour bagages : oui</string>
<string name="poi_ramp_luggage_no">Rampe pour bagages : non</string>
<string name="poi_cairn">Cairn</string>
<string name="poi_defibrillator">Défibrillateur</string>
<string name="poi_defibrillator_yes">Défibrillateur : oui</string>
<string name="poi_tomb_tumulus">Type : tumulus</string>
<string name="poi_tomb_columbarium">Type : columbarium</string>
<string name="poi_tomb_mausoleum">Type : mausolé</string>
<string name="poi_tomb_sarcophagus">Type : sarcophage</string>
<string name="poi_tomb_crypt">Type : crypte</string>
<string name="poi_tomb_pyramid">Type : pyramide</string>
<string name="poi_historic_civilization_celtic">Civilisation : celtique</string>
<string name="poi_historic_civilization_minoan">Civilisation : minoenne</string>
<string name="poi_horse_yes">Chevaux autorisés</string>
<string name="poi_horse_no">Chevaux interdits</string>
<string name="poi_animal_yes">Animaux autorisés</string>
<string name="poi_animal_no">Animaux interdits</string>
<string name="poi_historic_period_bronze_age">Période historique : âge de bronze</string>
<string name="poi_historic_period_iron_age">Période historique : âge de fer</string>
<string name="poi_historic_period_alexander_the_great">Période historique : Alexandre le Grand</string>
<string name="poi_historic_stone">Pierre historique</string>
<string name="poi_material_wood">Matière : bois</string>
<string name="poi_material_metal">Matière : métal</string>
<string name="poi_material_reinforced_concrete">Matière : béton armé</string>
<string name="poi_material_concrete">Matière : béton</string>
<string name="poi_material_steel">Matière : acier</string>
<string name="poi_material_stone">Matière : roche</string>
<string name="poi_material_masonry">Matière : maçonnerie</string>
<string name="poi_material_brick">Matière : brique</string>
<string name="poi_material_plastic">Matière : plastique</string>
<string name="poi_material_sandstone">Matière : grès</string>
<string name="poi_material_granite_stone">Matière : granite</string>
<string name="poi_material_metal_wood">Matière : métal, bois</string>
<string name="poi_material_glass">Matière : verre</string>
<string name="poi_material_bronze">Matière : bronze</string>
<string name="poi_material_composite">Matière : composite</string>
<string name="poi_material_limestone">Matière : calcaire</string>
<string name="poi_material_marble">Matière : marbre</string>
<string name="poi_material_aluminium">Matière : aluminium</string>
<string name="poi_site_type_megalith">Type : mégalithe</string>
<string name="poi_site_type_tumulus">Type : tumulus</string>
<string name="poi_site_type_fortification">Type : fortification</string>
<string name="poi_site_type_city">Type : ville</string>
<string name="poi_site_type_necropolis">Type : nécropole</string>
<string name="poi_megalith_type_menhir">Type de mégalithe : menhir</string>
<string name="poi_megalith_type_dolmen">Type de mégalithe : dolmen</string>
<string name="poi_historic_farm">Ferme historique</string>
<string name="poi_club_freemasonry">Loge maçonnique</string>
<string name="poi_club_sailing">Club nautique</string>
<string name="poi_club_scout">Club scout</string>
<string name="poi_historic_railway">Chemin de fer historique</string>
<string name="poi_artist_name">Artiste</string>
<string name="poi_sculptor">Sculpteur</string>
<string name="poi_building_type_church">Type de bâtiment : église</string>
<string name="poi_building_type_chapel">Type de bâtiment : chapelle</string>
<string name="poi_building_type_mosque">Type de bâtiment : mosquée</string>
<string name="poi_building_type_temple">Type de bâtiment : temple</string>
<string name="poi_building_type_cathedral">Type de bâtiment : cathédrale</string>
<string name="poi_building_type_monastery">Type de bâtiment : monastère</string>
<string name="poi_building_type_basilica">Type de bâtiment : basilique</string>
<string name="poi_building_type_synagogue">Type de bâtiment : synagogue</string>
<string name="poi_building_type_shrine">Type de bâtiment : tombeau</string>
<string name="poi_cross">Croix</string>
<string name="poi_concentration_camp">Type : camp de concentration</string>
<string name="poi_labor_camp">Type : camp de travail</string>
<string name="poi_concentration_camp_nazism">Type : nazi</string>
<string name="poi_concentration_camp_gulag">Type : goulag</string>
<string name="poi_temperature">Température</string>
<string name="poi_wiki_link">Wiki</string>
<string name="poi_resource_gravel">Gravier</string>
<string name="poi_resource_opal">Opale</string>
<string name="poi_resource_ruby">Rubis</string>
<string name="poi_technical_monument">Monument technique</string>
<string name="poi_historic_aircraft">Avion historique</string>
<string name="poi_office_camping">Réception du camping</string>
<string name="poi_model_aerodrome">Aérodrome de modélisme</string>
<string name="poi_street_lamp">Lampadaire</string>
<string name="poi_escape_lane">Voie d\'échappement</string>
<string name="poi_crop_rice">Culture : riz</string>
<string name="poi_crop_cereal">Culture : céréales</string>
<string name="poi_crop_sugarcane">Culture : canne à sucre</string>
<string name="poi_crop_wheat">Culture : blé</string>
<string name="poi_crop_barley">Culture : orge</string>
<string name="poi_crop_vegetables">Culture : légumes</string>
<string name="poi_crop_beet">Culture : betterave</string>
<string name="poi_crop_lavender">Culture : lavande</string>
<string name="poi_crop_tea">Culture : thé</string>
<string name="poi_crop_coffee">Culture : café</string>
<string name="poi_crop_sunflower">Culture : tournesol</string>
<string name="poi_crop_raspberry">Culture : framboise</string>
<string name="poi_crop_tobacco">Culture : tabac</string>
<string name="poi_crop_strawberry">Culture : fraise</string>
<string name="poi_crop_vegetables_flowers">Culture : légumes, fleurs</string>
<string name="poi_crop_cassava">Culture : manioc</string>
<string name="poi_crop_asparagus">Culture : asperge</string>
<string name="poi_crop_flowers">Culture : fleurs</string>
<string name="poi_content_sewage">Contenu : eaux usées</string>
<string name="poi_content_crop">Contenu : récolte</string>
<string name="poi_content_fodder">Contenu : fourrage</string>
<string name="poi_wetland_marsh">Marais</string>
<string name="poi_wetland_saltmarsh">Marais salant</string>
<string name="poi_artwork_type_sculpture">Type d’œuvre : sculpture</string>
<string name="poi_artwork_type_statue">Type d’œuvre : statue</string>
<string name="poi_artwork_type_mural">Type d’œuvre : mural</string>
<string name="poi_artwork_type_architecture">Type d’œuvre : architecture</string>
<string name="poi_artwork_type_painting">Type d’œuvre : peinture</string>
<string name="poi_artwork_type_installation">Type d’œuvre : installation</string>
<string name="poi_artwork_type_mosaic">Type d’œuvre : mosaïque</string>
<string name="poi_artwork_type_graffiti">Type d’œuvre : graffiti</string>
<string name="poi_artwork_type_stele">Type d’œuvre : stèle</string>
<string name="poi_artwork_type_fountain">Type d’œuvre : fontaine</string>
<string name="poi_width">Largeur</string>
<string name="poi_architect_name">Architecte</string>
<string name="poi_architecture_modern">Architecture : moderne</string>
<string name="poi_architecture_eclectic">Architecture : éclectique</string>
<string name="poi_surveillance_outdoor">Surveillance : extérieur</string>
<string name="poi_surveillance_indoor">Surveillance : intérieur</string>
<string name="poi_clothes_sports">Vêtements de sport</string>
<string name="poi_massage_sexual">Massage : sexuel</string>
<string name="poi_massage_chinese">Massage : chinois</string>
<string name="poi_massage_yes">Massages</string>
<string name="poi_massage_therapeutic">Massage: thérapeutique</string>
<string name="poi_sauna_yes">Sauna</string>
<string name="poi_solarium_yes">Solarium</string>
</resources> </resources>

4
OsmAnd/res/values-fr/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="offline_edition">Modifications hors-ligne</string> <string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string> <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
@ -2075,4 +2076,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="osm_edit_created_poi">PI créés sur OSM</string> <string name="osm_edit_created_poi">PI créés sur OSM</string>
<string name="osm_edit_created_bug">Bugs déclarés sur OSM</string> <string name="osm_edit_created_bug">Bugs déclarés sur OSM</string>
<string name="map_legend">Légende</string>
</resources> </resources>

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

@ -273,7 +273,7 @@
<string name="poi_bag">Táskabolt</string> <string name="poi_bag">Táskabolt</string>
<string name="poi_bathroom_furnishing">Fürdőszoba bútor</string> <string name="poi_bathroom_furnishing">Fürdőszoba bútor</string>
<string name="poi_bed">Hálószoba bútor</string> <string name="poi_bed">Ágymatrac és -felszerelés bolt</string>
<string name="poi_boutique">Divatszaküzlet</string> <string name="poi_boutique">Divatszaküzlet</string>
<string name="poi_camera">Fényképező, objektív</string> <string name="poi_camera">Fényképező, objektív</string>
<string name="poi_carpet">Szőnyegbolt</string> <string name="poi_carpet">Szőnyegbolt</string>
@ -613,4 +613,98 @@
<string name="poi_highway_crossing">Gyalogátkelő</string> <string name="poi_highway_crossing">Gyalogátkelő</string>
<string name="poi_node_networks">Túra- és kerékpárhálózati csomópont</string>
<string name="poi_hiking_routes">Turistautak</string>
<string name="poi_traffic_enforcement">Forgalmi kényszerítés</string>
<string name="poi_user_defined_other">Felhasználó által definiált</string>
<string name="poi_cheese">Sajtbolt</string>
<string name="poi_chocolate">Csokoládébolt</string>
<string name="poi_coffee">Kávébolt</string>
<string name="poi_pasta">Tésztabolt</string>
<string name="poi_pastry">Sütemény bolt</string>
<string name="poi_art">Műalkotás bolt</string>
<string name="poi_baby_goods">Bababolt</string>
<string name="poi_clothes">Ruhabolt</string>
<string name="poi_clothes_children">Gyerekruhabolt</string>
<string name="poi_candles">Gyertyabolt</string>
<string name="poi_doors">Ajtók</string>
<string name="poi_erotic">Sex-Shop</string>
<string name="poi_fashion">Divatüzlet</string>
<string name="poi_furnace">Fűtéstechnikai szaküzlet</string>
<string name="poi_garden_furniture">Kerti bútor bolt</string>
<string name="poi_gas">Cseppfolyós gáz bolt</string>
<string name="poi_herbalist">Gyógynövénybolt</string>
<string name="poi_hifi">HiFi-bolt</string>
<string name="poi_newsagent">Újságos</string>
<string name="poi_organic">Biobolt</string>
<string name="poi_outdoor">Outdoor bolt</string>
<string name="poi_second_hand">Használt áruk boltja</string>
<string name="poi_scuba_diving_shop">Búvárfelszerelés bolt</string>
<string name="poi_stationery">Írószerbolt</string>
<string name="poi_tyres">Autógumis</string>
<string name="poi_ses_station">SES-állomás</string>
<string name="poi_emergency_access_point">Sürgősségi elérési pont</string>
<string name="poi_ford_stepping_stones">Lépőkő híd</string>
<string name="poi_vehicle_inspection">Műszaki vizsgahely</string>
<string name="poi_aerialway_pylon">Felvonó pilon</string>
<string name="poi_breakwater">Hullámtörő</string>
<string name="poi_power_cable_distribution_cabinet">Elosztó szekrény</string>
<string name="poi_power_tower">Távvezeték oszlop</string>
<string name="poi_power_pole">Villanypózna</string>
<string name="poi_cooling_tower">Hűtőtorony</string>
<string name="poi_lighting_tower">Reflektor torony</string>
<string name="poi_recycling_centre">Típus: hulladékközpont</string>
<string name="poi_recycling_container">Típus: konténer</string>
<string name="poi_recycling_glass">Üveg</string>
<string name="poi_recycling_paper">Papír</string>
<string name="poi_recycling_clothes">Ruha</string>
<string name="poi_recycling_cans">Fémdoboz</string>
<string name="poi_recycling_glass_bottles">Üvegpalack</string>
<string name="poi_recycling_plastic">Műanyag</string>
<string name="poi_recycling_scrap_metal">Fémhulladék</string>
<string name="poi_recycling_batteries">Akkumulátor</string>
<string name="poi_recycling_plastic_bottles">Műanyagpalack</string>
<string name="poi_recycling_green_waste">Zöldhulladék</string>
<string name="poi_recycling_waste">Hulladék (fekete zsák)</string>
<string name="poi_recycling_plastic_packaging">Műanyag csomagolás</string>
<string name="poi_recycling_newspaper">Újságpapír</string>
<string name="poi_recycling_cartons">Kartondoboz</string>
<string name="poi_recycling_cardboard">Kartonpapír</string>
<string name="poi_recycling_magazines">Színes újság</string>
<string name="poi_recycling_paper_packaging">Papír csomagolás</string>
<string name="poi_recycling_small_appliances">Kisgépek</string>
<string name="poi_recycling_wood">Fa</string>
<string name="poi_recycling_books">Könyv</string>
<string name="poi_recycling_shoes">Cipő</string>
<string name="poi_recycling_aluminium">Alumínium</string>
<string name="poi_recycling_organic">Komposzt</string>
<string name="poi_recycling_beverage_cartons">Italkarton</string>
<string name="poi_recycling_garden_waste">Kerti hulladék</string>
<string name="poi_recycling_low_energy_bulbs">Energiatakarékos izzó</string>
<string name="poi_recycling_fluorescent_tubes">Fénycső</string>
<string name="poi_recycling_metal">Fém</string>
<string name="poi_recycling_electrical_items">Elektronikai hulladék</string>
<string name="poi_recycling_white_goods">Háztartási gépek</string>
<string name="poi_recycling_cooking_oil">Sütőolaj</string>
<string name="poi_recycling_engine_oil">Motorolaj</string>
<string name="poi_recycling_plastic_bags">Műanyag szatyor</string>
<string name="poi_recycling_hazardous_waste">Veszélyes hulladék</string>
<string name="poi_recycling_mobile_phones">Mobiltelefon</string>
<string name="poi_recycling_hydrargyrum">Higany</string>
<string name="poi_recycling_computers">Számítógép</string>
<string name="poi_recycling_tyres">Autógumi</string>
<string name="poi_recycling_tv_monitor">TV, monitor</string>
<string name="poi_recycling_tetrapak">Tetrapak</string>
<string name="poi_recycling_rubble">Sitt</string>
<string name="poi_recycling_cds">CD</string>
<string name="poi_recycling_waste_oil">Fáradt olaj</string>
<string name="poi_recycling_bottles">Palack</string>
<string name="poi_recycling_cork">Parafa</string>
<string name="poi_recycling_printer_cartridges">Nyomtató festékkazetta</string>
<string name="poi_recycling_sheet_metal">Fémlemez</string>
<string name="poi_recycling_foil">Fólia</string>
</resources> </resources>

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

@ -913,7 +913,7 @@
<string name="poi_crossing_unmarked">Неразмеченный</string> <string name="poi_crossing_unmarked">Неразмеченный</string>
<string name="poi_population">Население</string> <string name="poi_population">Население</string>
<string name="poi_start_date">Дата окончания постройки</string> <string name="poi_start_date">Дата постройки/основания</string>
<string name="poi_wheelchair">Доступно для инвалидных кресел</string> <string name="poi_wheelchair">Доступно для инвалидных кресел</string>
<string name="poi_wheelchair_no">Недоступно для инвалидных кресел</string> <string name="poi_wheelchair_no">Недоступно для инвалидных кресел</string>
<string name="poi_wheelchair_limited">Инвалидные кресла: ограничено</string> <string name="poi_wheelchair_limited">Инвалидные кресла: ограничено</string>
@ -2369,4 +2369,5 @@
<string name="poi_bathing_yes">Купание: да</string> <string name="poi_bathing_yes">Купание: да</string>
<string name="poi_bathing_no">Купание: нет</string> <string name="poi_bathing_no">Купание: нет</string>
</resources> </resources>

52
OsmAnd/res/values-ru/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" standalone="no"?>
<resources>
<string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string> <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
<string name="osmo_use_https">Использовать HTTPS</string> <string name="osmo_use_https">Использовать HTTPS</string>
<string name="srtm_plugin_description">"Этот плагин обеспечивает как наложение контурных линий, так и отображения затеняющего слоя рельефа поверх стандартных карт OsmAnd. Эта функция высоко оценится спортсменами, туристами, путешественниками и всеми, кто заинтересован в рельефной структуре ландшафта.\n\nГлобальные данные (между 70 градусами на севере и 70 градусами на юге) основываются на измерениях SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer) — инструментом визуализации Terra, флагманского спутника Системы Наблюдения Земли NASA. ASTER является результатом совместных усилий NASA, министерства экономики Японии, торговли и промышленности (METI), а также Космических Систем Японии (J-spacesystems). "</string> <string name="srtm_plugin_description">"Этот плагин обеспечивает как наложение контурных линий, так и отображения затеняющего слоя рельефа поверх стандартных карт OsmAnd. Эта функция высоко оценится спортсменами, туристами, путешественниками и всеми, кто заинтересован в рельефной структуре ландшафта.\n\nГлобальные данные (между 70 градусами на севере и 70 градусами на юге) основываются на измерениях SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer) — инструментом визуализации Terra, флагманского спутника Системы Наблюдения Земли NASA. ASTER является результатом совместных усилий NASA, министерства экономики Японии, торговли и промышленности (METI), а также Космических Систем Японии (J-spacesystems). "</string>
@ -44,10 +45,6 @@
<string name="rendering_attr_noAdminboundaries_description">Скрыть региональные границы (admin levels 5-9)</string> <string name="rendering_attr_noAdminboundaries_description">Скрыть региональные границы (admin levels 5-9)</string>
<string name="no_buildings_found">Здания не найдены.</string> <string name="no_buildings_found">Здания не найдены.</string>
<string name="incremental_search_city">Выберите город</string> <string name="incremental_search_city">Выберите город</string>
<string name="search_villages_and_postcodes">Поиск по деревням и почт. индексу</string> <string name="search_villages_and_postcodes">Поиск по деревням и почт. индексу</string>
@ -66,9 +63,6 @@
<string name="non_optimal_route_calculation">Быстрое построение маршрута (возможно неоптимально)</string> <string name="non_optimal_route_calculation">Быстрое построение маршрута (возможно неоптимально)</string>
<string name="oclock">ч.</string> <string name="oclock">ч.</string>
<string name="unknown_from_location">Начальное местоположение ещё не определено</string> <string name="unknown_from_location">Начальное местоположение ещё не определено</string>
<string name="unknown_location">Определяем местоположение</string> <string name="unknown_location">Определяем местоположение</string>
@ -93,7 +87,6 @@
<string name="osmand_accessibility_description">"Плагин добавляет поддержку специальных возможностей устройства непосредственно в OsmAnd. Это облегчает, например, регулировку скорости речи для голоса TTS, настройку направленности экрана навигации, управление масштабом при помощи трекбола или использование голосовых команд обратной связи для авто аннотации вашего местоположения."</string> <string name="osmand_accessibility_description">"Плагин добавляет поддержку специальных возможностей устройства непосредственно в OsmAnd. Это облегчает, например, регулировку скорости речи для голоса TTS, настройку направленности экрана навигации, управление масштабом при помощи трекбола или использование голосовых команд обратной связи для авто аннотации вашего местоположения."</string>
<string name="osmand_development_plugin_description">Плагин отображает параметры для разработки и отладки функций, таких как, проверка или моделирование маршрута, отображение производительности отрисовки, проверка голосовых подсказок. Эти настройки предназначены для разработчиков и не требуются для обычного пользователя.</string> <string name="osmand_development_plugin_description">Плагин отображает параметры для разработки и отладки функций, таких как, проверка или моделирование маршрута, отображение производительности отрисовки, проверка голосовых подсказок. Эти настройки предназначены для разработчиков и не требуются для обычного пользователя.</string>
<string name="plugins_screen">Плагины</string> <string name="plugins_screen">Плагины</string>
@ -175,7 +168,6 @@
<string name="download_files_question_space">Свободное место {2} MB! Загрузить {0} файл(ов) ({1} MB)?</string> <string name="download_files_question_space">Свободное место {2} MB! Загрузить {0} файл(ов) ({1} MB)?</string>
<string name="use_transparent_map_theme">Прозрачная тема</string> <string name="use_transparent_map_theme">Прозрачная тема</string>
<string name="native_library_not_supported">Нативная библиотека не поддерживается на этом устройстве.</string> <string name="native_library_not_supported">Нативная библиотека не поддерживается на этом устройстве.</string>
<string name="init_native_library">Инициализация нативной библиотеки…</string> <string name="init_native_library">Инициализация нативной библиотеки…</string>
@ -228,7 +220,6 @@
<string name="local_index_gpx_info_show">\n\nНажать и удерживать для вызова меню</string> <string name="local_index_gpx_info_show">\n\nНажать и удерживать для вызова меню</string>
<string name="local_index_installed">Загружено</string> <string name="local_index_installed">Загружено</string>
<string name="local_index_items_backuped">%1$d из %2$d объектов успешно архивированы.</string> <string name="local_index_items_backuped">%1$d из %2$d объектов успешно архивированы.</string>
<string name="local_index_items_deleted">%1$d из %2$d объектов успешно удалены.</string> <string name="local_index_items_deleted">%1$d из %2$d объектов успешно удалены.</string>
@ -258,8 +249,6 @@
<string name="map_text_size">Размер текста</string> <string name="map_text_size">Размер текста</string>
<string name="installing_new_resources">Распаковываются новые данные…</string> <string name="installing_new_resources">Распаковываются новые данные…</string>
<string name="internet_connection_required_for_online_route">Вы собираетесь использовать Интернет-маршрутизацию, но у Вас нет активного Интернет соединения.</string> <string name="internet_connection_required_for_online_route">Вы собираетесь использовать Интернет-маршрутизацию, но у Вас нет активного Интернет соединения.</string>
<string name="tts_language_not_supported_title">Язык не поддерживается</string> <string name="tts_language_not_supported_title">Язык не поддерживается</string>
@ -303,16 +292,6 @@
<string name="preferred_locale">Локализация</string> <string name="preferred_locale">Локализация</string>
<string name="shared_string_next">След.</string> <string name="shared_string_next">След.</string>
<string name="shared_string_previous">Предыдущий</string> <string name="shared_string_previous">Предыдущий</string>
<string name="unit_of_length_descr">Единицы измерения длины и скорости</string> <string name="unit_of_length_descr">Единицы измерения длины и скорости</string>
@ -576,7 +555,6 @@
<string name="shared_string_download_successful">Загрузка завершена успешно</string> <string name="shared_string_download_successful">Загрузка завершена успешно</string>
<string name="downloading_list_indexes">Загружается список доступных регионов…</string> <string name="downloading_list_indexes">Загружается список доступных регионов…</string>
<string name="list_index_files_was_not_loaded">Невозможно получить список доступных регионов с osmand.net.</string> <string name="list_index_files_was_not_loaded">Невозможно получить список доступных регионов с osmand.net.</string>
@ -619,8 +597,6 @@
<string name="finished_task">Окончен</string> <string name="finished_task">Окончен</string>
<string name="use_online_routing_descr">Использовать Интернет-сервис для прокладки маршрута</string> <string name="use_online_routing_descr">Использовать Интернет-сервис для прокладки маршрута</string>
<string name="use_online_routing">Онлайн маршрутизация</string> <string name="use_online_routing">Онлайн маршрутизация</string>
<string name="user_password_descr">Укажите пароль (требуется для работы с OSM)</string> <string name="user_password_descr">Укажите пароль (требуется для работы с OSM)</string>
@ -658,7 +634,6 @@
<string name="ChooseCountry">Выберите регион</string> <string name="ChooseCountry">Выберите регион</string>
<string name="show_view_angle">Угол обзора</string> <string name="show_view_angle">Угол обзора</string>
<string name="map_view_3d_descr">Включить 3D вид для карты</string> <string name="map_view_3d_descr">Включить 3D вид для карты</string>
<string name="map_view_3d">3D вид</string> <string name="map_view_3d">3D вид</string>
@ -676,7 +651,6 @@
<string name="app_description">Навигационное приложение</string> <string name="app_description">Навигационное приложение</string>
<string name="search_button">Поиск</string> <string name="search_button">Поиск</string>
<string name="search_activity">Поиск</string> <string name="search_activity">Поиск</string>
<string name="searchpoi_activity">Выберите POI</string> <string name="searchpoi_activity">Выберите POI</string>
@ -819,8 +793,6 @@
<string name="shared_string_accessibility">Специальные возможности</string> <string name="shared_string_accessibility">Специальные возможности</string>
<string name="pref_vector_rendering">Настройки векторного рендеринга</string> <string name="pref_vector_rendering">Настройки векторного рендеринга</string>
<string name="pref_overlay">Дополнительные слои</string> <string name="pref_overlay">Дополнительные слои</string>
<string name="pref_raster_map">Настройки онлайн карт</string> <string name="pref_raster_map">Настройки онлайн карт</string>
@ -839,10 +811,6 @@
<string name="favourites_edit_dialog_category">Категория</string> <string name="favourites_edit_dialog_category">Категория</string>
<string name="contribution_activity">Установка версии</string> <string name="contribution_activity">Установка версии</string>
<string name="process_navigation_service">Навигационный сервис OsmAnd</string> <string name="process_navigation_service">Навигационный сервис OsmAnd</string>
<string name="offline_navigation_not_available">Локальная навигация OsmAnd временно недоступна.</string> <string name="offline_navigation_not_available">Локальная навигация OsmAnd временно недоступна.</string>
@ -911,7 +879,6 @@
<string name="continue_follow_previous_route_auto">Предыдущий маршрут не был закончен. Продолжить следование по нему? (%1$s секунд)</string> <string name="continue_follow_previous_route_auto">Предыдущий маршрут не был закончен. Продолжить следование по нему? (%1$s секунд)</string>
<string name="show_cameras">Показать камеры контроля скорости</string> <string name="show_cameras">Показать камеры контроля скорости</string>
<string name="show_traffic_warnings">Показать ограничения скорости</string> <string name="show_traffic_warnings">Показать ограничения скорости</string>
<string name="avoid_toll_roads">Платные дороги</string> <string name="avoid_toll_roads">Платные дороги</string>
@ -970,10 +937,6 @@
<string name="map_widget_renderer">Стиль карты</string> <string name="map_widget_renderer">Стиль карты</string>
<string name="email">email</string> <string name="email">email</string>
<string name="day_night_info">Восход/закат</string> <string name="day_night_info">Восход/закат</string>
<string name="osmand_short_description_80_chars">OsmAnd - это навигационное приложение для путешествий с открытым исходным кодом</string> <string name="osmand_short_description_80_chars">OsmAnd - это навигационное приложение для путешествий с открытым исходным кодом</string>
@ -1151,9 +1114,6 @@
<string name="announce_gpx_waypoints">Маршрутные точки GPX</string> <string name="announce_gpx_waypoints">Маршрутные точки GPX</string>
<string name="osb_author_or_password_not_specified">Пожалуйста, укажите в настройках пароль и имя пользователя OSM</string> <string name="osb_author_or_password_not_specified">Пожалуйста, укажите в настройках пароль и имя пользователя OSM</string>
<string name="route_descr_map_location">Карта: </string> <string name="route_descr_map_location">Карта: </string>
<string name="osb_author_dialog_password">Пароль OSM (опционально)</string> <string name="osb_author_dialog_password">Пароль OSM (опционально)</string>
@ -1744,7 +1704,10 @@
<string name="action_modify">Изменить действие</string> <string name="action_modify">Изменить действие</string>
<string name="action_create">Создать действие</string> <string name="action_create">Создать действие</string>
<string name="osm_edits">OSM правки</string> <string name="osm_edits">OSM правки</string>
<string name="osmand_parking_hour">ч</string><string name="osmand_parking_minute">мин</string><string name="osmand_parking_time_left">осталось</string> <string name="parking_place_limited">Парковка ограничена временем</string> <string name="osmand_parking_hour">ч</string>
<string name="osmand_parking_minute">мин</string>
<string name="osmand_parking_time_left">осталось</string>
<string name="parking_place_limited">Парковка ограничена временем</string>
<string name="your_edits">Ваши правки</string> <string name="your_edits">Ваши правки</string>
<string name="waypoint_visit_after">Посетить после</string> <string name="waypoint_visit_after">Посетить после</string>
<string name="waypoint_visit_before">Посетить до</string> <string name="waypoint_visit_before">Посетить до</string>
@ -1977,7 +1940,7 @@
<string name="share_menu_location">Поделиться местоположением</string> <string name="share_menu_location">Поделиться местоположением</string>
<string name="shared_string_send">Отправить</string> <string name="shared_string_send">Отправить</string>
<string name="application_dir_description">Выберите, где вы хотите сохранить файлы карт.</string> <string name="application_dir_description">Выберите, где вы хотите сохранить файлы карт.</string>
<string name="show_on_start_description">Приложение будет запускаться с экрана карты</string> <string name="show_on_start_description">\"Отключено\" непосредственно запускает экран карты</string>
<string name="map_downloaded">Карта загружена</string> <string name="map_downloaded">Карта загружена</string>
<string name="shared_string_qr_code">QR-код</string> <string name="shared_string_qr_code">QR-код</string>
<string name="go_to_map">Перейти к карте</string> <string name="go_to_map">Перейти к карте</string>
@ -2005,4 +1968,5 @@
<string name="help_us_to_improve_menu_group">Помогите улучшить OsmAnd</string> <string name="help_us_to_improve_menu_group">Помогите улучшить OsmAnd</string>
<string name="other_menu_group">Прочее</string> <string name="other_menu_group">Прочее</string>
<string name="plugins_menu_group">Плагины</string> <string name="plugins_menu_group">Плагины</string>
<string name="map_legend">Легенда</string>
</resources> </resources>

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

@ -1481,4 +1481,7 @@
<string name="poi_route_railway_ref">Àndala ferroviària</string> <string name="poi_route_railway_ref">Àndala ferroviària</string>
<string name="poi_wiki_link">Wiki</string>
</resources> </resources>

4
OsmAnd/res/values-sk/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="recording_context_menu_show">Zobraziť</string> <string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s %2$s</string> <string name="recording_photo_description">Fotografia %1$s %2$s</string>
<string name="av_def_action_picture">Zachytiť fotografiu</string> <string name="av_def_action_picture">Zachytiť fotografiu</string>
@ -2140,4 +2141,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="versions_item">Verzie</string> <string name="versions_item">Verzie</string>
<string name="feedback">Anketa</string> <string name="feedback">Anketa</string>
<string name="contact_us">Kontaktujte nás</string> <string name="contact_us">Kontaktujte nás</string>
<string name="map_legend">Vysvetlivky k mape</string>
</resources> </resources>

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

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources>
<string name="search_button">Poišči</string> <string name="search_button">Poišči</string>
<string name="search_activity">Iskanje podatkov</string> <string name="search_activity">Iskanje podatkov</string>
<string name="choose_available_region">Izberi regijo s seznama</string> <string name="choose_available_region">Izberi regijo s seznama</string>
<string name="incremental_search_city">Sprotno iskanje mest</string> <string name="incremental_search_city">Sprotno iskanje mest</string>
<string name="searchpoi_activity">Izberi točko POI</string> <string name="searchpoi_activity">Izberi točko POI</string>
@ -1978,5 +1978,5 @@
<string name="enter_country_name">Vpis imena države</string> <string name="enter_country_name">Vpis imena države</string>
<string name="map_legend">Legenda zemljevida</string>
</resources> </resources>

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

@ -2147,4 +2147,9 @@
<string name="poi_power_supply_cee_7_5">電源供應(插座)：CEE 7/5</string> <string name="poi_power_supply_cee_7_5">電源供應(插座)：CEE 7/5</string>
<string name="poi_power_supply_nema_5_15">電源供應(插座)：NEMA 5-15</string> <string name="poi_power_supply_nema_5_15">電源供應(插座)：NEMA 5-15</string>
<string name="poi_capacity_tents">最大帳篷</string>
<string name="poi_capacity_caravans">最大露營拖車</string>
<string name="poi_dog_yes">允許狗入內</string>
<string name="poi_dog_no">不允許狗入內</string>
</resources> </resources>

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

@ -2373,4 +2373,6 @@
<string name="poi_bathing_yes">Bathing: yes</string> <string name="poi_bathing_yes">Bathing: yes</string>
<string name="poi_bathing_no">Bathing: no</string> <string name="poi_bathing_no">Bathing: no</string>
</resources> </resources>

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

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 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 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="shared_string_upload">Upload</string>
<string name="osm_edit_created_poi">Created OSM POI</string> <string name="osm_edit_created_poi">Created OSM POI</string>
<string name="osm_edit_created_bug">Created OSM bug</string> <string name="osm_edit_created_bug">Created OSM bug</string>
<string name="world_map_download_descr">World basemap (covering the whole world at small zooms) is missing or outdated. Please consider downloading World basemap for a complete environment.</string> <string name="world_map_download_descr">World basemap (covering the whole world at small zooms) is missing or outdated. Please consider downloading World basemap for a complete environment.</string>

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

@ -358,9 +358,25 @@ public class MapContextMenu extends MenuTitleController {
} }
} }
public TitleButtonController getTitleButtonController() { public TitleButtonController getLeftTitleButtonController() {
if (menuController != null) { if (menuController != null) {
return menuController.getTitleButtonController(); return menuController.getLeftTitleButtonController();
} else {
return null;
}
}
public TitleButtonController getRightTitleButtonController() {
if (menuController != null) {
return menuController.getRightTitleButtonController();
} else {
return null;
}
}
public TitleButtonController getTopRightTitleButtonController() {
if (menuController != null) {
return menuController.getTopRightTitleButtonController();
} else { } else {
return null; return null;
} }

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

@ -58,7 +58,9 @@ public class MapContextMenuFragment extends Fragment {
ImageView fabView; ImageView fabView;
private MapContextMenu menu; private MapContextMenu menu;
private TitleButtonController titleButtonController; private TitleButtonController leftTitleButtonController;
private TitleButtonController rightTitleButtonController;
private TitleButtonController topRightTitleButtonController;
private int menuTopViewHeight; private int menuTopViewHeight;
private int menuTopShadowHeight; private int menuTopShadowHeight;
@ -123,7 +125,9 @@ public class MapContextMenuFragment extends Fragment {
markerPaddingXPx = dpToPx(MARKER_PADDING_X_DP); markerPaddingXPx = dpToPx(MARKER_PADDING_X_DP);
menu = getMapActivity().getContextMenu(); menu = getMapActivity().getContextMenu();
titleButtonController = menu.getTitleButtonController(); leftTitleButtonController = menu.getLeftTitleButtonController();
rightTitleButtonController = menu.getRightTitleButtonController();
topRightTitleButtonController = menu.getTopRightTitleButtonController();
map = getMapActivity().getMapView(); map = getMapActivity().getMapView();
RotatedTileBox box = map.getCurrentRotatedTileBox().copy(); RotatedTileBox box = map.getCurrentRotatedTileBox().copy();
@ -144,35 +148,78 @@ public class MapContextMenuFragment extends Fragment {
view = inflater.inflate(R.layout.map_context_menu_fragment, container, false); view = inflater.inflate(R.layout.map_context_menu_fragment, container, false);
mainView = view.findViewById(R.id.context_menu_main); mainView = view.findViewById(R.id.context_menu_main);
// Title button // Title buttons
final View titleButtonContainer = view.findViewById(R.id.title_button_container); final View titleButtonsContainer = view.findViewById(R.id.title_button_container);
if (titleButtonController != null) { titleButtonsContainer.setVisibility(
titleButtonContainer.setVisibility(View.VISIBLE); leftTitleButtonController != null || rightTitleButtonController != null ? View.VISIBLE : View.GONE);
final Button titleButton = (Button) view.findViewById(R.id.title_button); // Left title button
titleButton.setText(titleButtonController.getCaption()); final Button leftTitleButton = (Button) view.findViewById(R.id.title_button);
final TextView titleButtonRightText = (TextView) view.findViewById(R.id.title_button_right_text);
if (leftTitleButtonController != null) {
leftTitleButton.setText(leftTitleButtonController.getCaption());
Drawable leftIcon = titleButtonController.getLeftIcon(); Drawable leftIcon = leftTitleButtonController.getLeftIcon();
if (leftIcon != null) { if (leftIcon != null) {
titleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null); leftTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
titleButton.setCompoundDrawablePadding(dpToPx(8f)); leftTitleButton.setCompoundDrawablePadding(dpToPx(4f));
} }
titleButton.setOnClickListener(new View.OnClickListener() { leftTitleButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
titleButtonController.buttonPressed(); leftTitleButtonController.buttonPressed();
} }
}); });
final TextView titleButtonRightText = (TextView) view.findViewById(R.id.title_button_right_text); if (leftTitleButtonController.isNeedRightText()) {
titleButtonRightText.setVisibility(titleButtonController.isNeedRightText() ? View.VISIBLE : View.GONE); titleButtonRightText.setText(leftTitleButtonController.getRightTextCaption());
if (titleButtonController.isNeedRightText()) { } else {
titleButtonRightText.setText(titleButtonController.getRightTextCaption()); titleButtonRightText.setVisibility(View.GONE);
} }
} else { } else {
titleButtonContainer.setVisibility(View.GONE); leftTitleButton.setVisibility(View.GONE);
titleButtonRightText.setVisibility(View.GONE);
} }
// Right title button
final Button rightTitleButton = (Button) view.findViewById(R.id.title_button_right);
if (rightTitleButtonController != null) {
rightTitleButton.setText(rightTitleButtonController.getCaption());
Drawable leftIcon = rightTitleButtonController.getLeftIcon();
if (leftIcon != null) {
rightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
rightTitleButton.setCompoundDrawablePadding(dpToPx(4f));
}
rightTitleButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
rightTitleButtonController.buttonPressed();
}
});
} else {
rightTitleButton.setVisibility(View.GONE);
}
// Top Right title button
final Button topRightTitleButton = (Button) view.findViewById(R.id.title_button_top_right);
if (topRightTitleButtonController != null) {
topRightTitleButton.setText(topRightTitleButtonController.getCaption());
Drawable leftIcon = topRightTitleButtonController.getLeftIcon();
if (leftIcon != null) {
topRightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
topRightTitleButton.setCompoundDrawablePadding(dpToPx(4f));
}
topRightTitleButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
topRightTitleButtonController.buttonPressed();
}
});
} else {
topRightTitleButton.setVisibility(View.GONE);
}
if (menu.isLandscapeLayout()) { if (menu.isLandscapeLayout()) {
mainView.setLayoutParams(new FrameLayout.LayoutParams(dpToPx(menu.getLandscapeWidthDp()), mainView.setLayoutParams(new FrameLayout.LayoutParams(dpToPx(menu.getLandscapeWidthDp()),

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

@ -8,7 +8,6 @@ import net.osmand.data.Amenity;
import net.osmand.data.FavouritePoint; import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.map.WorldRegion;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -49,7 +48,9 @@ public abstract class MenuController extends BaseMenuController {
private int currentMenuState; private int currentMenuState;
private MenuType menuType = MenuType.STANDARD; private MenuType menuType = MenuType.STANDARD;
protected TitleButtonController titleButtonController; protected TitleButtonController leftTitleButtonController;
protected TitleButtonController rightTitleButtonController;
protected TitleButtonController topRightTitleButtonController;
public abstract class TitleButtonController { public abstract class TitleButtonController {
@ -205,8 +206,16 @@ public abstract class MenuController extends BaseMenuController {
this.currentMenuState = currentMenuState; this.currentMenuState = currentMenuState;
} }
public TitleButtonController getTitleButtonController() { public TitleButtonController getLeftTitleButtonController() {
return titleButtonController; return leftTitleButtonController;
}
public TitleButtonController getRightTitleButtonController() {
return rightTitleButtonController;
}
public TitleButtonController getTopRightTitleButtonController() {
return topRightTitleButtonController;
} }
public boolean fabVisible() { public boolean fabVisible() {

47
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AudioVideoNoteMenuBuilder.java
View file

@ -1,29 +1,20 @@
package net.osmand.plus.mapcontextmenu.builders; package net.osmand.plus.mapcontextmenu.builders;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording; import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
import net.osmand.plus.mapcontextmenu.MenuBuilder; import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.util.Algorithms;
import java.io.File; import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
@ -50,6 +41,13 @@ public class AudioVideoNoteMenuBuilder extends MenuBuilder {
File file = recording.getFile(); File file = recording.getFile();
if (file != null) { if (file != null) {
DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(view.getContext());
DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext());
Date date = new Date(recording.getFile().lastModified());
buildRow(view, R.drawable.ic_action_data, dateFormat.format(date) + " — " + timeFormat.format(date), 0);
buildPlainMenuItems(view);
if (recording.isPhoto()) { if (recording.isPhoto()) {
BitmapFactory.Options opts = new BitmapFactory.Options(); BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inSampleSize = 4; opts.inSampleSize = 4;
@ -73,39 +71,10 @@ public class AudioVideoNoteMenuBuilder extends MenuBuilder {
} }
}); });
} }
} else {
DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(view.getContext());
DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext());
Date date = new Date(recording.getFile().lastModified());
buildRow(view, R.drawable.ic_action_data, dateFormat.format(date) + " — " + timeFormat.format(date), 0);
}
buildPlainMenuItems(view); buildPlainMenuItems(view);
buildButtonRow(view, null, view.getResources().getString(R.string.recording_context_menu_delete), new OnClickListener() {
@Override
public void onClick(View v) {
AccessibleAlertBuilder bld = new AccessibleAlertBuilder(v.getContext());
bld.setMessage(R.string.recording_delete_confirm);
final View fView = v;
bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
if (plugin != null) {
plugin.deleteRecording(recording);
if (fView.getContext() instanceof MapActivity) {
((MapActivity)fView.getContext()).getContextMenu().close();
} }
} }
}
});
bld.setNegativeButton(R.string.shared_string_no, null);
bld.show();
}
});
}
protected void buildImageRow(final View view, Bitmap bitmap, OnClickListener onClickListener) { protected void buildImageRow(final View view, Bitmap bitmap, OnClickListener onClickListener) {
LinearLayout ll = new LinearLayout(view.getContext()); LinearLayout ll = new LinearLayout(view.getContext());

89
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/EditPOIMenuBuilder.java
View file

@ -2,7 +2,6 @@ package net.osmand.plus.mapcontextmenu.builders;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.util.Linkify;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -11,10 +10,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.data.Amenity;
import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -24,7 +19,6 @@ import net.osmand.plus.osmedit.OpenstreetmapPoint;
import net.osmand.plus.osmedit.OsmEditingPlugin; import net.osmand.plus.osmedit.OsmEditingPlugin;
import net.osmand.plus.osmedit.OsmNotesPoint; import net.osmand.plus.osmedit.OsmNotesPoint;
import net.osmand.plus.osmedit.OsmPoint; import net.osmand.plus.osmedit.OsmPoint;
import net.osmand.util.Algorithms;
import java.util.Map; import java.util.Map;
@ -37,11 +31,11 @@ public class EditPOIMenuBuilder extends MenuBuilder {
this.osmPoint = osmPoint; this.osmPoint = osmPoint;
} }
private void buildRow(View view, int iconId, String text, int textColor, boolean needLinks) { private void buildRow(View view, int iconId, String text) {
buildRow(view, getRowIcon(iconId), text, textColor, needLinks); buildRow(view, getRowIcon(iconId), text);
} }
protected void buildRow(final View view, Drawable icon, String text, int textColor, boolean needLinks) { protected void buildRow(final View view, Drawable icon, String text) {
boolean light = app.getSettings().isLightContent(); boolean light = app.getSettings().isLightContent();
LinearLayout ll = new LinearLayout(view.getContext()); LinearLayout ll = new LinearLayout(view.getContext());
@ -77,15 +71,8 @@ public class EditPOIMenuBuilder extends MenuBuilder {
textView.setTextSize(16); textView.setTextSize(16);
textView.setTextColor(app.getResources().getColor(light ? R.color.ctx_menu_info_text_light : R.color.ctx_menu_info_text_dark)); textView.setTextColor(app.getResources().getColor(light ? R.color.ctx_menu_info_text_light : R.color.ctx_menu_info_text_dark));
if (needLinks) {
textView.setAutoLinkMask(Linkify.ALL);
textView.setLinksClickable(true);
}
textView.setEllipsize(TextUtils.TruncateAt.END); textView.setEllipsize(TextUtils.TruncateAt.END);
textView.setText(text); textView.setText(text);
if (textColor > 0) {
textView.setTextColor(view.getResources().getColor(textColor));
}
LinearLayout.LayoutParams llTextViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); LinearLayout.LayoutParams llTextViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
llTextViewParams.setMargins(0, 0, dpToPx(10f), 0); llTextViewParams.setMargins(0, 0, dpToPx(10f), 0);
@ -114,78 +101,16 @@ public class EditPOIMenuBuilder extends MenuBuilder {
if (osmPoint instanceof OsmNotesPoint) { if (osmPoint instanceof OsmNotesPoint) {
OsmNotesPoint notes = (OsmNotesPoint) osmPoint; OsmNotesPoint notes = (OsmNotesPoint) osmPoint;
buildRow(view, R.drawable.ic_action_note_dark, notes.getText(), 0, false); buildRow(view, R.drawable.ic_action_note_dark, notes.getText());
buildRow(view, R.drawable.ic_group, notes.getAuthor(), 0, false); buildRow(view, R.drawable.ic_group, notes.getAuthor());
} else if (osmPoint instanceof OpenstreetmapPoint) { } else if (osmPoint instanceof OpenstreetmapPoint) {
OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint; OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint;
MapPoiTypes poiTypes = app.getPoiTypes();
for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) { for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) {
int iconId; String text = e.getKey() + "=" + e.getValue();
Drawable icon = null; buildRow(view, R.drawable.ic_action_info_dark, text);
int textColor = 0;
String key = e.getKey();
String vl = e.getValue();
boolean needLinks = !"population".equals(key);
if (key.startsWith("name:")) {
continue;
} else if (Amenity.OPENING_HOURS.equals(key)) {
iconId = R.drawable.ic_action_time;
} else if (Amenity.PHONE.equals(key)) {
iconId = R.drawable.ic_action_call_dark;
} else if (Amenity.WEBSITE.equals(key)) {
iconId = R.drawable.ic_world_globe_dark;
vl = vl.replace(' ', '_');
} else {
if (Amenity.DESCRIPTION.equals(key)) {
iconId = R.drawable.ic_action_note_dark;
} else {
iconId = R.drawable.ic_action_info_dark;
}
AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(key);
if (pt != null) {
PoiType pType = (PoiType) pt;
if (pType.getParentType() != null && pType.getParentType() instanceof PoiType) {
icon = getRowIcon(view.getContext(), ((PoiType) pType.getParentType()).getOsmTag() + "_" + pType.getOsmTag().replace(':', '_') + "_" + pType.getOsmValue());
}
if (!((PoiType) pt).isText()) {
vl = pt.getTranslation();
} else {
vl = pt.getTranslation() + ": " + e.getValue();
}
} else {
vl = Algorithms.capitalizeFirstLetterAndLowercase(e.getKey()) + ": " + e.getValue();
}
}
if (icon != null) {
buildRow(view, icon, vl, textColor, needLinks);
} else {
buildRow(view, iconId, vl, textColor, needLinks);
} }
} }
} }
buildButtonRow(view, null, view.getResources().getString(R.string.shared_string_delete), new OnClickListener() {
@Override
public void onClick(View v) {
OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
if (plugin != null) {
boolean deleted = false;
if (osmPoint instanceof OsmNotesPoint) {
deleted = plugin.getDBBug().deleteAllBugModifications((OsmNotesPoint) osmPoint);
} else if (osmPoint instanceof OpenstreetmapPoint) {
deleted = plugin.getDBPOI().deletePOI((OpenstreetmapPoint) osmPoint);
}
if (deleted && v.getContext() instanceof MapActivity) {
((MapActivity)v.getContext()).getContextMenu().close();
}
}
}
});
}
} }

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

@ -1,9 +1,11 @@
package net.osmand.plus.mapcontextmenu.controllers; package net.osmand.plus.mapcontextmenu.controllers;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -11,7 +13,6 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin; import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording; import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.mapcontextmenu.MenuController; import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.mapcontextmenu.builders.AudioVideoNoteMenuBuilder; import net.osmand.plus.mapcontextmenu.builders.AudioVideoNoteMenuBuilder;
@ -33,8 +34,7 @@ public class AudioVideoNoteMenuController extends MenuController {
dateFormat = android.text.format.DateFormat.getMediumDateFormat(mapActivity); dateFormat = android.text.format.DateFormat.getMediumDateFormat(mapActivity);
timeFormat = android.text.format.DateFormat.getTimeFormat(mapActivity); timeFormat = android.text.format.DateFormat.getTimeFormat(mapActivity);
if (!recording.isPhoto()) { leftTitleButtonController = new TitleButtonController() {
titleButtonController = new TitleButtonController() {
@Override @Override
public void buttonPressed() { public void buttonPressed() {
if (plugin != null) { if (plugin != null) {
@ -42,12 +42,38 @@ public class AudioVideoNoteMenuController extends MenuController {
} }
} }
}; };
titleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_play); if (!recording.isPhoto()) {
titleButtonController.leftIconId = R.drawable.ic_play_dark; leftTitleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_play);
leftTitleButtonController.leftIconId = R.drawable.ic_play_dark;
String durationStr = recording.getPlainDuration(); String durationStr = recording.getPlainDuration();
titleButtonController.needRightText = true; leftTitleButtonController.needRightText = true;
titleButtonController.rightTextCaption = "— " + durationStr; leftTitleButtonController.rightTextCaption = "— " + durationStr;
} else {
leftTitleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_show);
leftTitleButtonController.leftIconId = R.drawable.ic_action_view;
} }
rightTitleButtonController = new TitleButtonController() {
@Override
public void buttonPressed() {
AccessibleAlertBuilder bld = new AccessibleAlertBuilder(getMapActivity());
bld.setMessage(R.string.recording_delete_confirm);
bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (plugin != null) {
plugin.deleteRecording(recording);
getMapActivity().getContextMenu().close();
}
}
});
bld.setNegativeButton(R.string.shared_string_no, null);
bld.show();
}
};
rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
} }
@Override @Override

38
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/EditPOIMenuController.java
View file

@ -1,8 +1,10 @@
package net.osmand.plus.mapcontextmenu.controllers; package net.osmand.plus.mapcontextmenu.controllers;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -11,11 +13,13 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.MenuController; import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.mapcontextmenu.builders.EditPOIMenuBuilder; import net.osmand.plus.mapcontextmenu.builders.EditPOIMenuBuilder;
import net.osmand.plus.osmedit.OpenstreetmapPoint;
import net.osmand.plus.osmedit.OpenstreetmapRemoteUtil; import net.osmand.plus.osmedit.OpenstreetmapRemoteUtil;
import net.osmand.plus.osmedit.OsmBugsRemoteUtil; import net.osmand.plus.osmedit.OsmBugsRemoteUtil;
import net.osmand.plus.osmedit.OsmEditingPlugin; import net.osmand.plus.osmedit.OsmEditingPlugin;
import net.osmand.plus.osmedit.OsmEditsUploadListener; import net.osmand.plus.osmedit.OsmEditsUploadListener;
import net.osmand.plus.osmedit.OsmEditsUploadListenerHelper; import net.osmand.plus.osmedit.OsmEditsUploadListenerHelper;
import net.osmand.plus.osmedit.OsmNotesPoint;
import net.osmand.plus.osmedit.OsmPoint; import net.osmand.plus.osmedit.OsmPoint;
import net.osmand.plus.osmedit.UploadOpenstreetmapPointAsyncTask; import net.osmand.plus.osmedit.UploadOpenstreetmapPointAsyncTask;
import net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment; import net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment;
@ -66,7 +70,7 @@ public class EditPOIMenuController extends MenuController {
} }
}; };
titleButtonController = new TitleButtonController() { leftTitleButtonController = new TitleButtonController() {
@Override @Override
public void buttonPressed() { public void buttonPressed() {
if (plugin != null) { if (plugin != null) {
@ -76,7 +80,37 @@ public class EditPOIMenuController extends MenuController {
} }
} }
}; };
titleButtonController.caption = getMapActivity().getString(R.string.local_openstreetmap_upload); leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_upload);
leftTitleButtonController.leftIconId = R.drawable.ic_action_export;
rightTitleButtonController = new TitleButtonController() {
@Override
public void buttonPressed() {
AccessibleAlertBuilder bld = new AccessibleAlertBuilder(getMapActivity());
bld.setMessage(R.string.recording_delete_confirm);
bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (plugin != null) {
boolean deleted = false;
if (osmPoint instanceof OsmNotesPoint) {
deleted = plugin.getDBBug().deleteAllBugModifications((OsmNotesPoint) osmPoint);
} else if (osmPoint instanceof OpenstreetmapPoint) {
deleted = plugin.getDBPOI().deletePOI((OpenstreetmapPoint) osmPoint);
}
if (deleted) {
getMapActivity().getContextMenu().close();
}
}
}
});
bld.setNegativeButton(R.string.shared_string_no, null);
bld.show();
}
};
rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
if (osmPoint.getGroup() == OsmPoint.Group.POI) { if (osmPoint.getGroup() == OsmPoint.Group.POI) {
pointTypeStr = getMapActivity().getString(R.string.osm_edit_created_poi); pointTypeStr = getMapActivity().getString(R.string.osm_edit_created_poi);

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

@ -30,7 +30,8 @@ public class MapDataMenuController extends MenuController {
} else { } else {
regionName = dataObject.getName(); regionName = dataObject.getName();
} }
titleButtonController = new TitleButtonController() {
leftTitleButtonController = new TitleButtonController() {
@Override @Override
public void buttonPressed() { public void buttonPressed() {
getMapActivity().getContextMenu().close(); getMapActivity().getContextMenu().close();
@ -42,8 +43,27 @@ public class MapDataMenuController extends MenuController {
getMapActivity().startActivity(intent); getMapActivity().startActivity(intent);
} }
}; };
titleButtonController.caption = getMapActivity().getString(R.string.shared_string_download_map); leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_download);
titleButtonController.leftIconId = R.drawable.ic_action_import; leftTitleButtonController.leftIconId = R.drawable.ic_action_import;
rightTitleButtonController = new TitleButtonController() {
@Override
public void buttonPressed() {
// todo delete
//getMapActivity().getContextMenu().close();
}
};
rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
topRightTitleButtonController = new TitleButtonController() {
@Override
public void buttonPressed() {
// todo other maps
}
};
topRightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_others);
} }
@Override @Override

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

@ -31,7 +31,7 @@ public class ParkingPositionMenuController extends MenuController {
} }
parkingDescription = sb.toString(); parkingDescription = sb.toString();
} }
titleButtonController = new TitleButtonController() { leftTitleButtonController = new TitleButtonController() {
@Override @Override
public void buttonPressed() { public void buttonPressed() {
if (plugin != null) { if (plugin != null) {
@ -39,7 +39,7 @@ public class ParkingPositionMenuController extends MenuController {
} }
} }
}; };
titleButtonController.caption = getMapActivity().getString(R.string.osmand_parking_delete); leftTitleButtonController.caption = getMapActivity().getString(R.string.osmand_parking_delete);
} }
@Override @Override

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

@ -18,7 +18,7 @@ public class TargetPointMenuController extends MenuController {
public TargetPointMenuController(OsmandApplication app, MapActivity mapActivity, final TargetPoint targetPoint) { public TargetPointMenuController(OsmandApplication app, MapActivity mapActivity, final TargetPoint targetPoint) {
super(new MenuBuilder(app), mapActivity); super(new MenuBuilder(app), mapActivity);
this.targetPoint = targetPoint; this.targetPoint = targetPoint;
titleButtonController = new TitleButtonController() { leftTitleButtonController = new TitleButtonController() {
@Override @Override
public void buttonPressed() { public void buttonPressed() {
TargetPointsHelper targetPointsHelper = getMapActivity().getMyApplication().getTargetPointsHelper(); TargetPointsHelper targetPointsHelper = getMapActivity().getMyApplication().getTargetPointsHelper();
@ -30,7 +30,7 @@ public class TargetPointMenuController extends MenuController {
getMapActivity().getContextMenu().close(); getMapActivity().getContextMenu().close();
} }
}; };
titleButtonController.caption = getMapActivity().getString(R.string.delete_target_point); leftTitleButtonController.caption = getMapActivity().getString(R.string.delete_target_point);
} }
@Override @Override

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

@ -188,7 +188,7 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.
@Override @Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res) { public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res) {
if (this.settings.SHOW_FAVORITES.get()) { if (this.settings.SHOW_FAVORITES.get() && tileBox.getZoom() >= startZoom) {
getFavoriteFromPoint(tileBox, point, res); getFavoriteFromPoint(tileBox, point, res);
} }
} }