diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index bffdf3def7..f716440e1b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -29,10 +29,10 @@
 	<string name="local_openstreetmap_upload">Upload modification to OSM</string>
 	<string name="local_openstreetmap_delete">Delete POI modification</string>
 	<string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
-	<string name="local_openstreetmap_settings">Locally saved OSM points</string>
-	<string name="local_openstreetmap_settings_descr">Show and manage OSM points noted in local database</string>
+	<string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
 
-	<string name="live_monitoring_descr">Enable sending HTTP requests to a specified web service</string>
+	<string name="live_monitoring_descr">Send tracking to a specified web service</string>
 	<string name="live_monitoring">Online Live Tracking</string>
 	<string name="live_monitoring_interval_descr">Specify Live Tracking interval</string>
 	<string name="live_monitoring_interval">Live Tracking interval</string>
@@ -148,7 +148,7 @@
 	<string name="native_library_not_supported">Native library is not supported on this device.</string>
 	<string name="init_native_library">Initializing native library&#8230;</string>
 	<string name="choose_auto_follow_route">Auto-center map view</string>
-	<string name="choose_auto_follow_route_descr">Time until map view returns to being synchronized with position</string>
+	<string name="choose_auto_follow_route_descr">Time until map view synchronizes with current position</string>
 	<string name="auto_follow_route_never">Never</string>
 	<string name="auto_follow_route_navigation">Auto-center nav only</string>
 	<string name="auto_follow_route_navigation_descr">Auto-center map view only while navigating.</string>
@@ -243,10 +243,10 @@
 	<string name="favourites_edit_dialog_name">Name</string>
 	<string name="favourites_edit_dialog_category">Category</string>
 
