diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 1d7912d3d1..737c8255a3 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1896,4 +1896,5 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
 <string name="updates_size">Actualitzacions: %s</string>
     <string name="last_map_change">Darrer canvi del mapa: %s</string>
 <string name="rec_split_storage_size">Mida per l\'emmagatzematge</string>
+    <string name="shared_string_not_selected">No seleccionat</string>
     </resources>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 0fed071782..4f27b9af74 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="poi_shop">Compras</string>
-		<string name="poi_shop_food">Alimentación</string>
+		<string name="poi_shop_food">Tienda de alimentación</string>
 	<string name="poi_emergency">Emergencia</string>
 	<string name="poi_transportation">Transporte</string>
 		<string name="poi_road_obstacle">Obstáculo de carretera</string>
@@ -74,14 +74,14 @@
 	<string name="poi_kiosk">Quiosco</string>
 	<string name="poi_kitchen">Muebles de cocina</string>
 	<string name="poi_medical_supply">Artículos médicos</string>
-	<string name="poi_mobile_phone">Telefonía móvil</string>
+	<string name="poi_mobile_phone">Tienda de telefonía móvil</string>
 	<string name="poi_motorcycle">Motocicletas</string>
 	<string name="poi_musical_instrument">Instrumentos musicales</string>
 	<string name="poi_newsagent">Agencia de noticias</string>
 	<string name="poi_optician">Óptica</string>
 	<string name="poi_organic">Comida orgánica</string>
 	<string name="poi_outdoor">Tienda de actividades al aire libre</string>
-	<string name="poi_paint">Pinturería</string>
+	<string name="poi_paint">Tienda de pintura</string>
 	<string name="poi_pet">Mascotas</string>
 	<string name="poi_photo">Servicio fotográfico</string>
 	<string name="poi_second_hand">Tienda de segunda mano</string>
@@ -93,9 +93,9 @@
 	<string name="poi_variety_store">Bazar</string>
 	<string name="poi_video">Videoclub</string>
 	<string name="poi_department_store">Grandes almacenes</string>
-	<string name="poi_electronics">Electrónicos</string>
+	<string name="poi_electronics">Tienda de electrónica</string>
 	<string name="poi_car">Concesionario de automóviles</string>
-	<string name="poi_car_parts">Autopartes</string>
+	<string name="poi_car_parts">Piezas de automóvil</string>
 	<string name="poi_cosmetics">Cosméticos</string>
 	<string name="poi_marketplace">Mercado</string>
 	<string name="poi_police">Policía</string>
@@ -114,7 +114,7 @@
 	<string name="poi_lift_gate">Barrera levadiza</string>
 	<string name="poi_toll_booth">Peaje</string>
 	<string name="poi_border_control">Control fronterizo</string>
-	<string name="poi_traffic_calming_bump">Resalto (chico)</string>
+	<string name="poi_traffic_calming_bump">Badén (pequeño)</string>
 	<string name="poi_traffic_signals">Semáforo</string>
 
 	<string name="poi_car_repair">Taller mecánico</string>
@@ -133,9 +133,9 @@
 	<string name="poi_compressed_air">Aire comprimido</string>
 	<string name="poi_parking">Aparcamiento</string>
 	<string name="poi_motorcycle_parking">Aparcamiento de motocicletas</string>
-	<string name="poi_public_transport_platform">Andén de transporte público</string>
-	<string name="poi_public_transport_platform_bus">Andén de autobús</string>
-	<string name="poi_public_transport_platform_trolleybus">Andén de trolebús</string>
+	<string name="poi_public_transport_platform">Parada de transporte público</string>
+	<string name="poi_public_transport_platform_bus">Parada de autobús</string>
+	<string name="poi_public_transport_platform_trolleybus">Parada de trolebús</string>
 	<string name="poi_bus_stop">Parada de autobús</string>
 	<string name="poi_public_transport_platform_tram">Andén de tranvía</string>
 	<string name="poi_tram_stop">Parada de tranvía</string>
@@ -187,7 +187,7 @@
 	<string name="poi_observatory">Observatorio</string>
 	<string name="poi_astronomical_observatory">Observatorio astronómico</string>
 	<string name="poi_tower">Torre</string>
-	<string name="poi_mast">Mástil</string>
+	<string name="poi_mast">Poste eléctrico</string>
 	<string name="poi_radar">Radar</string>
 	<string name="poi_construction">Construcción</string>
 	<string name="poi_works">Fábrica</string>
@@ -197,7 +197,7 @@
 	<string name="poi_silo">Silo</string>
 	<string name="poi_college">Instituto</string>
 	<string name="poi_driving_school">Autoescuela</string>
-	<string name="poi_kindergarten">Jardín infantil</string>
+	<string name="poi_kindergarten">Jardín de infancia</string>
 	<string name="poi_school">Escuela</string>
 	<string name="poi_university">Universidad</string>
 
@@ -237,7 +237,7 @@
 	<string name="poi_golf_course">Campo de golf</string>
 	<string name="poi_pitch">Cancha</string>
 	<string name="poi_raceway">Pista de carreras</string>
