diff --git a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
index 16f6e5bf12..29172cc0db 100644
--- a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
+++ b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
@@ -1,6 +1,8 @@
 package net.osmand.util;
 
 import java.net.URI;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -82,15 +84,15 @@ public class GeoPointParserUtil {
 
 		// google calendar
 		// geo:0,0?q=760 West Genesee Street Syracuse NY 13204
-		String qstr = "q=760 West Genesee Street Syracuse NY 13204";
-		url = "geo:0,0?" + qstr;
+		String qstr = "760 West Genesee Street Syracuse NY 13204";
+		url = "geo:0,0?q=" + qstr;
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse("geo", url);
-		assertGeoPoint(actual, new GeoParsedPoint(qstr.replaceAll("\\s+", "+")));
+		assertGeoPoint(actual, new GeoParsedPoint(qstr));
 
 		// geo:0,0?z=11&q=1600+Amphitheatre+Parkway,+CA
-		qstr = "q=1600+Amphitheatre+Parkway,+CA";
-		url = "geo:0,0?z=11&" + qstr;
+		qstr = "1600 Amphitheatre Parkway, CA";
+		url = "geo:0,0?z=11&q=" + URLEncoder.encode(qstr);
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse("geo", url);
 		assertGeoPoint(actual, new GeoParsedPoint(qstr));
@@ -341,7 +343,7 @@ public class GeoPointParserUtil {
 
 	/**
 	 * Parses geo and map intents:
-	 * 
+	 *
 	 * @param scheme
 	 *            The intent scheme
 	 * @param uri
@@ -461,48 +463,79 @@ public class GeoPointParserUtil {
 			return null;
 		}
 		if ("geo".equals(scheme) || "osmand.geo".equals(scheme)) {
-			final String schemeSpecific = data.getSchemeSpecificPart();
+			String schemeSpecific = data.getSchemeSpecificPart();
 			if (schemeSpecific == null) {
 				return null;
 			}
-			if (schemeSpecific.startsWith("0,0?")) {
-				// geo:0,0?q=34.99,-106.61(Treasure Island)
-				// geo:0,0?z=11&q=34.99,-106.61(Treasure Island)
-				String query = schemeSpecific.substring("0,0?".length());
-				final String pattern = "(?:z=(\\d{1,2}))?&?q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)[\\+]?(?:\\((.+?)\\))?";
-				final Matcher matcher = Pattern.compile(pattern).matcher(query);
-				if (matcher.matches()) {
-					final String z = matcher.group(1);
-					final String name = matcher.group(4);
-					final int zoom = z != null ? Integer.parseInt(z) : GeoParsedPoint.NO_ZOOM;
-					final double lat = Double.parseDouble(matcher.group(2));
-					final double lon = Double.parseDouble(matcher.group(3));
-					return new GeoParsedPoint(lat, lon, zoom, name);
-				} else {
-					// geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA
-					if (query.contains("z="))
-						query = query.substring(query.indexOf("&") + 1);
-					return new GeoParsedPoint(query);
-				}
-			} else {
-				// geo:47.6,-122.3
-				// geo:47.6,-122.3?z=11 (Treasure Island)
-				final String pattern = "([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:(?:\\?z=(\\d{1,2}))?|(?:\\?q=.*?)?)[\\+]?(?:\\((.*?)\\))?";
-				final Matcher matcher = Pattern.compile(pattern).matcher(schemeSpecific);
-				if (matcher.matches()) {
-					final double lat = Double.valueOf(matcher.group(1));
-					final double lon = Double.valueOf(matcher.group(2));
-					final String name = matcher.group(4);
-					int zoom = matcher.group(3) != null ? Integer.parseInt(matcher.group(3)) : GeoParsedPoint.NO_ZOOM;
-					if (zoom != GeoParsedPoint.NO_ZOOM) {
-						return new GeoParsedPoint(lat, lon, zoom, name);
-					} else {
-						return new GeoParsedPoint(lat, lon, name);
-					}
-				} else {
-					return null;
+
+			String name = null;
+			final Pattern namePattern = Pattern.compile("[\\+\\s]*\\((.*)\\)[\\+\\s]*$");
+			final Matcher nameMatcher = namePattern.matcher(schemeSpecific);
+			if (nameMatcher.find()) {
+				name = URLDecoder.decode(nameMatcher.group(1));
+				if (name != null) {
+					schemeSpecific = schemeSpecific.substring(0, nameMatcher.start());
 				}
 			}
+
+			String positionPart;
+			String queryPart = "";
+			int queryStartIndex = schemeSpecific.indexOf('?');
+			if (queryStartIndex == -1) {
+				positionPart = schemeSpecific;
+			} else {
+				positionPart = schemeSpecific.substring(0, queryStartIndex);
+				if (queryStartIndex < schemeSpecific.length())
+					queryPart = schemeSpecific.substring(queryStartIndex + 1);
+			}
+
+			final Pattern positionPattern = Pattern.compile(
+					"([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)");
+			final Matcher positionMatcher = positionPattern.matcher(positionPart);
+			if (!positionMatcher.find()) {
+				return null;
+			}
+			double lat = Double.valueOf(positionMatcher.group(1));
+			double lon = Double.valueOf(positionMatcher.group(2));
+
+			int zoom = GeoParsedPoint.NO_ZOOM;
+			String searchRequest = null;
+			for (String param : queryPart.split("&")) {
+				String paramName;
+				String paramValue = null;
+				int nameValueDelimititerIndex = param.indexOf('=');
+				if (nameValueDelimititerIndex == -1) {
+					paramName = param;
+				} else {
+					paramName = param.substring(0, nameValueDelimititerIndex);
+					if (nameValueDelimititerIndex < param.length())
+						paramValue = param.substring(nameValueDelimititerIndex + 1);
+				}
+
+				if ("z".equals(paramName) && paramValue != null) {
+					zoom = Integer.parseInt(paramValue);
+				} else if ("q".equals(paramName) && paramValue != null) {
+					searchRequest = URLDecoder.decode(paramValue);
+				}
+			}
+
+			if (searchRequest != null) {
+				final Matcher positionInSearchRequestMatcher =
+						positionPattern.matcher(searchRequest);
+				if (lat == 0.0 && lon == 0.0 && positionInSearchRequestMatcher.find()) {
+					lat = Double.valueOf(positionInSearchRequestMatcher.group(1));
+					lon = Double.valueOf(positionInSearchRequestMatcher.group(2));
+				}
+			}
+
+			if (lat == 0.0 && lon == 0.0 && searchRequest != null) {
+				return new GeoParsedPoint(searchRequest);
+			}
+
+			if (zoom != GeoParsedPoint.NO_ZOOM) {
+				return new GeoParsedPoint(lat, lon, zoom, name);
+			}
+			return new GeoParsedPoint(lat, lon, name);
 		}
 		return null;
 	}
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index b19960a90f..c6bf7bdd8a 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -140,7 +140,7 @@
     <string name="targets">Celі</string>
     <string name="announce_gpx_waypoints">Ahalošvać maršrutnyja punkty GPX</string>
     <string name="download_additional_maps">Spampavać mapy, što adsutnіčajuć, %1$s (%2$d MB)?</string>
-    <string name="more">Boĺš...</string>
+    <string name="more">Boĺš…</string>
     <string name="rendering_value_browse_map_name">Prahliad mapy</string>  
     <string name="rendering_value_car_name">Aŭtamabіĺ</string>
     <string name="rendering_value_bicycle_name">Rovar</string>
@@ -309,7 +309,7 @@
     <string name="osmo_tracker_id">Piersanaĺny ID trekiera</string>
     <string name="osmo_tracker_id_descr">Nacіsnіcie, kab pahliadzieć cі padzialіcca іdentyfіkataram trekiera.          Vykarystańnie іdentyfіkatara trekiera zviazanaha z prystasavańniem dasć mahčymasć kantraliavać usie pieramiaščeńnі hetaha prystasavańnia! Dlia adkliučeńnia vybierycie opcyju pierastvareńnia.</string>
     <string name="osmo_session_token">Tokien siesіі: %1$s</string>
-    <string name="osmo_auth_pending">U čakańnі dazvolu...</string>
+    <string name="osmo_auth_pending">U čakańnі dazvolu…</string>
     <string name="osmo_locations_sent">"Miescaznachodžańnie adaslana %1$d (u bufiery %2$d) "</string>
     <string name="osmo_conn_successfull">"Zlučeńnie ŭstanoŭliena: %1$s "</string>
     <string name="osmo_io_error">"Prabliema z padkliučeńniem OsMo: "</string>
@@ -412,7 +412,7 @@
 	<string name="routing_attr_weight_description">Zadajcie vahu aŭtamabіlia dlia prakladańnia maršrutaŭ</string>
     <string name="android_19_location_disabled">Z viersіі 4.4 Android (KitKat) vy nia možacie zahružać і abnaŭliać mapu ŭ papiarednіm katalohu zachoŭvańnia (%s). Vy chočacie źmianіć kataloh na dazvolieny і skapіjavać usie fajly OsmAnd tudy?\n Zaŭvaha 1: Vašy staryja fajly zastanucca niekranutymі (vy možacie vydalіć іch samastojna).         
 \n Zaŭvaha 2: U novym miescy zachoŭvańnia budzie niemahčyma adnačasova vykarystoŭvać fajly ŭ OsmAnd і OsmAnd+.</string>
-    <string name="copying_osmand_one_file_descr">Kapіravańnie fajla (%s) u novaje miesca...</string>
+    <string name="copying_osmand_one_file_descr">Kapіravańnie fajla (%s) u novaje miesca…</string>
     <string name="copying_osmand_files_descr">Kapіjavańnie dadzienych OsmAnd u novaje miesca (%s)</string>
     <string name="copying_osmand_files">Kapіjavańnie dadzienych OsmAnd</string>
     <string name="calculate_osmand_route_gpx">Raźlіčyć pazasiecіŭny maršrut OsmAnd</string>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index c82e9cfbac..8ed6c0335a 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -607,4 +607,14 @@
 	<string name="poi_suburb">Прыгарад</string>
 	<string name="poi_neighbourhood">Ваколіцы</string>
 	<string name="poi_dock">Док</string>
+	<string name="poi_motorway_junction">Дарожная разьвязка</string>
+
+	<string name="poi_amusement_ride">Атракцыён</string>
+	<string name="poi_attraction_animal">Жывёла (атракцыён)</string>
+	<string name="poi_roller_coaster">Амэрыканскія горкі</string>
+	<string name="poi_slide">Жолаб</string>
+	<string name="poi_summer_toboggan">Летнія сані</string>
+	<string name="poi_seamark_rock">Скала</string>
+	<string name="poi_seamark_dry_dock">Сухі док</string>
+	<string name="poi_seamark_floating_dock">Плывучы док</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 81933f4919..d02c177aaf 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1348,7 +1348,7 @@
 \n Nota 1: Els vostres arxius obsolets  quedaran intactes (els podeu esborrar manualment).
 \n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir arxius entre l\'OsmAnd i l\'OsmAnd+."</string>
     <string name="application_dir_change_warning2">Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació? Indiqueu «No» i l\'OsmAnd crearà i utilitzarà una carpeta nova.</string>
-    <string name="copying_osmand_one_file_descr">S\'està copiant el fitxer (%s) a la nova destinació...</string>
+    <string name="copying_osmand_one_file_descr">S\'està copiant el fitxer (%s) a la nova destinació…</string>
     <string name="copying_osmand_files_descr">S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)</string>
     <string name="copying_osmand_files">S\'estan copiant fitxers de dades de l\'OsmAnd</string>
     <string name="calculate_osmand_route_gpx">Calcula una ruta fora de línia amb l\'OsmAnd</string>
@@ -1402,10 +1402,10 @@
 	\n\t* Entrada ràpida en la recerca d\'adreça
 	\n\t* Errors corregits de càlcul de rutes i visualització
     </string>
-    <string name="select_gpx">Selecciona una traça GPX …</string>
+    <string name="select_gpx">Selecciona una traça GPX…</string>
     <string name="route_descr_select_destination">Selecciona un destí</string>
-    <string name="route_descr_select_on_map">Selecciona al mapa …</string>
-    <string name="route_descr_favorite">Preferida …</string>
+    <string name="route_descr_select_on_map">Selecciona al mapa…</string>
+    <string name="route_descr_favorite">Preferida…</string>
     <string name="route_preferences">Preferències de ruta</string>
     <string name="route_info">Informació de ruta</string>
     <string name="tip_recent_changes_1_3_t">Canvis a la 1.3:
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index ed8fc85f0d..18a464cbe3 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1467,7 +1467,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="android_19_location_disabled">Depuis Android 4.4 (KitKat), vous ne pouvez plus télécharger et mettre à jour les cartes dans le dossier (%s) utilisé jusqu\'à présent. Voulez-vous utiliser le nouveau dossier et y copier l\'ensemble des fichiers OsmAnd ?
 \n Note 1 : Les anciens fichiers seront conservés (mais vous pouvez les supprimer manuellement)\n Note 2 : En raison de ce nouveau dossier de stockage, il ne sera plus possible de partager des fichiers entre OsmAnd et OsmAnd+.</string>
     <string name="application_dir_change_warning2">Souhaitez-vous qu\'OsmAnd copie aussi ses données vers la nouvelle destination ? (choisissez \'Non\' pour qu\'OsmAnd crée et utilise un nouveau dossier vierge)</string>
-    <string name="copying_osmand_one_file_descr">Copie des fichiers (%s) vers la nouvelle destination...</string>
+    <string name="copying_osmand_one_file_descr">Copie du fichier (%s) vers le nouvel emplacement…</string>
     <string name="copying_osmand_files_descr">Copie des fichiers de données OsmAnd vers la nouvelle destination (%s)</string>
     <string name="copying_osmand_files">Copie des fichiers de données OsmAnd</string>
     <string name="calculate_osmand_route_gpx">Calcul de la route OsmAnd hors-ligne</string>
@@ -1488,7 +1488,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="routing_attr_weight_description">Spécifier la limite de poids devant être autorisée sur les routes</string>
     <string name="select_gpx">Sélectionner GPX…</string>
     <string name="route_descr_select_destination">Sélectionnez la destination</string>
-    <string name="route_descr_select_on_map">Sélectionnez sur la carte…</string>
+    <string name="route_descr_select_on_map">Sélectionner sur la carte…</string>
     <string name="route_descr_favorite">Favori…</string>
     <string name="route_preferences">Préférences d\'itinéraire</string>
     <string name="route_info">Informations sur l\'itinéraire</string>
@@ -1696,7 +1696,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="gpx_available_current_track">Trace en cours d\'enregistrement</string>
     <string name="gpx_wpt">Point de passage</string>
     <string name="map_widget_plain_time">Heure actuelle</string>
-    <string name="loading_smth">Chargement de %1$s …</string>
+    <string name="loading_smth">Chargement de %1$s…</string>
     <string name="save_as_favorites_points">Enregistrer comme groupe de favoris</string>
     <string name="select_destination_and_intermediate_points">Sélectionnez les points de passage</string>
     <string name="layer_amenity_label">Libellés de point</string>
@@ -1784,7 +1784,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="rendering_value_car_name">Voiture</string>
     <string name="rendering_value_bicycle_name">Vélo</string>
     <string name="rendering_value_pedestrian_name">Piéton</string>
-    <string name="more">Plus...</string>
+    <string name="more">Plus…</string>
     <string name="download_additional_maps">Télécharger les cartes manquantes %1$s (%2$d Mo) ?</string>
     <string name="flat_list_waypoitns">Tous</string>
     <string name="waypoints">Points de passage</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index e8afde2d9e..226f9f4a41 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -127,7 +127,7 @@
 	<string name="settings_preset_descr">각 프로필마다 맵뷰어 와 라우팅 설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
 	
 	
-	<string name="routing_settings">운행 (라우팅)</string>
+	<string name="routing_settings">운행</string>
 	<string name="routing_settings_descr">라우팅을 위한 옵션을 설정합니다</string>
 	<string name="global_settings">일반 설정</string>
 	<string name="index_settings">지도 관리</string>
@@ -215,7 +215,7 @@
 	</string>
 	<string name="file_can_not_be_renamed">파일 이름을 바꿀 수 없습니다.</string>
 	<string name="file_with_name_already_exists">같은 이름을 가진 파일이 이미 존재합니다.</string>
-	<string name="gpx_navigation">GPX 운행 경로</string>
+	<string name="gpx_navigation">GPX 경로</string>
 	<string name="poi_query_by_name_matches_categories">이름으로 검색한 POI에 해당하는 몇몇 카테고리를 찾았습니다 :</string>
 	<string name="data_to_search_poi_not_available">검색한 POI에 대한 로컬 데이터가 존재하지 않습니다.</string>
 	<string name="poi_filter_by_name">이름으로 검색</string>
@@ -338,7 +338,7 @@
 	<string name="choose_audio_stream">음성 안내 출력</string>
 	<string name="choose_audio_stream_descr">음성 안내를 재생할 채널을 선택합니다 (시스템 의존)</string>
 	<string name="voice_stream_voice_call">음성 호출 오디오</string>
-	<string name="voice_stream_notification">알림 오디오</string>
+	<string name="voice_stream_notification">오디오 알림</string>
 	<string name="voice_stream_music">미디어/음악 오디오</string>
 	<string name="warning_tile_layer_not_downloadable">OsmAnd 앱이 계층 지도 %1$s 를 다운로드할 수 없으니, 재설치 하세요.</string>
 	<string name="overlay_transparency_descr">오버레이 맵 투명도를 수정합니다</string>
@@ -756,9 +756,9 @@
     <string name="save_current_track_descr">현재 트랙을 SD 카드에 저장합니다</string>
     <string name="save_current_track">현재 트랙을 GPX 파일로 저장</string>
     <string name="save_track_interval_descr">운행하는 동안 트랙 레코딩을 저장하는 로깅 간격을 선택합니다</string>
-    <string name="save_track_interval">운행하는 로깅 간격</string>
+    <string name="save_track_interval">운행중 로깅 간격</string>
     <string name="save_track_to_gpx_descrp">운행하는 동안 트랙을 GPX파일로 저장합니다</string>
-    <string name="save_track_to_gpx">운행하는 동안 트랙을 GPX파일로 저장</string>
+    <string name="save_track_to_gpx">운행하는 동안 트랙을 GPX파일로 기록</string>
     <string name="update_tile">맵 업데이트</string>
     <string name="reload_tile">타일 재로드</string>
     <string name="mark_point">목적지</string>
@@ -792,7 +792,7 @@
     <string name="settings_activity">설정</string>
     <string name="show_gps_coordinates_text">지도에 GPS 좌표 표시</string>
     <string name="use_internet_to_download_tile">누락된 맵 타일을 다운로드하기 위해 인터넷을 사용합니다</string>
-    <string name="app_description">운행 (라우팅) 앱</string>
+    <string name="app_description">운행 앱</string>
 
 <string name="exit_Button">종료</string>
 <string name="map_Button">지도</string>
@@ -943,7 +943,7 @@
     <string name="gpx_option_calculate_first_last_segment">첫번째와 마지막 경로 구간 계산</string>
     <string name="use_displayed_track_for_navigation">운행을 위해 맵뷰어에 표시된 경로를 사용하시겠습니까?</string>
     <string name="keep_and_add_destination_point">목적지로 추가</string>
-    <string name="select_gpx">GPX파일 선택…</string>
+    <string name="select_gpx">GPX 선택…</string>
     <string name="route_descr_select_destination">목적지 선택</string>
     <string name="route_descr_select_on_map">지도에서 선택…</string>
     <string name="route_descr_favorite">즐겨찾기…</string>
@@ -966,8 +966,8 @@
 \n저장 위치를 변경하고 모든 파일을 그곳에 복사하는 것을 허락하겠습니까?
 \n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다.</string>
     <string name="application_dir_change_warning2">OsmAnd에 새 목적지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요.</string>
-    <string name="copying_osmand_one_file_descr">새 목적지로 파일(%s)을 복사중...</string>
-    <string name="copying_osmand_files_descr">새로운 목적지에 OsmAnd 데이터 파일을 복사중 (%s)</string>
+    <string name="copying_osmand_one_file_descr">새 도착지에 파일(%s)을 복사중…</string>
+    <string name="copying_osmand_files_descr">새로운 도착지에 OsmAnd 데이터 파일을 복사중 (%s)</string>
     <string name="copying_osmand_files">OsmAnd 데이터 파일을 복사중</string>
     <string name="calculate_osmand_route_gpx">OsmAnd 오프라인 경로 계산하기</string>
     <string name="app_mode_truck">트럭</string>
@@ -1043,7 +1043,7 @@
 	<string name="lang_sl">슬로베니아어</string>
 	<string name="lang_cy">웨일스어</string>
 	<string name="route_preferences">경로 환경설정</string>
-    <string name="guidance_preferences_descr">라우팅 환경설정</string>
+    <string name="guidance_preferences_descr">운행 환경설정</string>
     <string name="disable_complex_routing_descr">자동차용 라우팅의 복잡한 출발지/도착지 2단계 라우팅 사용불가</string>
     <string name="app_modes_choose_descr">앱에서 볼 수있는 사용자 프로필를 선택합니다</string>
     <string name="map_widget_appearance">나머지 요소 :</string>
@@ -1187,8 +1187,8 @@
     <string name="recording_open_external_player">외부 플레이어 열기</string>
     <string name="recording_delete_confirm">이 기록을 삭제하시겠습니까 ?</string>
     <string name="recording_unavailable">사용 불가능</string>
-    <string name="recording_context_menu_arecord">오디오 노트 기록하기</string>
-    <string name="recording_context_menu_vrecord">비디오 노트 기록하기</string>
+    <string name="recording_context_menu_arecord">오디오 녹음</string>
+    <string name="recording_context_menu_vrecord">비디오 녹화</string>
     <string name="layer_recordings">레코딩 레이어</string>
     <string name="recording_can_not_be_played">레코딩을 재생할 수 없습니다</string>
     <string name="recording_context_menu_delete">레코딩 삭제</string>
@@ -1805,7 +1805,7 @@
     <string name="osmo_tracker_id">개인 트래커 ID</string>
     <string name="osmo_tracker_id_descr">트래커 ID를 보거나 공유하려면 클릭하십시오. 트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다! 선택 재생성 옵션을 분리합니다.</string>
     <string name="osmo_session_token">세션 토큰 : %1$s</string>
-    <string name="osmo_auth_pending">허가를 기다리는 중...</string>
+    <string name="osmo_auth_pending">허가를 기다리는 중…</string>
     <string name="osmo_locations_sent">위치 전송 %1$d (in buffer %2$d) </string>
     <string name="osmo_conn_successfull">설정된 연결 : %1$s </string>
     <string name="tip_recent_changes_1_8_alpha">"1.8의 변경 사항 :
@@ -1981,7 +1981,7 @@
     <string name="rendering_attr_osmcTraces_description">OSMC 흔적에 따라 경로 렌더링</string>
     
 	<string name="rendering_attr_coloredBuildings_name">유형별 색상 코드 건물</string>
-    <string name="osmo_invite">초대...</string>
+    <string name="osmo_invite">초대…</string>
     <string name="osmo_leave_confirmation_msg">그룹 %1$s를 떠나시겠습니까?</string>
     <string name="osmo_specify_tracker_id">Id를 지정 하십시오</string>
     <string name="arrival_distance_factor_early">일찍</string>
@@ -1996,17 +1996,17 @@
     <string name="rendering_value_car_name">자동차</string>
     <string name="rendering_value_bicycle_name">자전거</string>
     <string name="rendering_value_pedestrian_name">보행자</string>
-    <string name="more">기타...</string>
+    <string name="more">더 보기…</string>
     <string name="download_additional_maps">누락된 지도 %1$s (%2$d MB) 를 다운로드 할까요?</string>
     <string name="record_plugin_description">지도 화면에 하나의 버튼 터치로 경로를 저장 합니다. 로컬 GPX 파일 또는 웹 서비스를 사용하여 온라인에 여행을 기록하기 위해 설정을 보여줍니다.</string>
-    <string name="record_plugin_name">여행 기록</string>
+    <string name="record_plugin_name">트랙 기록</string>
     <string name="int_hour">h</string>
     <string name="duration">경과시간</string>
     <string name="distance">거리</string>
     <string name="index_tours">여행</string>
     <string name="flat_list_waypoints">모두</string>
     <string name="waypoints">경유지</string>
-    <string name="targets">목적지</string>
+    <string name="targets">도착지</string>
     <string name="way_alarms">교통 경고</string>
     <string name="speak_favorites">가까운 즐겨찾기 알리기</string>
     <string name="speak_poi">가까운 POI 알리기</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 7c2891e84a..98b6dbb75e 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -580,7 +580,7 @@
   <string name="select_build_to_install">Įdiegimui pasirinkite vieną iš OsmAnd versijų</string>
   <string name="contribution_activity">Specialūs veiksmai tobulinamai versijai</string>
   <string name="gps_status_app_not_found">GPS statuso programa neįdiegta. Ieškoti Parduotuvėje?</string>
-  <string name="voice_is_not_available_msg">Balso nurodymai neprieinami. Eikite į Nustatymus→Bendra→Balso pranešiai, išsirinkite arba parsisiųskite pageidaujamą kalbos paketą .</string>
+  <string name="voice_is_not_available_msg">Balso nurodymai neprieinami. Eikite į Nustatymus→Bendra→Balso pranešimai, pasirinkite arba parsisiųskite pageidaujamą kalbos paketą .</string>
   <string name="voice_is_not_available_title">Balso nurodymai nepasirinkti</string>
   <string name="daynight_mode_day">Diena</string>
   <string name="daynight_mode_night">Naktis</string>
@@ -1472,7 +1472,7 @@
 \n Pastaba: Seni failai išliks kur buvę (galima bus ištrinti rankiniu būdu).
 \n Pastaba: dalintis tais pačiais failais tarp OsmAnd ir OsmAnd+ nebus galima.</string>
     <string name="application_dir_change_warning2">Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą? Pasirinkite \"Ne\", jei norite, kad OsmAnd tik sukurtų ir naudotų naują folderį.</string>
-    <string name="copying_osmand_one_file_descr">Kopijuojami failai (%/s) į naują saugojimo vietą...</string>
+    <string name="copying_osmand_one_file_descr">Kopijuojami failai (%/s) į naują saugojimo vietą…</string>
     <string name="copying_osmand_files_descr">OsmAnd failai kopijuojami į naują vietą (%/s)</string>
     <string name="copying_osmand_files">Kopijuojami OsmAnd failai</string>
     <string name="keep_and_add_destination_point">Įtraukti kaip kelionės tikslą</string>
@@ -1586,7 +1586,7 @@
     <string name="osmo_tracker_id_descr">Paspauskite peržiūrėti ar bendrinti sekiklio ID. 
         Naudodami sekiklio ID prijungti prietaisai galės stebėti visą šio įrenginio judėjimą! Norėdami atjungti pasirinkite Regeneravimo nustatymą.</string>
     <string name="osmo_session_token">Sesijos žymė: %1$s</string>
-    <string name="osmo_auth_pending">Laukiama autorizavimo...</string>
+    <string name="osmo_auth_pending">Laukiama autorizavimo…</string>
     <string name="osmo_locations_sent">Buvimo vieta išsiųsta %1$d (talpykloje %2$d) </string>
     <string name="osmo_conn_successfull">Prisijungta sėkmingai: %1$s </string>
     <string name="tip_recent_changes_1_8_alpha">"Pakeitimai 1.8 versijoje: * Apskaičiouti maršrutą tarp GPX failo taškų * Pakeistas šalių sąrašo išdėstymas žemėlapių parsiuntimui (palaikoma vietovardžių paieška) * Palaiko GPX/KML importavimą (konvertuoja KML į GPX) * GPX maršrutai perkelti į \'Mano duomenys\' * GPX maršrutus galima padalinti į kelias dalis pagal atstumą ir patikrinti altitudės skirtumus ir greitį * Automatiškai pradėti navigaciją su uždelsimu "</string>
@@ -1754,7 +1754,7 @@
 	<string name="rendering_attr_alpineHiking_description">Užkrauti kelius pagal SAC skalę</string>
     <string name="rendering_attr_osmcTraces_description">Užkrauti kelius pagal OSMC pėdsakus</string>
     
-	<string name="osmo_invite">Pakvietimas...</string>
+	<string name="osmo_invite">Pakvietimas…</string>
     <string name="osmo_leave_confirmation_msg">Ar norite atsijungti nuo grupės %1$s?</string>
     <string name="osmo_specify_tracker_id">Prašome nurodyti id</string>
     <string name="arrival_distance_factor_early">Anksti</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index eab81516ce..5432afc36a 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2038,9 +2038,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="rendering_value_americanRoadAtlas_name">Amerikaanse wegenkaart</string>
     <string name="routing_attr_no_new_routing_name">Gebruik routeberekening v1.9 niet</string>
     <string name="routing_attr_no_new_routing_description">Gebruik routeberekening v1.9 niet</string>
-    <string name="traffic_warning_railways">Spoorweg</string>
-	<string name="traffic_warning_pedestrian">Voetgangers</string>
-	<string name="show_railway_warnings">Waarschuw voor spoorwegovergangen</string>
-	<string name="show_pedestrian_warnings">Waarschuw voor oversteekplaatsen</string>
+    <string name="traffic_warning_railways">Spoorweg overgang</string>
+	<string name="traffic_warning_pedestrian">Voetgangers oversteekplaats</string>
+	<string name="show_railway_warnings">Toon spoorwegovergangen</string>
+	<string name="show_pedestrian_warnings">Toon voetgangers oversteekplaatsen</string>
     <string name="speak_pedestrian">Meld oversteekplaatsen</string>
     </resources>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 703ac4f063..ae83426d29 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -71,7 +71,7 @@
 	<string name="poi_pet_shop">Zoologiczny</string>
 	<string name="poi_radiotechnics_shop">Art. RTV</string>
 	<string name="poi_second_hand">Rzeczy \"z drugiej ręki\"</string>
-	<string name="poi_ship_chandler">Żeglarski</string>
+	<string name="poi_ship_chandler">Armator</string>
 	<string name="poi_sports_shop">Sportowy</string>
 	<string name="poi_stationery_shop">Papierniczy</string>
 	<string name="poi_tableware_shop">Zastawy stołowe</string>
@@ -135,13 +135,13 @@
 	<string name="poi_public_transport_platform">Przystanek transportu miejskiego</string>
 	<string name="poi_public_transport_platform_bus">Przystanek autobusowy</string>
 	<string name="poi_public_transport_platform_trolleybus">Przystanek trolejbusowy</string>
-	<string name="poi_bus_stop">Przystanek autobusowy (nieczynny)</string>
+	<string name="poi_bus_stop">Przystanek autobusowy (przestarzałe)</string>
 	<string name="poi_public_transport_platform_tram">Przystanek tramwajowy</string>
-	<string name="poi_tram_stop">Przystanek tramwajowy (nieczynny)</string>
+	<string name="poi_tram_stop">Przystanek tramwajowy (przestarzałe)</string>
 	<string name="poi_public_transport_station">Dworzec transportu miejskiego</string>
-	<string name="poi_bus_station">Przystanek autobusowy (nieczynny)</string>
-	<string name="poi_railway_station">Przystanek kolejowy (nieczynny)</string>
-	<string name="poi_railway_platform">Peron kolejowy (nieczynny)</string>
+	<string name="poi_bus_station">Dworzec autobusowy (przestarzałe)</string>
+	<string name="poi_railway_station">Stacja kolejowa (przestarzałe)</string>
+	<string name="poi_railway_platform">Peron kolejowy (przestarzałe)</string>
 	<string name="poi_subway_entrance">Metro - wejście</string>
 	<string name="poi_subway_station">Stacja metra</string>
 	<string name="poi_taxi">Postój TAXI</string>
@@ -179,7 +179,7 @@
 	<string name="poi_emergency_access_point">Pogotowie</string>
 
 	<string name="poi_railway_halt">Dworzec kolejowy (nieaktualne)</string>
-	<string name="poi_turning_circle">Punkt zawracania</string>
+	<string name="poi_turning_circle">Miejsce do zawracania</string>
 	<string name="poi_motorway_junction">Zjazd z autostrady</string>
 
 	<string name="poi_water_well">Fontanna</string>
@@ -188,4 +188,14 @@
 	<string name="poi_boatyard">Stocznia</string>
 	<string name="poi_wastewater_plant">Oczyszczalnia ścieków</string>
 	<string name="poi_water_tower">Wieża ciśnień</string>
+	<string name="poi_dam">Tama</string>
+	<string name="poi_water_mill">Młyn wodny</string>
+
+	<string name="poi_power_substation">Podstacja</string>
+	<string name="poi_power_transformer">Transformator</string>
+	<string name="poi_post_office">Urząd pocztowy</string>
+	<string name="poi_post_box">Skrzynka pocztowa</string>
+	<string name="poi_telephone">Telefon</string>
+	<string name="poi_waste_basket">Kosz na śmieci</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 3fdc6112be..36ca52dacb 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -595,7 +595,7 @@
 
 	<string name="poi_military_airfield">Военный аэродром</string>
 	<string name="poi_military_bunker">Военный бункер</string>
-	<string name="poi_military_barracks">Бараки</string>
+	<string name="poi_military_barracks">Казармы</string>
 	<string name="poi_military_danger_area">Опасная зона</string>
 	<string name="poi_military_range">Военное стрельбище</string>
 	<string name="poi_military_naval_base">Военно-морская база</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 5e2148c9e0..a468c9558f 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1549,7 +1549,7 @@
     <string name="osmo_connected_devices">Устройства</string>
     <string name="osmo_groups">Управление OsMo</string>
     <string name="osmo_connect_to_device">Подключиться к устройству</string>
-    <string name="osmo_auth_pending">Ожидание авторизации...</string>
+    <string name="osmo_auth_pending">Ожидание авторизации…</string>
     <string name="osmo_conn_successfull">Соединение установлено: %1$s </string>
     <string name="hours_ago">часов назад</string>
     <string name="minutes_ago">минут назад</string>
@@ -1716,7 +1716,7 @@
 	<string name="lang_zh_CN">Упрощенный китайский</string>
 	<string name="lang_zh_TW">Традиционный китайский</string>
     <string name="rendering_attr_subwayMode_name">Маршруты метро</string>
-	<string name="osmo_invite">Пригласить...</string>
+	<string name="osmo_invite">Пригласить…</string>
     <string name="osmo_leave_confirmation_msg">Вы хотите выйти из группы %1$s?</string>
     <string name="osmo_specify_tracker_id">Пожалуйста, укажите ID</string>
     <string name="continue_navigation">Продолжить навигацию</string>
@@ -1740,7 +1740,7 @@
     <string name="rendering_value_bicycle_name">Велосипед</string>
     <string name="rendering_value_pedestrian_name">Пешеход</string>
     <string name="download_additional_maps">Скачать недостающие карты %1$s (%2$d MB)?</string>
-    <string name="more">Более...</string>
+    <string name="more">Более…</string>
     <string name="flat_list_waypoitns">Все</string>
     <string name="waypoints">Путевые точки</string>
     <string name="targets">Пункты назначения</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index d0292b47b0..df2b63cdee 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1443,7 +1443,7 @@
     <string name="routing_preferences_descr">路線偏好</string>
     <string name="app_mode_truck">卡車</string>
     <string name="application_dir_change_warning2">您想要將 OsmAnd 資料複製到新的目的地嗎？選擇否，OsmAnd 只建立和使用新的資料夾。</string>
-    <string name="copying_osmand_one_file_descr">複製檔案 (%s) 到新的目的地...</string>
+    <string name="copying_osmand_one_file_descr">複製檔案 (%s) 到新的目的地…</string>
     <string name="copying_osmand_files_descr">複製 OsmAnd 資料檔到新的目的地 (%s)</string>
     <string name="copying_osmand_files">複製 OsmAnd 資料檔案</string>
     <string name="calculate_osmand_route_gpx">OsmAnd 預估離線路線</string>
@@ -1566,7 +1566,7 @@
     <string name="osmo_tracker_id">個人追蹤 ID</string>
     <string name="osmo_tracker_id_descr">點擊查看或分享追蹤 ID。          使用追蹤 ID 連線的裝置將能夠監控該裝置的所有動作！ 要斷開選擇恢復選項。</string>
     <string name="osmo_session_token">連線階段標記：%1$s</string>
-    <string name="osmo_auth_pending">等候授權...</string>
+    <string name="osmo_auth_pending">等候授權…</string>
     <string name="osmo_locations_sent">發送位置 %1$d（在緩衝區 %2$d） </string>
     <string name="osmo_conn_successfull">已建立的連線：%1$s </string>
     <string name="osmo_mode_restart">重新啟動 OsMo 連線階段</string>
@@ -1738,7 +1738,7 @@
 	<string name="rendering_attr_subwayMode_name">捷運路線</string>
  	<string name="continue_navigation">繼續導航</string>
     <string name="pause_navigation">暫停導航</string>
-	<string name="osmo_invite">邀請...</string>
+	<string name="osmo_invite">邀請…</string>
     <string name="osmo_leave_confirmation_msg">您想要離開 %1$s 群組嗎？</string>
     <string name="osmo_specify_tracker_id">請指定 ID</string>
     <string name="rendering_attr_alpineHiking_name">高山徒步比例尺 (SAC)</string>
@@ -1759,7 +1759,7 @@
     <string name="rendering_value_car_name">汽車</string>
     <string name="rendering_value_bicycle_name">自行車</string>
     <string name="rendering_value_pedestrian_name">步行</string>
-    <string name="more">更多...</string>
+    <string name="more">更多…</string>
     <string name="download_additional_maps">要下載缺少的地圖 %1$s (%2$d MB) 嗎？</string>
     <string name="flat_list_waypoitns">全部</string>
     <string name="waypoints">中途點</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 309e2b2730..a36d860e4a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -169,13 +169,13 @@
     <string name="targets">Destinations</string>
     <string name="announce_gpx_waypoints">Announce GPX waypoints</string>
     <string name="download_additional_maps">Download missing maps %1$s (%2$d MB)?</string>
-    <string name="more">More...</string>
+    <string name="more">More&#8230;</string>
     <string name="rendering_value_browse_map_name">Browse map</string>  
     <string name="rendering_value_car_name">Car</string>
     <string name="rendering_value_bicycle_name">Bicycle</string>
     <string name="rendering_value_pedestrian_name">Pedestrian</string>
     <string name="rendering_attr_coloredBuildings_name">Color-code buildings by type</string>
-    <string name="osmo_invite">Invite...</string>
+    <string name="osmo_invite">Invite&#8230;</string>
     <string name="osmo_leave_confirmation_msg">Do you want to leave group %1$s?</string>
     <string name="osmo_specify_tracker_id">Please specify id</string>
     <string name="continue_navigation">Continue Navigation</string>
@@ -240,7 +240,7 @@
     <string name="save_as_favorites_points">Save as group of favorites</string>
     <string name="select_destination_and_intermediate_points">Select waypoints</string>
     <string name="layer_amenity_label">Point labels</string>
-    <string name="loading_smth">Loading %1$s &#8230;</string>
+    <string name="loading_smth">Loading %1$s&#8230;</string>
     <string name="map_widget_plain_time">Current time</string>
     <string name="gpx_wpt">Waypoint</string>
     <string name="selected_gpx_info_show">\n\nPress and hold to see on map</string>
@@ -339,7 +339,7 @@
     <string name="osmo_tracker_id_descr">Click to view or share tracker id. 
         Using tracker id connected devices will be able to monitor all movements of this device! To disconnect select Regenerate option.</string>
     <string name="osmo_session_token">Session token: %1$s</string>
-    <string name="osmo_auth_pending">Waiting for authorization...</string>
+    <string name="osmo_auth_pending">Waiting for authorization&#8230;</string>
     <string name="osmo_locations_sent">Locations sent %1$d (in buffer %2$d) </string>
     <string name="osmo_conn_successfull">Connection established: %1$s </string>
     <string name="osmo_io_error">OsMo connection problem: </string>
@@ -431,10 +431,10 @@
     <string name="gpx_option_calculate_first_last_segment">Calculate OsmAnd route for first and last route segment</string>
     <string name="use_displayed_track_for_navigation">Do you want to use displayed track for navigation?</string>
     <string name="keep_and_add_destination_point">Add as destination point</string>
-    <string name="select_gpx">Select GPX &#8230;</string>
+    <string name="select_gpx">Select GPX&#8230;</string>
     <string name="route_descr_select_destination">Select Destination</string>
-    <string name="route_descr_select_on_map">Select on map &#8230;</string>
-    <string name="route_descr_favorite">Favorite &#8230;</string>
+    <string name="route_descr_select_on_map">Select on map&#8230;</string>
+    <string name="route_descr_favorite">Favorite&#8230;</string>
     <string name="route_preferences">Route preferences</string>
     <string name="route_info">Route information</string>
     <string name="routing_attr_prefer_motorway_name">Prefer motorways</string>
@@ -454,7 +454,7 @@
     <string name="android_19_location_disabled">Since Android version 4.4 (KitKat) you cannot download and update maps to the previous storage folder (%s). Do you want to change to the permitted storage location and copy all OsmAnd files there?
         \n Note 1: Your old files will remain untouched (but can be deleted manually).
         \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
-    <string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination...</string>
+    <string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination&#8230;</string>
     <string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)</string>
     <string name="copying_osmand_files">Copying OsmAnd data files</string>
     <string name="calculate_osmand_route_gpx">Calculate OsmAnd offline route</string>