Remove translation for tags. Make legend image fill screen.

OsmAnd/no_translate.xml

@@ -48,4 +48,7 @@
     <string name="preferred_locale_no_translate">Display language</string>
     <string name="system_locale_no_translate">Device language</string>
 	<string name="osmo">OsMo</string>
+    <string name="tag_poi_amenity">amenity</string>
+    <string name="tag_poi_name">name</string>
+
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -1887,7 +1887,7 @@
 	<string name="opening_at">Адчыняецца ў</string>
 	<string name="closing_at">Зачыняецца ў</string>
 <string name="tab_title_advanced">Пашыранае</string>
-	<string name="tag_poi_name">назва</string>
+	
 	<string name="contact_info">Кантакты</string>
 	<string name="description">Апісаньне</string>
 	<string name="add_opening_hours">Дадаць гадзіны працы</string>
@@ -1896,7 +1896,7 @@
 <string name="av_locations_descr">GPX-файл зь мецазнаходжаньнем заўваг</string>
     <string name="av_locations">Месцазнаходжаньні</string>
     <string name="number_of_rows_in_dash">Колькасьць радкоў на галоўным экране %1$s</string>
-	<string name="tag_poi_amenity">грамадзкі аб\'ект</string>
+	
 	<string name="poi_action_delete">выдаліць</string>
 	<string name="working_days">Працоўныя дні</string>
 	<string name="recent_places">Нядаўнія месцы</string>

OsmAnd/res/values-bg/strings.xml

@@ -1963,7 +1963,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="lang_zh_TW">традиционен китайски</string>
 	<string name="error_message_pattern">Грешка: {0}</string>
 	<string name="app_name_osmand">OsmAnd</string>
-	<string name="tag_poi_name">име</string>
+	
 	<string name="description">Описание</string>
 	<string name="poi_dialog_poi_type">Тип POI</string>
 	<string name="working_days">Работни дни</string>

OsmAnd/res/values-ca/strings.xml

@@ -1901,13 +1901,13 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
 	<string name="closing_at">Tanquen a les</string>
 <string name="av_locations">Ubicacions</string>
     <string name="av_locations_descr">Fitxer GPX amb posicions comentades</string>
-    <string name="tag_poi_name">nom</string>
+    
 	<string name="contact_info">Informació de contacte</string>
 	<string name="description">Descripció</string>
 	<string name="add_opening_hours">Afegeix l\'horari de servei</string>
 	<string name="poi_dialog_poi_type">Tipus de PDI</string>
 	<string name="please_specify_poi_type">Especifiqueu el tipus de PDI.</string>
-<string name="tag_poi_amenity">instal·lació comunitària</string>
+
 	<string name="number_of_rows_in_dash">Nombre de files al tauler %1$s</string>
 	<string name="poi_action_delete">Suprimeix</string>
 	<string name="working_days">Dies laborables</string>

OsmAnd/res/values-cs/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<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="send_files_to_osm">Nahrát GPX soubory do OSM?</string>
@@ -1852,7 +1851,7 @@
     <string name="tab_title_advanced">Rozšířené</string>
     <string name="building_number">Číslo domu</string>
     <string name="next_proceed">Další</string>
-    <string name="tag_poi_name">název</string>
+    
     <string name="poi_dialog_poi_type">Typ POI</string>
     <string name="number_of_rows_in_dash">Počet řádků v bloku %1$s</string>
     <string name="saved_at_time">Úspěšně uloženo na: %1$s</string>
@@ -1886,7 +1885,7 @@
     <string name="lang_gl">Galicijsky</string>
     <string name="lang_et">Estonsky</string>
     <string name="lang_ceb">Cebuansky</string>
-    <string name="tag_poi_amenity">občanská vybavenost</string>
+    
     <string name="opening_at">Otevřeno od</string>
     <string name="closing_at">Otevřeno do</string>
     <string name="count_of_lines">Počet řádků</string>