-	<string name="poi_archery">Arquería</string>
+	<string name="poi_archery">Tiro con arco</string>
 	<string name="poi_american_football">Fútbol americano</string>
 	<string name="poi_australian_football">Fútbol australiano</string>
 	<string name="poi_baseball">Béisbol</string>
@@ -284,11 +284,11 @@
 	<string name="poi_attraction_train">Trencito</string>
 	<string name="poi_hotel">Hotel</string>
 	<string name="poi_guest_house">Casa de huéspedes</string>
-	<string name="poi_hostel">Hostel</string>
+	<string name="poi_hostel">Hostal</string>
 	<string name="poi_motel">Motel</string>
 	<string name="poi_alpine_hut">Cabaña alpina</string>
 	<string name="poi_chalet">Chalé</string>
-	<string name="poi_apartment">Departamento</string>
+	<string name="poi_apartment">Apartamento</string>
 	<string name="poi_place_of_worship">Lugar de culto</string>
 	<string name="poi_religion_christian">Cristianismo</string>
 	<string name="poi_internet_access_wlan">Internet inalámbrico</string>
@@ -387,7 +387,7 @@
 	<string name="poi_bathroom_furnishing">Muebles de baño</string>
 	<string name="poi_carpet">Alfombras</string>
 	<string name="poi_charity">Tienda benéfica</string>
-	<string name="poi_confectionery">Dulcería</string>
+	<string name="poi_confectionery">Confitería</string>
 	<string name="poi_clothes">Tienda de ropa</string>
 	<string name="poi_clothes_children">Ropa infantil</string>
 	<string name="poi_shoes">Zapatería</string>
@@ -444,12 +444,12 @@
 	<string name="poi_tableware">Vajillas</string>
 	<string name="poi_window_blind">Tienda de persianas</string>
 	<string name="poi_atv">Cuatriciclos</string>
-	<string name="poi_fire_flapper">Aleta de fuego</string>
+	<string name="poi_fire_flapper">Batefuegos</string>
 	<string name="poi_fire_water_pond">Estanque de agua contra incendios</string>
 	<string name="poi_ford">Vado</string>
-	<string name="poi_traffic_calming_hump">Resalto (grande)</string>
+	<string name="poi_traffic_calming_hump">badén (grande)</string>
 	<string name="poi_traffic_calming_chicane">Chicana</string>
-	<string name="poi_traffic_calming_table">Peatonal elevada</string>
+	<string name="poi_traffic_calming_table">Plataforma elevada</string>
 	<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>
 	<string name="poi_fuel_lpg">GPL</string>
 	<string name="poi_fuel_1_50">Combustible 1:50</string>
@@ -507,7 +507,7 @@
 	<string name="poi_first_aid">Primeros auxilios</string>
 	<string name="poi_nursing_home">Residencia de ancianos</string>
 	<string name="poi_audiologist">Audiólogo</string>
-	<string name="poi_midwife">Partera</string>
+	<string name="poi_midwife">Matrona</string>
 	<string name="poi_occupational_therapist">Terapeuta ocupacional</string>
 	<string name="poi_optometrist">Optometrista</string>
 	<string name="poi_physiotherapist">Fisioterapeuta</string>
@@ -530,7 +530,7 @@
 	<string name="poi_horse_track">Hipódromo</string>
 	<string name="poi_athletics">Atletismo</string>
 	<string name="poi_base">Salto base</string>
-	<string name="poi_beachvolleyball">Voley playero</string>
+	<string name="poi_beachvolleyball">Voley playa</string>
 	<string name="poi_climbing">Escalada</string>
 	<string name="poi_croquet">Croquet</string>
 	<string name="poi_diving">Buceo</string>
@@ -628,7 +628,7 @@
 	<string name="poi_dry_cleaning">Tintorería</string>
 	<string name="poi_car_sharing">Coche compartido</string>
 	<string name="poi_boat_sharing">Barco compartido</string>
-	<string name="poi_dock">Dársena</string>
+	<string name="poi_dock">Dique</string>
 	<string name="poi_toilets">Baños</string>
 	<string name="poi_internet_cafe">Cibercafé</string>
 
@@ -681,7 +681,7 @@
 	<string name="poi_boules">Bolos</string>
 	<string name="poi_cricket">Críquet</string>
 	<string name="poi_scuba_diving">Submarinismo</string>
-	<string name="poi_handball">Hándbol</string>
+	<string name="poi_handball">Balonmano</string>
 	<string name="poi_pelota">Frontón</string>
 	<string name="poi_roller_skating">Patinaje sobre ruedas</string>
 	<string name="poi_skiing">Esquí</string>
@@ -751,8 +751,8 @@
 	<string name="poi_signal_station_warning">Estación de señales de advertencia</string>
 	<string name="poi_small_craft_facility">Centro para pequeñas embarcaciones</string>
 	<string name="poi_topmark">Tope náutico</string>
-	<string name="poi_seamark_rock">Roca náutica</string>
-	<string name="poi_seamark_wreck">Restos náuticos</string>
+	<string name="poi_seamark_rock">Bajo</string>
+	<string name="poi_seamark_wreck">Pecio</string>
 
 	<string name="poi_military_landuse">Zona militar</string>
 	<string name="poi_military_airfield">Aeródromo militar</string>
