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

OsmAnd-java/test/resources/test_turn_lanes.json

@@ -337,6 +337,20 @@
     "expectedResults": {
       "328033376": "TL|+C|TR"
     }
+  },
+  {
+    "testName": "20.Leimuiderweg (N207) TL Leidsestraat (N208)",
+    "startPoint": {
+      "latitude": 45.66587440212255,
+      "longitude": 35.598875460624754
+    },
+    "endPoint": {
+      "latitude": 45.664455433977736,
+      "longitude": 35.59152620792395
+    },
+    "expectedResults": {
+      "385047566": "+TL|+TL,C|TR"
+    }
   }
 
 ]

OsmAnd/build.gradle

@@ -58,7 +58,6 @@ android {
 	}
 
 	dexOptions {
-		jumboMode = true
 		incremental true
 		javaMaxHeapSize "4g"
 	}

OsmAnd/no_translate.xml

@@ -28,5 +28,8 @@
     <string name="hint_value">Value</string>
     <!-- DEVELOPMENT -->
         <string name="osm_live_default_price">€1,49</string>
+    <string name="twitter_address">https://twitter.com/osmandapp</string>
+    <string name="facebook_address">https://www.facebook.com/osmandapp</string>
+    <string name="vk_address">https://vk.com/osmandapp</string>
 
 </resources>

OsmAnd/res/layout/download_item_list_section.xml

@@ -9,6 +9,7 @@
     android:minHeight="40dp"
     android:orientation="horizontal"
     android:paddingLeft="@dimen/list_header_padding"
+    android:background="?attr/ctx_menu_info_view_bg"
     android:paddingRight="@dimen/list_header_padding">
 
     <net.osmand.plus.widgets.TextViewEx

OsmAnd/res/layout/two_line_with_images_list_item.xml

@@ -15,7 +15,7 @@
         android:paddingLeft="@dimen/list_content_padding">
 
         <ImageView
-            android:id="@+id/leftImageView"
+            android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -30,7 +30,7 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/name"
+                android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?android:textColorPrimary"
@@ -65,7 +65,7 @@
         </LinearLayout>
 
         <ImageView
-            android:id="@+id/rightImageButton"
+            android:id="@+id/secondaryIcon"
             android:layout_width="@dimen/list_item_height"
             android:layout_height="@dimen/list_item_height"
             android:layout_gravity="center_vertical"

OsmAnd/res/values-be/phrases.xml

@@ -959,7 +959,7 @@
 	<string name="poi_monitoring_station">Станцыя назіраньня</string>
 	<string name="poi_email">Эл. пошта</string>
 	<string name="poi_fax">Факс</string>
-	<string name="poi_facebook">Фэйсбук</string>
+	<string name="facebook">Фэйсбук</string>
 	<string name="poi_mobile">Сотавы тэлефон</string>
 	<string name="poi_animal_shelter_dog">Прытулак для сабак</string>
 	<string name="poi_animal_shelter_cat">Прытулак для катоў</string>
@@ -1054,11 +1054,11 @@
 	<string name="poi_recycling_waste_oil">Адпрацаваная алiва</string>
 	<string name="poi_perfumery">Парфумэрыя</string>
 
-	<string name="poi_twitter">Твітар</string>
+	<string name="twitter">Твітар</string>
 	<string name="poi_skype">Скайп</string>
 	<string name="poi_youtube">Ютуб</string>
 	<string name="poi_instagram">Інстаграм</string>
-	<string name="poi_vk">УКантакце</string>
+	<string name="vk">УКантакце</string>
 	<string name="poi_google_plus">Гугл+</string>
 	<string name="poi_mill_pond">Млынавая сажалка</string>
 	<string name="poi_building">Будынак</string>
@@ -1523,4 +1523,5 @@
 	<string name="poi_resource_zinc">Цынк</string>
 	<string name="poi_resource_zircon">Цыркон</string>
 
+	<string name="poi_highway_steps">Сходы</string>
 	</resources>

OsmAnd/res/values-be/strings.xml

@@ -2204,4 +2204,9 @@
     <string name="map_widget_magnetic_bearing">Магнітны азімут</string>
     <string name="use_osm_live_routing">Навігацыя OSM Live</string>
     <string name="access_no_destination">Пункт прызначэньня не зададзены</string>
+    <string name="follow_us">Сачыце за намі</string>
+    <string name="access_direction_audio_feedback">Гукавая індыкацыя кірунку</string>
+    <string name="access_direction_audio_feedback_descr">Індыцыраваць гукам кірунак на мэтавы пункт</string>
+    <string name="access_direction_haptic_feedback">Тактыльная індыкацыя кірунку</string>
+    <string name="access_direction_haptic_feedback_descr">Індыцыраваць вібрацыяй кірунак на мэтавы пункт</string>
     </resources>

OsmAnd/res/values-ca/phrases.xml

@@ -954,7 +954,7 @@
 
 	<string name="poi_email">Correu electrònic</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Mòbil</string>
 	<string name="poi_animal_shelter_dog">Tipus de refugi: per gossos</string>
 	<string name="poi_animal_shelter_cat">Tipus de refugi: per gats</string>
@@ -1048,11 +1048,11 @@
 	<string name="poi_recycling_beverage_cartons">Envasos de cartró de begudes</string>
 	<string name="poi_recycling_sheet_metal">Xapa metàl·lica</string>
 	<string name="poi_mill_pond">Bassa del molí</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Perfumeria</string>
 
@@ -2207,4 +2207,5 @@
 	<string name="poi_disease_aids_yes">SIDA: sí</string>
 	<string name="poi_disease_aids_no">SIDA: no</string>
 
+	<string name="poi_fire_hydrant_position_underground">Situació de l\'hidrant: soterrat</string>
 	</resources>

OsmAnd/res/values-ca/strings.xml

@@ -2030,4 +2030,5 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="access_direction_audio_feedback_descr">Indica la direcció al punt de destinació amb só</string>
     <string name="access_direction_audio_feedback">Resposta acústica segons direcció</string>
     <string name="access_direction_haptic_feedback">Resposta cinètica segons direcció</string>
+    <string name="follow_us">Seguiu-nos</string>
     </resources>

OsmAnd/res/values-cs/phrases.xml

@@ -1078,12 +1078,12 @@
 	<string name="poi_military_office">Vojenský úřad</string>
 	<string name="poi_email">E-mail</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Mobilní telefon</string>
 	<string name="poi_height">Výška</string>

OsmAnd/res/values-cs/strings.xml

@@ -1980,6 +1980,43 @@
     <string name="map_marker">Mapová značka</string>
     <string name="consider_turning_polygons_off">Je doporučeno vypnout zobrazování polygonů.</string>
     <string name="rendering_attr_showMtbRoutes_name">Zobrazit trasy pro horská kola</string>
-    <string name="storage_permission_restart_is_required">Nyní aplikace umožňuje zapisovat na externí úložiště. Je potřeba provést ruční restart aplikace.</string>
+    <string name="storage_permission_restart_is_required">Aplikace nyní umožňuje zapisovat na externí úložiště. Je potřeba provést ruční restart aplikace.</string>
     <string name="file_name_containes_illegal_char">Název souboru obsahuje nepovolené znaky</string>
+<string name="access_no_destination">Cíl není určen</string>
+    <string name="map_widget_magnetic_bearing">Magnetické směrování</string>
+    <string name="map_widget_bearing">Relativní směrování</string>
+    <string name="access_disable_offroute_recalc">Neměnit trasu při odchýlení z cesty</string>
+    <string name="access_disable_offroute_recalc_descr">Neprovádět automatické přepočítání trasy pokud jste daleko od správné cesty</string>
+    <string name="access_disable_wrong_direction_recalc">Neměnit trasu při jízdě opačným směrem</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Neprovádět automatické přepočítání když se pohybujete opačným směrem</string>
+    <string name="access_smart_autoannounce">Chytré oznamování</string>
+    <string name="access_smart_autoannounce_descr">Oznamovat pouze když se změní směr k cíli</string>
+    <string name="access_autoannounce_period">Interval oznamování</string>
+    <string name="access_autoannounce_period_descr">Minimální čas mezi oznámeními</string>
+    <string name="access_default_color">Výchozí barva</string>
+    <string name="access_category_choice">Vyberte kategorii</string>
+    <string name="access_hint_enter_name">Zadejte název</string>
+    <string name="access_hint_enter_category">Zadejte kategorii</string>
+    <string name="access_hint_enter_description">Zadejte popis</string>
+    <string name="access_map_linked_to_location">Mapa je propojená na pozici</string>
+    <string name="access_collapsed_list">Sbalený seznam</string>
+    <string name="access_expanded_list">Rozbalený seznam</string>
+    <string name="access_empty_list">Prázdný seznam</string>
+    <string name="access_tree_list">Stromový seznam</string>
+    <string name="access_shared_string_not_installed">Není nainstalované</string>
+    <string name="access_widget_expand">Rozbalit</string>
+    <string name="access_shared_string_navigate_up">Navigovat nahoru</string>
+    <string name="access_sort">Setřídit</string>
+    <string name="map_mode">Režim mapy</string>
+    <string name="number_of_gpx_files_selected_pattern">%s vybraných GPX souborů</string>
+    <string name="rendering_value_thin_name">Tenké</string>
+    <string name="rendering_value_medium_name">Střední</string>
+    <string name="rendering_value_bold_name">Tučné</string>
+    <string name="no_map_markers_found">Prosím přidejte mapové značky pomocí mapy</string>
+    <string name="no_waypoints_found">Žádné body cesty nenalezeny</string>
+    <string name="follow_us">Sleduj nás</string>
+    <string name="access_direction_audio_feedback_descr">Indikovat směr k cílovému bodu zvukem</string>
+    <string name="access_direction_haptic_feedback">Haptická zpětná vazba směru</string>
+    <string name="access_direction_haptic_feedback_descr">Indikovat směr k cílovému bodu vibrováním</string>
+    <string name="use_osm_live_routing">OSM Live navigace</string>
     </resources>

OsmAnd/res/values-da/phrases.xml

@@ -966,7 +966,7 @@
 
 	<string name="poi_email">E-mail</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Mobiltelefon</string>
 	<string name="poi_animal_shelter_dog">Internat: hund</string>
 	<string name="poi_animal_shelter_cat">Internat: kat</string>
@@ -1060,11 +1060,11 @@
 	<string name="poi_crossing_unmarked">Ikke markeret</string>
 
 	<string name="poi_mill_pond">Mølledam</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Parfumeri</string>
 
@@ -2916,10 +2916,10 @@
 	<string name="poi_fire_hydrant_position_street">Brandhane placering: gaden</string>
 	<string name="poi_fire_hydrant_position_underground">Brandhane placering: under jorden</string>
 	<string name="poi_fire_hydrant_style_wsh">Brandhane stil: wsh</string>
-	<string name="poi_fire_hydrant_style_water_source_main">Brandhane vandforsyning: primær</string>
+	<string name="poi_fire_hydrant_style_water_source_main">Brandhane vandforsyningskilde: primær</string>
-	<string name="poi_fire_hydrant_style_water_source_pond">Brandhane vandforsyning dam</string>
+	<string name="poi_fire_hydrant_style_water_source_pond">Brandhane vandforsyningskilde: dam</string>
-	<string name="poi_fire_hydrant_style_water_source_stream">Brandhane vandforsyning: bæk</string>
+	<string name="poi_fire_hydrant_style_water_source_stream">Brandhane vandforsyningskilde: vandløb</string>
-	<string name="poi_fire_hydrant_style_water_source_cistern">Brandhane vandforsyning: cisterne</string>
+	<string name="poi_fire_hydrant_style_water_source_cistern">Brandhane vandforsyningskilde: cisterne</string>
 	<string name="poi_in_service_yes">I tjeneste: ja</string>
 
 <string name="poi_street_cabinet_power">Gadeskabstype: eldistribution</string>

OsmAnd/res/values-da/strings.xml

@@ -2361,8 +2361,9 @@
     <string name="access_no_destination">Destination er ikke angivet</string>
     <string name="use_osm_live_routing_description">Aktiver navigation for OSM Live ændringer (Beta)</string>
 	<string name="use_osm_live_routing">OSM Live navigation</string>
-    <string name="access_direction_audio_feedback">Retning lyd-feedback</string>
+    <string name="access_direction_audio_feedback">Retning med lyd-indikation</string>
-    <string name="access_direction_audio_feedback_descr">Angiv målpunkt retning med lyd</string>
+    <string name="access_direction_audio_feedback_descr">"Indikerer retning til målpunkt  med lyd"</string>
-    <string name="access_direction_haptic_feedback">Retning haptisk feedback</string>
+    <string name="access_direction_haptic_feedback">Retning med haptisk indikation</string>
-    <string name="access_direction_haptic_feedback_descr">Angiv målpunkt retning med vibrationer</string>
+    <string name="access_direction_haptic_feedback_descr">"Indikerer retning til målpunkt  med vibrationer"</string>
+    <string name="follow_us">Følg os</string>
     </resources>

OsmAnd/res/values-de/phrases.xml

@@ -956,7 +956,7 @@
 	<string name="poi_shower">Dusche</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Mobiltelefon</string>
 	<string name="poi_fee_no">kostenfrei</string>
 	<string name="poi_drinking_water_yes">Trinkwasser</string>
@@ -1008,11 +1008,11 @@
 	<string name="poi_animal_shelter_bird">Unterkunftstyp: Vogel</string>
 
 <string name="poi_mill_pond">Mühlenteich</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">Youtube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Parfümerie</string>
 

OsmAnd/res/values-eo/strings.xml

@@ -403,7 +403,7 @@
     <string name="lang_es">Hispana</string>
     <string name="about_version">Versio:</string>
     <string name="shared_string_about">Pri</string>
-    <string name="about_settings_descr">Montras informojn, permesilojn, kontribuistojn</string>
+    <string name="about_settings_descr">Informoj, permesiloj, kontribuistoj</string>
     <string name="choose_osmand_theme">Etoso</string>
     <string name="choose_osmand_theme_descr">Elektu etoson de aplikaĵo</string>
     <string name="local_indexes_cat_srtm">Nivelkurboj</string>
@@ -453,7 +453,7 @@
     <string name="action_delete">Forigi</string>
     <string name="osm_edits">OSM-aj redaktoj</string>
     <string name="parking_place_limited">Parkuma tempo limigita ĝis</string>
-    <string name="osmand_parking_time_left">restas</string>
+    <string name="osmand_parking_time_left">ankoraŭ</string>
     <string name="your_edits">Viaj redaktoj</string>
     <string name="waypoint_visit_after">Viziti poste</string>
     <string name="waypoint_visit_before">Viziti antaŭe</string>
@@ -628,9 +628,9 @@
     <string name="announce_gpx_waypoints">GPX-aj navigadpunktoj</string>
     <string name="download_additional_maps">Ĉu elŝuti mankajn mapojn de %1$s (%2$d MB)?</string>
     <string name="rendering_value_browse_map_name">Esplori mapon</string>
