diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index a8655e36f7..0f60e684a5 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy.</string>
   <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení
diff --git a/OsmAnd/res/values-cy/strings.xml b/OsmAnd/res/values-cy/strings.xml
index 9183affb4b..8fc6196165 100644
--- a/OsmAnd/res/values-cy/strings.xml
+++ b/OsmAnd/res/values-cy/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="avoid_in_routing_title">Osgoi...</string>
 <string name="avoid_in_routing_descr">Osgoi tollffyrdd, ffyrdd garw, fferïau</string>
 <string name="show_warnings_title">Dangos larymau</string>
@@ -76,7 +76,7 @@
 <string name="starting_point_too_far">Man cychwyn yn rhy bell o\'r ffordd agosaf</string>
 <string name="shared_location">Lleoliad rhanedig</string>
 <string name="avoid_motorway">Ceisiwch osgoi traffyrdd</string>
-<string name="auto_zoom_map_descr">Zoom Auto mapio yn ôl eich cyflymder (tra map wedi eu cydamseru gyda'r sefyllfa bresennol)</string>
+<string name="auto_zoom_map_descr">Zoom Auto mapio yn ôl eich cyflymder (tra map wedi eu cydamseru gyda\'r sefyllfa bresennol)</string>
 <string name="auto_zoom_map">Auto chwyddo map</string>
 <string name="tip_recent_changes_0_8_3_t">Newidiadau mewn 0.8.3: ↵
 \n\t* cyfarwyddyd llwybr Gwell ↵
@@ -86,7 +86,7 @@
 \n\t* Mae rhai bug chyfyngderau ↵
 tip_recent_changes_0_8_3_t Cyd-destun</string>
 <string name="snap_to_road_descr">Snap sefyllfa i ffyrdd yn ystod llywio</string>
-<string name="snap_to_road">Snap i'r ffordd</string>
+<string name="snap_to_road">Snap i\'r ffordd</string>
 <string name="osmand_short_description_80_chars">OsmAnd yn gais ffynhonnell agored ar gyfer llywio fapiau all-lein ac ar-lein</string>
 <string name="osmand_plus_short_description_80_chars">OsmAnd yn gais ffynhonnell agored ar gyfer llywio fapiau all-lein ac ar-lein</string>
 <string name="tip_update_index">Diweddaru Data All-lein</string>
@@ -115,8 +115,8 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="osmand_parking_add_event">Ychwanegwch hysbysiad i calendr cais</string>
 <string name="osmand_parking_time_limit">Amser-gyfyngedig parcio</string>
 <string name="osmand_parking_time_no_limit">Amser-diderfyn parcio</string>
-<string name="osmand_parking_position_description">Mae'r sefyllfa eich car wedi parcio. %1$s</string>
-<string name="osmand_parking_position_description_add">I godi'r car yn:</string>
+<string name="osmand_parking_position_description">Mae\'r sefyllfa eich car wedi parcio. %1$s</string>
+<string name="osmand_parking_position_description_add">I godi\'r car yn:</string>
 <string name="osmand_parking_position_name">Pwynt parcio</string>
 <string name="osmand_parking_plugin_description">Mae hyn yn ategyn yn caniatáu i storio y lleoliad eich car wedi parcio.</string>
 <string name="osmand_parking_plugin_name">Ategyn Safle Parcio</string>
@@ -129,8 +129,8 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="asap">cyn gynted â phosibl</string>
 <string name="save_route_as_gpx">Cadw llwybr fel GPX ffeil</string>
 <string name="route_roundabout">Cylchfan: cymryd %1$d allanfa ac yn mynd</string>
-<string name="route_kl">Cadwch i'r chwith ac ewch</string>
-<string name="route_kr">Cadwch i'r dde ac ewch</string>
+<string name="route_kl">Cadwch i\'r chwith ac ewch</string>
+<string name="route_kr">Cadwch i\'r dde ac ewch</string>
 <string name="rendering_attr_noPolygons_description">Gwneud yr holl nodweddion tir arwynebedd ar fap tryloyw</string>
 <string name="rendering_attr_noPolygons_name">Dim polygonau</string>
 <string name="rendering_attr_appMode_name">Rendro modd</string>
@@ -151,12 +151,12 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="left_side_navigation">Chwith-law gyrru</string>
 <string name="left_side_navigation_descr">Dewiswch ar gyfer gwledydd gyda chwith traffig</string>
 <string name="download_link_and_local_description">Cliciwch yma i lawrlwytho neu ddiweddaru data all-lein. \nCliciwch unrhyw eitem presennol i weld mwy o fanylion, bwyso a dal i deactivate neu ddileu. Data cyfredol ar y ddyfais (%1$s am ddim):</string>
-<string name="unknown_from_location">Nid yw man cychwyn hwn wedi'i benderfynu eto</string>
-<string name="unknown_location">Sefyllfa nad yw'n hysbys eto</string>
+<string name="unknown_from_location">Nid yw man cychwyn hwn wedi\'i benderfynu eto</string>
+<string name="unknown_location">Sefyllfa nad yw\'n hysbys eto</string>
 <string name="context_menu_item_directions">Cyfarwyddiadau i fan hyn</string>
 <string name="modify_transparency">Addasu tryloywder (0 - tryloyw, 255 - afloyw)</string>
 <string name="confirm_interrupt_download">Ydych chi eisiau i dorri ar draws llwytho ffeil?</string>
-<string name="basemap_was_selected_to_download">Basemap yn ofynnol ar gyfer gweithredu'n briodol cais a dewiswyd ef i lawrlwytho.</string>
+<string name="basemap_was_selected_to_download">Basemap yn ofynnol ar gyfer gweithredu\'n briodol cais a dewiswyd ef i lawrlwytho.</string>
 <string name="select_index_file_to_download">Ni ddaethpwyd o hyd. Os gallwch ni all ddod o hyd i\'ch rhanbarth, gallwch wneud eich hun (gweler http://osmand.net).</string>
 <string name="local_indexes_cat_tile">Mapiau Ar-lein (teils)</string>
 <string name="local_indexes_cat_map">Fapiau all-lein (fector)</string>
@@ -181,7 +181,7 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="tip_recent_changes_0_8_0_t">Newidiadau mewn 0.8.0:
 \n\t- *ymarferoldeb Ategyn*
 \n\t - ymarferoldeb y rhan fwyaf o ei grwpio yn ôl nodweddion a gellir eu galluogi / anabl yn y Rheolwr Ategyn
-Gallwch alluogi (ar-lein neu cached) Ffynonellau teils map, lleoliadau olrhain, a nodweddion newydd a fu'n bodoli eraill.
+Gallwch alluogi (ar-lein neu cached) Ffynonellau teils map, lleoliadau olrhain, a nodweddion newydd a fu\'n bodoli eraill.
 \n\t- *data cymorth newydd map offline*
 \n\t - Map rendro yn dod yn gyflymach ac yn fwy manwl gywir (arfordir a phroblemau ardal dan ddŵr yn cael eu gosod yn bennaf).
 \n\t - Mae angen i chi lawrlwytho data all-lein hollol newydd (ni fydd hen ddata yn cael ei gefnogi anymore)
@@ -189,7 +189,7 @@ Gallwch alluogi (ar-lein neu cached) Ffynonellau teils map, lleoliadau olrhain,
 \n\t - llwybrau All-lein yn dod yn fwy cadarn
 \n\t *Defnyddioldeb a phrofiad UI*
 \n\t - Gwell mewn llawer o ardaloedd</string>
-<string name="vector_maps_may_display_faster_on_some_devices">Mapiau fector debygol arddangos yn gyflymach. Efallai na gweithio'n dda ar rai dyfeisiau.</string>
+<string name="vector_maps_may_display_faster_on_some_devices">Mapiau fector debygol arddangos yn gyflymach. Efallai na gweithio\'n dda ar rai dyfeisiau.</string>
 <string name="play_commands_of_currently_selected_voice">Chwarae gorchmynion llais a ddewiswyd ar hyn o bryd</string>
 <string name="debugging_and_development">OsmAnd datblygu</string>
 <string name="native_rendering">Rendro Brodorol</string>
@@ -239,7 +239,7 @@ Gallwch alluogi (ar-lein neu cached) Ffynonellau teils map, lleoliadau olrhain,
 <string name="back">Yn ôl</string>
 <string name="back_left">Cefn ar y chwith</string>
 <string name="left">Chwith</string>
-<string name="front_left">Flaen, o'r chwith</string>
+<string name="front_left">Flaen, o\'r chwith</string>
 <string name="accuracy">Cywirdeb</string>
 <string name="altitude">Uchder</string>
 </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 3168d2ad2b..e9e4470644 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="show_warnings_title">Warnungen anzeigen…</string>
 	<string name="show_warnings_descr">Warnungen für Tempolimits, stationäre Radarkontrollen, Rüttelschwellen u.Ä.</string>
 	<string name="use_compass_navigation_descr">Kompass verwenden, wenn keine andere Richtungsbestimmung möglich</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index dffc55073f..7899a75c88 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="btn_add_tag">Προσθήκη Ετικέτας</string>
     <string name="btn_advanced_mode">Advanced Mode...</string>
     <string name="poi_filter_parking">Στάθμευση</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index f5510609dd..80de52b088 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
   <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per mostrare tracce e percorsi</string>
   <string name="offline_edition">Modifiche offline</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 6edcb03c1a..a90414c428 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="live_monitoring_mode_off">Start Live tracking</string>
   <string name="live_monitoring_mode_on">Stop Live tracking</string>
   <string name="layer_map_appearance">Configureer scherm…</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 61b9813ce0..679b89dce6 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="amenity_type_administrative">Administrativo</string>
   <string name="amenity_type_barrier">Barreira</string>
   <string name="amenity_type_education">Educação</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 98e2901acb..cc5a0dbc40 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="download_link_and_local_description">Загрузите или обновите локальные данные. \nЧтобы получить дополнительную информацию о карте, выделите ее в списке. Удерживайте карту, если вы хотите удалить или деактивировать. \nДанные на устройстве (%1$s свободно):</string>
   <string name="unknown_from_location">Начальное местоположение еще не определено</string>
   <string name="unknown_location">Местоположение еще не определено</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 8d044d0078..dfac988c42 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="screen_is_locked">För att låsa upp skärmen trycker låsikon</string>
 <string name="map_widget_top_text">Gatunamn</string>
 <string name="map_widget_back_to_loc">Var är jag</string>
@@ -404,7 +404,7 @@ OsmAnd aktivt utvecklas och vårt projekt och dess fortsatta framsteg bygger på
 \n\t\Vrid inte (norr är uppåt)\'- Karta inte kommer att roteras. Norr kommer alltid upp
 \n\t\'Till rörelseriktning\' - Karta kommer kontinuerligt anpassas till din kurs
 \n\t\'Till kompass\' - Karta kommer kontinuerligt anpassas till enhetens kompass läsning</string>
-<string name="binary_map_download_success">Ladda framgångsrika.\n\t\n\tFör användning aktivera \'Meny\' -&gt; \'Definiera Visa\' -&gt; \'Karta källa...\' -&gt; \ 'Offline vektorkartor\'.</string>
+<string name="binary_map_download_success">Ladda framgångsrika.\n\t\n\tFör användning aktivera \'Meny\' -&gt; \'Definiera Visa\' -&gt; \'Karta källa...\' -&gt; \ \'Offline vektorkartor\'.</string>
 <string name="tip_day_night_mode">Dag/nattläge</string>
 <string name="tip_osm_improve">Förbättra OSM data</string>
 <string name="download_files_not_enough_space">Det finns inte tillräckligt med ledigt utrymme för att ladda ner %1$s MB (tillgängliga: %2$s).</string>
@@ -527,6 +527,6 @@ OsmAnd aktivt utvecklas och vårt projekt och dess fortsatta framsteg bygger på
 <string name="gpx_option_reverse_route">Omvänd GPX riktning</string>
 <string name="gpx_option_destination_point">Använd aktuell destination</string>
 <string name="gpx_option_from_start_point">Passera längs hela spåret</string>
-<string name="switch_to_vector_map_to_see">Offline vektor map närvarande för den här platsen. \n\t\n\tFör användning aktivera \'Meny\' -&gt; \'Definiera utsikt\' -&gt; \ 'Kartkälla...\' -&gt; \'Offline vektorkartor\'.</string>
+<string name="switch_to_vector_map_to_see">Offline vektor map närvarande för den här platsen. \n\t\n\tFör användning aktivera \'Meny\' -&gt; \'Definiera utsikt\' -&gt; \ \'Kartkälla...\' -&gt; \'Offline vektorkartor\'.</string>
 <string name="choose_audio_stream">Röstvägledning utgång</string>
 </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index bbff012ac8..c4f73eb5fd 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -21,8 +21,8 @@
 	</string>
     
     <string name="navigate_to">Set as destination</string>
-    <string name="context_menu_item_last_intermediate_point">Last intermediate point</string>
-    <string name="context_menu_item_first_intermediate_point">First intermediate point</string>
+    <string name="context_menu_item_last_intermediate_point">Set last target point</string>
+    <string name="context_menu_item_first_intermediate_point">Set first target point</string>
     <string name="add_as_last_destination_point">Add as last intermedate point</string>
     <string name="add_as_first_destination_point">Add as first intermediate point</string>
     <string name="replace_destination_point">Replace destination point</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 7c3634c9ee..c1c5f7dd4a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -715,7 +715,7 @@ public class MapActivityActions implements DialogProvider {
 		adapter.registerItem(R.string.context_menu_item_navigate_point, R.drawable.list_view_set_destination);
 		adapter.registerItem(R.string.context_menu_item_directions, R.drawable.list_activities_directions_to_here);
 		if(settings.getPointToNavigate() != null) {
-			if(settings.getIntermediatePoints().size() > 0) {
+			if(mapActivity.getIntermediatePoints().size() == 0) {
 				adapter.registerItem(R.string.context_menu_item_intermediate_point, R.drawable.list_view_set_intermediate);
 			} else {
 				adapter.registerItem(R.string.context_menu_item_first_intermediate_point, R.drawable.list_view_set_intermediate);