@@ -1973,9 +1972,9 @@
     <string name="map_viewing_item">Prohlížení mapy</string>
     <string name="search_on_the_map_item">Hledání na mapě</string>
     <string name="planning_trip_item">Plánování cesty</string>
-    <string name="contour_lines_and_hillshade_maps_item">Vrstevnice a stínování kopců</string>
+    
     <string name="osmand_ski_maps_item">OsmAnd lyžařské mapy</string>
-    <string name="audio_video_note_item">Audio/video poznámky</string>
+    
     <string name="instalation_troubleshooting_item">Instalace a řešení problémů</string>
     <string name="techical_articles_item">Technické články</string>
     <string name="versions_item">Verze</string>

OsmAnd/res/values-da/strings.xml

@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<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="av_def_action_video">Optag video</string>
     <string name="av_def_action_audio">Optag audio</string>
@@ -1890,7 +1889,7 @@
     <string name="av_locations_descr">GPX-fil med placeringsnoter</string>
     <string name="av_locations">Placeringer</string>
     <string name="tab_title_basic">Grundlæggende</string>
-    <string name="tag_poi_name">navn</string>
+    
     <string name="tag_poi_amenity">facilitet</string>
     <string name="contact_info">Kontaktoplysninger</string>
     <string name="description">Beskrivelse</string>
@@ -1992,9 +1991,9 @@
     <string name="map_viewing_item">Kortvisning</string>
     <string name="search_on_the_map_item">Søgning på kortet</string>
     <string name="planning_trip_item">Turplanlægning</string>
-    <string name="contour_lines_and_hillshade_maps_item">Højdekurver og reliefoverlejring</string>
+    
     <string name="osmand_ski_maps_item">Skikort</string>
-    <string name="audio_video_note_item">Audio-/videonoter</string>
+    
     <string name="instalation_troubleshooting_item">Installation og fejlfinding</string>
     <string name="techical_articles_item">Tekniske artikler</string>
     <string name="versions_item">Versioner</string>
@@ -2003,4 +2002,4 @@
     <string name="osm_edit_created_poi">Oprettede OSM IP</string>
     <string name="osm_edit_created_bug">Oprettede OSM fejlregistrering</string>
 <string name="map_legend">Kortforklaring</string>
-</resources>
+</resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -1905,7 +1905,7 @@
 	<string name="closing_at">Cierran a las</string>
 <string name="av_locations_descr">Archivo GPX con notas de ubicaciones</string>
     <string name="av_locations">Ubicaciones</string>
-    <string name="tag_poi_name">nombre</string>
+    
 	<string name="tag_poi_amenity">servicio</string>
 	<string name="contact_info">Información de contacto</string>
 	<string name="description">Descripción</string>
@@ -2005,9 +2005,9 @@
     <string name="map_viewing_item">Vista del mapa</string>
     <string name="search_on_the_map_item">Busqueda en el mapa</string>
 	<string name="planning_trip_item">Planificación de viaje</string>
-    <string name="contour_lines_and_hillshade_maps_item">Mapas de curvas de nivel y sombreado</string>
+    
     <string name="osmand_ski_maps_item">Mapas de esquí de OsmAnd</string>
-    <string name="audio_video_note_item">Notas multimedia</string>
+    
     <string name="instalation_troubleshooting_item">Instalación y solución de problemas</string>
     <string name="techical_articles_item">Artículos técnicos</string>
     <string name="versions_item">Versiones</string>

OsmAnd/res/values-es/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
 
     <string name="layer_map_appearance">Configurar pantalla</string>
     <string name="show_lanes">Mostrar carriles</string>
@@ -2026,7 +2025,7 @@
     <string name="closing_at">Cierran a las</string>
     <string name="av_locations_descr">Archivo GPX con ubicaciones de nota</string>
     <string name="av_locations">Ubicaciones</string>
-    <string name="tag_poi_name">nombre</string>
+    
     <string name="tag_poi_amenity">servicio</string>
     <string name="contact_info">Información de contacto</string>
     <string name="description">Descripción</string>