-    <string name="rendering_value_car_name">Aŭte</string>
+    <string name="rendering_value_car_name">Aŭto</string>
-    <string name="rendering_value_bicycle_name">Bicikle</string>
+    <string name="rendering_value_bicycle_name">Biciklo</string>
-    <string name="rendering_value_pedestrian_name">Perpiede</string>
+    <string name="rendering_value_pedestrian_name">Perpiedanto</string>
     <string name="osmo_invite">Inviti…</string>
     <string name="rendering_attr_coloredBuildings_name">Kolor-kodigi domojn laŭspece</string>
     <string name="osmo_leave_confirmation_msg">Ĉu vi volas forlasi grupon %1$s?</string>
@@ -846,14 +846,14 @@
     <string name="rendering_value_thin_name">Maldika</string>
     <string name="rendering_value_medium_name">Meza</string>
     <string name="rendering_value_bold_name">Dika</string>
-    <string name="access_no_destination">Finpunkto ne estas precizigita</string>
+    <string name="access_no_destination">Celo ne estas precizigita</string>
     <string name="index_item_world_bitcoin_payments">Tutmondaj Bitmono-pageblaj lokoj</string>
     <string name="index_item_world_basemap">Fundamenta mapo de mondo</string>
     <string name="index_item_world_ski">Tutmondaj skivojoj</string>
     <string name="calculate_osmand_route_without_internet">Loke kalkuli segmenton de OsmAnd-a kurso</string>
     <string name="use_displayed_track_for_navigation">Ĉu vi volas uzi montratan kurson por navigado?</string>
     <string name="gpx_option_calculate_first_last_segment">Kalkuli OsmAnd-an kurson por unua kaj fina segmentoj de kurso</string>
-    <string name="keep_and_add_destination_point">Aldoni kiel finpunkto</string>
+    <string name="keep_and_add_destination_point">Aldoni kiel celo</string>
     <string name="select_gpx">Elekti GPX-on…</string>
     <string name="route_descr_select_destination">Elekti celon</string>
     <string name="route_preferences">Kursaj agordoj</string>
@@ -888,7 +888,7 @@
     <string name="app_mode_truck">Kamiono</string>
     <string name="guidance_preferences_descr">Navigadaj agordoj</string>
     <string name="routing_preferences_descr">Difinado de vojo</string>
-    <string name="speech_rate_descr">Agordu lud-rapidon por generitaj dialogaj helpoj</string>
+    <string name="speech_rate_descr">Agordas lud-rapidon por parolsintezitaj dialogaj helpoj</string>
     <string name="speech_rate">Voĉa rapido</string>
     <string name="complex_route_calculation_failed">Eraro dum rapida kalkulado de kurso (%s), retropaŝanta malrapidan kalkuladon.</string>
     <string name="disable_complex_routing_descr">Malaktivigas 2-fazan difinadon de vojo por aŭt-navigado</string>
@@ -903,4 +903,116 @@
     <string name="app_mode_aircraft">Aviadilo</string>
     <string name="local_osm_changes_delete_all_confirm">Ĉu vi certe volas forigi %1$d OSM-ajn ŝanĝojn?</string>
     <string name="animate_routing_route_not_calculated">Bonvolu antaŭe kalkuli la kurson</string>
+    <string name="follow_us">Sekvu nin</string>
+    <string name="animate_routing_route">"Simuli uzante kalkulitan kurson "</string>
+    <string name="animate_routing_gpx">Simuli uzante GPX-kurson</string>
+    <string name="route_is_too_long">Eksterreta kalkulado de kurso povos okupi multe da tempo (aŭ eĉ ĝi povos malfunkcii) por punktoj pli malproksimaj ol 200km. Eble vi provos aldoni interajn celojn por plibonigi rendimenton.</string>
+    <string name="auto_zoom_none">Sen aŭtomata skalado</string>
+    <string name="auto_zoom_close">Pliproksime</string>
+    <string name="auto_zoom_far">Meza-skalado</string>
+    <string name="auto_zoom_farthest">Malproksime</string>
+    <string name="base_world_map">Monda bazmapo</string>
+    <string name="map_magnifier">Map-skalado</string>
+    <string name="local_index_tile_data_zooms">Elŝutitaj niveloj de pligrandigo: %1$s</string>
+    <string name="local_index_tile_data_expire">Senvalidiĝos (minutoj): %1$s</string>
+    <string name="local_index_tile_data_downloadable">Elŝuteblaj: %1$s</string>
+    <string name="local_index_tile_data_maxzoom">Maksimuma skalo: %1$s</string>
+    <string name="local_index_tile_data_minzoom">Minimuma skalo: %1$s</string>
+    <string name="local_index_tile_data_name">Kahelaj datumoj: %1$s</string>
+    <string name="edit_tilesource_successfully">Kahelfonto %1$s estas sukcese konservita</string>
+    <string name="edit_tilesource_elliptic_tile">Elipsa merkatora</string>
+    <string name="edit_tilesource_maxzoom">Maksimuma skalo</string>
+    <string name="edit_tilesource_expiration_time">Senvalidiĝas (minutoj)</string>
+    <string name="edit_tilesource_minzoom">Minimuma skalo</string>
+    <string name="edit_tilesource_url_to_load">URL</string>
+    <string name="edit_tilesource_choose_existing">Elekti ekzistantan…</string>
+    <string name="edit_tilesource_name">Nomo</string>
+    <string name="maps_define_edit">Difini/Redakti…</string>
+    <string name="map_widget_fps_info">Montri kadrojn sekunde (senerarigo)</string>
+    <string name="driving_region">Trafika regiono</string>
+    <string name="driving_region_descr">Elektu trafikan regionon: Usono, Eŭropo, Unuiĝinta Reĝlando, Azio, kaj aliaj</string>
+    <string name="speak_title">Anoncanta…</string>
+    <string name="speak_descr">Agordas anoncoj pri strataj nomoj, trafikaj avertoj (endaj haltejoj, strat-ĝiboj), rapid-kontroladoj, rapidlimoj</string>
+    <string name="speak_street_names">Nomoj de stratoj (parolsintezitaj)</string>
+    <string name="speak_speed_limit">Rapidlimoj</string>
+    <string name="speak_cameras">Rapid-kontroladoj</string>
+    <string name="speak_traffic_warnings">Trafikaj avertoj</string>
+    <string name="osb_author_or_password_not_specified">Bonvolu entajpi uzantnomon kaj pasvorton por OSM en Agordoj</string>
+    <string name="clear_intermediate_points">Vakigi inter-celojn</string>
+    <string name="keep_intermediate_points">Konservi inter-celojn</string>
+    <string name="new_directions_point_dialog">Vi jam precizigis inter-celojn.</string>
+    <string name="context_menu_item_directions_to">Navigi al</string>
+    <string name="context_menu_item_directions_from">Navigi el</string>
+    <string name="route_descr_map_location">"Mapo: "</string>
+    <string name="route_descr_lat_lon">Lat %1$.3f, Lon %2$.3f</string>
+    <string name="route_descr_destination">Celo</string>
+    <string name="route_to">Al:</string>
+    <string name="route_via">Tra:</string>
+    <string name="route_from">El:</string>
+
+    <string name="app_mode_default">Esplori mapon</string>
+    <string name="settings_preset">Implicita profilo</string>
+    <string name="settings_preset_descr">Map-vido kaj navigadaj agordoj estas memoritaj aparte por ia profilo de uzado. Agordu vian implicitan profilon tie ĉi.</string>
+    <string name="destination_point">Celo %1$s</string>
+    <string name="context_menu_item_destination_point">Agordi kiel celo</string>
+    <string name="please_select_address">Unue elektu urbon aŭ straton</string>
+    <string name="search_street_in_neighborhood_cities">Serĉi straton en apudaj urboj</string>
+    <string name="intermediate_items_sort_return">Inter-celoj estas reordigitaj de nuna pozicio al la celo.</string>
+    <string name="intermediate_items_sort_by_distance">Ordigi de celo ĝis celo (laŭ la plej malgranda distanco)</string>
+    <string name="local_osm_changes_backup_successful">OSM-a ŝanĝodosiero kreita sukcese %1$s</string>
+    <string name="local_osm_changes_backup_failed">Eraro kreanta sekurkopion de OSM-aj ŝanĝoj</string>
+    <string name="local_osm_changes_backup">Krei sekurkopion kiel OSM-a ŝanĝo</string>
+    <string name="delete_point">Forigi punkton</string>
+    <string name="plugin_distance_point_time">tempo</string>
+    <string name="plugin_distance_point_hdop">precizeco</string>
+    <string name="plugin_distance_point_speed">rapideco</string>
+    <string name="plugin_distance_point_ele">alto</string>
+    <string name="plugin_distance_point">Punkto</string>
+    <string name="gpx_file_name">Nomo de GPX-dosiero</string>
+    <string name="gpx_saved_sucessfully">GPX-dosiero konservita sukcesa al {0}</string>
+    <string name="use_distance_measurement_help">* Tuŝu por marki punkton.\n * Premtenu sur la mapo por forigi antaŭan punkton.\n * Premtenu punkton por vidi kaj aldoni priskribon.\n * Tuŝu mezur-fenestraĵon por vidi pli funkciojn.</string>
+    <string name="distance_measurement_start_editing">Eki redaktadon</string>
+    <string name="distance_measurement_finish_editing">Finigi redaktadon</string>
+    <string name="distance_measurement_clear_route">Vakigi ĉiujn punktojn</string>
+    <string name="distance_measurement_finish_subtrack">Eki novan subkurson</string>
+    <string name="distance_measurement_load_gpx">Malfermi GPX-dosieron</string>
+    <string name="wait_current_task_finished">Bonvolu atendi ĝis nuna tasko finis</string>
+    <string name="use_kalman_filter_compass">Uzi filtrilon de Kalman</string>
+    <string name="use_kalman_filter_compass_descr">Etigas bruojn en logoj de kompaso sed egigas inertecon</string>
+    <string name="use_magnetic_sensor">Uzi magneto-sentilon</string>
+    <string name="use_magnetic_sensor_descr">Uzas magneto-sentilon anstataŭ orientiĝo-sentilon por legi kompasan direkton</string>
+    <string name="other_location">Alia</string>
+    <string name="files_limit">Ankoraŭ %1$d dosieroj</string>
+    <string name="available_downloads_left">%1$d dosieroj disponeblaj por elŝuto</string>
+    <string name="install_paid">Plena versio</string>
+    <string name="cancel_route">Forĵeti kurson</string>
+    <string name="cancel_navigation">Ĉesigi navigadon</string>
+    <string name="clear_destination">Vakigi celpunkton</string>
+    <string name="street_name">Strat-nomo</string>
+    <string name="download_using_mobile_internet">Nuntempe vi ne konektas tra vifion. Ĉu vi volas uzi estantan interretan konekton por elŝuti?</string>
+    <string name="hno">Dom-numero</string>
+    <string name="website">Retejo</string>
+    <string name="phone">Telefono</string>
+    <string name="osmand_background_plugin_description">Montras agordojn pri aktivigi spuradon kaj navigadon fone (malaktiva ekrano) per periode aktivanta GPS-on.</string>
+    <string name="contribution_activity">Instalaj versioj</string>
+    <string name="accessibility_options">Alireblecaj agordoj</string>
+    <string name="osmand_accessibility_description">Tiu ĉi kromprogramo ebligas uzi alireblecajn ilojn senpere en OsmAnd. Ĝi plifaciligas ekz. agordi rapidon de parolsintezitaj dialogaj helpoj, uzi montrilo-butonojn por navigado sur ekrano, uzi stirglobon por skalado, aŭ uzi teksto-al-parolajn sciigojn ekz. por aŭtomate anonci vian pozicion.</string>
+    <string name="select_address_activity">Elekti adreson</string>
+    <string name="favourites_list_activity">Elekti ŝatatan</string>
+    <string name="local_openstreetmap_act_title">Modifoj de OSM</string>
+    <string name="layer_hillshade">Tavolo de nivel-ombrumo</string>
+    <string name="map_widget_gps_info">GPS-informo</string>
+    <string name="access_arrival_time">Alvena tempo</string>
+    <string name="item_checked">markita(j)</string>
+    <string name="item_unchecked">nemarkita(j)</string>
+    <string name="prefer_motorways">Preferi aŭtovojojn</string>
+    <string name="prefer_in_routing_title">Preferi…</string>
+    <string name="prefer_in_routing_descr">Preferas aŭtovojojn</string>
+    <string name="max_speed_none">nenia</string>
+    <string name="index_name_openmaps">OpenMaps EU</string>
+    <string name="download_wikipedia_maps">Vikipedio</string>
+    <string name="download_hillshade_maps">Nivel-ombrumoj</string>
+    <string name="local_indexes_cat_av">Sonaj/videaj datumoj</string>
+    <string name="stop_routing_confirm">Ĉu vi certe volas ĉesigi navigadon?</string>
+    <string name="clear_dest_confirm">Ĉu vi certe volas vakigi la celpunkton (kaj inter-celojn)?</string>
     </resources>

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

@@ -949,7 +949,7 @@
 
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Móvil</string>
 	<string name="poi_animal_shelter_dog">Refugio canino</string>
 	<string name="poi_animal_shelter_cat">Refugio gatuno</string>
@@ -1042,11 +1042,11 @@
 	<string name="poi_recycling_hardcore">Escombros</string>
 	<string name="poi_recycling_chipboard">Cartón prensado</string>
 	<string name="poi_mill_pond">Laguna de molino</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Perfumería</string>
 
@@ -1899,9 +1899,9 @@
 	<string name="poi_surface_paved">Superficie pavimentada</string>
 	<string name="poi_surface_asphalt">Superficie asfaltada</string>
 	<string name="poi_surface_concrete">Superficie de hormigón</string>
-	<string name="poi_surface_sett">Superficie adoquinada</string>
+	<string name="poi_surface_sett">Superficie de pavimento intertrabado</string>
 	<string name="poi_surface_cobblestone">Superficie empedrada (adoquín)</string>
-	<string name="poi_surface_paving_stones">Superficie de adoquín prefabricado</string>
+	<string name="poi_surface_paving_stones">Superficie de adoquín prefabricado (loseta)</string>
 	<string name="poi_surface_pebblestone">Superficie empedrada (canto rodado)</string>
 	<string name="poi_surface_stone">Superficie de piedras</string>
 	<string name="poi_surface_metal">Superficie metalizada</string>

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

@@ -2171,4 +2171,9 @@
     <string name="access_no_destination">No se fijó el destino</string>
     <string name="use_osm_live_routing_description">Activa la navegación para cambios con OSM Live (Beta)</string>
 	<string name="use_osm_live_routing">Navegación OSM Live</string>