@@ -763,7 +763,7 @@
 	<string name="poi_military_naval_base">Base naval militar</string>
 	<string name="poi_military_nuclear_explosion_site">Sitio de explosión nuclear</string>
 <string name="poi_ice_stock">Curling bávaro</string>
-	<string name="poi_stone">Roca sobresaliente</string>
+	<string name="poi_stone">Roca notable</string>
 	<string name="poi_piste">Pista</string>
 	<string name="poi_observation_tower">Torre de observación</string>
 	<string name="poi_bell_tower">Campanario</string>
@@ -845,7 +845,7 @@
 	<string name="poi_scuba_diving_shop">Artículos de buceo</string>
 	<string name="poi_tyres">Neumáticos</string>
 	<string name="poi_energy">Acumulador de energía</string>
-	<string name="poi_watches">Tienda de relojes pulsera</string>
+	<string name="poi_watches">Tienda de relojes de pulsera</string>
 	<string name="poi_swimming_pool_shop">Artículos de piscina</string>
 	<string name="poi_games">Juegos</string>
 	<string name="poi_model">Modelos a escala</string>
@@ -995,7 +995,7 @@
 	<string name="poi_recycling_engine_oil">Aceite de motor</string>
 	<string name="poi_recycling_plastic_bags">Bolsas de plástico</string>
 	<string name="poi_recycling_hazardous_waste">Residuos peligrosos</string>
-	<string name="poi_recycling_mobile_phones">Celulares</string>
+	<string name="poi_recycling_mobile_phones">Teléfonos móviles</string>
 	<string name="poi_recycling_hydrargyrum">Mercurio</string>
 	<string name="poi_recycling_computers">Computadoras</string>
 	<string name="poi_recycling_tyres">Llantas</string>
@@ -1006,19 +1006,19 @@
 	<string name="poi_recycling_waste_oil">Aceite usado</string>
 	<string name="poi_recycling_bottles">Botellas</string>
 	<string name="poi_recycling_cork">Corchos</string>
-	<string name="poi_recycling_printer_cartridges">Cartuchos de impresoras</string>
+	<string name="poi_recycling_printer_cartridges">Cartuchos de impresora</string>
 	<string name="poi_recycling_sheet_metal">Chapas</string>
 	<string name="poi_recycling_foil">Papel de aluminio</string>
 	<string name="poi_recycling_paint">Pintura</string>
 	<string name="poi_recycling_styrofoam">Poliestireno extruído</string>
-	<string name="poi_recycling_drugs">Drogas</string>
+	<string name="poi_recycling_drugs">Medicamentos</string>
 	<string name="poi_recycling_compost">Compost</string>
 	<string name="poi_recycling_christmas_trees">Árboles navideños</string>
 	<string name="poi_recycling_light_bulbs">Bombillas</string>
 	<string name="poi_recycling_polyester">Poliéster</string>
 	<string name="poi_recycling_plasterboard">Cartón yeso</string>
 	<string name="poi_recycling_animal_waste">Residuos de animales</string>
-	<string name="poi_recycling_fridge_and_freezer">Heladeras y congeladores</string>
+	<string name="poi_recycling_fridge_and_freezer">Frigoríficos y congeladores</string>
 	<string name="poi_recycling_furniture">Muebles</string>
 	<string name="poi_recycling_diapers">Pañales</string>
 	<string name="poi_recycling_car_batteries">Baterías de autos</string>
@@ -1038,7 +1038,7 @@
 	<string name="poi_seasonal_summer">Verano</string>
 	<string name="poi_seasonal_autumn">Otoño</string>
 	<string name="poi_seasonal_winter">Invierno</string>
-	<string name="poi_crossing_traffic_signals">Semaforizado</string>
+	<string name="poi_crossing_traffic_signals">Con semáforos</string>
 	<string name="poi_crossing_uncontrolled">No controlado</string>
 	<string name="poi_crossing_unmarked">Desmarcado</string>
 
@@ -1148,7 +1148,7 @@
 	<string name="poi_content_fuel">Contenido: Combustible</string>
 	<string name="poi_content_manure">Contenido: Estiércol</string>
 	<string name="poi_content_wine">Contenido: Vino</string>