-	<string name="vector_map_not_needed">Not needed</string>
-	<string name="basemap_missing">Base world map (covering whole world at small zooms) is missing. Please consider downloading World_basemap_x.obf for a complete environment.</string>
+	<string name="vector_map_not_needed">No, thanks</string>
+	<string name="basemap_missing">Base world map (covering the whole world at small zooms) is missing. Please consider downloading World_basemap_x.obf for a complete environment.</string>
 	<string name="vector_data_missing">On board (\'offline\') data is missing on SD card. Please consider to download it in order to use maps offline.</string>
-	<string name="local_index_gpx_info_show">\n\nLong click for options</string>
+	<string name="local_index_gpx_info_show">\n\nPress and hold for options</string>
 	<string name="local_index_gpx_info_speed">\nAverage speed : %1$s \nMaximum speed : %2$s</string>
 	<string name="local_index_gpx_info_elevation">\nAverage altitude : %1$.0f m\nMinimum altitude : %2$.0f m\nMaximum altitude : %3$.0f m\nAscents : %4$.0f m\nDescents : %5$.0f m</string>
 	<string name="local_index_gpx_info">Subtracks : %1$d\nTotal points : %2$d\nWay points : %3$d\nTotal distance : %4$s\nStart time : %5$tF,  %5$tR\nEnd time : %6$tF,  %6$tR</string>
@@ -288,14 +288,14 @@
 \n\t- Text To Speech engine for voice navigation
 \n\t- Make map renderer more detailed
 \n\t- Basemap for whole world packaged with app
-\n\t- Tweak offline routing (still experimental)
-\n\t- GPX routing options
+\n\t- Tweak offline navigation (still experimental)
+\n\t- GPX navigation options
 \n\t- UI update and large bug fixing
 	</string>
 	<string name="voice_not_use">Do not use</string>
 	<string name="voice_not_specified">None</string>
 	<string name="installing_new_resources">Unpacking new data&#8230;</string>
-	<string name="internet_connection_required_for_online_route">An online routing service is selected but no internet connection is available.</string>
+	<string name="internet_connection_required_for_online_route">An online navigation service is selected but no internet connection is available.</string>
 	<string name="tts_language_not_supported_title">Language not supported</string>
 	<string name="tts_language_not_supported">The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to go to the Market to look for another TTS engine? Otherwise the preset TTS language will be used.</string>
 	<string name="tts_missing_language_data_title">Missing data</string>
@@ -372,15 +372,15 @@
 \n\tYou can change profiles in \'Menu\' -> \'Settings\' -> \'User Profile\', or when creating a route.</string>
 
 	<string name="tip_navigation">Navigation</string>
-	<string name="tip_navigation_t">\tBefore starting a navigation (routing) you need to select a destination. Afterwards press \'Menu\' -> \'Directions\' on map and select the navigation type.</string>
+	<string name="tip_navigation_t">\tBefore starting a navigation you need to select a destination. Afterwards press \'Menu\' -> \'Directions\' on map and select the navigation type.</string>
 
 	<string name="tip_search">Searching</string>
 	<string name="tip_search_t">\tYou can search for places directly on the map, or by address, by location, as POI, or as predefined favorite.
 \n\tPressing \'Search\' in the main menu opens the search activities. For all hits a context menu offers 2 options: \'Set as destination\' or \'Show on map\'.</string>
 
 	<string name="tip_map_context_menu">Map Context Menu</string>
-	<string name="tip_map_context_menu_t">\tThe map context menu is available by long pressing on the map or by pressing the trackball button.
-\n\tThis produces a box with point coordinates. To open the map context menu dialog, tap on it. (Or long press on it to hide the box again.)
+	<string name="tip_map_context_menu_t">\tThe map context menu is available by pressing and holding on the map or by pressing the trackball button.
+\n\tThis produces a box with point coordinates. To open the map context menu dialog, tap on it. (Or press and hold on it to hide the box again.)
 \n\tThe map context menu contains all actions referring to a point (location).</string>
 
 	<string name="tip_initial">Tips and Tricks</string>
@@ -390,7 +390,7 @@
 	<string name="previous_button">Previous</string>
 
 	<string name="unit_of_length_descr">Change units of length and speed</string>
-	<string name="unit_of_length">Unit of length</string>
+	<string name="unit_of_length">Unit of measure</string>
 	<string name="si_mi_foots">Miles/feet</string>
 	<string name="si_mi_yard">Miles/yards</string>
 	<string name="si_km_m">Kilometers/meters</string>
@@ -447,9 +447,9 @@
 	<string name="version_index_is_big_for_memory">The index \'\'{0}\'\' did not fit into memory</string>
 	<string name="version_index_is_not_supported">The version of index \'\'{0}\'\' is not supported</string>
 
-	<string name="use_osmand_routing_service">OsmAnd routing >20km</string>
-	<string name="use_osmand_routing_service_descr">Use OsmAnd offline routing for long distances (experimental) instead of fallback to CloudMade</string>
-	<string name="osmand_routing_experimental">OsmAnd offline routing is an experimental feature and it does not work for distances of more than about 20 km.\n\nRouting service is temporarily switched to online CloudMade.</string>
+	<string name="use_osmand_routing_service">OsmAnd navigation >20km</string>
+	<string name="use_osmand_routing_service_descr">Use OsmAnd offline navigation applies only to routes > 20 km (experimental)</string>
+	<string name="osmand_routing_experimental">OsmAnd offline routing is an experimental feature and it does not work for distances of more than about 20 km.\n\nNavigation service is temporarily switched to online CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Can not find specified directory.</string>
 	<string name="application_dir">Storage directory</string>
 	<string name="application_dir_change_warning">Changing the storage directory will not move or delete the data. This must be performed separately and outside OsmAnd. Continue anyway?</string>
@@ -575,13 +575,13 @@
 	<string name="background_service_provider">Location provider</string>
 	<string name="background_router_service_descr">Runs OsmAnd in the background to track your location while screen is off</string>
 	<string name="background_router_service">Run in the background</string>
-	<string name="off_router_service_no_gps_available">The background routing service requires a location source to be turned on.</string>
+	<string name="off_router_service_no_gps_available">The background navigation service requires a location source to be turned on.</string>
 	<string name="hide_poi_filter">Hide filter</string>
 	<string name="show_poi_filter">Show filter</string>
 	<string name="search_poi_filter">Filter</string>
 	<string name="menu_mute_off">Sound is on</string>
 	<string name="menu_mute_on">Sound is off</string>
-	<string name="voice_provider_descr">Select voice guidance for routing</string>
+	<string name="voice_provider_descr">Select voice guidance for navigation</string>
 	<string name="voice_provider">Voice guidance</string>
 	<string name="voice_data_initializing">Initializing voice data&#8230;</string>
 	<string name="voice_data_not_supported">Unsupported version of voice data</string>
@@ -601,8 +601,8 @@
 	<string name="route_head">Head</string>
 	<string name="first_time_continue">Continue</string>
 	<string name="first_time_download">Download regions</string>
-	<string name="first_time_msg">Thank you for choosing OsmAnd. \nTo use all features of the application you need some regional offline data, which you can download (Settings, Offline Data) or prepare yourself. Afterwards, you will be able to search by address, search for POIs, and search for public transport.</string>
-	<string name="search_poi_location">Searching signal&#8230;</string>
+	<string name="first_time_msg">Thank you for choosing OsmAnd. \nTo use the major features of this application, you will need some regional offline data, which you can download (use Settings, Offline Data). Afterwards, you will be able to search by address, look up POIs and find public transportation.</string>
+	<string name="search_poi_location">Searching for signal&#8230;</string>
 	<string name="search_near_map">Search near last map location</string>
 	<string name="search_nearby">Search nearby</string>
 	<string name="map_orientation_default">Same as device</string>
@@ -655,8 +655,8 @@
 	<string name="max_level_download_tile">Max. online zoom</string>
 	<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
 	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
-	<string name="router_service_descr">Choose online or offline routing services</string>
-	<string name="router_service">Routing service</string>
+	<string name="router_service_descr">Choose online or offline navigation service</string>
+	<string name="router_service">Navigation service</string>
 	<string name="sd_dir_not_accessible">Save directory on SD card not accessible</string>
 	<string name="download_question">Download {0} - {1} ?</string>
 	<string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
@@ -703,7 +703,7 @@
 	<string name="close">Close</string>
 	<string name="loading_data">Loading data&#8230;</string>
 	<string name="reading_indexes">Reading local data&#8230;</string>
-	<string name="previous_run_crashed">Previous application run crashed. Log file is at {0}. Please report the issue and attach log file.</string>
+	<string name="previous_run_crashed">Last OsmAnd run crashed. Log file is at {0}. Please report the issue and attach the log file.</string>
 	<string name="saving_gpx_tracks">Saving GPX tracks to SD&#8230;</string>
 	<string name="finished_task">Finished</string>
     <string name="reload_indexes_descr">Re-read offline vector maps and data from SD card</string>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index ce78587496..e9d1acc33e 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -62,10 +62,10 @@
 		<PreferenceCategory android:title="@string/live_monitoring">
 			<CheckBoxPreference android:summary="@string/live_monitoring_descr" android:title="@string/live_monitoring"
 				android:key="live_monitoring"></CheckBoxPreference>
-			<ListPreference android:summary="@string/live_monitoring_interval_descr" android:title="@string/live_monitoring_interval"
-				android:key="live_monitoring_interval"></ListPreference>
 			<EditTextPreference android:summary="@string/live_monitoring_url_descr" android:title="@string/live_monitoring_url"
 				android:key="live_monitoring_url"/>
+			<ListPreference android:summary="@string/live_monitoring_interval_descr" android:title="@string/live_monitoring_interval"
+				android:key="live_monitoring_interval"></ListPreference>
 		</PreferenceCategory>
 	</PreferenceScreen>