+    <string name="follow_us">Síguenos</string>
+    <string name="access_direction_audio_feedback">Dirección de retroalimentación auditiva</string>
+    <string name="access_direction_audio_feedback_descr">Indica el punto de dirección del destino mediante sonido</string>
+    <string name="access_direction_haptic_feedback">Dirección de retroalimentación háptica</string>
+    <string name="access_direction_haptic_feedback_descr">Indica el punto de dirección del destino mediante vibración</string>
     </resources>

OsmAnd/res/values-es-rUS/phrases.xml

@@ -894,7 +894,7 @@
 	<string name="poi_fee_no">Sin cargo</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Móvil</string>
 	<string name="poi_animal_shelter_dog">Refugio canino</string>
 	<string name="poi_animal_shelter_cat">Refugio gatuno</string>
@@ -984,11 +984,11 @@
 	<string name="poi_recycling_hardcore">Escombros</string>
 	<string name="poi_recycling_chipboard">Cartón prensado</string>
 	<string name="poi_mill_pond">Laguna de molino</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Perfumería</string>
 	<string name="poi_building">Edificio</string>
@@ -1757,9 +1757,9 @@
 	<string name="poi_surface_paved">Superficie pavimentada</string>
 	<string name="poi_surface_asphalt">Superficie asfaltada</string>
 	<string name="poi_surface_concrete">Superficie de hormigón</string>
-	<string name="poi_surface_sett">Superficie adoquinada</string>
+	<string name="poi_surface_sett">Superficie de pavimento intertrabado</string>
 	<string name="poi_surface_cobblestone">Superficie empedrada (adoquín)</string>
-	<string name="poi_surface_paving_stones">Superficie de adoquín prefabricado</string>
+	<string name="poi_surface_paving_stones">Superficie de adoquín prefabricado (loseta)</string>
 	<string name="poi_surface_pebblestone">Superficie empedrada (canto rodado)</string>
 	<string name="poi_surface_stone">Superficie de piedras</string>
 	<string name="poi_surface_metal">Superficie metalizada</string>

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

@@ -2171,4 +2171,9 @@
     <string name="access_no_destination">No se fijó el destino</string>
     <string name="use_osm_live_routing_description">Activa la navegación para cambios con OSM Live (Beta)</string>
 	<string name="use_osm_live_routing">Navegación OSM Live</string>
+    <string name="follow_us">Síguenos</string>
+    <string name="access_direction_audio_feedback">Dirección de retroalimentación auditiva</string>
+    <string name="access_direction_audio_feedback_descr">Indica el punto de dirección del destino mediante sonido</string>
+    <string name="access_direction_haptic_feedback">Dirección de retroalimentación háptica</string>
+    <string name="access_direction_haptic_feedback_descr">Indica el punto de dirección del destino mediante vibración</string>
     </resources>

OsmAnd/res/values-es/phrases.xml

@@ -952,7 +952,7 @@
 
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Móvil</string>
 	<string name="poi_animal_shelter_dog">Refugio canino</string>
 	<string name="poi_animal_shelter_cat">Refugio gatuno</string>
@@ -1045,11 +1045,11 @@
 	<string name="poi_recycling_hardcore">Escombros</string>
 	<string name="poi_recycling_chipboard">Cartón prensado</string>
 	<string name="poi_mill_pond">Lago de molino</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Perfumería</string>
 

OsmAnd/res/values-eu/strings.xml

@@ -881,7 +881,7 @@
   <string name="gps_provider">GPS</string>
   <string name="int_seconds">segundoak</string>
   <string name="int_min">min.</string>
-  <string name="background_service_int_descr">Ezarri esekite moduko zerbitzua erabiltzen duen esnaratze tartea </string>
+  <string name="background_service_int_descr">"Ezarri esekite moduko zerbitzua erabiltzen duen esnaratze tartea "</string>
   <string name="background_service_int">Esnaratze tartea</string>
   <string name="background_service_provider_descr">Aukeatu esekidura moduko zerbitzuaren kokapen hornitzailea</string>
   <string name="background_service_provider">Kokapen hornitzailea</string>
@@ -1186,9 +1186,9 @@
 	<string name="routing_attr_avoid_motorway_description">Saihestu autobideak</string>
 	<string name="routing_attr_weight_name">Pisua</string>
 	<string name="routing_attr_weight_description">Zehaztu ibilbideetan baimendu beharreko ibilgailuaren pisua</string>
-    <string name="android_19_location_disabled">KitKat bertsioa geroztik ezin da deskargatu eta eguneratu mapak aurreko biltegiratze kokapenan (%s). Fitxategi guztiak kopiatu nahi dituzu baimendutako kokapenera?
+    <string name="android_19_location_disabled">"KitKat bertsioa geroztik ezin da deskargatu eta eguneratu mapak aurreko biltegiratze kokapenan (%s). Fitxategi guztiak kopiatu nahi dituzu baimendutako kokapenera?
 \n Oharra : fitxategi zaharrak ukitu gabe jarraituko dute.
-        \n Oharra : OsmAnd eta OsmAnd+ artean ezingo dira fitxategiak partekatu. </string>
+\n Oharra : OsmAnd eta OsmAnd+ artean ezingo dira fitxategiak partekatu. "</string>
     
     <string name="copying_osmand_one_file_descr">Fitxategia kopiatzen (%s) kokapen berrira…</string>
     <string name="copying_osmand_files_descr">OsmAnd fitxategiak kopiatzen kokapen berrira (%s)</string>
@@ -1781,4 +1781,21 @@
     <string name="please_specify_poi_type_only_from_list">Zehaztu POI mota egokia edo saltatu</string>
     <string name="access_from_map_description">Menu botoiak kontrol panela abiatzen du, ez menua</string>
     <string name="show_on_start_description">Desgaitzean maparen pantaila abiatzen da zuzenean</string>
+    <string name="always_center_position_on_map">Bistaratu posizioa beti erdian</string>
+    <string name="index_item_world_seamarks">Munduko itsaso markak</string>
+    <string name="index_item_world_bitcoin_payments">Munduko ordainketak bitcoin</string>
+    <string name="index_item_world_basemap">Munduko ikuspegi mapa</string>
+    <string name="index_item_world_ski">Munduko ski mapa</string>
+    <string name="disable_complex_routing">Ezgaitu ibilbide kalkulu konplexua</string>
+    <string name="amenity_type_seamark">Itsaso marka</string>
+    <string name="app_modes_choose">Aplikazio profilak</string>
+    <string name="app_mode_motorcycle">Motorra</string>
+    <string name="app_mode_boat">Itsasontzia</string>
+    <string name="app_mode_aircraft">Hegazkina</string>
+    <string name="auto_zoom_none">Auto zoom-ik ez</string>
+    <string name="auto_zoom_close">Gerturatu</string>
+    <string name="auto_zoom_farthest">Aldendu</string>
+    <string name="map_magnifier">Mapa handitzailea</string>
+    <string name="base_world_map">Mundu oinarri mapa</string>
+    <string name="create_poi_link_to_osm_doc"><u>Sareko OSM</u>ren mapa klasifikazioa irudiekin</string>
     </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -956,7 +956,7 @@
 	<string name="poi_shower">Douche</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_drinking_water_yes">Eau potable : Oui</string>
 	<string name="poi_drinking_water_no">Eau potable : Non</string>
 	<string name="poi_seasonal_no">Permanent</string>
@@ -1019,7 +1019,7 @@
 	<string name="poi_recycling_light_bulbs">Ampoules électriques</string>
 	<string name="poi_recycling_chipboard">Contreplaqué</string>
 	<string name="poi_recycling_fridge_and_freezer">Réfrigérateur et congélateur</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
@@ -1867,7 +1867,7 @@
 
 	<string name="poi_debris">Gravats</string>
 	<string name="poi_jersey_barrier">Mur Jersey</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_content_silage">Contenu : ensilage</string>
 	<string name="poi_content_manure">Contenu : fumier</string>
 	<string name="poi_nudism_permissive">Nudisme autorisé</string>

OsmAnd/res/values-fr/strings.xml

@@ -2215,4 +2215,5 @@
     <string name="access_disable_wrong_direction_recalc">Ignorer les écarts de direction</string>
     <string name="use_osm_live_routing_description">Activer la navigation OSM Live prenant en comptes les modifications en temps réel (Bêta)</string>
 	<string name="use_osm_live_routing">Navigation OSM Live</string>
+    <string name="follow_us">Suivez nous</string>
     </resources>

OsmAnd/res/values-gl/phrases.xml

@@ -712,12 +712,12 @@
 	<string name="poi_website">Sitio web</string>
 	<string name="poi_email">Correo electrónico</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">Youtube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">Vkontakte</string>
+	<string name="vk">Vkontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Móbil</string>
 	<string name="poi_maxheight">Altura máxima</string>

OsmAnd/res/values-hu/phrases.xml

@@ -970,12 +970,12 @@
 	<string name="poi_website">Weboldal</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Mobiltelefon</string>
 	<string name="poi_service_times">Szolgáltatási idő</string>

OsmAnd/res/values-it/strings.xml

@@ -2242,9 +2242,9 @@
     <string name="map_widget_magnetic_bearing">Bussola magnetica</string>
     <string name="map_widget_bearing">Bussola relativa</string>
     <string name="access_disable_offroute_recalc">Non cambiare il percorso quando si è fuori strada</string>
-    <string name="access_disable_offroute_recalc_descr">Previene il ricalcolo automatico del percorso quando si è un po \' fuori dalla giusta via.</string>
+    <string name="access_disable_offroute_recalc_descr">Previene il ricalcolo automatico del percorso quando si esce dalla strada giusta.</string>
     <string name="access_disable_wrong_direction_recalc">Non cambiare il percorso se la direzione è sbagliata</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Previene il ricalcolo automatico del percorso quando stai muovendoti nella direzione sbagliata</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Previene il ricalcolo automatico del percorso quando ci muove nella direzione sbagliata</string>
     <string name="access_smart_autoannounce">Annuncio automatico intelligente</string>
     <string name="access_smart_autoannounce_descr">Notifica solo quando la direzione verso la destinazione è cambiata</string>
     <string name="access_autoannounce_period">Intervallo annuncio automatico</string>

OsmAnd/res/values-nl/phrases.xml

@@ -1102,12 +1102,12 @@
 	<string name="poi_website">Website</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Mobiel</string>
 	<string name="poi_service_times">Aanvangstijd</string>

OsmAnd/res/values-nl/strings.xml

@@ -114,7 +114,7 @@
   <string name="free_version_message">Deze gratis versie van OsmAnd is beperkt tot %1$s downloads en ondersteunt geen offline Wikipedia artikelen.</string>
   <string name="free_version_title">Gratis versie</string>
   <string name="poi_context_menu_showdescription">Toon interessepunt-beschrijvingen</string>
-  <string name="index_name_north_america">Noord Amerika</string>
+  <string name="index_name_north_america">Noord-Amerika</string>
   <string name="index_name_us">Noord Amerika - Verenigde Staten</string>
   <string name="index_name_central_america">Centraal Amerika</string>
   <string name="index_name_south_america">Zuid Amerika</string>
@@ -159,7 +159,7 @@
   
   
   <string name="download_files_not_enough_space">Er is niet voldoende vrije ruimte %1$s MB te downloaden (vrij: %2$s).</string>
-  <string name="download_files_question_space">{0} bestand(en) downloaden? Hiervoor is {1} MB vrije ruimte nodig. Er is nu {2} MB beschikbaar!</string>
+  <string name="download_files_question_space">{0} bestand(en) downloaden? Deze beslaan {1} MB opslagruimte. Er is nu {2} MB beschikbaar.</string>
   
   
   <string name="use_transparent_map_theme">Transparant thema</string>
@@ -213,7 +213,7 @@
   <string name="show_more_map_detail_descr">Toon sommige vectorkaartdetails (wegen enz.) al op lager zoomniveau</string>
   <string name="favourites_delete_multiple_succesful">Favoriet(en) succesvol verwijderd.</string>
   <string name="favorite_delete_multiple">%1$d favorieten en %2$d groepen verwijderen?</string>
-  <string name="favorite_home_category">Dashboard</string>
+  <string name="favorite_home_category">Thuis</string>
   <string name="favorite_friends_category">Vrienden</string>
   <string name="favorite_places_category">Plaatsen</string>
   
@@ -231,7 +231,7 @@
   <string name="local_index_items_deleted">%1$d van %2$d bestanden succesvol verwijderd.</string>
   <string name="local_index_items_restored">%1$d van %2$d bestanden succesvol geactiveerd.</string>
   <string name="local_index_no_items_to_do">Voor %1$s: geen bestanden</string>
-  <string name="local_index_action_do">%1$s: %2$s bestanden. Doorgaan?</string>
+  <string name="local_index_action_do">U gaat %2$s bestanden %1$s. Doorgaan?</string>
   <string name="local_index_descr_title">Kaartbeheer</string>
   <string name="local_index_mi_restore">Activeer</string>
   <string name="local_index_mi_backup">Deactiveer</string>
@@ -511,7 +511,7 @@
   <string name="route_head">Volg</string>
   <string name="first_time_continue">Ga door</string>
   <string name="first_time_download">Download regio\'s</string>
-  <string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of deze zelf aanmaken. Daarna kan je de kaart bekijken, navigeren en adressen, interessepunten en openbaar vervoer opzoeken.</string>
+  <string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\'). Daarna kan je navigeren, de kaart bekijken, en adressen, interessepunten en openbaar vervoer opzoeken.</string>
   <string name="search_poi_location">Naar signaal zoeken…</string>
   <string name="search_near_map">Zoek bij het midden van de kaart</string>
   <string name="search_nearby">Zoek dichtbij</string>
@@ -956,7 +956,7 @@
 
     <string name="context_menu_item_last_intermediate_point">Als laatste Tussenpunt toevoegen</string>
     <string name="context_menu_item_first_intermediate_point">Als eerste Tussenpunt toevoegen</string>
-    <string name="add_as_last_destination_point">Als laatste Tussenpunt toevoegen</string>
+    <string name="add_as_last_destination_point">Als laatste tussenpunt toevoegen</string>
     <string name="add_as_first_destination_point">Als eerste Tussenpunt toevoegen</string>
     <string name="replace_destination_point">Bestemming vervangen</string>
     <string name="new_destination_point_dialog">Er is al een Bestemming gekozen.</string>
@@ -1207,7 +1207,7 @@
 	
     <string name="base_world_map">Basis-wereldkaart</string>
     <string name="map_magnifier">Kaartvergrootglas</string>
-    <string name="route_is_too_long">"De afstand tot de bestemming is meer dan 200 km. De routeberekening kan hierdoor erg lang duren (of zelfs  mislukken). Door Tussenpunten toe te voegen, wordt de routeberekening sneller."</string>
+    <string name="route_is_too_long">"De afstand tot de bestemming is meer dan 200 km. De routeberekening kan hierdoor erg lang duren (of zelfs  mislukken). Door tussenpunten toe te voegen, wordt de routeberekening sneller."</string>
     <string name="auto_zoom_none">Geen automatische zoom</string>
     <string name="auto_zoom_close">Zoom naar close-up</string>
     <string name="auto_zoom_far">Zoom naar gemiddelde afstand</string>