-	<string name="poi_content_sewage">Contenido: Aguas negras</string>
+	<string name="poi_content_sewage">Contenido: Aguas residuales</string>
 	<string name="poi_content_gas">Contenido: Gas</string>
 	<string name="poi_content_biomass">Contenido: Biomasa</string>
 	<string name="poi_content_wastewater">Contenido: Aguas residuales</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index a600d49b60..6192d680d8 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1174,7 +1174,7 @@
 \n\nLa lista de países incluidos (¡prácticamente todo el mundo!):
 \n\nAfganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Antillas Holandesas, Arabia Saudita, Argelia, Argentina, Armenia, Aruba, Australia, Austria, Azerbaiyán, Bahamas, Bahrein, Bangladesh, Barbados, Bélgica, Belice, Benín, Bermuda, Bielorrusia, Bolivia, Bonaire, Bosnia y Herzegovina, Botsuana, Brasil, Brunei, Bulgaria, Burkina Faso, Burundi, Bután, Cabo Verde, Camboya, Camerún, Canadá, Chad, Chile, China, Chipre, Colombia, Comoras, Congo, Corea del Norte, Corea del Sur, Costa de Marfil, Costa Rica, Croacia, Cuba, Curazao, Dinamarca, Djibouti, Dominica, Ecuador, Egipto, El Salvador, El Vaticano, Emiratos Árabes Unidos, Eritrea, Eslovaquia, Eslovenia, España, Estados Unidos de América, Estonia, Etiopía, Fiji, Filipinas, Finlandia, Francia, Gabón, Gambia, Georgia, Georgia del Sur, Ghana, Gibraltar, Granada, Grecia, Groenlandia, Guadalupe, Guam, Guatemala, Guayana Francesa, Guernsey, Guinea, Guinea-Bissau, Guinea Ecuatorial, Guyana, Haití, Honduras, Hong Kong, Hungría, India, Indonesia, Irán, Iraq, Irlanda, Isla de Man, Islandia, Islas Vírgenes Británicas, Israel, Italia, Jamaica, Japón, Jersey, Jordania, Kazajstán, Kenya, Kirguistán, Kiribati, Kuwait, Laos, Lesotho, Letonia, Líbano, Liberia, Libia, Liechtenstein, Lituania, Luxemburgo, Macao, Macedonia, Madagascar, Malasia, Malawi, Maldivas, Malí, Malta, Marruecos, Martinica, Mauricio, Mauritania, Mayotte, México, Micronesia, Moldavia, Mónaco, Mongolia, Montenegro, Montserrat, Mozambique, Myanmar, Namibia, Nauru, Nepal, Nicaragua, Níger, Nigeria, Noruega, Nueva Caledonia, Nueva Zelanda, Omán, Países Bajos, Pakistán, Palau, Panamá, Papúa Nueva Guinea, Paraguay, Perú, Polinesia Francesa, Polonia, Portugal, Puerto Rico, Qatar, Reino Unido, República Centroafricana, República Checa, República Dominicana, Ruanda, Rumanía, Rusia, Sahara Occidental, Saint-Barthelemy, Saint Helena, Saint Kitts y Nevis, Samoa, San Marino, San Martin, San Pedro y Miquelón, Santa Lucía, San Vicente y las Granadinas, Senegal, Serbia, Seychelles, Sierra Leona, Singapur, Siria, Somalia, Sri Lanka, Sudáfrica, Sudán, Sudán del Sur, Suecia, Suiza, Suriname, Swazilandia, Tailandia, Taiwán, Tanzania, Tayikistán, Territorio Palestino, Timor Oriental, Togo, Tokelau, Tonga, Trinidad y Tobago, Túnez, Turkmenistán, Turquía, Tuvalu, Ucrania, Uganda, Uruguay, Uzbekistán, Vanuatu, Venezuela, Vietnam, Wallis y Futuna, Yemen, Zambia, Zimbabwe. "</string>
     <string name="map_magnifier">Ampliar el mapa</string>
-    <string name="route_is_too_long">El cálculo de la ruta de OsmAnd sin conexión, puede tardar mucho tiempo (o a veces no funcionar) para puntos separados mayores de 200km. Tal vez quiera añadir destinos intermedios para un mejor rendimiento.</string>
+    <string name="route_is_too_long">El cálculo de la ruta de OsmAnd sin conexión, puede tardar mucho tiempo (o a veces no funcionar) para puntos separados más de 200km. Tal vez quiera añadir destinos intermedios para un mejor rendimiento.</string>
     <string name="auto_zoom_none">Sin acercamiento automático</string>
     <string name="shared_string_remember_my_choice">Recordar mi elección</string>
     <string name="shared_string_and">y</string>
@@ -2029,7 +2029,7 @@
     <string name="rec_split_title">Usar la división de grabación</string>
     <string name="rec_split_desc">Sobrescribir clips al exceder el espacio de almacenamiento utilizado</string>
     <string name="rec_split_clip_length">Duración del clip</string>
-    <string name="rec_split_clip_length_desc">La duración de cada clip grabado, no excederá el tiempo de intervalo establecido</string>
+    <string name="rec_split_clip_length_desc">La duración de cada clip grabado no excederá el tiempo de intervalo establecido</string>
     <string name="rec_split_storage_size_desc">Cantidad de espacio que pueden ocupar todos los clips grabados</string>
     <string name="hourly">Cada hora</string>
     <string name="daily">Diario</string>
diff --git a/OsmAnd/res/values-ku/strings.xml b/OsmAnd/res/values-ku/strings.xml
index 63210215a1..28cdac1c35 100644
--- a/OsmAnd/res/values-ku/strings.xml
+++ b/OsmAnd/res/values-ku/strings.xml
@@ -64,4 +64,5 @@
     <string name="shared_string_or">An Je</string>
     <string name="shared_string_and">û</string>
     <string name="shared_string_edit">Sazkirin</string>
+    <string name="available_maps">Nexeyen kû hane</string>
     </resources>
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index 6464d764ff..cf2957df6f 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -241,4 +241,5 @@
 	<string name="poi_site_type_city">Type: by</string>
 	<string name="poi_site_type_settlement">Type: bosetting</string>
 	<string name="poi_site_type_megalith">Type: megalitt</string>