@@ -2125,9 +2124,9 @@
     <string name="map_viewing_item">Vista del mapa</string>
     <string name="search_on_the_map_item">Búsqueda en el mapa</string>
     <string name="planning_trip_item">Planeando un viaje</string>
-    <string name="contour_lines_and_hillshade_maps_item">Mapas de curvas de nivel y sombreado</string>
+    
     <string name="osmand_ski_maps_item">Mapas de esquí de OsmAnd</string>
-    <string name="audio_video_note_item">Notas multimedia</string>
+    
     <string name="instalation_troubleshooting_item">Instalación y solución de problemas</string>
     <string name="techical_articles_item">Artículos técnicos</string>
     <string name="versions_item">Versiones</string>

OsmAnd/res/values-et/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="add_opening_hours">Lisa lahioleku ajad</string>
 	<string name="description">Kirjeldus</string>
 	<string name="contact_info">Kontakti info</string>
-	<string name="tag_poi_name">nimi</string>
+	
 	<string name="building_number">Hoone Number</string>
 	<string name="shared_string_skip">Jäta vahele</string>
 	<string name="poi_action_add">lisa</string>

OsmAnd/res/values-fi/strings.xml

@@ -867,7 +867,7 @@
     <string name="show_gpx">Näytä GPX</string>
 	<string name="favourites">Suosikit</string>
 	<string name="description">Kuvaus</string>
-	<string name="tag_poi_name">nimi</string>
+	
 	<string name="closing_at">Sulkeutuu</string>
 	<string name="opening_at">Avautuu</string>
 	<string name="address_unknown">Osoitetta ei tiedetä vielä</string>

OsmAnd/res/values-fr/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="offline_edition">Modifications hors-ligne</string>
     <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
 
@@ -1956,7 +1955,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="next_proceed">Suivant</string>
     <string name="opening_at">Ouverture à</string>
     <string name="closing_at">Fermeture à</string>
-    <string name="tag_poi_name">nom</string>
+    
     <string name="description">Description</string>
     <string name="add_opening_hours">Ajouter des heures d\'ouverture</string>
     <string name="poi_dialog_poi_type">Type de PI</string>
@@ -1978,7 +1977,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="shared_string_card_was_hidden">La carte a été masquée</string>
     <string name="routing_attr_avoid_shuttle_train_name">Éviter les trains-navettes</string>
     <string name="av_locations_descr">Fichier GPX avec notes</string>
-    <string name="tag_poi_amenity">aménité</string>
+    
     <string name="simulate_your_location_stop_descr">Arrêter de simuler votre position</string>
     <string name="simulate_your_location_descr">Simuler à partir d\'un fichier GPX ou d\'une route calculée</string>
     <string name="are_you_sure">Etes-vous certain ?</string>
@@ -2065,9 +2064,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="map_viewing_item">Affichage de la carte</string>
     <string name="search_on_the_map_item">Rechercher de carte</string>
     <string name="planning_trip_item">Préparer un trajet</string>
-    <string name="contour_lines_and_hillshade_maps_item">Cartes avec relief et courbes de niveau</string>
+    
     <string name="osmand_ski_maps_item">Cartes de ski OsmAnd</string>
-    <string name="osm_editing_item">Contribution OSM</string>
+    
     <string name="instalation_troubleshooting_item">Installation et débogage</string>
     <string name="techical_articles_item">Articles techniques</string>
     <string name="versions_item">Versions</string>

OsmAnd/res/values-gl/strings.xml

@@ -1791,7 +1791,7 @@
 	<string name="tab_title_advanced">Avanzado</string>
 	<string name="building_number">Número de versión</string>
 	<string name="next_proceed">Seguinte</string>
-	<string name="tag_poi_name">nome</string>
+	
 	<string name="contact_info">información de contacto</string>
 	<string name="description">Descrición</string>
 	<string name="poi_dialog_poi_type">Tipo de PDI</string>

OsmAnd/res/values-hu/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
     <string name="gpx_visibility_txt">Láthatóság</string>
     <string name="gpx_tags_txt">Címkék</string>