@@ -1392,7 +1392,7 @@
     <string name="osmo_enable_tracker">Verstuur mijn posities</string>
     <string name="osmo_control">OsMo snelle toegang</string>
     
-	<string name="import_file_favourites">Gegevens als GPX-bestand opslaan of importeren naar Favorieten?</string>
+	<string name="import_file_favourites">Gegevens als GPX-bestand opslaan of importeren naar favorieten?</string>
 	
 	
 	<string name="rendering_value_pink_name">Roze</string>
@@ -1449,7 +1449,7 @@
     <string name="loading_smth">Laad %1$s…</string>
     <string name="map_widget_plain_time">Huidige tijd</string>
     <string name="select_destination_and_intermediate_points">Kies Bestemmingen</string>
-    <string name="layer_amenity_label">Namen van Interessepunten</string>
+    <string name="layer_amenity_label">Namen van interessepunten</string>
     <string name="gpx_wpt">Routepunt</string>
     <string name="selected_gpx_info_show">\n\nLang drukken om op de kaart te bekijken</string>
     <string name="delay_navigation_start">Start navigatie automatisch</string>
@@ -1982,7 +1982,7 @@
     <string name="shared_string_others">Overige</string>
 	<string name="favourites_context_menu_add">Favoriet toevoegen</string>
 	<string name="poi_action_delete">wissen</string>
-	<string name="dahboard_options_dialog_title">Configureer dashboard</string>
+	<string name="dahboard_options_dialog_title">Dashboard instellen</string>
 	<string name="show_on_start">Na opstarten tonen</string>
 	<string name="shared_string_card_was_hidden">Kaart was verborgen</string>
 	<string name="shared_string_undo">Ongedaan maken</string>
@@ -1994,7 +1994,7 @@
 	<string name="tab_title_advanced">Geavanceerd</string>
 	<string name="building_number">Huisnummer</string>
 	<string name="next_proceed">Volgende</string>
-	<string name="opening_at">Open vanaf</string>
+	<string name="opening_at">Open van</string>
 	<string name="closing_at">Sluit om</string>
 	<string name="contact_info">Contact</string>
 	<string name="description">Omschrijving</string>
@@ -2076,7 +2076,7 @@
 	<string name="osn_close_dialog_error">Er was een probleem: notitie is niet afgesloten</string>
 	<string name="osm_save_offline">Bewaar voor off-line gebruik</string>
     
-    <string name="dashboard_or_drawer_description">Kies tussen het flexibele dashboard of een vast menu. Dit is altijd te wijzigen via de dashboard-instellingen.</string>
+    <string name="dashboard_or_drawer_description">Kies tussen het flexibele Dashboard of een vast Menu. Dit is altijd te wijzigen via de dashboard-instellingen.</string>
     <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
     <string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te gebruiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer… "</string>
     <string name="shared_string_commit">Bijdrage versturen</string>
@@ -2093,11 +2093,11 @@
     <string name="save_poi_without_poi_type_message">Deze POI echt bewaren zonder het type aan te geven?</string>
     <string name="poi_context_menu_modify_osm_change">Verander OSM-wijziging</string>
     
-    <string name="dashboard_or_drawer_title">Kies tussen dashboard of menu</string>
+    <string name="dashboard_or_drawer_title">Kies tussen Dashboard of Menu</string>
     <string name="please_specify_poi_type_only_from_list">Geef het juiste type POI of sla dit over</string>
     <string name="access_from_map_description">Menu-knop opent dashboard in plaats van menu</string>
     <string name="access_from_map">Openen vanaf de kaart</string>
-    <string name="use_dashboard_btn">Gebruik dashboard</string>
+    <string name="use_dashboard_btn">Dashboard gebruiken</string>
     <string name="use_drawer_btn">Gebruik menu</string>
     <string name="routing_attr_avoid_stairs_name">Vermijd trappen</string>
 	<string name="routing_attr_avoid_stairs_description">Vermijd trappen</string>
@@ -2183,7 +2183,7 @@
     <string name="osm_editors_ranking">OSM-Bijdragers Ranglijst</string>
     <string name="osm_live_subscription">OSM Live abonnement</string>
     <string name="osm_live_subscribe_btn">Abonneren</string>
-    <string name="osm_live_email_desc">Om je op de hoogte te houden over je abonnement</string>
+    <string name="osm_live_email_desc">Dit is nodig om je op de hoogte te houden over je abonnement</string>
     <string name="osm_live_user_public_name">Openbare Naam</string>
     <string name="osm_live_hide_user_name">Mijn naam niet tonen in verslagen</string>
     <string name="osm_live_support_region">Ondersteunde regio</string>
@@ -2271,4 +2271,9 @@
     <string name="map_widget_magnetic_bearing">Magnetische koers</string>
     <string name="use_osm_live_routing_description">OSM Live Updates gebruiken bij navigatie (Beta)</string>
 	<string name="use_osm_live_routing">OSM Live navigatie</string>
+    <string name="follow_us">Volg ons</string>
+    <string name="access_direction_audio_feedback">Richting aangeven met geluid</string>
+    <string name="access_direction_audio_feedback_descr">Geef de richting van de bestemming aan met geluid</string>
+    <string name="access_direction_haptic_feedback">Richting aangeven met trilling</string>
+    <string name="access_direction_haptic_feedback_descr">Geef de richting van de bestemming aan met trillingen</string>
     </resources>

OsmAnd/res/values-pl/phrases.xml

@@ -1040,12 +1040,12 @@
 	<string name="poi_shower">Prysznic</string>
 	<string name="poi_email">E-mail</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_height">Wysokość</string>
 	<string name="poi_ele">Wysokość nad poziomem morza</string>

OsmAnd/res/values-pl/strings.xml

@@ -1331,7 +1331,7 @@
 
     <string name="osmo_auto_send_locations_descr">Po uruchomieniu aplikacji automatycznie uruchom trackera i przesyłaj pozycję</string>
     <string name="osmo_auto_send_locations">Automatycznie uruchom trackera</string>
-    <string name="osmo_tracker_id">ID trackera</string>
+    <string name="osmo_tracker_id">Identyfikator serwera śledzącego</string>
     <string name="osmo_session_token">Token sesji: %1$s</string>
     <string name="osmo_auth_pending">Oczekiwanie na uwierzytelnienie…</string>
     <string name="osmo_conn_successfull">"Nawiązano połączenie: %1$s "</string>
@@ -1341,7 +1341,7 @@
     <string name="minutes_ago">minut temu</string>
     <string name="seconds_ago">sekund temu</string>
     <string name="osmo_connect_to_device_name">Nazwa użytkownika</string>
-    <string name="osmo_connect_to_device_tracker_id">ID trackera</string>
+    <string name="osmo_connect_to_device_tracker_id">Identyfikator serwera śledzącego</string>
     <string name="osmo_connect_to_device">Sparuj z urządzeniem</string>
 
 
@@ -2125,7 +2125,7 @@
     <string name="storage_directory_readonly_desc">Wybrany katalog przechowywania danych umożliwia tylko ich odczyt. Katalog przechowywania został tymczasowo umieszczony w pamięci wewnętrznej. Proszę wybrać prawidłowy katalog przechowywania danych.</string>
     <string name="storage_directory_shared">Pamięć współdzielona</string>
     <string name="osm_live_subscribe_btn">Zasubskrybuj</string>
-    <string name="storage_permission_restart_is_required">Teraz aplikacja może zapisywać do pamięci zewnętrznej. Wymagane jest manualne ponowne uruchomienie.</string>
+    <string name="storage_permission_restart_is_required">Teraz program może zapisywać do pamięci zewnętrznej. Wymagane jest ponowne uruchomienie programu.</string>
     <string name="full_report">Pełny raport</string>
     <string name="donations">Kwota datków</string>
     <string name="number_of_recipients">Liczba odbiorców</string>
@@ -2164,8 +2164,8 @@
     <string name="file_name_containes_illegal_char">Nazwa pliku zawiera niedozwolony znak</string>
 <string name="access_default_color">Domyślny kolor</string>
     <string name="access_category_choice">Wybierz kategorię</string>
-    <string name="access_hint_enter_category">Wpisz kategorię</string>
+    <string name="access_hint_enter_category">Proszę wprowadzić kategorię</string>
-    <string name="access_hint_enter_description">Wpisz opis</string>
+    <string name="access_hint_enter_description">Proszę wprowadzić opis</string>
     <string name="access_collapsed_list">Zwinięta lista</string>
     <string name="access_expanded_list">Rozwinięta lista</string>
     <string name="access_empty_list">Pusta lista</string>
@@ -2174,17 +2174,19 @@
     <string name="access_sort">Sortuj</string>
     <string name="map_mode">Tryb mapy</string>
     <string name="number_of_gpx_files_selected_pattern">Wybrano %s plików GPX</string>
-    <string name="access_hint_enter_name">Wprowadź nazwę</string>
+    <string name="access_hint_enter_name">Proszę wprowadzić nazwę</string>
-    <string name="access_map_linked_to_location">Mapa jest powiązana z obszarem</string>
+    <string name="access_map_linked_to_location">Mapa jest powiązana z położeniem</string>
     <string name="access_tree_list">Lista hierarchiczna</string>
-    <string name="access_shared_string_navigate_up">Idź w górę</string>
+    <string name="access_shared_string_navigate_up">Przejdź w górę</string>
     <string name="rendering_value_thin_name">Cienki</string>
     <string name="rendering_value_medium_name">Średni</string>
     <string name="rendering_value_bold_name">Gruby</string>
     <string name="access_no_destination">Nie ustalono celu trasy</string>
     <string name="access_disable_offroute_recalc">Nie zmienianie trasy po zboczeniu z niej</string>
-    <string name="access_disable_offroute_recalc_descr">Zapobiega automatycznej zmianie proponowanej trasy po poważnym oddaleniu się od niej</string>
+    <string name="access_disable_offroute_recalc_descr">Zapobiega zmianie wyznaczonej trasy po znacznym oddaleniu się od niej</string>
     <string name="map_widget_magnetic_bearing">Orientacja magnetyczna</string>
     <string name="map_widget_bearing">Orientacja względna</string>
-    <string name="access_disable_wrong_direction_recalc">Nie zmienianie trasy po obraniu niewłaściwego kierunku</string>
+    <string name="access_disable_wrong_direction_recalc">Utrzymywanie trasy po obraniu niewłaściwego kierunku</string>
+    <string name="use_osm_live_routing_description">Włącza nawigację dla bieżących aktualizacji mapy (beta)</string>
+	<string name="access_disable_wrong_direction_recalc_descr">Zapobiega zmianie wyznaczonej trasy podczas poruszania się w niewłaściwym kierunku</string>
     </resources>

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

@@ -949,7 +949,7 @@
 
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Celular</string>
 	<string name="poi_animal_shelter_dog">Abrigo para cães</string>
 	<string name="poi_animal_shelter_cat">Abrigo para gatos</string>
@@ -1043,11 +1043,11 @@
 	<string name="poi_crossing_unmarked">Desmarcado</string>
 
 	<string name="poi_mill_pond">Lagoa do moinho</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Perfumaria</string>
 

OsmAnd/res/values-ru/phrases.xml

@@ -1969,7 +1969,7 @@
 	<string name="poi_entrance_exit">Выход</string>
 	<string name="poi_highway_crossing">Пешеходный переход</string>
 
-	<string name="poi_vk">ВКонтакте</string>
+	<string name="vk">ВКонтакте</string>
 
 	<string name="poi_content_silage">Содержимое: силос</string>
 	<string name="poi_content_water">Содержимое: вода</string>
@@ -2372,8 +2372,8 @@
 	<string name="poi_boat_storage">Место для хранения лодок</string>
 
 	<string name="poi_kissing_gate">Калитка</string>
-	<string name="poi_facebook">Фейсбук</string>
+	<string name="facebook">Фейсбук</string>
-	<string name="poi_twitter">Твиттер</string>
+	<string name="twitter">Твиттер</string>
 	<string name="poi_skype">Скайп</string>
 	<string name="poi_garden_style_kitchen">Стиль сада: кухня</string>
 	<string name="poi_toilets_access_community">Туалет: общественный</string>

OsmAnd/res/values-sc/phrases.xml

@@ -1045,12 +1045,12 @@
 	<string name="poi_military_office">Ufìtziu militare</string>
 	<string name="poi_bollard">Bita</string>
 	<string name="poi_cattle_grid">Inferriada/cràdica pro su bestiàmene</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Mòbile</string>
 	<string name="poi_height">Artària</string>

OsmAnd/res/values-sc/strings.xml

@@ -2179,4 +2179,18 @@
     <string name="access_widget_expand">Ismànnia</string>
     <string name="access_shared_string_navigate_up">Nàviga in subra</string>
     <string name="access_sort">Òrdina</string>
+    <string name="follow_us">Sighi·nos</string>
+    <string name="use_osm_live_routing_description">Allue su nàvigu OSM Live cun sas mòdìficas in tempus reale (Beta)</string>
+	<string name="use_osm_live_routing">Nàvigu OSM Live</string>
+    <string name="access_no_destination">Destinatzione non definida</string>
+    <string name="map_widget_magnetic_bearing">Bùssola magnètica</string>
+    <string name="map_widget_bearing">Bùssola relativa</string>
+    <string name="access_disable_offroute_recalc">Non cambiare s\'àndala si ses a fora de s\'istrada</string>
+    <string name="access_disable_offroute_recalc_descr">Èvita su ricàlculu de s\'àndala cando ses meda indedda dae s\'istrada giusta</string>
+    <string name="access_disable_wrong_direction_recalc">Non cambiare s\'àndala si sa diretzione est isballiada</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Èvita su ricàlculu automàticu de s\'àndala si ti ses moende in sa diretzione isballiada</string>
+    <string name="access_smart_autoannounce">Annùntziu automàticu intelligente</string>
+    <string name="access_smart_autoannounce_descr">Notìfica petzi cando sa diretzione cara a sa destinatzione est cambiada</string>
+    <string name="access_autoannounce_period">Intervallu de annùntziu automàticu</string>
+    <string name="access_autoannounce_period_descr">Tempus mìnimu intre sos annùntzios</string>
     </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -850,7 +850,7 @@
 	<string name="poi_chocolate">Obchod s čokoládou</string>
 	<string name="poi_coffee">Obchod s kávou</string>
 	<string name="poi_pasta">Obchod s cestovinami</string>
-	<string name="poi_pastry">Obchod s zákuskami</string>
+	<string name="poi_pastry">Obchod so zákuskami</string>
 	<string name="poi_candles">Obchod so sviečkami</string>
 	<string name="poi_fashion">Módny butik</string>
 	<string name="poi_furnace">Obchod s kúrením</string>