+	<string name="poi_fountain">Fontene</string>
 	</resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 9ee81e6845..b1d9607b16 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -35,7 +35,7 @@
     <string name="poi_filter_for_tourists">For turister</string>
     <string name="poi_filter_fuel">Drivstoff</string>
     <string name="show_warnings_title">Vis varsler…</string>
-    <string name="show_warnings_descr">Still inn trafikkvarsler (fartsgrenser, tvungne stopp, fartsdumper), fotoboksvarsler og kjørefeltinformasjon</string>
+    <string name="show_warnings_descr">Innstilling av trafikkvarsler (fartsgrenser, tvungne stopp, fartsdumper), fotoboksvarsler og kjørefeltinformasjon</string>
     <string name="use_compass_navigation_descr">Bruk kompass hvis det ikke er mulig med annen retningsfastsettelse</string>
     <string name="use_compass_navigation">Bruk kompass</string>
     <string name="avoid_motorway">Unngå motorveier</string>
@@ -52,7 +52,7 @@
     <string name="map_widget_day_night">Dag/natt-kart</string>
     <string name="map_widget_vector_attributes">Opptegningsattributter</string>
     <string name="map_widget_renderer">Kartstil</string>
-    <string name="layer_map_appearance">Still inn skjerm</string>
+    <string name="layer_map_appearance">Skjerminnstilling</string>
     <string name="show_lanes">Vis kjørefelt</string>
     <string name="avoid_unpaved">Unngå uasfalterte veier</string>
     <string name="avoid_ferries">Unngå ferger</string>
@@ -62,7 +62,7 @@
     <string name="map_widget_show_ruler">Målestokk</string>
 
     <string name="map_widget_top_text">Gatenavn</string>
-    <string name="map_widget_config">Still inn skjerm</string>
+    <string name="map_widget_config">Skjerminnstilling</string>
 
     <string name="map_widget_back_to_loc">Hvor er jeg</string>
     <string name="map_widget_lock_screen">Lås skjerm</string>
@@ -247,7 +247,7 @@
     <string name="button_upgrade_osmandplus">Oppgrader OsmAnd+</string>
     <string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din gjeldende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string>
     <string name="search_position_current_location_search">Søker posisjon…</string>
-    <string name="search_position_current_location_found">Posisjon (funnet)</string>
+    <string name="search_position_current_location_found">Min posisjon (funnet)</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favoritter…</string>
     <string name="search_position_undefined">Udefinert</string>