@@ -1876,7 +1875,7 @@
     <string name="building_number">Házszám</string>
     <string name="opening_at">Nyitás</string>
     <string name="closing_at">Zárás</string>
-    <string name="tag_poi_name">név</string>
+    
     <string name="tag_poi_amenity">szolgáltatás</string>
     <string name="contact_info">Elérhetőségek</string>
     <string name="description">Leírás</string>
@@ -1976,9 +1975,9 @@
     <string name="map_viewing_item">Térkép böngészése</string>
     <string name="search_on_the_map_item">Keresés a térképen</string>
     <string name="planning_trip_item">Utazás tervezése</string>
-    <string name="contour_lines_and_hillshade_maps_item">Szintvonal és domborzatárnyékolás</string>
+    
     <string name="osmand_ski_maps_item">OsmAnd sítérkép</string>
-    <string name="audio_video_note_item">Hang- és videójegyzetek</string>
+    
     <string name="instalation_troubleshooting_item">Telepítés és hibaelhárítás</string>
     <string name="techical_articles_item">Technikai cikkek</string>
     <string name="versions_item">Verziók</string>

OsmAnd/res/values-it/strings.xml

@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
     <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
     <string name="offline_edition">Modifiche offline</string>
@@ -1922,7 +1921,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="closing_at">Chiude alle</string>
     <string name="av_locations_descr">File GPX con note locali</string>
     <string name="av_locations">Località</string>
-    <string name="tag_poi_name">nome</string>
+    
     <string name="tag_poi_amenity">amenità</string>
     <string name="contact_info">Informazioni di contatto</string>
     <string name="description">Descrizione</string>
@@ -2023,14 +2022,14 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="map_viewing_item">Visualizzazione mappa</string>
     <string name="search_on_the_map_item">Ricerca sulla mappa</string>
     <string name="planning_trip_item">Pianifica un viaggio</string>
-    <string name="contour_lines_and_hillshade_maps_item">Mappe linee di livello e ombreggiamento rilievi</string>
+    
     <string name="osmand_ski_maps_item">Mappe sci OsmAnd</string>
-    <string name="audio_video_note_item">Note audio/video</string>
+    
     <string name="instalation_troubleshooting_item">Installazione e soluzione dei problemi</string>
     <string name="techical_articles_item">Articoli tecnici</string>
     <string name="versions_item">Versioni</string>
     <string name="contact_us">Contattaci</string>
     <string name="world_map_download_descr">La mappa di base (copertura mondiale a piccoli livelli di zoom) è mancante o non aggiornata. Valutate di scaricare la mappa mondiale di base per un ambiente completo.</string>
-<string name="poll">Sondaggio</string>
+
     <string name="map_legend">Legenda della mappa</string>
-</resources>
+</resources>

OsmAnd/res/values-ja/strings.xml

@@ -1962,7 +1962,7 @@ POIの更新は利用できません</string>
 	<string name="next_proceed">次</string>
 	<string name="opening_at">～で開く</string>
 	<string name="closing_at">～で閉じる</string>
-	<string name="tag_poi_name">名称</string>
+	
 	<string name="tag_poi_amenity">施設</string>
 	<string name="contact_info">連絡先</string>
 	<string name="description">説明</string>

OsmAnd/res/values-ko/strings.xml

@@ -2149,7 +2149,7 @@
 	<string name="next_proceed">다음</string>
 	<string name="opening_at">~ 열기</string>
 	<string name="closing_at">에 닫기</string>
-	<string name="tag_poi_name">이름</string>
+	
 	<string name="tag_poi_amenity">시설</string>
 	<string name="contact_info">연락처 정보</string>
 	<string name="description">설명</string>

OsmAnd/res/values-lt/strings.xml

@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
     <string name="shared_location">Bendrinta vieta</string>
     <string name="osmand_parking_warning">Dėmesio</string>