@@ -1023,7 +1023,7 @@
 	<string name="poi_abandoned_poi">Opustený objekt</string>
 	<string name="poi_email">E-mailová adresa</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
 	<string name="poi_mobile">Mobilný telefón</string>
 	<string name="poi_route_hiking_iwn_poi">Medzinárodná pešia trasa</string>
 	<string name="poi_route_hiking_nwn_poi">Národná pešia trasa</string>
@@ -1075,11 +1075,11 @@
 	<string name="poi_denomination_church_of_christ">Kristova cirkev</string>
 	<string name="poi_building">Budova</string>
 
-<string name="poi_twitter">Twitter</string>
+<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_military_office">Vojenský úrad</string>
 	<string name="poi_landfill_waste_nuclear">Jadrový odpad</string>
@@ -1642,4 +1642,77 @@
 	<string name="poi_vending_drinks_food">Jedlo a nápoje</string>
 	<string name="poi_vending_fuel">Palivo</string>
 	<string name="poi_vending_parcel_pickup">Vyzdvihnutie balíkov</string>
+	<string name="poi_surface_unpaved">Povrch: nespevnený</string>
+	<string name="poi_surface_paved">Povrch: spevnený</string>
+	<string name="poi_surface_asphalt">Povrch: asfalt</string>
+	<string name="poi_surface_concrete">Povrch: betón</string>
+	<string name="poi_surface_sett">Povrch: hranaté kamene</string>
+	<string name="poi_surface_cobblestone">Povrch: dlažobné kamene</string>
+	<string name="poi_surface_paving_stones">Povrch: dlažobné tvárnice</string>
+	<string name="poi_surface_pebblestone">Povrch: oblý štrk</string>
+	<string name="poi_surface_stone">Povrch: kameň</string>
+	<string name="poi_surface_metal">Povrch: kov</string>
+	<string name="poi_surface_wood">Povrch: drevo</string>
+	<string name="poi_surface_gravel">Povrch: ostrý štrk</string>
+	<string name="poi_surface_fine_gravel">Povrch: jemné kamienky</string>
+	<string name="poi_surface_compacted">Povrch: zhutnený</string>
+	<string name="poi_surface_sand">Povrch: piesok</string>
+	<string name="poi_surface_grass">Povrch: tráva</string>
+	<string name="poi_surface_grass_paver">Povrch: zatrávňovacie panely</string>
+	<string name="poi_surface_ground">Povrch: zem</string>
+	<string name="poi_surface_dirt">Povrch: pôda</string>
+	<string name="poi_surface_mud">Povrch: blato</string>
+	<string name="poi_surface_ice">Povrch: ľad</string>
+	<string name="poi_surface_salt">Povrch: soľ</string>
+	<string name="poi_surface_snow">Povrch: sneh</string>
+
+	<string name="poi_parking_surface">Typ: povrchové</string>
+	<string name="poi_fitness_centre">Fitnescentrum</string>
+	<string name="poi_fitness">Fitness</string>
+
+	<string name="poi_fitness_station">Miesto na cvičenie</string>
+
+	<string name="poi_atm_yes">Bankomat: áno</string>
+	<string name="poi_atm_no">Bankomat: nie</string>
+
+	<string name="poi_highway_steps">Schody</string>
+	<string name="poi_tunnel_pedestrian">Tunel pre peších</string>
+	<string name="poi_bridge_pedestrian">Most pre peších</string>
+	<string name="poi_running">Beh</string>
+	<string name="poi_internet_access_type_wlan">Typ internetového pripojenia: wifi</string>
+	<string name="poi_internet_access_type_terminal">Typ internetového pripojenia: terminál</string>
+	<string name="poi_internet_access_type_wired">Typ internetového pripojenia: kábel</string>
+	<string name="poi_internet_access_type_public">Typ internetového pripojenia: verejné</string>
+	<string name="poi_internet_access_type_service">Typ internetového pripojenia: služba</string>
+	<string name="poi_internet_access_type_no">Žiadny prístup na Internet</string>
+	<string name="poi_internet_access_type_yes">S prístupom na Internet</string>
+
+	<string name="poi_memorial_statue">Socha</string>
+	<string name="poi_artwork_type_statue">Typ diela: socha</string>
+	<string name="poi_artwork_type_sculpture">Typ diela: plastika</string>
+	<string name="poi_artwork_type_mural">Typ diela: freska</string>
+	<string name="poi_artwork_type_architecture">Typ diela: architektúra</string>
+	<string name="poi_artwork_type_painting">Typ diela: maľba</string>
+	<string name="poi_artwork_type_stone">Typ diela: kameň</string>
+	<string name="poi_artwork_type_bust">Typ diela: busta</string>
+	<string name="poi_artwork_type_installation">Typ diela: inštalácia</string>
+	<string name="poi_artwork_type_mosaic">Typ diela: mozaika</string>
+	<string name="poi_artwork_type_relief">Typ diela: reliéf</string>
+	<string name="poi_artwork_type_graffiti">Typ diela: grafiti</string>
+	<string name="poi_artwork_type_stele">Typ diela: stéla</string>
+	<string name="poi_artwork_type_fountain">Typ diela: fontána</string>
+
+	<string name="poi_building_type_church">Typ budovy: kostol</string>
+	<string name="poi_building_type_chapel">Typ budovy: kaplnka</string>
+	<string name="poi_building_type_mosque">Typ budovy: mešita</string>
+	<string name="poi_building_type_temple">Typ budovy: chrám</string>
+	<string name="poi_building_type_cathedral">Typ budovy: katedrála</string>
+	<string name="poi_building_type_monastery">Typ budovy: kláštor</string>
+	<string name="poi_building_type_basilica">Typ budovy: bazilika</string>
+	<string name="poi_building_type_synagogue">Typ budovy: synagóga</string>
+	<string name="poi_building_type_shrine">Typ budovy: svätyňa</string>
+
+	<string name="poi_building_type_pyramid">Typ budovy: pyramída</string>
+
+	<string name="poi_square">Námestie</string>
 	</resources>

OsmAnd/res/values-sk/strings.xml

@@ -2033,4 +2033,9 @@
     <string name="map_widget_magnetic_bearing">Magnetické smerovanie</string>
     <string name="use_osm_live_routing_description">Zapnúť navigáciu pomocou zmien z OSM Naživo (beta test)</string>
 	<string name="use_osm_live_routing">Navigácia OSM Naživo</string>
+    <string name="follow_us">Sledujte nás</string>
+    <string name="access_direction_audio_feedback">Zvuková indikácia smeru</string>
+    <string name="access_direction_audio_feedback_descr">Indikovať smer k cieľu pomocou zvuku</string>
+    <string name="access_direction_haptic_feedback">Dotyková indikácia smeru</string>
+    <string name="access_direction_haptic_feedback_descr">Indikovať smer k cieľu pomocou vibrácie</string>
     </resources>

OsmAnd/res/values-sl/strings.xml

@@ -2195,4 +2195,9 @@
     <string name="map_widget_magnetic_bearing">Smer po magnetnem polju</string>
     <string name="use_osm_live_routing_description">Omogoči navigacijo za spremembe OSM v živo (beta)</string>
 	<string name="use_osm_live_routing">Navigacija OSM v živo</string>
+    <string name="follow_us">Sledi nam</string>
+    <string name="access_direction_audio_feedback">Zvočno najavljanje smeri</string>
+    <string name="access_direction_audio_feedback_descr">Določi smer ciljne točke z zvokom</string>
+    <string name="access_direction_haptic_feedback">Vibracijsko najavljanje smeri</string>
+    <string name="access_direction_haptic_feedback_descr">Določi smer ciljne točke z vibriranjem naprave</string>
     </resources>

OsmAnd/res/values-tr/phrases.xml

@@ -996,7 +996,7 @@
 	<string name="poi_fax">Faks</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">İnstagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google +</string>
 	<string name="poi_mobile">Mobil</string>
 	<string name="poi_maxweight">Maksimum ağırlık</string>

OsmAnd/res/values-tr/strings.xml

@@ -720,7 +720,7 @@
 	<string name="layer_hillshade">Tepe gölgesi katmanı</string>
     <string name="map_widget_fps_info">FPS hata ayıklama bilgisi</string>
 	<string name="driving_region_descr">Sürüş bölgeyi seçin: ABD Avrupa, İngiltere, Asya ve Diğerleri</string>
-	<string name="driving_region">Sürüş Bölgesi</string>
+	<string name="driving_region">Araba sürme alanı</string>
 	<string name="driving_region_japan">Japonya</string>
 	<string name="driving_region_us">Amerika</string>
 	<string name="driving_region_canada">Kanada</string>
@@ -1319,7 +1319,7 @@
     <string name="disable_recording_once_app_killed">Tek başına günlüğe eklemeyi önle</string>
     <string name="disable_recording_once_app_killed_descrp">Uygulama kapatılırsa (son uygulamalardan) GPX iz kaydına ara verilecektir. (OsmAnd Uyku modu simgesi Bildirim alanından kaybolur)</string>
     
-    <string name="routing_attr_avoid_shuttle_train_name">Mekik treninden kaçın</string>
+    <string name="routing_attr_avoid_shuttle_train_name">Aynı hatta gidip gelen trenden sakın</string>
 	<string name="local_indexes_cat_wiki">Vikipedi</string>
     <string name="osm_edit_context_menu_delete">OSM düzeltmesini sil</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Rota kapsamına göre Boyama</string>
@@ -1397,7 +1397,7 @@
     <string name="lang_als">Arnavut (Tosk)</string>
     <string name="read_more">Daha fazla oku</string>
     <string name="whats_new">Yenilikler neler:</string>
-    <string name="rendering_attr_hideProposed_name">Önerilen nesneleri gizlemek</string>
+    <string name="rendering_attr_hideProposed_name">Önerilen nesneler</string>
     <string name="shared_string_update">Güncelleştirme</string>
     <string name="shared_string_upload">Yükleme</string>
     <string name="osm_edit_created_poi">OSM POI oluşturmak</string>
@@ -1738,7 +1738,7 @@
     <string name="index_item_world_seamarks">Dünya seamarks</string>
     <string name="osmo_connect_to_device">Cihazla bağlantı</string>
     <string name="osmo_connect_to_group">Grubu ile bağlantı</string>
-    <string name="osmo_connect">Bağlanmak</string>
+    <string name="osmo_connect">Katıl</string>
     <string name="osmo_create_group">Grup oluştur</string>
     <string name="osmo_server_operation_failed">OSMO Sunucu işlemi başarısız oldu</string>
     <string name="osmo_activity">OpenStreetMap İzleme</string>
@@ -1751,8 +1751,8 @@
     <string name="osmo_groups">OsMo Grupları / Aygıtlar</string>
     <string name="osmo_auto_send_locations_descr">Uygulama başladığında otomatik olarak gezintiyi başlat ve lokasyonları gönder</string>
     <string name="osmo_auto_send_locations">Otomatik olarak gezinti oturumu başlatın</string>
-    <string name="osmo_tracker_id">Kişisel izci kimliği</string>
+    <string name="osmo_tracker_id">İzleyici Kimliği</string>
-    <string name="osmo_tracker_id_descr">Görüntülemek veya izci kimliği paylaşmak için tıklayınız. Izci kimliği bağlı cihazlar kullanarak bu cihazın tüm hareketlerini izlemek mümkün olacak! Select Regenerate seçeneği kesmek için.</string>
+    <string name="osmo_tracker_id_descr">İzleyici kimliğini incelemek için tıkla</string>
     <string name="osmo_group_policy">Politika</string>
     <string name="osmo_connect_to_device_tracker_id">Yolcu kimliği</string>
     <string name="osmo_connect_to_device_name">Kullanıcı adı</string>
@@ -1841,7 +1841,7 @@
     <string name="si_kmh">Saatte kilometre</string>
     <string name="si_min_m">Mil başına Dakika</string>
     <string name="si_nm_h">Saatte deniz mili (düğüm)</string>
-    <string name="nm_h">nmh</string>
+    <string name="nm_h">deniz mili/saat</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -1972,7 +1972,7 @@
     <string name="gpx_monitoring_start">GPX günlüğü başlat</string>
     <string name="gpx_monitoring_stop">Dur GPX günlüğü</string>
     <string name="gpx_start_new_segment">Yeni bir segment başlat</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Olmayan araç otoyolları gizle</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Araç olmayan otoyollar</string>
     <string name="rendering_attr_hideWoodScrubs_name">Ahşap ve scrubs gizle</string>
     <string name="rendering_attr_buildings15zoom_name">Binalar üzerinde yakınlaştırma 15</string>
     <string name="rendering_attr_hideAccess_name">Erişim kısıtlamaları</string>
@@ -2051,7 +2051,7 @@
     <string name="shared_string_toolbar">Araç çubuğu</string>
     <string name="shared_string_widgets">widget\'ler</string>
     <string name="add_points_to_map_markers_q">İşaretlerini eşlemek için tüm noktaları eklemek istiyor musunuz?</string>
-    <string name="shared_string_add_to_map_markers">Harita işaretleyicilerine ekleyin</string>
+    <string name="shared_string_add_to_map_markers">Harita belirteçleri ekle</string>
     <string name="select_map_markers">Harita işaretleyicilerini seçin</string>
     <string name="shared_string_reverse_order">Ters sırada</string>
     <string name="show_map_markers_description">Harita işaretleri özelliğini etkinleştirmek</string>
@@ -2124,6 +2124,6 @@
     <string name="rendering_value_bold_name">Kalın</string>
     <string name="storage_permission_restart_is_required">Şimdi uygulamaya harici kayıt yerine yazma izni verildi. Elle uygulamanın baştan başlatılması gereklidir.</string>
     <string name="full_report">Full rapor</string>
-    <string name="open_street_map_login_and_pass">OpenStreetMap login and password</string>
+    <string name="open_street_map_login_and_pass">OpenStreetMap oturum açma ve parola</string>
     <string name="file_name_containes_illegal_char">Dosya adı uygunsuz karakter içeriyor</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -1520,7 +1520,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="osmo_settings_descr">Налаштування параметрів моніторингу та встановлення персонального каналу моніторингу</string>
     <string name="osmo_settings">OsMo</string>
     <string name="osmo_plugin_description">"Цей втулок частково надає можливості OpenStreetMap Monitoring, дивіться https://osmo.mobi\n\nВи можете відстежувати пристрої учасників з вашої групи в поточному часі. Також, ви можете бачити точки та треки завантажені в групу, до якої ви належите.
-\n\nГрупи, що не були вилучені вродовж місяців, повині привести свій стан у відповідність до груп створених на сайті OsMo.mobi "</string>
+\n\nГрупи, що не були вилучені впродовж місяців, повинні привести свій стан у відповідність до груп створених на сайті OsMo.mobi "</string>
     <string name="osmo_plugin_name">OpenStreetMap моніторинг</string>
    	<string name="always_center_position_on_map">Показувати положення завжди в центрі</string>
     <string name="voice_pref_title">Голос</string>