@@ -298,7 +298,7 @@
     <string name="tts_language_not_supported">Det valgte språket støttes ikke av den installerte Android TTS (tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
     <string name="tts_missing_language_data_title">Manglende data</string>
 	<string name="switch_to_vector_map_to_see">Offline-vektorkart foreligger for dette stedet.
-\n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'.</string>
+\n\t\n\tFor å bruke aktiver \'Meny\' → \'Kartinnstilling\' → \'Kartkilde…\' → \'Offline vektorkart\'.</string>
     <string name="install_more">Installer flere…</string>
 
 
@@ -590,7 +590,7 @@
 
     <string name="announce_gpx_waypoints">GPX-rutepunkter</string>
     <string name="speak_title">Meld om…</string>
-    <string name="speak_descr">Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string>
+    <string name="speak_descr">Innstilling for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string>
     <string name="speak_street_names">Gatenavn (TTS)</string>
     <string name="speak_speed_limit">Fartsgrense</string>
     <string name="speak_cameras">Fotobokser</string>
@@ -736,7 +736,7 @@
     <string name="rendering_category_transport">Transport</string>
     <string name="map_widget_right">Høyre panel</string>
     <string name="map_widget_left">Venstre panel</string>
-    <string name="configure_map">Still inn kart</string>
+    <string name="configure_map">Kartinnstilling</string>
     <string name="osmo_device_not_found">Enhet ikke funnet</string>
     <string name="speed_limit_exceed">Toleranse for fartsgrense</string>
     <string name="text_size_descr">Sett tekststørrelsen på kartet.</string>
@@ -1363,7 +1363,7 @@
     <string name="successfully_uploaded_pattern">Vellykket lastet opp {0}/{1}</string>
     <string name="try_again">Prøv igjen</string>
     <string name="error_message_pattern">Feil: {0}</string>
-    <string name="dahboard_options_dialog_title">Still inn dashbord</string>
+    <string name="dahboard_options_dialog_title">Dashbord-innstilling</string>
     <string name="shared_string_undo">Angre</string>
     <string name="shared_string_skip">Hopp over</string>
     <string name="app_name_osmand">OsmAnd</string>
@@ -1475,10 +1475,20 @@
 	<string name="other_menu_group">Annet</string>
     <string name="instalation_troubleshooting_item">Installering og problemløsing</string>
     <string name="osn_comment_dialog_title">Legg til kommentar</string>
-	<string name="navigation_item_description">Still inn navigering</string>
+	<string name="navigation_item_description">Navigeringsoppsett</string>
     <string name="free_downloads_used_description">Viser de benyttede gratis nedlastingene</string>
 
     <string name="route_distance">Avstand:</string>
     <string name="route_duration">Tid:</string>
     <string name="shared_string_sound">Lyd</string>
+    <string name="available_maps">Tilgjengelige kart</string>
+    <string name="impassable_road_desc">Velg veier du vil unngå under navigering</string>
+    <string name="daily">Daglig</string>
+    <string name="weekly">Ukentlig</string>
+    <string name="hourly">Hver time</string>
+    <string name="last_map_change">Siste kartendring: %s</string>
+    <string name="last_update">Siste oppdatering: %s</string>
+    <string name="update_time">Oppdateringstidspunkt</string>
+    <string name="updates_size">Oppdateringsstørrelse</string>
+    <string name="update_now">Oppdater nå</string>
     </resources>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 69fecbcaf3..221cef516d 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -99,15 +99,15 @@
   
   <string name="update_poi_does_not_change_indexes">Wijzigingen aan interessepunten hebben geen invloed op de gedownloade kaartbestanden, maar worden opgeslagen in een lokaal bestand.</string>
   <string name="local_openstreetmap_uploading">Uploaden…</string>
-  <string name="local_openstreetmap_were_uploaded">{0} Interessepunten/Notities zijn ge-upload</string>
+  <string name="local_openstreetmap_were_uploaded">"{0} Interessepunten/Opmerkingen  zijn ge-upload"</string>
   <string name="local_openstreetmap_uploadall">Upload alle</string>
   
   
   <string name="local_openstreetmap_upload">Upload wijziging naar OSM</string>
   <string name="local_openstreetmap_delete">Wis de wijziging</string>
   <string name="local_openstreetmap_descr_title">OpenStreetMap asynchroon wijzigen:</string>
-  <string name="local_openstreetmap_settings">Lokaal opgeslagen OSM Interessepunten/Notities</string>
-  <string name="local_openstreetmap_settings_descr">Beheer OSM Interessepunten/Notities die lokaal zijn bewaard</string>
+  <string name="local_openstreetmap_settings">Lokaal opgeslagen OSM-Interessepunten/Opmerkingen</string>
+  <string name="local_openstreetmap_settings_descr">"Beheer OSM-Interessepunten/Opmerkingen  die lokaal zijn bewaard"</string>
   
   
   <string name="live_monitoring_interval_descr">Specificeer interval voor online tracking</string>
@@ -337,7 +337,7 @@
   <string name="send_location_sms_pattern">Locatie: %1$s\n%2$s</string>
   <string name="send_location_email_pattern">Om de locatie te zien: volg de weblink %1$s of android intent link %2$s</string>
   <string name="send_location">Stuur locatie</string>
-  <string name="context_menu_item_share_location">Deel locatie</string>
+  <string name="context_menu_item_share_location">Deel Locatie</string>
   <string name="add_waypoint_dialog_added">GPX-routepunt \'\'{0}\'\' succesvol toegevoegd</string>
   <string name="add_waypoint_dialog_title">Voeg routepunt toe aan de opgenomen GPX-track</string>
   <string name="context_menu_item_add_waypoint">Opslaan als routepunt in GPX-track</string>
@@ -415,7 +415,7 @@
   <string name="continuous_rendering">Continue kaartgeneratie</string>
   <string name="continuous_rendering_descr">Continue kaartgeneratie inplaats van eenmalige generatie van de hele kaart</string>
   <string name="rendering_exception">Fout opgetreden bij kaartgeneratie van het geselecteerde gebied</string>
-  <string name="show_point_options">Gebruik locatie…</string>
+  <string name="show_point_options">Gebruik Locatie…</string>
   <string name="renderer_load_sucess">Kaartgenerator succesvol geladen</string>
   <string name="renderer_load_exception">Fout opgetreden: kaartgenerator niet geladen</string>
   <string name="renderers">Kaartstijl</string>
@@ -445,8 +445,8 @@
   <string name="transport_context_menu">Zoek Openbaar Vervoer op halte</string>
   
   
-  <string name="poi_context_menu_modify">Wijzig interessepunt</string>
-  <string name="poi_context_menu_delete">Verwijder interessepunt</string>
+  <string name="poi_context_menu_modify">Wijzig Interessepunt</string>
+  <string name="poi_context_menu_delete">Verwijder Interessepunt</string>
   <string name="rotate_map_compass_opt">Volgens kompas</string>
   <string name="rotate_map_bearing_opt">In beweegrichting</string>
   <string name="rotate_map_none_opt">Niet roteren (noorden boven)</string>
@@ -472,7 +472,7 @@
   <string name="layer_poi">Interessepunt…</string>
   <string name="layer_map">Kaartbron…</string>
   <string name="menu_layers">Kaartlagen</string>
-  <string name="context_menu_item_search_poi">Zoek interessepunt</string>
+  <string name="context_menu_item_search_poi">Zoek Interessepunt</string>
   
   <string name="use_trackball_descr">Gebruik trackball om de kaart te verschuiven</string>
   <string name="use_trackball">Gebruik trackball</string>
@@ -657,12 +657,12 @@
   <string name="map_view_3d_descr">Activeer 3D kaartbeeld</string>
   <string name="map_view_3d">Kaartbeeld 3D</string>
   <string name="show_poi_over_map_description">Toon interessepunten op kaart (met laatst gebruikte filter)</string>
-  <string name="show_poi_over_map">Toon interessepunten</string>
+  <string name="show_poi_over_map">Toon Interessepunten</string>
   <string name="map_tile_source_descr">Kies de bron van online of offline kaartsegmenten</string>
   <string name="map_tile_source">Kaartsegment bron</string>
   <string name="map_source">Kaartbron</string>
   <string name="use_internet">Gebruik internet</string>
-  <string name="show_location">Toon je positie</string>
+  <string name="show_location">Toon Huidige Positie</string>
   
   
   <string name="show_gps_coordinates_text">Toon GPS-coördinaten op kaart</string>
@@ -729,11 +729,11 @@
   
   
   
-  <string name="poi_edit_title">Bewerk interessepunt</string>
+  <string name="poi_edit_title">Bewerk Interessepunt</string>
   <string name="poi_create_title">OSM-Interessepunt aanmaken</string>
   <string name="poi_error_poi_not_found">Punt niet gevonden of voorziening is niet een enkel punt</string>
   <string name="poi_remove_confirm_template">Verwijderen {0} (geef commentaar)?</string>
-  <string name="poi_remove_title">Verwijder interessepunt</string>
+  <string name="poi_remove_title">Verwijder Interessepunt</string>
   <string name="poi_remove_success">Interessepunt is verwijderd</string>
   <string name="poi_action_add">voeg toe</string>
   <string name="poi_action_change">wijzigen</string>
@@ -784,14 +784,14 @@
   <string name="osm_editing_plugin_description">Gebruik deze plugin om bij te dragen aan OpenStreetMap (OSM), bijvoorbeeld door het aanmaken of wijzigen van OSM-interessepunten, aanmaken of becommentariëren van OSM-opmerkingen, en door GPX-tracks te uploaden. OSM is een wereldwijd community-driven project om een wereldwijde kaart te maken. Voor details zie http://openstreetmap.org. Actieve deelnemers zijn welkom, en bijdragen kunnen direct vanuit OsmAnd worden gemaakt, zodra uw OSM-aanmeldgegevens zijn ingevuld in de app.</string>
   <string name="north_north_west">noordnoordwest</string>
   <string name="search_position_current_location_search">Positie zoeken…</string>
-  <string name="search_position_current_location_found">Mijn positie (gevonden)</string>
+  <string name="search_position_current_location_found">Huidige Positie (gevonden)</string>
   <string name="search_position_address">Adres…</string>
   <string name="search_position_favorites">Favorieten…</string>
   <string name="search_position_undefined">Ongedefinieerd</string>
   
   <string name="local_index_routing_data">Navigatiedata</string>
   <string name="navigate_point_format">Formaat</string>
-  <string name="poi_search_desc">Zoek interessepunt (POI)</string>
+  <string name="poi_search_desc">Zoek Interessepunt (POI)</string>
   <string name="address_search_desc">Adres zoeken</string>
   <string name="navpoint_search_desc">Coördinaten</string>
   <string name="transport_search_desc">Openbaar Vervoer zoeken</string>
@@ -1456,7 +1456,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>
@@ -1746,7 +1746,7 @@
 	<string name="shared_string_control_start">Start</string>
 	<string name="shared_string_control_stop">Stop</string>
 	<string name="shared_string_import">Importeer</string>
-	<string name="shared_string_export">Exporteer</string>
+	<string name="shared_string_export">Export naar OSM</string>
 	<string name="shared_string_more">Meer…</string>
 	<string name="shared_string_more_actions">Meer acties</string>
 	<string name="shared_string_do_not_show_again">Toon niet meer</string>
@@ -1796,7 +1796,7 @@
     <string name="general_settings_2">Algemene instellingen</string>
 	<string name="shared_string_clear_all">Wis alles</string>
 	<string name="shared_string_collapse">Inklappen</string>
-	<string name="shared_string_my_location">Mijn positie</string>
+	<string name="shared_string_my_location">Huidige Positie</string>
 	<string name="shared_string_my_favorites">Favorieten</string>
 	<string name="shared_string_my_tracks">GPX-tracks</string>
 	<string name="shared_string_currently_recording_track">Huidige GPX-track</string>
@@ -1851,7 +1851,7 @@
     <string name="rendering_value_disabled_name">Uitgeschakeld</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Kleuren naar afstandscategorie</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Kleuring volgens OSMC</string>
-    <string name="osmo_share_my_location">Deel mijn positie</string>
+    <string name="osmo_share_my_location">Deel Huidige Positie</string>
     <string name="shared_string_logoff">Uitloggen</string>
     <string name="gps_network_not_enabled">Locatiedienst is niet ingeschakeld. Wil je ze aanzetten?</string>
     <string name="read_full_article">Lees volledig artikel (online)</string>
@@ -1963,13 +1963,13 @@
     <string name="simulate_your_location_stop_descr">Stop simulatie</string>
     <string name="simulate_your_location_descr">Routesimulatie met de berekende route of een GPX-track</string>
     <string name="av_locations_descr">GPX-bestand met Audio/Video-notities</string>
-    <string name="av_locations">Locaties</string>
+    <string name="av_locations">Locaties van geselecteerde AV-Notities</string>
     <string name="plugin_settings">Plugins</string>
 	<string name="routing_attr_avoid_shuttle_train_name">Vermijd autotreinen</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Vermijd autotreinen</string>
     <string name="shared_string_wikipedia">Wikipedia</string>
     <string name="share_geo">geo:</string>
-    <string name="share_menu_location">Deel locatie</string>
+    <string name="share_menu_location">Deel Locatie</string>
     <string name="shared_string_send">Verzenden</string>
     <string name="osmand_running_in_background">Op achtergrond actief</string>
     <string name="shared_string_qr_code">QR-code</string>
@@ -2064,7 +2064,7 @@
     <string name="lang_mk">Macedonisch</string>
     <string name="lang_fy">Fries</string>
     <string name="lang_als">Toskisch (Albanees)</string>
-    <string name="shared_string_location">Locatie</string>
+    <string name="shared_string_location">Coördinaten</string>
     <string name="osm_edit_modified_poi">Gewijzigde OSM POI</string>
     <string name="osm_edit_deleted_poi">Gewiste OSM POI</string>
     <string name="context_menu_item_open_note">OSM-Opmerking aanmaken</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 8533131380..6f664dcd40 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -38,7 +38,7 @@
   
   <string name="poi_filter_nominatim">Nominatim Online</string>
   <string name="search_position_current_location_search">Ustalanie pozycji…</string>
-  <string name="search_position_current_location_found">Pozycja (ustalona)</string>
+  <string name="search_position_current_location_found">Moja pozycja (ustalona)</string>
   <string name="search_position_address">Adres…</string>
   <string name="search_position_favorites">Ulubione…</string>
   <string name="search_position_undefined">Niezdefiniowane</string>
@@ -2100,4 +2100,5 @@
     <string name="last_update">Ostatnia aktualizacja: %s</string>
     <string name="update_time">Czas aktualizacj</string>
     <string name="updates_size">Aktualizacje: %s</string>
+    <string name="last_map_change">Ostatnia zmiana mapy: %s</string>
     </resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index e21e322388..bcd3f8b049 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1226,7 +1226,7 @@
 	<string name="map_version_changed_info">Servidor contém arquivos de mapa incompatíveis com sua versão atual do Osmand. Para baixar e usá-los, por favor atualize o Osmand para a versão mais recente.</string>
 	<string name="poi_filter_nominatim">Nominatim on-line</string>
 	<string name="search_position_current_location_search">Procurando posição…</string>
-	<string name="search_position_current_location_found">Posição (encontrada)</string>
+	<string name="search_position_current_location_found">Minha Posição (encontrada)</string>
 	<string name="search_position_address">Endereço…</string>
 	<string name="search_position_favorites">Favoritos…</string>
 	<string name="search_position_undefined">Indefinido</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 2ef5b5e4d9..f48de83636 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -747,4 +747,19 @@
     <string name="rec_split_storage_size_desc">Величина заузећа свих снимљених одсечака</string>
     <string name="Night">Ноћ</string>
 <string name="shared_string_go">Иди</string>
+    <string name="shared_string_not_selected">Није означено</string>
+    <string name="osmand_parking_hour">h</string>
+    <string name="osmand_parking_minute">min</string>
+    <string name="traffic_warning_calming">Смиривање саобраћаја</string>
+    <string name="way_alarms">Упозорења о гужвама у саобраћају</string>
+    <string name="background_service_is_enabled_question">Позадинске услуге Османда и даље дејствују. Да ли желите да и њих прекинете?</string>
+    <string name="sleep_mode_stop_dialog">Да ли прекинути рад позадинског ГПС-а?</string>
+    <string name="stop_navigation_service">Прекини</string>
+    <string name="confirm_every_run">Увек питај</string>
+    <string name="save_global_track_interval_descr">Изаберите међувреме пријаве ради снимања путања (које су омогућене пријавом преко справице ГПИкс-а на карти)</string>
+    <string name="save_global_track_interval">Међувреме опште пријаве</string>
+    <string name="background_service_int">Међувреме буђења ГПИкс-а</string>
+    <string name="enable_sleep_mode">Омогући рад у позадини ГПИкс-а</string>
+    <string name="save_track_to_gpx_globally">Уписуј путању у датотеку ГПИкс-а</string>
+    <string name="save_track_to_gpx_globally_headline">Праћење путање по захтеву</string>
     </resources>
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
index 68319378f3..8959e1bd9a 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
@@ -75,7 +75,9 @@ public abstract class MenuTitleController {
 		MenuController menuController = getMenuController();
 		if (menuController != null && menuController.needStreetName()) {
 			// Display "Looking up address..." status
-			if (searchingAddress) {
+			//if (searchingAddress) {
+			// Again here searchingAddress does not work for case of search interrupted by new searcj, so:
+			if (Algorithms.isEmpty(streetStr)) {
 				return addressNotKnownStr;
 			} else {
 				return streetStr;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index 249104eee4..302b24ee42 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -291,7 +291,11 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 
 		ImageView fromIcon = (ImageView) parentView.findViewById(R.id.fromIcon);
 		ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
-		fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
+		if (targets.getPointToStart() == null) {
+			fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
+		} else {
+			fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_marker_dark, isLight()));
+		}
 
 		ImageView fromDropDownIcon = (ImageView) parentView.findViewById(R.id.fromDropDownIcon);
 		fromDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_arrow_drop_down, isLight()));