@@ -1877,7 +1876,7 @@
     <string name="av_locations">Vietovės</string>
     <string name="building_number">Pastato numeris</string>
     <string name="next_proceed">Toliau</string>
-    <string name="tag_poi_name">pavadinimas</string>
+    
     <string name="description">Aprašymas</string>
     <string name="add_opening_hours">Pridėti darbo valandas</string>
     <string name="poi_dialog_poi_type">LV tipas</string>
@@ -1957,7 +1956,7 @@
     <string name="faq_item">DUK</string>
     <string name="search_on_the_map_item">Ieškoti žemėlapyje</string>
     <string name="planning_trip_item">Kelionės planavimas</string>
-    <string name="trip_recording_tool_item">Kelionės įrašymo įrankis</string>
+    
     <string name="osm_editing_item">OSM redagavimas</string>
     <string name="instalation_troubleshooting_item">Diegimas ir problemų sprendimas</string>
     <string name="versions_item">Versijos</string>
@@ -1974,9 +1973,9 @@
     <string name="faq_item_description">Kaip naudotis įskiepiais</string>
     <string name="map_viewing_item">Žemėlapio peržiūra</string>
 
-    <string name="audio_video_note_item">Garso/vaizdo pastabos</string>
+    
     <string name="techical_articles_item">Techniniai straipsniai</string>
-    <string name="poll">apklausa</string>
+    
     <string name="osm_edit_created_poi"/>
     <string name="osm_edit_created_bug">Sukurtas OSM riktas</string>
-</resources>
+</resources>

OsmAnd/res/values-nb/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
     <string name="rendering_attr_roadColors_name">Veifargeskjema</string>
     <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@@ -1378,7 +1377,7 @@
     <string name="osmand_running_in_background">Kjører i bakgrunnen</string>
     <string name="favourites_edit_dialog_title">Favorittinformasjon</string>
     <string name="next_proceed">Neste</string>
-    <string name="tag_poi_name">navn</string>
+    
     <string name="description">Beskrivelse</string>
     <string name="add_opening_hours">Legg til åpningstider</string>
     <string name="poi_dialog_poi_type">Interessepunkttype</string>
@@ -1416,7 +1415,7 @@
     <string name="activate_srtm_plugin">Aktiver programtillegg SRTM</string>
     <string name="opening_at">Åpner</string>
     <string name="closing_at">Lukker</string>
-    <string name="tag_poi_amenity">fasilitet</string>
+    
     <string name="contact_info">Kontaktinformasjon</string>
     <string name="recent_places">Nylige steder</string>
     <string name="saved_at_time">Vellykket lagret: %1$s</string>
@@ -1430,7 +1429,7 @@
     <string name="faq_item_description">Hvordan bruke programtillegg</string>
     <string name="map_viewing_item">Kartvisning</string>
     <string name="search_on_the_map_item">Kartsøking</string>
-    <string name="osmand_ski_maps_item">OsmAnd skikart</string>
+    
     <string name="audio_video_note_item">Audio/video-notater</string>
     <string name="versions_item">Versjoner</string>
     <string name="contact_us">Kontakt oss</string>

OsmAnd/res/values-pl/strings.xml

@@ -2056,7 +2056,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="next_proceed">Następny</string>
 	<string name="opening_at">Otwarte od</string>
 	<string name="closing_at">Zamknięte od</string>
-	<string name="tag_poi_name">Nazwa</string>
+	
 	<string name="tag_poi_amenity">Udogodnienia</string>
 	<string name="contact_info">Informacje kontaktowe</string>
 	<string name="add_opening_hours">Dodaj godziny otwarcia</string>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -1780,13 +1780,13 @@
 	<string name="closing_at">Fecha em</string>
 <string name="av_locations_descr">Arquivo GPX com notas de posição</string>
     <string name="av_locations">Posições</string>
-    <string name="tag_poi_name">nome</string>
+    
 	<string name="contact_info">Informações de contato</string>
 	<string name="description">Descrição</string>
 	<string name="add_opening_hours">Adicionar o horário de funcionamento</string>
 	<string name="poi_dialog_poi_type">Tipo de POI</string>
 	<string name="number_of_rows_in_dash">Número de linhas no traço de %1$s</string>