@@ -2311,7 +2311,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="upload_anonymously">Вивантажено анонімно</string>
     <string name="show_transparency_seekbar">Показати прозору пошукову панель</string>
     <string name="report">Звіт</string>
-    <string name="use_osm_live_routing_description">Ввімкнути навігацію для змін OSM Live (Beta)</string>
+    <string name="use_osm_live_routing_description">Увімкнути навігацію для змін OSM Live (Beta)</string>
 	<string name="use_osm_live_routing">Навігація OSM Live</string>
     <string name="access_no_destination">Пункт призначення не встановлено</string>
     <string name="map_widget_magnetic_bearing">Магнітний пеленг</string>
@@ -2376,4 +2376,9 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="upload_osm_note_description">Ви можете додати Нотатку в OSM анонімно, або скориставшись вашим обліковим записом на OpenStreetMap.org.</string>
     <string name="upload_osm_note">Надіслати Нотатку OSM</string>
     <string name="file_name_containes_illegal_char">Назва файлу містить неприпустимі символи</string>
+<string name="follow_us">Слідуйте за нами</string>
+    <string name="access_direction_audio_feedback">Звукова ідентифікація напрямку</string>
+    <string name="access_direction_audio_feedback_descr">Ініціювати звуком напрям на цільову точку</string>
+    <string name="access_direction_haptic_feedback">Напрям тактильного зворотнього звязку</string>
+    <string name="access_direction_haptic_feedback_descr">Показати вібрацією напрям на цільову точку</string>
     </resources>

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

@@ -948,7 +948,7 @@
 
 	<string name="poi_email">電子郵件</string>
 	<string name="poi_fax">傳真</string>
-	<string name="poi_facebook">臉書</string>
+	<string name="facebook">臉書</string>
 	<string name="poi_mobile">行動電話</string>
 	<string name="poi_animal_shelter_dog">收容所類型：狗</string>
 	<string name="poi_animal_shelter_cat">收容所：貓</string>
@@ -1041,11 +1041,11 @@
 	<string name="poi_supervised_yes">有監管</string>
 	<string name="poi_supervised_no">沒有監管</string>
 	<string name="poi_mill_pond">磨房水塘</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">Youtube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">香水商店</string>
 

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

@@ -2126,7 +2126,7 @@
     <string name="osm_live_enter_email">請輸入有效的電子郵件地址</string>
     <string name="osm_live_enter_user_name">請輸入公眾名稱</string>
     <string name="osm_live_subscription_settings">認捐設定</string>
-    <string name="osm_live_subscription">OSM 直接捐款</string>
+    <string name="osm_live_subscription">OSM 即時捐助</string>
     <string name="osm_live_thanks">感謝您的捐款，即時更新！</string>
     <string name="osm_live_region_desc">您捐助的一部分會發送到 OSM，使用者將送交更改到該地區的地圖</string>
     <string name="osm_live_ask_for_purchase">請先購買 OSM 即時捐助</string>
@@ -2146,7 +2146,7 @@
     <string name="report">報告</string>
     <string name="file_name_containes_illegal_char">檔案名稱含有違反規則的字符</string>
 <string name="storage_permission_restart_is_required">現在應用程式允許寫入外部記憶體。應用程式需要手動重新啟動。</string>
-    <string name="release_2_3">" • OSM實況。支援地圖貢獻者和開發者和每小時獲得地圖更新。\n\n• 地圖標記。一種新的方式以快速在地圖上選擇地點。\n\n• 更詳細的 OSM 地圖與國家具體的公路標誌和許多新的地圖功能。\n\n• 改善外觀和感覺的路線準備。\n\n• 在地圖下拉選單中有許多改善，如下拉地址查找。\n\n以及更多… "</string>
+    <string name="release_2_3">" • OSM 即時。支援地圖貢獻者和開發者和每小時獲得地圖更新。\n\n• 地圖標記。一種新的方式以快速在地圖上選擇地點。\n\n• 更詳細的 OSM 地圖與國家具體的公路標誌和許多新的地圖功能。\n\n• 改善外觀和感覺的路線準備。\n\n• 在地圖下拉選單中有許多改善，如下拉地址查找。\n\n以及更多… "</string>
     <string name="no_map_markers_found">請透過地圖增加地圖標記</string>
     <string name="no_waypoints_found">未發現任何航點</string>
     <string name="rendering_value_medium_name">中等</string>
@@ -2179,6 +2179,11 @@
     <string name="map_widget_bearing">相對方位</string>
     <string name="map_widget_magnetic_bearing">磁力方位</string>
     <string name="access_no_destination">未設定目的地</string>
-    <string name="use_osm_live_routing_description">為 OSM 即時更改啟用導航 (Beta)</string>
+    <string name="use_osm_live_routing_description">為 OSM 即時兌換啟用導引 (Beta)</string>
-	<string name="use_osm_live_routing">OSM 即時導航</string>
+	<string name="use_osm_live_routing">OSM 即時導引</string>
+    <string name="follow_us">追蹤我們</string>
+    <string name="access_direction_audio_feedback">方向音訊反饋</string>
+    <string name="access_direction_audio_feedback_descr">用聲音指示目標點方向</string>
+    <string name="access_direction_haptic_feedback">方向觸感反饋</string>
+    <string name="access_direction_haptic_feedback_descr">由振動指示目標點方向</string>
     </resources>

OsmAnd/res/values/phrases.xml

@@ -1083,12 +1083,12 @@
 	<string name="poi_website">Website</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="poi_facebook">Facebook</string>
+	<string name="facebook">Facebook</string>
-	<string name="poi_twitter">Twitter</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
-	<string name="poi_vk">VKontakte</string>
+	<string name="vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Mobile</string>
 	<string name="poi_service_times">Service times</string>

OsmAnd/res/values/strings.xml

@@ -10,6 +10,7 @@
     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="follow_us">Follow us</string>
     <string name="access_direction_audio_feedback">Direction audio feedback</string>
     <string name="access_direction_audio_feedback_descr">Indicate target point direction by sound</string>
     <string name="access_direction_haptic_feedback">Direction haptic feedback</string>

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -36,9 +36,6 @@ public class AndroidUtils {
 		return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
 	}
 	