-<string name="tag_poi_amenity">facilidade</string>
+
 	<string name="please_specify_poi_type">Por favor, especifique tipo de POI.</string>
 <string name="working_days">Dias úteis</string>
 	<string name="recent_places">Locais recentes</string>

OsmAnd/res/values-ru/strings.xml

@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</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>
@@ -1902,7 +1901,7 @@
 	<string name="next_proceed">Следующий</string>
 	<string name="opening_at">Открытие в</string>
 	<string name="closing_at">Закрытие в</string>
-	<string name="tag_poi_name">название</string>
+	
 	<string name="contact_info">Контактная информация</string>
 	<string name="description">Описание</string>
 	<string name="add_opening_hours">Добавить часы работы</string>
@@ -1916,7 +1915,7 @@
 <string name="poi_deleted_localy">POI будут удалены после того как вы загрузите ваши изменения</string>
 	<string name="show_gpx">Показать GPX</string>
 <string name="poi_action_delete">удалить</string>
-	<string name="tag_poi_amenity">инфраструктура</string>
+	
 	<string name="recent_places">Недавние места</string>
 	<string name="count_of_lines">Количество строк</string>
 <string name="show_on_start">Показывать при запуске</string>
@@ -2006,4 +2005,4 @@
     <string name="help_us_to_improve_menu_group">Помогите улучшить OsmAnd</string>
     <string name="other_menu_group">Прочее</string>
     <string name="plugins_menu_group">Плагины</string>
-    </resources>
+    </resources>

OsmAnd/res/values-sc/strings.xml

@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
     <string name="misc_pref_title">Mistura</string>
@@ -1864,12 +1863,12 @@
     <string name="closing_at">Serrat a sas</string>
     <string name="av_locations_descr">Documentu GPX cun notas locales</string>
     <string name="av_locations">Localidades</string>
-    <string name="tag_poi_name">nùmene</string>
+    
     <string name="contact_info">Informatziones de cuntatu</string>
     <string name="description">Descritzione</string>
     <string name="add_opening_hours">Annanghe s’oràriu de abertura</string>
     <string name="poi_dialog_poi_type">Casta de PDI</string>
-    <string name="tag_poi_amenity">atratzione</string>
+    
     <string name="please_specify_poi_type">Dislinda casta de PDI.</string>
     <string name="number_of_rows_in_dash">Nùmeru de rigas in su pannellu %1$s</string>
     <string name="poi_action_delete">burra</string>
@@ -1965,9 +1964,9 @@
     <string name="map_viewing_item">Visione de sa mapa</string>
     <string name="search_on_the_map_item">Chircare in sa mapa</string>
     <string name="planning_trip_item">Pranificare unu biàgiu</string>
-    <string name="contour_lines_and_hillshade_maps_item">Mapas de sas lìnias de livellu e de sas umbraduras de sos rilievos</string>
+    
     <string name="osmand_ski_maps_item">Mapas pro iscì OsmAnd</string>
-    <string name="audio_video_note_item">Notas àudio/vìdeu</string>
+    
     <string name="instalation_troubleshooting_item">Installatzione e solutziones a sos problemas</string>
     <string name="techical_articles_item">Artìculos tècnicos</string>
     <string name="versions_item">Versiones</string>
@@ -1976,4 +1975,4 @@
     <string name="osm_edit_created_poi">PDI de OSM creadu</string>
     <string name="osm_edit_created_bug">Nota de errore de OSM creada</string>
 <string name="map_legend">Legenda de sa mapa</string>
-</resources>
+</resources>

OsmAnd/res/values-sk/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="recording_context_menu_show">Zobraziť</string>
     <string name="recording_photo_description">Fotografia %1$s %2$s</string>
     <string name="av_def_action_picture">Zachytiť fotografiu</string>
@@ -2031,7 +2030,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="next_proceed">Ďalší</string>
     <string name="opening_at">Otvára o</string>
     <string name="closing_at">Zatvára o</string>
-    <string name="tag_poi_name">názov</string>
+    
     <string name="tag_poi_amenity">občianska vybavenosť</string>
     <string name="contact_info">Kontaktné údaje</string>
     <string name="description">Popis</string>
@@ -2133,9 +2132,9 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="map_viewing_item">Prezeranie mapy</string>
     <string name="search_on_the_map_item">Hľadanie na mape</string>
     <string name="planning_trip_item">Plánovanie výletu</string>
-    <string name="contour_lines_and_hillshade_maps_item">Mapy vrstevníc a tieňované svahy</string>
+    
     <string name="osmand_ski_maps_item">Lyžiarske mapy</string>
-    <string name="audio_video_note_item">Zvukové/video poznámky</string>
+    
     <string name="instalation_troubleshooting_item">Inštalácia a riešenie problémov</string>
     <string name="techical_articles_item">Technické články</string>
     <string name="versions_item">Verzie</string>

OsmAnd/res/values-sl/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="search_button">Poišči</string>
     <string name="search_activity">Iskanje podatkov</string>
 
@@ -1872,7 +1871,7 @@
     <string name="poi_action_delete">izbriši</string>
     <string name="tab_title_basic">Osnovno</string>
     <string name="tab_title_advanced">Napredno</string>
-    <string name="tag_poi_name">ime</string>
+    
     <string name="tag_poi_amenity">prednost</string>
     <string name="contact_info">Podatki stika</string>
     <string name="description">Opis</string>
@@ -1966,7 +1965,7 @@
     <string name="map_viewing_item">Pogled zemljevida</string>
     <string name="search_on_the_map_item">Iskanje po zemljevidu</string>
     <string name="planning_trip_item">Planiranje potovanja</string>
-    <string name="osmand_ski_maps_item">Smučarski zemljevidi OsmAnd</string>
+    
     <string name="audio_video_note_item">Zvočni in video zaznamki</string>
     <string name="instalation_troubleshooting_item">Namestitev in odpravljanje napak</string>
     <string name="techical_articles_item">Tehnični članki</string>
@@ -1978,6 +1977,6 @@
     <string name="show_on_start_description">Možnost \'brez\' zažene v pogledu zemljevida</string>
     <string name="enter_country_name">Vpis imena države</string>
 
-    <string name="trip_recording_tool_item">Orodje za beleženje poti</string>
+    
 
 </resources>

OsmAnd/res/values-sv/strings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
     <string name="ChooseCountry">Välj land</string>
     <string name="choose_city">Välj stad</string>
@@ -1860,7 +1859,7 @@
     <string name="contact_info">Kontaktinformation</string>
     <string name="dahboard_options_dialog_title">Konfigurera panelen</string>
     <string name="commit_poi">Skicka in POI</string>
-    <string name="tag_poi_name">namn</string>
+    
     <string name="tag_poi_amenity">service</string>
     <string name="number_of_rows_in_dash">Antal rader i panelen: %1$s</string>
     <string name="please_specify_poi_type">Ange typ av POI.</string>
@@ -1952,9 +1951,9 @@
     <string name="map_viewing_item">Kartvisning</string>
     <string name="search_on_the_map_item">Söka på kartan</string>
     <string name="planning_trip_item">Att planera en resa</string>
-    <string name="trip_recording_tool_item">Verktyg för inspelning av resa</string>
+    
     <string name="nautical_charts_item">Sjökort</string>
-    <string name="osm_editing_item">OSM-redigering</string>
+    
     <string name="instalation_troubleshooting_item">Installation och problemlösning</string>
     <string name="techical_articles_item">Tekniska artiklar</string>
     <string name="versions_item">Versioner</string>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-<resources>
     <string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
     <string name="rendering_attr_roadColors_name">道路的色彩調配</string>
     <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@@ -1850,7 +1849,7 @@
     <string name="next_proceed">下頁</string>
     <string name="av_locations_descr">GPX 檔案加上地點注解</string>
     <string name="av_locations">地點</string>
-    <string name="tag_poi_name">名稱</string>
+    
     <string name="tag_poi_amenity">便利設施</string>
     <string name="contact_info">連絡資訊</string>
     <string name="description">記述</string>
@@ -1950,9 +1949,9 @@
     <string name="map_viewing_item">地圖檢視</string>
     <string name="search_on_the_map_item">地圖查詢中</string>
     <string name="planning_trip_item">規劃一次旅程</string>
-    <string name="contour_lines_and_hillshade_maps_item">等高線和山體陰影地圖</string>
+    
     <string name="osmand_ski_maps_item">OsmAnd 滑雪地圖</string>
-    <string name="audio_video_note_item">音訊/視訊注解</string>
+    
     <string name="instalation_troubleshooting_item">安裝和疑難排除</string>
     <string name="techical_articles_item">技術文章</string>
     <string name="versions_item">版本</string>
@@ -1961,4 +1960,4 @@
     <string name="osm_edit_created_poi">建立 OSM 的興趣點</string>
     <string name="osm_edit_created_bug">建立 OSM 的錯誤</string>
 <string name="map_legend">地圖圖例</string>
-</resources>
+</resources>

OsmAnd/res/values/strings.xml

@@ -1995,8 +1995,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="next_proceed">Next</string>
 	<string name="opening_at">Opening at</string>
 	<string name="closing_at">Closing at</string>
-	<string name="tag_poi_name">name</string>
-	<string name="tag_poi_amenity">amenity</string>
 	<string name="contact_info">Contact info</string>
 	<string name="description">Description</string>
 	<string name="add_opening_hours">Add opening hours</string>

OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpArticleDialogFragment.java

@@ -71,6 +71,8 @@ public class HelpArticleDialogFragment extends DialogFragment {
 				webView.loadDataWithBaseURL("http://osmand.net", sb.toString(), null, "utf-8", null);
 			}
 		} else if (url != null) {
+			webView.getSettings().setLoadWithOverviewMode(true);
+			webView.getSettings().setUseWideViewPort(true);
 			if (savedInstanceState != null) {
 				webView.restoreState(savedInstanceState);
 			} else {

OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java

@@ -241,6 +241,7 @@ public class EditPoiDialogFragment extends DialogFragment {
 		});
 		poiNameEditText.setOnEditorActionListener(mOnEditorActionListener);
 		poiTypeEditText.setOnEditorActionListener(mOnEditorActionListener);
+		poiTypeEditText.setText(editPoiData.amenity.getSubType());
 
 		Button saveButton = (Button) view.findViewById(R.id.saveButton);
 		int saveButtonTextId = R.string.default_buttons_commit;
@@ -332,9 +333,9 @@ public class EditPoiDialogFragment extends DialogFragment {
 		getDialog().setOnKeyListener(new DialogInterface.OnKeyListener() {
 			@Override
 			public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-				if (keyCode == android.view.KeyEvent.KEYCODE_BACK) {
+				if (keyCode == android.view.KeyEvent.KEYCODE_BACK
-					if (editPoiData.hasChangesBeenMade()) {
+						&& editPoiData.hasChangesBeenMade()) {
-						LOG.debug("onKey hasChangesBeenMade" + editPoiData.hasChangesBeenMade());
+					if (event.getAction() == KeyEvent.ACTION_DOWN) {
 						return true;
 					} else {
 						dismissCheckForChanges();
@@ -488,7 +489,9 @@ public class EditPoiDialogFragment extends DialogFragment {
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 				Object item = parent.getAdapter().getItem(position);
 				LOG.debug("item=" + item);
+				//noinspection SuspiciousMethodCalls
 				if (subCategories.containsKey(item)) {
+					//noinspection SuspiciousMethodCalls
 					String keyName = subCategories.get(item).getKeyName();
 					poiTypeEditText.setText(keyName);
 				}