-	/**
-	 * @param context
-	 */
 	public static void softKeyboardDelayed(final View view) {
 		view.post(new Runnable() {
 			@Override

OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java

@@ -55,8 +55,12 @@ public class ContextMenuAdapter {
 	}
 
 	public void addItem(ContextMenuItem item) {
+		try {
+			items.add(item.getPos(), item);
+		} catch (IndexOutOfBoundsException ex) {
 			items.add(item);
 		}
+	}
 
 	public ContextMenuItem getItem(int position) {
 		return items.get(position);
@@ -182,10 +186,10 @@ public class ContextMenuAdapter {
 			} else {
 				if (item.getIcon() != ContextMenuItem.INVALID_ID) {
 					int colorRes = item.getColorRes();
-					if (colorRes == ContextMenuItem.INVALID_ID) {
+					if (colorRes == ContextMenuItem.INVALID_ID && !item.shouldSkipPainting()) {
 						colorRes = lightTheme ? R.color.icon_color : R.color.color_white;
 					}
-					Drawable drawable = mIconsCache.getIcon(item.getIcon(), colorRes);
+					final Drawable drawable = mIconsCache.getIcon(item.getIcon(), colorRes);
 					((AppCompatImageView) convertView.findViewById(R.id.icon)).setImageDrawable(drawable);
 					convertView.findViewById(R.id.icon).setVisibility(View.VISIBLE);
 				} else if (convertView.findViewById(R.id.icon) != null) {
@@ -290,12 +294,13 @@ public class ContextMenuAdapter {
 					dividerView.setVisibility(View.VISIBLE);
 				}
 			}
-			return convertView;
+
+			if (item.isCategory()) {
+				convertView.setFocusable(false);
+				convertView.setClickable(false);
 			}
 
-		@Override
+			return convertView;
-		public boolean isEnabled(int position) {
-			return !getItem(position).isCategory();
 		}
 	}
 

OsmAnd/src/net/osmand/plus/ContextMenuItem.java

@@ -142,6 +142,10 @@ public class ContextMenuItem {
 		return integerListener;
 	}
 
+	public boolean shouldSkipPainting() {
+		return skipPaintingWithoutColor;
+	}
+
 	public boolean shouldHideDivider() {
 		return hideDivider;
 	}
@@ -194,7 +198,7 @@ public class ContextMenuItem {
 		private int mLayout = INVALID_ID;
 		private boolean mLoading = false;
 		private boolean mIsCategory = false;
-		private int mPosition = INVALID_ID;
+		private int mPosition = -1;
 		private String mDescription = null;
 		private ContextMenuAdapter.ItemClickListener mItemClickListener = null;
 		private ContextMenuAdapter.OnIntegerValueChangedListener mIntegerListener = null;

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -2336,7 +2336,7 @@ public class OsmandSettings {
 	public Set<String> getSelectedPoiFilters() {
 		Set<String> result = new LinkedHashSet<>();
 		String filtersId = SELECTED_POI_FILTER_FOR_MAP.get();
-		if (filtersId != null) {
+		if (filtersId != null && !filtersId.trim().isEmpty()) {
 			Collections.addAll(result, filtersId.split(","));
 		}
 		return result;

OsmAnd/src/net/osmand/plus/activities/HelpActivity.java

@@ -1,16 +1,22 @@
 package net.osmand.plus.activities;
 
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
 import android.support.annotation.StringRes;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.content.ContextCompat;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
@@ -24,6 +30,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 	//	public static final String DIALOG = "dialog";
 	@IdRes
 	public static final String OSMAND_POLL_HTML = "http://osmand.net/android-poll.html";
+	public static final int NULL_ID = -1;
 	private ArrayAdapter<ContextMenuItem> mAdapter;
 
 	//public static final String OSMAND_MAP_LEGEND = "http://osmand.net/help/map-legend_default.png";
@@ -35,66 +42,40 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 		setContentView(R.layout.fragment_help_screen);
 
 		ContextMenuAdapter contextMenuAdapter = new ContextMenuAdapter();
-		contextMenuAdapter.setDefaultLayoutId(R.layout.list_item_icon_and_menu);
+		contextMenuAdapter.setDefaultLayoutId(R.layout.two_line_with_images_list_item);
 
-		contextMenuAdapter.addItem(createCategory(R.string.begin_with_osmand_menu_group));
 		createBeginWithOsmandItems(contextMenuAdapter);
-		contextMenuAdapter.addItem(createCategory(R.string.features_menu_group));
 		createFeaturesItems(contextMenuAdapter);
-		contextMenuAdapter.addItem(createCategory(R.string.plugins_menu_group));
 		createPluginsItems(contextMenuAdapter);
-		contextMenuAdapter.addItem(createCategory(R.string.help_us_to_improve_menu_group));
 		createHelpUsToImproveItems(contextMenuAdapter);
-		contextMenuAdapter.addItem(createCategory(R.string.other_menu_group));
 		createOtherItems(contextMenuAdapter);
+		createSocialNetworksItems(contextMenuAdapter);
 
-		mAdapter = contextMenuAdapter.createListAdapter(this, getMyApplication().getSettings().isLightContent());
+		boolean lightContent = getMyApplication().getSettings().isLightContent();
+
+		mAdapter = contextMenuAdapter.createListAdapter(this, lightContent);
 
 		ListView listView = (ListView) findViewById(android.R.id.list);
 		listView.setAdapter(mAdapter);
 		listView.setOnItemClickListener(this);
+		int dividerColor = lightContent ? R.color.icon_color_light : R.color.dialog_inactive_text_color_dark;
+		Drawable dividerDrawable = new ColorDrawable(ContextCompat.getColor(this, dividerColor));
+		listView.setDivider(dividerDrawable);
+		listView.setDividerHeight(AndroidUtils.dpToPx(this, 1f));
 
 		setTitle(R.string.shared_string_help);
 		setupHomeButton();
 	}
 
-	private void createHelpUsToImproveItems(ContextMenuAdapter contextMenuAdapter) {
-		contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder()
-				.setLayout(R.layout.help_to_improve_item).createItem());
-	}
 
-	private ContextMenuItem createCategory(@StringRes int titleRes) {
-		return new ContextMenuItem.ItemBuilder().setTitle(
-				getString(titleRes)).setCategory(true)
-				.setLayout(R.layout.download_item_list_section).createItem();
-	}
 
-	private ContextMenuItem createItem(@StringRes int titleRes,
+	@Override
-									   @StringRes String path) {
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		return new ContextMenuItem.ItemBuilder()
+		ContextMenuAdapter.ItemClickListener listener =
-				.setTitle(getString(titleRes))
+				mAdapter.getItem(position).getItemClickListener();
-				.setListener(new ShowArticleOnTouchListener(path, this))
+		if (listener != null) {
-				.createItem();
+			listener.onContextMenuClick(mAdapter, position, position, false);
 		}
-
-	private ContextMenuItem createPluginItem(String title,
-											 @DrawableRes int icon,
-											 String path) {
-		return new ContextMenuItem.ItemBuilder()
-				.setTitle(title)
-				.setIcon(icon)
-				.setListener(new ShowArticleOnTouchListener(path, this))
-				.createItem();
-	}
-
-	private ContextMenuItem createItem(@StringRes int titleRes,
-									   @StringRes int descriptionRes,
-									   String path) {
-		return new ContextMenuItem.ItemBuilder()
-				.setTitle(getString(titleRes))
-				.setDescription(getString(descriptionRes))
-				.setListener(new ShowArticleOnTouchListener(path, this))
-				.createItem();
 	}
 
 	@Override
@@ -108,32 +89,45 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 	}
 
 	private void createBeginWithOsmandItems(ContextMenuAdapter contextMenuAdapter) {
-		contextMenuAdapter.addItem(createItem(R.string.first_usage_item, R.string.first_usage_item_description,
+		contextMenuAdapter.addItem(createCategory(R.string.begin_with_osmand_menu_group));
-				"feature_articles/start.html"));
+		contextMenuAdapter.addItem(createItem(R.string.first_usage_item,
-		contextMenuAdapter.addItem(createItem(R.string.shared_string_navigation, R.string.navigation_item_description,
+				R.string.first_usage_item_description, "feature_articles/start.html"));
-				"feature_articles/navigation.html"));
+		contextMenuAdapter.addItem(createItem(R.string.shared_string_navigation,
-		contextMenuAdapter.addItem(createItem(R.string.faq_item, R.string.faq_item_description,
+				R.string.navigation_item_description, "feature_articles/navigation.html"));
-				"feature_articles/faq.html"));
+		contextMenuAdapter.addItem(createItem(R.string.faq_item,
+				R.string.faq_item_description, "feature_articles/faq.html"));
 	}
 
-	@Override
+	private void createSocialNetworksItems(ContextMenuAdapter contextMenuAdapter) {
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		contextMenuAdapter.addItem(createCategory(R.string.follow_us));
-		mAdapter.getItem(position).getItemClickListener()
+		contextMenuAdapter.addItem(createSocialItem(R.string.twitter, R.string.twitter_address,
-				.onContextMenuClick(mAdapter, position, position, false);
+				R.drawable.ic_action_social_twitter));
+		contextMenuAdapter.addItem(createSocialItem(R.string.facebook, R.string.facebook_address,
+				R.drawable.ic_action_social_facebook));
+		contextMenuAdapter.addItem(createSocialItem(R.string.vk, R.string.vk_address,
+				R.drawable.ic_action_social_vk));
+	}
+
+	private void createHelpUsToImproveItems(ContextMenuAdapter contextMenuAdapter) {
+		contextMenuAdapter.addItem(createCategory(R.string.help_us_to_improve_menu_group));
+		contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setLayout(R.layout.help_to_improve_item).createItem());
 	}
 
 	private void createFeaturesItems(ContextMenuAdapter contextMenuAdapter) {
-		contextMenuAdapter.addItem(createItem(R.string.map_viewing_item,
+		contextMenuAdapter.addItem(createCategory(R.string.features_menu_group));
+		contextMenuAdapter.addItem(createItem(R.string.map_viewing_item, NULL_ID,
 				"feature_articles/map-viewing.html"));
-		contextMenuAdapter.addItem(createItem(R.string.search_on_the_map_item,
+		contextMenuAdapter.addItem(createItem(R.string.search_on_the_map_item, NULL_ID,
 				"feature_articles/find-something-on-map.html"));
-		contextMenuAdapter.addItem(createItem(R.string.planning_trip_item,
+		contextMenuAdapter.addItem(createItem(R.string.planning_trip_item, NULL_ID,
 				"feature_articles/trip-planning.html"));
-		contextMenuAdapter.addItem(createItem(R.string.map_legend,
+		contextMenuAdapter.addItem(createItem(R.string.map_legend, NULL_ID,
 				"feature_articles/map-legend.html"));
 	}
 
 	private void createPluginsItems(ContextMenuAdapter contextMenuAdapter) {
+		contextMenuAdapter.addItem(createCategory(R.string.plugins_menu_group));
 		for (final OsmandPlugin osmandPlugin : OsmandPlugin.getAvailablePlugins()) {
 			final String helpFileName = osmandPlugin.getHelpFileName();
 			if (helpFileName != null) {
@@ -144,11 +138,12 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 	}
 
 	private void createOtherItems(ContextMenuAdapter contextMenuAdapter) {
-		contextMenuAdapter.addItem(createItem(R.string.instalation_troubleshooting_item,
+		contextMenuAdapter.addItem(createCategory(R.string.other_menu_group));
+		contextMenuAdapter.addItem(createItem(R.string.instalation_troubleshooting_item, NULL_ID,
 				"feature_articles/installation-and-troubleshooting.html"));
-		contextMenuAdapter.addItem(createItem(R.string.techical_articles_item,
+		contextMenuAdapter.addItem(createItem(R.string.techical_articles_item, NULL_ID,
 				"feature_articles/technical-articles.html"));
-		contextMenuAdapter.addItem(createItem(R.string.versions_item,
+		contextMenuAdapter.addItem(createItem(R.string.versions_item, NULL_ID,
 				"feature_articles/changes.html"));
 
 		String releasedate = "";
@@ -163,6 +158,57 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 				.setDescription(version).setListener(listener).createItem());
 	}
 
+	// Helper metods
+	private ContextMenuItem createCategory(@StringRes int titleRes) {
+		return new ContextMenuItem.ItemBuilder().setTitle(
+				getString(titleRes)).setCategory(true)
+				.setLayout(R.layout.download_item_list_section).createItem();
+	}
+
+	private ContextMenuItem createItem(@StringRes int titleRes,
+									   @StringRes int descriptionRes,
+									   String path) {
+		ContextMenuItem.ItemBuilder builder = new ContextMenuItem.ItemBuilder()
+				.setTitle(getString(titleRes))
+				.setListener(new ShowArticleOnTouchListener(path, this));
+		if (descriptionRes != -1) {
+			builder.setDescription(getString(descriptionRes));
+		}
+		return builder.createItem();
+	}
+
+	private ContextMenuItem createPluginItem(String title,
+											 @DrawableRes int icon,
+											 String path) {
+		return new ContextMenuItem.ItemBuilder()
+				.setTitle(title)
+				.setIcon(icon)
+				.setListener(new ShowArticleOnTouchListener(path, this))
+				.createItem();
+	}
+
+	private ContextMenuItem createSocialItem(@StringRes int title,
+											 @StringRes int urlRes,
+											 @DrawableRes int icon) {
+		final String url = getString(urlRes);
+		return new ContextMenuItem.ItemBuilder()
+				.setTitle(getString(title))
+				.setDescription(url)
+				.setIcon(icon)
+				.setListener(new ContextMenuAdapter.ItemClickListener() {
+					@Override
+					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter,
+													  int itemId,
+													  int position,
+													  boolean isChecked) {
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+						startActivity(intent);
+						return false;
+					}
+				})
+				.createItem();
+	}
+
 	private static class ShowArticleOnTouchListener implements ContextMenuAdapter.ItemClickListener {
 		private final String filename;
 		private final FragmentActivity ctx;

OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java

@@ -3,9 +3,13 @@ package net.osmand.plus.activities;
 
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.support.v7.app.AlertDialog;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
+import android.widget.Button;
+import android.widget.ListView;
 import android.widget.Toast;
 
 import net.osmand.CallbackWithObject;
@@ -54,7 +58,6 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Set;
 
 /**
  * Object is responsible to maintain layers using by map activity
@@ -101,7 +104,7 @@ public class MapActivityLayers {
 
 	public void createLayers(final OsmandMapTileView mapView) {
 
-		OsmandApplication app = (OsmandApplication) getApplication();
+		OsmandApplication app = getApplication();
 		RoutingHelper routingHelper = app.getRoutingHelper();
 		// first create to make accessible
 		mapTextLayer = new MapTextLayer();
@@ -235,8 +238,7 @@ public class MapActivityLayers {
 							g.path = getString(R.string.show_current_gpx_title);
 						}
 						break;
-					}
+					} else {
-					if (!g.showCurrentTrack || locToShow == null) {
 						locToShow = g.findPointToShow();
 					}
 				}
@@ -259,51 +261,123 @@ public class MapActivityLayers {
 	}
 
 
-	public AlertDialog selectPOIFilterLayer(final OsmandMapTileView mapView) {
+	public void showMultichoicePoiFilterDialog(final OsmandMapTileView mapView, final ConfirmListener listener) {
-		OsmandApplication app = getApplication();
+		final OsmandApplication app = getApplication();
 		final PoiFiltersHelper poiFilters = app.getPoiFilters();
 		final ContextMenuAdapter adapter = new ContextMenuAdapter();
-		adapter.addItem(new ContextMenuItem.ItemBuilder()
+		final List<PoiUIFilter> list = new ArrayList<>();
-				.setTitleId(R.string.shared_string_search, app)
-				.setIcon(R.drawable.ic_action_search_dark).createItem());
-		final List<PoiUIFilter> list = new ArrayList<PoiUIFilter>();
 		list.add(poiFilters.getCustomPOIFilter());
 		for (PoiUIFilter f : poiFilters.getTopDefinedPoiFilters()) {
-			addFilterToList(adapter, list, f);
+			addFilterToList(adapter, list, f, true);
 		}
 		for (PoiUIFilter f : poiFilters.getSearchPoiFilters()) {
-			addFilterToList(adapter, list, f);
+			addFilterToList(adapter, list, f, true);
 		}
 
+		final ArrayAdapter<ContextMenuItem> listAdapter = adapter.createListAdapter(activity, app.getSettings().isLightContent());
+		AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+		final ListView listView = new ListView(activity);
+		listView.setDivider(null);
+		listView.setClickable(true);
+		listView.setAdapter(listAdapter);
+		listView.setOnItemClickListener(new ListView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				ContextMenuItem item = listAdapter.getItem(position);
+				item.setSelected(!item.getSelected());
+				item.getItemClickListener().onContextMenuClick(listAdapter, position, position, item.getSelected());
+				listAdapter.notifyDataSetChanged();
+			}
+		});
+		builder.setView(listView)
+				.setTitle(R.string.show_poi_over_map)
+				.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						mapView.refreshMap();
+						listener.confirm();
+					}
+				})
+				.setNegativeButton(R.string.shared_string_cancel, null)
+				// TODO go to single choice dialog
+				.setNeutralButton(" ", new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						showSingleChoicePoiFilterDialog(mapView, listener);
+					}
+				});
+		final AlertDialog alertDialog = builder.create();
+		alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+			@Override
+			public void onShow(DialogInterface dialog) {
+				Button neutralButton = alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
+				Drawable drawable = app.getIconsCache().getThemedIcon(R.drawable.ic_action_singleselect);
+				neutralButton.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);			}
+		});
+		alertDialog.show();
+	}
+
+	public void showSingleChoicePoiFilterDialog(final OsmandMapTileView mapView, final ConfirmListener listener) {
+		final OsmandApplication app = getApplication();
+		final PoiFiltersHelper poiFilters = app.getPoiFilters();
+		final ContextMenuAdapter adapter = new ContextMenuAdapter();
+		final List<PoiUIFilter> list = new ArrayList<>();
+		list.add(poiFilters.getCustomPOIFilter());
+		for (PoiUIFilter f : poiFilters.getTopDefinedPoiFilters()) {
+			addFilterToList(adapter, list, f, false);
+		}
+		for (PoiUIFilter f : poiFilters.getSearchPoiFilters()) {
+			addFilterToList(adapter, list, f, false);
+		}
+
+		final ArrayAdapter<ContextMenuItem> listAdapter =
+				adapter.createListAdapter(activity, app.getSettings().isLightContent());
 		AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-		ListAdapter listAdapter = adapter.createListAdapter(activity, app.getSettings().isLightContent());
 		builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {
 			@Override
-			public void onClick(DialogInterface dialog, int position) {
+			public void onClick(DialogInterface dialog, int which) {
-                PoiUIFilter pf = list.get(position);
+				PoiUIFilter pf = list.get(which + 1);
 				String filterId = pf.getFilterId();
 				if (filterId.equals(PoiUIFilter.CUSTOM_FILTER_ID)) {
 					Intent search = new Intent(activity, SearchActivity.class);
 					search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 					activity.getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.POI_TAB_INDEX);
 					activity.startActivity(search);
-				}
+				} else {
-			}
+					getApplication().getPoiFilters().clearSelectedPoiFilters();
-		});
+					getApplication().getPoiFilters().addSelectedPoiFilter(pf);
-		builder.setTitle(R.string.show_poi_over_map)
-				.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
 					mapView.refreshMap();
+					listener.confirm();
 				}
-				})
-				.setNegativeButton(R.string.shared_string_cancel, null);
-		return builder.show();
 			}
 
-	private void addFilterToList(final ContextMenuAdapter adapter, final List<PoiUIFilter> list, final PoiUIFilter f) {
+		});
+		builder.setTitle(R.string.show_poi_over_map);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
+		builder.setNeutralButton(" ", new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				showMultichoicePoiFilterDialog(mapView, listener);
+			}
+		});
+		final AlertDialog alertDialog = builder.create();
+		alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+			@Override
+			public void onShow(DialogInterface dialog) {
+				Button neutralButton = alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
+				Drawable drawable = app.getIconsCache().getThemedIcon(R.drawable.ic_action_multiselect);
+				neutralButton.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);			}
+		});
+		alertDialog.show();
+	}
+
+	private void addFilterToList(final ContextMenuAdapter adapter,
+								 final List<PoiUIFilter> list,
+								 final PoiUIFilter f,
+								 boolean multichoice) {
 		list.add(f);
 		ContextMenuItem.ItemBuilder builder = new ContextMenuItem.ItemBuilder();
+		if (multichoice) {
 			builder.setListener(new ContextMenuAdapter.ItemClickListener() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int position, boolean isChecked) {
@@ -315,14 +389,16 @@ public class MapActivityLayers {
 					return true;
 				}
 			});
-		builder.setTitle(f.getName());
 			builder.setSelected(getApplication().getPoiFilters().isPoiFilterSelected(f));
+		}
+		builder.setTitle(f.getName());
 		if (RenderingIcons.containsBigIcon(f.getIconId())) {
 			builder.setIcon(RenderingIcons.getBigIconResourceId(f.getIconId()));
 		} else {
 			builder.setIcon(R.drawable.mx_user_defined);
 		}
-		builder.setColor(R.color.osmand_orange);
+		builder.setColor(ContextMenuItem.INVALID_ID);
+		builder.setSkipPaintingWithoutColor(true);
 		adapter.addItem(builder.createItem());
 	}
 
@@ -333,7 +409,7 @@ public class MapActivityLayers {
 		}
 		final OsmandSettings settings = getApplication().getSettings();
 
-		final LinkedHashMap<String, String> entriesMap = new LinkedHashMap<String, String>();
+		final LinkedHashMap<String, String> entriesMap = new LinkedHashMap<>();
 
 
 		final String layerOsmVector = "LAYER_OSM_VECTOR";
@@ -345,7 +421,7 @@ public class MapActivityLayers {
 		entriesMap.put(layerInstallMore, getString(R.string.install_more));
 		entriesMap.put(layerEditInstall, getString(R.string.maps_define_edit));
 
-		final List<Entry<String, String>> entriesMapList = new ArrayList<Entry<String, String>>(entriesMap.entrySet());
+		final List<Entry<String, String>> entriesMapList = new ArrayList<>(entriesMap.entrySet());
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
@@ -380,10 +456,12 @@ public class MapActivityLayers {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				String layerKey = entriesMapList.get(which).getKey();
-				if (layerKey.equals(layerOsmVector)) {
+				switch (layerKey) {
+					case layerOsmVector:
 						settings.MAP_ONLINE_DATA.set(false);
 						updateMapSource(mapView, null);
-				} else if (layerKey.equals(layerEditInstall)) {
+						break;
+					case layerEditInstall:
 						OsmandRasterMapsPlugin.defineNewEditLayer(activity, new ResultMatcher<TileSourceTemplate>() {
 
 							@Override
@@ -400,7 +478,8 @@ public class MapActivityLayers {
 							}
 
 						});
-				} else if (layerKey.equals(layerInstallMore)) {
+						break;
+					case layerInstallMore:
 						OsmandRasterMapsPlugin.installMapLayers(activity, new ResultMatcher<TileSourceTemplate>() {
 							TileSourceTemplate template = null;
 							int count = 0;
@@ -427,10 +506,12 @@ public class MapActivityLayers {
 								return false;
 							}
 						});
-				} else {
+						break;
+					default:
 						settings.MAP_TILE_SOURCES.set(layerKey);
 						settings.MAP_ONLINE_DATA.set(true);
 						updateMapSource(mapView, settings.MAP_TILE_SOURCES);
+						break;
 				}
 
 				dialog.dismiss();
@@ -504,4 +585,8 @@ public class MapActivityLayers {
 	public DownloadedRegionsLayer getDownloadedRegionsLayer() {
 		return downloadedRegionsLayer;
 	}
+
+	public interface ConfirmListener {
+		void confirm();
+	}
 }

OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java

@@ -25,16 +25,15 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.MapActivityLayers;
 import net.osmand.plus.activities.PluginActivity;
 import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.activities.TransportRouteHelper;
 import net.osmand.plus.poi.PoiFiltersHelper;
-import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.views.GPXLayer;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.POIMapLayer;
 import net.osmand.plus.views.RouteLayer;
 import net.osmand.plus.views.corenative.NativeCoreContext;
 import net.osmand.render.RenderingRuleProperty;
@@ -104,7 +103,7 @@ public class ConfigureMapMenu {
 		@Override
 		public boolean onRowItemClick(ArrayAdapter<ContextMenuItem> adapter, View view, int itemId, int pos) {
 			if (itemId == R.string.layer_poi) {
-				selectPOILayer(adapter, adapter.getItem(pos));
+				showPoiFilterDialog(adapter, adapter.getItem(pos));
 				return false;
 			} else if (itemId == R.string.layer_gpx_layer && cm.getItem(pos).getSelected()) {
 				showGpxSelectionDialog(adapter, adapter.getItem(pos));
@@ -135,7 +134,7 @@ public class ConfigureMapMenu {
 			if (itemId == R.string.layer_poi) {
 				pfh.clearSelectedPoiFilters();
 				if (isChecked) {
-					selectPOILayer(adapter, adapter.getItem(pos));
+					showPoiFilterDialog(adapter, adapter.getItem(pos));
 				} else {
 					adapter.getItem(pos).setDescription(pfh.getSelectedPoiFiltersName());
 				}
@@ -184,13 +183,12 @@ public class ConfigureMapMenu {
 			});
 		}
 
-		protected void selectPOILayer(final ArrayAdapter<ContextMenuItem> adapter,
+		protected void showPoiFilterDialog(final ArrayAdapter<ContextMenuItem> adapter,
 										   final ContextMenuItem item) {
-			AlertDialog dlg = ma.getMapLayers().selectPOIFilterLayer(ma.getMapView());
+			ma.getMapLayers().showSingleChoicePoiFilterDialog(ma.getMapView(),
-			dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+					new MapActivityLayers.ConfirmListener() {
-
 						@Override
-				public void onDismiss(DialogInterface dialog) {
+						public void confirm() {
 							PoiFiltersHelper pf = ma.getMyApplication().getPoiFilters();
 							boolean selected = pf.isShowingAnyPoi();
 							item.setSelected(selected);

OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java

@@ -79,10 +79,10 @@ public class ItemViewHolder {
 		dateFormat = android.text.format.DateFormat.getMediumDateFormat(context);
 		progressBar = (ProgressBar) view.findViewById(R.id.progressBar);
 		rightButton = (Button) view.findViewById(R.id.rightButton);
-		leftImageView = (ImageView) view.findViewById(R.id.leftImageView);
+		leftImageView = (ImageView) view.findViewById(R.id.icon);
 		descrTextView = (TextView) view.findViewById(R.id.description);
-		rightImageButton = (ImageView) view.findViewById(R.id.rightImageButton);
+		rightImageButton = (ImageView) view.findViewById(R.id.secondaryIcon);
-		nameTextView = (TextView) view.findViewById(R.id.name);
+		nameTextView = (TextView) view.findViewById(R.id.title);
 
 		view.setAccessibilityDelegate(context.getAccessibilityAssistant());
 		rightButton.setAccessibilityDelegate(context.getAccessibilityAssistant());

OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java

@@ -5,12 +5,12 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.Shape;
 import android.os.AsyncTask;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.PopupMenu;
 import android.view.MenuItem;
@@ -37,6 +37,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.MapActivityLayers;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
 import net.osmand.plus.poi.PoiUIFilter;
@@ -62,7 +63,9 @@ public class WaypointDialogHelper {
 
 	public interface WaypointDialogHelperCallbacks {
 		void reloadAdapter();
+
 		void deleteWaypoint(int position);
+
 		void exchangeWaypoints(int pos1, int pos2);
 	}
 
@@ -222,11 +225,11 @@ public class WaypointDialogHelper {
 		int color;
 		int pointColor;
 		if (nightMode) {
-			color = ctx.getResources().getColor(R.color.dashboard_divider_dark);
+			color = ContextCompat.getColor(ctx, R.color.dashboard_divider_dark);
-			pointColor = ctx.getResources().getColor(R.color.dashboard_divider_dark);
+			pointColor = ContextCompat.getColor(ctx, R.color.dashboard_divider_dark);
 		} else {
-			color = ctx.getResources().getColor(R.color.dashboard_divider_light);
+			color = ContextCompat.getColor(ctx, R.color.dashboard_divider_light);
-			pointColor = ctx.getResources().getColor(R.color.ctx_menu_info_divider_light);
+			pointColor = ContextCompat.getColor(ctx, R.color.ctx_menu_info_divider_light);
 		}
 
 		Shape fullDividerShape = new ListDividerShape(color, 0);
@@ -614,10 +617,10 @@ public class WaypointDialogHelper {
 					running[0] = position;
 					thisAdapter.notifyDataSetInvalidated();
 					MapActivity map = (MapActivity) ctx;
-					AlertDialog dlg = map.getMapLayers().selectPOIFilterLayer(map.getMapView());
+					map.getMapLayers().showSingleChoicePoiFilterDialog(map.getMapView(),
-					dlg.setOnDismissListener(new OnDismissListener() {
+							new MapActivityLayers.ConfirmListener() {
 								@Override
-						public void onDismiss(DialogInterface dialog) {
+								public void confirm() {
 									enableType(running, thisAdapter, type, true);
 								}
 							});
@@ -688,11 +691,10 @@ public class WaypointDialogHelper {
 		if (ctx instanceof MapActivity &&
 				!app.getPoiFilters().isPoiFilterSelected(PoiUIFilter.CUSTOM_FILTER_ID)) {
 			MapActivity map = (MapActivity) ctx;
-			AlertDialog dlg = map.getMapLayers().selectPOIFilterLayer(map.getMapView());
+			map.getMapLayers().showSingleChoicePoiFilterDialog(map.getMapView(),
-			dlg.setOnDismissListener(new OnDismissListener() {
+					new MapActivityLayers.ConfirmListener() {
-
 						@Override
-				public void onDismiss(DialogInterface dialog) {
+						public void confirm() {
 							if (app.getPoiFilters().isShowingAnyPoi()) {
 								enableType(running, listAdapter, type, enable);
 							}
@@ -833,9 +835,8 @@ public class WaypointDialogHelper {
 		boolean rc = waypointHelper.isRouteCalculated();
 		for (int i = 0; i < WaypointHelper.MAX; i++) {
 			List<LocationPointWrapper> tp = waypointHelper.getWaypoints(i);
-			if (!rc && i != WaypointHelper.WAYPOINTS && i != WaypointHelper.TARGETS) {
+			if ((rc || i == WaypointHelper.WAYPOINTS || i == WaypointHelper.TARGETS)
-				// skip
+					&& waypointHelper.isTypeVisible(i)) {
-			} else if (waypointHelper.isTypeVisible(i)) {
 				if (points.size() > 0) {
 					points.add(true);
 				}
@@ -888,43 +889,6 @@ public class WaypointDialogHelper {
 		app.getSettings().setMapLocationToShow(locationPoint.getLatitude(), locationPoint.getLongitude(),
 				15, locationPoint.getPointDescription(a), false, locationPoint);
 		MapActivity.launchMapActivityMoveToTop(a);
-
-		/*
-		MapActivity ctx = (MapActivity) a;
-		AnimateDraggingMapThread thread = ctx.getMapView().getAnimatedDraggingThread();
-		int fZoom = ctx.getMapView().getZoom() < 15 ? 15 : ctx.getMapView().getZoom();
-		double flat = locationPoint.getLatitude();
-		double flon = locationPoint.getLongitude();
-		if (!center) {
-			RotatedTileBox cp = ctx.getMapView().getCurrentRotatedTileBox().copy();
-			cp.setCenterLocation(0.5f, 0.25f);
-			cp.setLatLonCenter(flat, flon);
-			flat = cp.getLatFromPixel(cp.getPixWidth() / 2, cp.getPixHeight() / 2);
-			flon = cp.getLonFromPixel(cp.getPixWidth() / 2, cp.getPixHeight() / 2);
-		}
-		if (thread.isAnimating()) {
-			ctx.getMapView().setIntZoom(fZoom);
-			ctx.getMapView().setLatLon(flat, flon);
-			app.getAppCustomization().showLocationPoint(ctx, locationPoint);
-		} else {
-			final double dist = MapUtils.getDistance(ctx.getMapView().getLatitude(), ctx.getMapView().getLongitude(),
-					locationPoint.getLatitude(), locationPoint.getLongitude());
-			double t = 10;
-			if (dist < t) {
-				app.getAppCustomization().showLocationPoint(ctx, locationPoint);
-			} else {
-				thread.startMoving(flat, flon, fZoom, true);
-			}
-			if (ctx.getDashboard().isVisible()) {
-				ctx.getDashboard().hideDashboard();
-				ctx.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
-				ctx.getContextMenu().show(
-						new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()),
-						locationPoint.getPointDescription(ctx),
-						locationPoint);
-			}
-		}
-		*/
 	}
 
 	public static void sortAllTargets(final OsmandApplication app, final Activity activity,

OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java

@@ -411,8 +411,8 @@ public class InAppHelper {
 	}
 
 	private void sendToken(String purchaseToken, final OnRequestResultListener listener) {
-		String userId = ctx.getSettings().BILLING_USER_ID.get();
+		final String userId = ctx.getSettings().BILLING_USER_ID.get();
-		String email = ctx.getSettings().BILLING_USER_EMAIL.get();
+		final String email = ctx.getSettings().BILLING_USER_EMAIL.get();
 		try {
 			Map<String, String> parameters = new HashMap<>();
 			parameters.put("userid", userId);
@@ -458,11 +458,15 @@ public class InAppHelper {
 											ctx.getSettings().BILLING_USER_EMAIL.set(obj.getString("email"));
 										}
 									} else {
-										complain("SendToken Error: " + obj.getString("error"));
+										complain("SendToken Error: "
+												+ obj.getString("error")
+												+ " (userId=" + userId + " token=" + token + ")");
 									}
 								} catch (JSONException e) {
 									logError("SendToken", e);
-									complain("SendToken Error: " + (e.getMessage() != null ? e.getMessage() : "JSONException"));
+									complain("SendToken Error: "
+											+ (e.getMessage() != null ? e.getMessage() : "JSONException")
+											+ " (userId=" + userId + " token=" + token + ")");
 								}
 							}
 							if (listener != null) {
@@ -518,7 +522,7 @@ public class InAppHelper {
 
 	private void complain(String message) {
 		logError("**** InAppHelper Error: " + message);
-		showToast("Error: " + message);
+		showToast(message);
 	}
 
 	private void showToast(final String message) {
@@ -530,7 +534,7 @@ public class InAppHelper {
 	}
 
 	void logError(String msg) {
-		Log.e(TAG, "Error: " + msg);
+		Log.e(TAG, msg);
 	}
 
 	void logError(String msg, Throwable e) {

OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java

@@ -113,6 +113,13 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 		updatePoiAdditionals();
 	}
 
+	public PoiUIFilter(Set<PoiUIFilter> filtersToMerge, OsmandApplication app) {
+		this(app);
+		combineWithPoiFilters(filtersToMerge);
+		filterId = PoiUIFilter.STD_PREFIX + "combined";
+		name = app.getPoiFilters().getFiltersName(filtersToMerge);
+	}
+
 	public String getFilterByName() {
 		return filterByName;
 	}
@@ -494,6 +501,12 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 		poiAdditionals.putAll(f.poiAdditionals);
 	}
 
+	public void combineWithPoiFilters(Set<PoiUIFilter> filters) {
+		for (PoiUIFilter f : filters) {
+			combineWithPoiFilter(f);
+		}
+	}
+
 	public static void combineStandardPoiFilters(Set<PoiUIFilter> filters, OsmandApplication app) {
 		Set<PoiUIFilter> standardFilters = new TreeSet<>();
 		for (PoiUIFilter filter : filters) {
@@ -503,16 +516,7 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 			}
 		}
 		if (!standardFilters.isEmpty()) {
-			PoiUIFilter standardFiltersCombined = null;
+			PoiUIFilter standardFiltersCombined = new PoiUIFilter(standardFilters, app);
-			for (PoiUIFilter f : standardFilters) {
-				if (standardFiltersCombined == null) {
-					standardFiltersCombined = f;
-					f.filterId = PoiUIFilter.STD_PREFIX + "combined";
-					f.name = app.getPoiFilters().getFiltersName(standardFilters);
-				} else {
-					standardFiltersCombined.combineWithPoiFilter(f);
-				}
-			}
 			filters.removeAll(standardFilters);
 			filters.add(standardFiltersCombined);
 		}

OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java

@@ -7,6 +7,7 @@ import android.app.Activity;
 import android.graphics.Paint.Style;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
@@ -99,12 +100,17 @@ public class TextInfoWidget  {
 		return isNight;
 	}
 
-	public void setContentDescription(CharSequence text) {
+	private CharSequence combine(CharSequence text, CharSequence subtext) {
-		if (contentTitle != null) {
+		if (TextUtils.isEmpty(text)) {
-			view.setContentDescription(contentTitle + " " + text); //$NON-NLS-1$
+			return subtext;
-		} else { 
+		} else if (TextUtils.isEmpty(subtext)) {
-			view.setContentDescription(text);
+			return text;
 		}
+		return text + " " + subtext; //$NON-NLS-1$
+	}
+
+	public void setContentDescription(CharSequence text) {
+		view.setContentDescription(combine(contentTitle, text));
 	}
 	
 	public void setContentTitle(int messageId) {
@@ -113,7 +119,7 @@ public class TextInfoWidget  {
 
 	public void setContentTitle(String text) {
 		contentTitle = text;
-		view.setContentDescription(text);
+		setContentDescription(combine(textView.getText(), smallTextView.getText()));
 	}
 	
 	public void setText(String text, String subtext) {
@@ -122,15 +128,7 @@ public class TextInfoWidget  {
 	}
 
 	protected void setTextNoUpdateVisibility(String text, String subtext) {
-		if (text != null) {
+		setContentDescription(combine(text, subtext));
-			if (subtext != null) {
-				setContentDescription(text + " " + subtext); //$NON-NLS-1$
-			} else {
-				setContentDescription(text);
-			}
-		} else if(subtext != null){
-			setContentDescription(subtext);
-		}
 //		if(this.text != null && this.text.length() > 7) {
 //			this.text = this.text.substring(0, 6) +"..";
 //		}

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }