diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
index ef9ccd4a7d..754f1be034 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@@ -74,14 +74,15 @@ public class BinaryInspector {
 			in.inspector(new String[] {
 //					"-vpoi",
 //					"-vmap", "-vmapobjects", // "-vmapcoordinates",
-//					"-vrouting",
-					"-vtransport",
+					"-vrouting",
+//					"-vtransport",
 //					"-vaddress", "-vcities","-vstreetgroups",
 //					"-vstreets", "-vbuildings", "-vintersections",
 //					"-lang=ru",
-//					"-bbox=4.8486,52.3084,4.8747,52.2970",
-//					"-osm="+System.getProperty("maps.dir")+"/map.obf.osm", 
+//					"-bbox=30.4981,50.4424,30.5195,50.4351",
+//					"-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
 					System.getProperty("maps.dir")+"/Map.obf"
+//					System.getProperty("maps.dir")+"/Ukraine_kiev-city_europe.obf"
 			});
 		} else {
 			in.inspector(args);
diff --git a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/net/osmand/router/GeneralRouter.java
index 2203b89d62..a497b57c9d 100644
--- a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java
+++ b/OsmAnd-java/src/net/osmand/router/GeneralRouter.java
@@ -62,7 +62,8 @@ public class GeneralRouter implements VehicleRouter {
 		OBSTACLES("obstacle_time"),
 		ROUTING_OBSTACLES("obstacle"),
 		ONEWAY("oneway"),
-		PENALTY_TRANSITION("penalty_transition");
+		PENALTY_TRANSITION("penalty_transition"),
+		OBSTACLE_SRTM_ALT_SPEED("obstacle_srtm_alt_speed");
 		public final String nm; 
 		RouteDataObjectAttribute(String name) {
 			nm = name;
diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
index 57d34b167b..82a6110dee 100644
--- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
+++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
@@ -360,6 +360,7 @@ public class RouteResultPreparation {
 				}
 				additional.append("start_bearing = \"").append(res.getBearingBegin()).append("\" ");
 				additional.append("end_bearing = \"").append(res.getBearingEnd()).append("\" ");
+				additional.append("height = \"").append(Arrays.toString(res.getHeightValues())).append("\" ");
 				additional.append("description = \"").append(res.getDescription()).append("\" ");
 				println(MessageFormat.format("\t<segment id=\"{0}\" oid=\"{1}\" start=\"{2}\" end=\"{3}\" {4}/>",
 						(res.getObject().getId() >> (BinaryInspector.SHIFT_ID )) + "", res.getObject().getId() + "", 
@@ -378,7 +379,7 @@ public class RouteResultPreparation {
 			int[] pointNameTypes = res.getObject().getPointNameTypes(k);
 			if (tp != null || pointNameTypes != null) {
 				StringBuilder bld = new StringBuilder();
-				bld.append("<point ");
+				bld.append("<point " + (k));
 				if (tp != null) {
 					for (int t = 0; t < tp.length; t++) {
 						RouteTypeRule rr = res.getObject().region.quickGetEncodingRule(tp[t]);
diff --git a/OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java b/OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java
index 497d6cd951..747284db4c 100644
--- a/OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java
+++ b/OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java
@@ -1,12 +1,16 @@
 package net.osmand.router;
 
 
+import gnu.trove.list.array.TIntArrayList;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.data.LatLon;
+import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
 
@@ -23,6 +27,7 @@ public class RouteSegmentResult {
 	private String description = "";
 	// this make not possible to make turns in between segment result for now
 	private TurnType turnType;
+	public static int HEIGHT_UNDEFINED = -80000;
 	
 	
 	public RouteSegmentResult(RouteDataObject object, int startPointIndex, int endPointIndex) {
@@ -32,6 +37,83 @@ public class RouteSegmentResult {
 		updateCapacity();
 	}
 	
+	public float[] getHeightValues() {
+		int startHeight = Algorithms.parseIntSilently(object.getValue("osmand_ele_start"), HEIGHT_UNDEFINED);
+		int endHeight = Algorithms.parseIntSilently(object.getValue("osmand_ele_end"), startHeight);
+		if(startHeight == HEIGHT_UNDEFINED) {
+			return new float[0];
+		}
+		TIntArrayList list = new TIntArrayList();
+		float[] pf = new float[2*object.getPointsLength()]; 
+		double dist = 0;
+		double plon = 0;
+		double plat = 0;
+		int prevHeight = startHeight;
+		for(int k = 0; k < object.getPointsLength(); k++) {
+			double lon = MapUtils.get31LongitudeX(object.getPoint31XTile(k));
+			double lat = MapUtils.get31LatitudeY(object.getPoint31YTile(k));
+			if(k > 0) {
+				double dd = MapUtils.getDistance(plat, plon, lat, lon);
+				int height = HEIGHT_UNDEFINED;
+				if(k == object.getPointsLength() - 1) {
+					height = endHeight;
+				} else {
+					int[] tps = object.getPointTypes(k);
+					if (tps != null) {
+						for (int id : tps) {
+							RouteTypeRule rt = object.region.quickGetEncodingRule(id);
+							if (rt.getTag().equals("osmand_ele_asc")) {
+								height = (int) (prevHeight + Float.parseFloat(rt.getValue()));
+								break;
+							} else if (rt.getTag().equals("osmand_ele_desc")) {
+								height = (int) (prevHeight - Float.parseFloat(rt.getValue()));
+								break;
+							}
+						}
+					}
+				}
+				pf[2*k] = (float) dd;
+				pf[2*k+1] = height;
+				if(height != HEIGHT_UNDEFINED) {
+					// interpolate undefined
+					double totalDistance = dd;
+					int startUndefined = k;
+					while(startUndefined - 1 >= 0 && pf[2*(startUndefined - 1)+1] == HEIGHT_UNDEFINED) {
+						startUndefined --;
+						totalDistance += pf[2*(startUndefined)];
+					}
+					if(totalDistance > 0) {
+						double angle = (height - prevHeight) / totalDistance;
+						for(int j = startUndefined; j < k; j++) {
+							pf[2*j+1] = (float) ((pf[2*j] * angle) + pf[2*j-1]);
+						}
+					}
+					prevHeight = height;
+				}
+				
+			} else {
+				pf[0] = 0;
+				pf[1] = startHeight;
+			}
+			plat = lat;
+			plon = lon;
+		}
+		boolean reverse = startPointIndex > endPointIndex;
+		int st = Math.min(startPointIndex, endPointIndex);
+		int end = Math.max(startPointIndex, endPointIndex);
+		
+		float[] res = new float[(end - st + 1) * 2];
+		for (int k = 0; k < res.length / 2; k++) {
+			if (k == 0) {
+				res[2 * k] = 0;
+			} else {
+				res[2 * k] = pf[reverse ? (2 * (end - k)) : (2 * (k + st))];
+			}
+			res[2 * k + 1] = pf[reverse ?  (2 * (end - k) + 1) : (2 * (k + st) + 1)];
+		}
+		return res;
+	}
+	
 
 	@SuppressWarnings("unchecked")
 	private void updateCapacity() {
diff --git a/OsmAnd-java/src/net/osmand/util/Algorithms.java b/OsmAnd-java/src/net/osmand/util/Algorithms.java
index 1ae2a1d07f..97dd1bdd16 100644
--- a/OsmAnd-java/src/net/osmand/util/Algorithms.java
+++ b/OsmAnd-java/src/net/osmand/util/Algorithms.java
@@ -70,6 +70,17 @@ public class Algorithms {
 		}
 		return def;
 	}
+	
+	public static int parseIntSilently(String input, int def) {
+		if (input != null && input.length() > 0) {
+			try {
+				return Integer.parseInt(input);
+			} catch (NumberFormatException e) {
+				return def;
+			}
+		}
+		return def;
+	}
 
 
 	public static String getFileNameWithoutExtension(File f) {
diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml
index bf21aa6a1e..b21f702ce1 100644
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@@ -412,7 +412,7 @@
 
 	<string name="poi_toilets_wheelchair_yes">الوصول إلى المراحيض بالكراسي المتحركة: نعم</string>
 	<string name="poi_toilets_wheelchair_no">الوصول إلى المراحيض بالكراسي المتحركة: لا</string>
-	<string name="poi_toilets_access_customers">الوصول إلى المراحيض: العملاء</string>
+	<string name="poi_toilets_access_customers">الوصول إلى المراحيض : العملاء</string>
 	<string name="poi_diaper_yes">طاولة تغيير الحفاض</string>
 	<string name="poi_diaper_no">لا توجد طاولة تغيير الحفاض</string>
 	<string name="poi_diaper_room">غرفة تغيير الحفاضات</string>
@@ -706,7 +706,7 @@
 	<string name="poi_monument">نصب تذكاري</string>
 	<string name="poi_zoo">حديقة الحيوانات</string>
 	<string name="poi_home_visit">زيارة منزلية</string>
-	<string name="poi_hearing_aids">أدوات مساعذة للسمع</string>
+	<string name="poi_hearing_aids">أدوات مساعدة للسمع</string>
 	<string name="poi_ship_chandler">لوازم السفن والقوارب</string>
 	<string name="poi_window_blind">متجر ستائر</string>
 	<string name="poi_atv">متجر الدرجات الرباعية</string>
@@ -749,7 +749,7 @@
 	<string name="poi_craft_watchmaker">صانع ساعات</string>
 	<string name="poi_craft_window_construction">بناء إطار النوافذ</string>
 
-	<string name="poi_funeral_directors">ادارة الجنائز</string>
+	<string name="poi_funeral_directors">إدارة الجنائز</string>
 	<string name="poi_craft_computer">تركيب الحواسيب</string>
 	<string name="poi_beauty">صالون تجميل</string>
 	<string name="poi_beauty_salon_nails">تجميل الاظافر</string>
@@ -796,7 +796,7 @@
 	<string name="poi_club_photography">نادي التصوير الفوتوغرافي</string>
 	<string name="poi_club_shooting">نادي الرماية</string>
 	<string name="poi_club_tourism">نادي السياحة</string>
-	<string name="poi_club_charity">نادي جمعية خيرية</string>
+	<string name="poi_club_charity">جمعية خيرية</string>
 	<string name="poi_club_freemasonry">محفل ماسوني</string>
 	<string name="poi_club_sailing">نادي الإبحار</string>
 	<string name="poi_club_scout">نادي الكشافة</string>
@@ -861,4 +861,25 @@
 	<string name="poi_denomination_evangelical">الإنجيلية</string>
 	<string name="poi_denomination_russian_orthodox">الأرثودكسية الروسية</string>
 	<string name="poi_buoy_safe_water">عوامة مياه آمنة</string>
+	<string name="poi_xmas">عيد الميلاد</string>
+	<string name="poi_xmas_market">سوق عيد الميلاد</string>
+	<string name="poi_xmas_shop">متجر عيد الميلاد</string>
+	<string name="poi_xmas_tree">شجرة عيد الميلاد</string>
+	<string name="poi_emergency_infrastructure">هياكل الإستعجالات</string>
+	<string name="poi_houseware">متجر الأدوات المنزلية</string>
+	<string name="poi_fire_water_pond">احتياطي مياه الحرائق</string>
+	<string name="poi_traffic_calming_chicane">ممهل</string>
+	<string name="poi_aeroway_terminal">محطة المطار</string>
+	<string name="poi_aeroway_gate">بوابة الصعود</string>
+
+	<string name="poi_club_art">نادي الفنون</string>
+	<string name="poi_club_astronomy">نادي علم الفلك</string>
+	<string name="poi_club_computer">نادي الإعلام الآلي</string>
+	<string name="poi_club_motorcycle">نادي الدراجات النارية</string>
+	<string name="poi_club_sport">نادي للرياضة</string>
+	<string name="poi_club_game">نادي للألعاب</string>
+	<string name="poi_club_automobile">نادي السيارات</string>
+	<string name="poi_club_chess">نادي الشطرنج</string>
+	<string name="poi_club_veterans">نادي قدامى المحاربين</string>
+	<string name="poi_club_hunting">نادي الصيد</string>
 	</resources>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index ff89a06f39..7cceffad4b 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -63,7 +63,7 @@
     <string name="download_roads_only_item">الطرق فقط</string>
     <string name="download_srtm_maps">الخطوط المحيطية (الكنتورية)</string>
     <string name="download_regular_maps">الخرائط العادية</string>
-    <string name="rendering_attr_noAdminboundaries_name">اخفِ الحدود</string>
+    <string name="rendering_attr_noAdminboundaries_name">حدود</string>
 	<string name="map_widget_max_speed">حدّ السرعة</string>
     
     
@@ -494,7 +494,7 @@
 	<string name="asap">في أسرع وقت ممكن</string>
 	<string name="route_roundabout">دوّار: خذ المخرج %1$d ثم استمر</string>
 	<string name="rendering_attr_noPolygons_description">اجعل جميع الميزات الأرض المساحية شفافة على خريطة</string>
-	<string name="rendering_attr_noPolygons_name">اخف المضلعات</string>
+	<string name="rendering_attr_noPolygons_name">مضلعات</string>
 	<string name="rendering_attr_appMode_name">نمط التصيير</string>
 	<string name="rendering_attr_appMode_description">تحسين الخريطة لـ</string>
 	<string name="poi_search_desc">بحث عن النقاط المهمة</string>
@@ -1223,7 +1223,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="shared_string_search">بحث</string>
 	<string name="shared_string_show_description">عرض الوصف</string>
 	<string name="shared_string_message">رسالة</string>
-	<string name="welmode_download_maps">حمل الخرائط</string>
+	<string name="welmode_download_maps">تنزيل الخرائط</string>
 	<string name="welcome_select_region">لعرض إشارات وقواعد المرور بشكل صحيح، من فضلك اختر منطقة القيادة:</string>
 	<string name="shared_string_add_to_favorites">إضافة إلى المواقع المفضلة</string>
 	<string name="shared_string_my_places">مواقعي</string>
@@ -1448,7 +1448,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="lang_sw">السواحلية</string>
     <string name="lang_he">العبرية</string>
     <string name="forward">إلى الأمام</string>
-    <string name="home">لوحةالتحكم</string>
+    <string name="home">لوحة التحكم</string>
     <string name="live_monitoring_m_descr">إرسال التتبع لخدمة ويب محددة إذا تم تمكين تسجيل GPX.</string>
 	<string name="live_monitoring_m">تعقب على الإنترنت (GPX مطلوب)</string>
     <string name="live_monitoring_start">بدء التتبع على الإنترنت</string>
@@ -1933,7 +1933,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="feedback">الاصداء</string>
     <string name="contact_us">اتصل بنا</string>
     <string name="poi_context_menu_modify_osm_change">تعديل تغيير OSM</string>
-    <string name="dashboard_or_drawer_title">لوحة التحكم</string>
+    <string name="dashboard_or_drawer_title">لوحة التحكم أو شريط المراقبة</string>
     <string name="update">التحديث</string>
     <string name="only_download_over_wifi">التنزيل عبر الواي فاي فقط</string>
     <string name="live_update">تحديث آني</string>
@@ -2644,13 +2644,15 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="show_legacy_search_desc">تفعيل البحث القديم في قائمة الدرج</string>
     <string name="routing_attr_allow_motorway_name">الطريق السريع مسموح</string>
     <string name="routing_attr_allow_motorway_description">الطريق السريع مسموح</string>
-    <string name="legacy_search">تنصل:
-          إذا كنت تسير على ترجمة الجمل، يرجى التأكد من:
-          1. لا توجد سلاسل مكررة بالاسم
-          ويسبق 2. كل الفاصلة (الاقتباس) من قبل مائل (انظر غيرها).
-          إذا كنت ترغب بجعل / تصحيح ترجمة الإنجليزية تأكد من:
-          3. كل المعدلة / السلاسل التي تم إنشاؤها هي في الجزء العلوي من ملف (لجعل أسهل تجد ترجمتها \\ \'ق).
-     من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد حقا تحسين بك وعملنا :-) تشك - هاردي</string>
+    <string name="legacy_search">بحث موروث</string>
     <string name="lang_sr_latn">الصربية (اللاتينية)</string>
     <string name="lang_zh_hk">الصينية (هونج كونج)</string>
+    <string name="rendering_attr_hideWaterPolygons_description">ماء</string>
+    <string name="rendering_attr_contourWidth_description">عرض الخطوط الكنتورية</string>
+    <string name="rendering_attr_contourWidth_name">عرض الخطوط الكنتورية</string>
+    <string name="rendering_attr_contourDensity_description">كثافة الخطوط الكنتورية</string>
+    <string name="rendering_attr_contourDensity_name">كثافة الخطوط الكنتورية</string>
+    <string name="rendering_value_high_name">عالية</string>
+    <string name="rendering_value_medium_w_name">متوسطة</string>
+    <string name="rendering_value_low_name">منخفض</string>
     </resources>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index d83cc60665..52a3c8c643 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -3372,4 +3372,6 @@
 	<string name="poi_tower_construction_dome">Канструкцыя: радом</string>
 	<string name="poi_tower_construction_concealed">Канструкцыя: замаскаваная</string>
 
+<string name="poi_railway_yard">Грузавая станцыя</string>
+
 </resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 28204854ab..490868678d 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -201,7 +201,7 @@
     <string name="download_regular_maps">Стандартныя мапы</string>
     <string name="download_roads_only_maps">Мапа толькі дарог</string>
     
-	<string name="rendering_attr_noAdminboundaries_name">Схаваць межы</string>
+	<string name="rendering_attr_noAdminboundaries_name">Межы</string>
 	<string name="rendering_attr_noAdminboundaries_description">Не адлюстроўваць рэгіянальныя межы (адміністатыўныя ўзроўні 5–9)</string>
     
     
@@ -558,7 +558,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="route_kl">Трымайцеся левага боку</string>
 	<string name="route_kr">Трымайцеся правага боку</string>
 	<string name="rendering_attr_noPolygons_description">Адлюстроўваць толькі контуры, без заліваньня</string>
-	<string name="rendering_attr_noPolygons_name">Схаваць палігоны</string>
+	<string name="rendering_attr_noPolygons_name">Палігоны</string>
 	<string name="rendering_attr_appMode_name">Рэжым візуалізацыі</string>
 	<string name="rendering_attr_appMode_description">Аптымізаваць мапу для</string>
 	<string name="rendering_attr_contourLines_description">Мінімальны ўзровень маштабу з адлюстраваньнем ізаліній вышынь:</string>
@@ -2704,4 +2704,29 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="lang_zh_hk">кітайская (Ганконг)</string>
     <string name="legacy_search">Састарэлы пошук</string>
     <string name="show_legacy_search">Паказваць састарэлы пошук</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Ваду</string>
+    <string name="show_legacy_search_desc">Дазволіць састарэлы пошук у мэню</string>
+    <string name="rendering_attr_contourWidth_name">Таўшчыня гарызанталяў</string>
+    <string name="release_2_5">"
+ • Іконкі на мапе, якія можа націскаць,
+
+
+• Пошук любых POI: Пошук рэстаранаў паводле кухні або кемпінгаў з пэўнымі выгодамі,
+
+
+• Новы стыль мапы \"OsmAnd Topo\" для веласіпедыстаў і пешых турыстаў.
+
+
+• Паляпшэньне запісу сьледу,
+
+
+• Паляпшэньне апавяшчэньняў пры навігацыі (Android Wear)
+
+
+• Мноства іншых паляпшэньняў і выпраўленьняў,
+
+
+і многае іншае ...
+ "</string>
+    <string name="rendering_attr_contourWidth_description">Таўшчыня гарызанталяў (ізагіпсы)</string>
     </resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 2425dee0d3..8a4e9a20d3 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -1713,7 +1713,7 @@
 	<string name="poi_diet_vegetarian_only">Només vegetarià</string>
 	<string name="poi_diet_vegetarian_yes">Vegetarià</string>
 	<string name="poi_diet_vegetarian_no">Dieta vegetariana: no</string>
-	<string name="poi_diet_vegetarian_few">Dieta vegetariana: algun plat</string>
+	<string name="poi_diet_vegetarian_few">Vegetarià (algun plat)</string>
 	<string name="poi_diet_vegan_only">Només vegà</string>
 	<string name="poi_diet_vegan_yes">Vegà</string>
 	<string name="poi_diet_vegan_no">Dieta vegana: no</string>
@@ -2358,4 +2358,40 @@
 	<string name="poi_beach_surface_type">Superfície</string>
 	<string name="poi_nudism">Nudisme</string>
 	<string name="poi_diet">Dieta</string>
+	<string name="poi_health_specialty">Especialitat mèdica</string>
+	<string name="poi_massage_type">Tipus de massatge</string>
+	<string name="poi_tents">Tendes de campanya</string>
+	<string name="poi_washing_machine">Rentadora</string>
+	<string name="poi_caravans">Caravanes</string>
+	<string name="poi_power_supply">Subministrament elèctric</string>
+	<string name="poi_social_facility_type">Tipus</string>
+	<string name="poi_compressed_air_filter">Aire comprimit</string>
+	<string name="poi_vacuum_cleaner_filter">Aspiradora</string>
+	<string name="poi_home_visit">Visites a domicili</string>
+	<string name="poi_medical_system">Tipus de medicina</string>
+	<string name="poi_dish">Plat</string>
+	<string name="poi_free_flying_characteristic">Característica</string>
+
+<string name="poi_emergency_infrastructure">Infraestructura d\'emergència</string>
+	<string name="poi_spices">Botiga d\'espècies</string>
+	<string name="poi_honey">Venda de mel</string>
+	<string name="poi_religion">Material religiós</string>
+
+	<string name="poi_aeroway_fuel">Benzinera per avions</string>
+	<string name="poi_waterway_fuel">Benzinera per embarcacions</string>
+	<string name="poi_ice_hockey">Hoquei sobre gel</string>
+	<string name="poi_internet_access_fee_yes">Accés a Internet - de pagament</string>
+	<string name="poi_internet_access_fee_no">Accés a Internet - de franc</string>
+
+	<string name="poi_club_freemasonry">Lògia maçònica</string>
+	<string name="poi_club_sailing">Club nàutic</string>
+	<string name="poi_club_scout">Club d\'escoltes</string>
+
+	<string name="poi_wiki_lang_af">Wiki en afrikaans</string>
+	<string name="poi_wiki_lang_bn">Wiki en bengalí</string>
+	<string name="poi_wiki_lang_bpy">Wiki en bishnupriya</string>
+	<string name="poi_wiki_lang_br">Wiki en gal·lès</string>
+	<string name="poi_wiki_lang_fa">Wiki en persa</string>
+	<string name="poi_wiki_lang_ml">Wiki en malaiàlam</string>
+	<string name="poi_wiki_lang_mr">Wiki en marathi</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index b72fe177c3..6e54805cbc 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -63,7 +63,7 @@
     <string name="context_menu_item_delete_parking_point">Suprimeix un marcador d\'aparcament</string>
     <string name="gpxup_identifiable">Identificable</string>
     <string name="route_roundabout">Rotonda: preneu la %1$d sortida i continueu</string>
-    <string name="rendering_attr_noPolygons_name">Sense polígons</string>
+    <string name="rendering_attr_noPolygons_name">Polígons</string>
     <string name="rendering_attr_appMode_name">Mode de renderització</string>
     <string name="rendering_attr_contourLines_name">Mostra les línies de contorn</string>
     <string name="rendering_attr_hmRendered_description">Augmenta la quantitat de detalls mostrats al mapa</string>
@@ -858,7 +858,7 @@ Els mapes de tessel·les es poden obtenir directament de proveïdors en línia,
     <string name="recording_context_menu_delete">Elimina l\'enregistrament</string>
     <string name="av_use_external_recorder">Usa un enregistrador extern</string>
     <string name="download_select_map_types">Altres mapes</string>
-    <string name="rendering_attr_noAdminboundaries_name">Amaga els límits administratius</string>
+    <string name="rendering_attr_noAdminboundaries_name">Límits administratius</string>
     <string name="download_roads_only_maps">Mapa només de carreteres</string>
     <string name="safe_mode">Mode segur</string>
     <string name="background_service_is_enabled_question">El mode en segon pla encara s\'està executant. També el voleu aturar?</string>
@@ -2529,4 +2529,12 @@ Si aprecieu OsmAnd  i OSM i voleu ajudar-los, és la via perfecta per fer-ho."</
     <string name="routing_attr_allow_motorway_description">Permet les autopistes</string>
     <string name="lang_sr_latn">Serbi (alfabet llatí)</string>
     <string name="lang_zh_hk">Xinès (Hong Kong)</string>
+    <string name="rendering_attr_contourWidth_description">Gruix de les corbes de nivell</string>
+    <string name="rendering_attr_contourWidth_name">Gruix de les corbes de nivell</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Hidràulic</string>
+    <string name="rendering_attr_contourDensity_description">Densitat de les corbes de nivell</string>
+    <string name="rendering_attr_contourDensity_name">Densitat de les corbes de nivell</string>
+    <string name="rendering_value_high_name">Gros</string>
+    <string name="rendering_value_medium_w_name">Mitjà</string>
+    <string name="rendering_value_low_name">Baix</string>
     </resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 8febbec2bc..884b19aaf3 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -3427,4 +3427,6 @@
 	<string name="poi_tower_construction_dome">Konstruktion: kuppel</string>
 	<string name="poi_tower_construction_concealed">Konstruktion: skjult</string>
 
+<string name="poi_railway_yard">Godsterminal</string>
+
 </resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 0e6c3c8cf3..2ca6d81336 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2737,4 +2737,11 @@ Hvis du  ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p
     <string name="lang_sr_latn">Serbisk (Latin)</string>
     <string name="lang_zh_hk">Kinesisk (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vand</string>
+    <string name="rendering_attr_contourWidth_description">Højdekurver bredde</string>
+    <string name="rendering_attr_contourWidth_name">Højdekurver bredde</string>
+    <string name="rendering_attr_contourDensity_description">Højdekurver tæthed</string>
+    <string name="rendering_attr_contourDensity_name">Højdekurver tæthed</string>
+    <string name="rendering_value_high_name">Høj</string>
+    <string name="rendering_value_medium_w_name">Mellem</string>
+    <string name="rendering_value_low_name">Lav</string>
     </resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index f13d29a6bd..c51786bf82 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -1443,18 +1443,18 @@
 
 	<string name="poi_capacity">Kapazität</string>
 	<string name="poi_capacity_disabled_yes">Ja</string>
-	<string name="poi_capacity_disabled_no">Keine reservierten Plätze für Behinderte</string>
-	<string name="poi_capacity_disabled">Reservierte Plätze für Behinderte</string>
-	<string name="poi_capacity_women_yes">Reservierte Plätze für Frauen</string>
-	<string name="poi_capacity_women_no">Keine reservierten Plätze für Frauen</string>
-	<string name="poi_capacity_women">Reservierte Plätze für Frauen</string>
-	<string name="poi_capacity_pupils">reservierte Plätze für Schüler</string>
-	<string name="poi_capacity_teachers">reservierte Plätze für Lehrer</string>
-	<string name="poi_capacity_parent_yes">reservierte Plätze für Eltern</string>
-	<string name="poi_capacity_parent_no">keine reservierten Plätze für Eltern</string>
-	<string name="poi_capacity_parent">reservierte Plätze für Eltern</string>
+	<string name="poi_capacity_disabled_no">keine Behindertenplätze</string>
+	<string name="poi_capacity_disabled">Behindertenplätze</string>
+	<string name="poi_capacity_women_yes">Frauenplätze</string>
+	<string name="poi_capacity_women_no">keine Frauenplätze</string>
+	<string name="poi_capacity_women">Frauenplätze</string>
+	<string name="poi_capacity_pupils">Schülerplätze</string>
+	<string name="poi_capacity_teachers">Lehrerplätze</string>
+	<string name="poi_capacity_parent_yes">Elternplätze</string>
+	<string name="poi_capacity_parent_no">keine Elternplätze</string>
+	<string name="poi_capacity_parent">Elternplätze</string>
 
-	<string name="poi_aerialway_occupancy">Kabin-, Gondel-, Sesselkapazität</string>
+	<string name="poi_aerialway_occupancy">Kabinen-, Gondel-, Sesselkapazität</string>
 	<string name="poi_aerialway_capacity">Kapazität pro Stunde</string>
 	<string name="poi_aerialway_duration">durchschnittliche Fahrzeit, Minuten</string>
 	<string name="poi_aerialway_bubble_yes">Blase</string>
@@ -1931,7 +1931,7 @@
 	<string name="poi_toilets_wheelchair_no">Rollstuhlgerechte Toilette: Nein</string>
 	<string name="poi_toilets_access_customers">Toilettenzugang: Kunden</string>
 	<string name="poi_toilets_access_permissive">Toilettenzugang: geduldet</string>
-	<string name="poi_toilets_access_community">Toilettenzugang: allgemein</string>
+	<string name="poi_toilets_access_community">Toilettenzugang: öffentlich</string>
 	<string name="poi_toilets_access_public">Toilettenzugang: öffentlich</string>
 
 	<string name="poi_diaper_yes">Wickeltisch</string>
@@ -2062,7 +2062,7 @@
 
 	<string name="poi_architecture_stalinist_neoclassicism">Kunstart: stalinistischer Neoklassizismus</string>
 	<string name="poi_architecture_eclectic">Architektur: vielseitig</string>
-	<string name="poi_architecture_new_objectivity">Architektur: neue Sachlichkeit</string>
+	<string name="poi_architecture_new_objectivity">Architektur: Neue Sachlichkeit</string>
 	<string name="poi_architecture_contemporary">Architektur: Zeitgenössisch</string>
 	<string name="poi_architecture_constructivism">Architektur: Konstruktivismus</string>
 	<string name="poi_architecture_umgebinde">Architektur: Umgebinde</string>
@@ -3019,7 +3019,7 @@
 <string name="poi_service_bicycle_charging_yes">Fahrrad laden: Ja</string>
 	<string name="poi_service_bicycle_charging_no">Fahrrad laden: Nein</string>
 
-<string name="poi_shop_craft">Kunst und Handwerk Zubehörgeschäft</string>
+<string name="poi_shop_craft">Geschäft für Kunsthandwerksbedarf</string>
 
 	<string name="poi_fuel_avia_type">Typ</string>
 	<string name="poi_payment_fuel_type">Tankkarten</string>
@@ -3090,8 +3090,8 @@
 	<string name="poi_xmas_url">Weihnachten: Internetseite</string>
 
 <string name="poi_vending_type">Verkaufsart</string>
-	<string name="poi_bicycle_service">Fahrrad Dienstleitung</string>
-	<string name="poi_service_car">Dienstleistung</string>
+	<string name="poi_bicycle_service">Fahrrad-Kundendienst</string>
+	<string name="poi_service_car">Kundendienst</string>
 	<string name="poi_self_service">Selbstbedienung</string>
 	<string name="poi_pharmacy_dispensing">Rezepte</string>
 	<string name="poi_archaeological_site_type">Typ</string>
@@ -3343,4 +3343,6 @@
 	<string name="poi_tower_construction_dish">Konstruktion: Schüssel</string>
 	<string name="poi_tower_construction_concealed">Konstruktion: verdeckt</string>
 
+<string name="poi_railway_yard">Güterbahnhof</string>
+
 </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 1ff8b7f6a4..c42f4e2c3b 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2347,9 +2347,9 @@ Lon %2$s</string>
     <string name="consider_turning_polygons_off">Es wird empfohlen, das Rendern von Polygonen zu deaktivieren.</string>
     
     <string name="shared_string_widgets">Widgets</string>
-    <string name="download_files_error_not_enough_space">"Nicht genug Speicher!
-Es werden vorübergehend {3} MB  und {1} MB dauerhaft benötigt.
-Aktuell sind nur {2} MB verfügbar."</string>
+    <string name="download_files_error_not_enough_space">Nicht genug Speicher!
+Es werden vorübergehend {3} MB und dauerhaft {1} MB Speicherplatz benötigt.
+Aktuell sind nur {2} MB verfügbar.</string>
     <string name="download_files_question_space_with_temp">{0} Datei(en) herunterladen?
  Dies benötigt vorübergehend {3} MB und dauerhaft {1} MB.
  (Aktuell sind {2} MB verfügbar.)</string>
@@ -2489,14 +2489,14 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
     <string name="route_stops_before">%1$s Haltestellen vor</string>
     <string name="rendering_attr_hideOverground_name">Oberirdische Objekte</string>
 
-    <string name="routing_attr_short_way_name">Kraftstoff sparende Route</string>
+    <string name="routing_attr_short_way_name">Kraftstoffsparende Route</string>
     <string name="routing_attr_short_way_description">Kraftstoffsparende Route verwenden (in der Regel kürzer)</string>
-    <string name="replace_favorite_confirmation">Wollen sie Favorit \'%1$s\' wirklich ersetzen?</string>
+    <string name="replace_favorite_confirmation">Wollen Sie den Favorit \'%1$s\' wirklich ersetzen?</string>
     <string name="shared_string_change">Ändern</string>
     <string name="get_started">Erste Schritte</string>
     <string name="update_all_maps_now">Wollen sie jetzt alle Karten aktualisieren?</string>
     <string name="clear_tile_data">Alle Kartenkacheln löschen</string>
-    <string name="skip_map_downloading_desc">Sie haben keine Offline Karten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - %1$s“ herunterladen.</string>
+    <string name="skip_map_downloading_desc">Es sind keine Offline-Karten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - %1$s“ herunterladen.</string>
     <string name="search_another_country">Eine andere Region auswählen</string>
     <string name="search_map">Karte wird gesucht…</string>
     <string name="first_usage_wizard_desc">Lassen Sie OsmAnd Ihren Standort bestimmen und Karten für diese Region zum Herunterladen vorschlagen.</string>
@@ -2529,7 +2529,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
     <string name="save_filter">Filter speichern</string>
     <string name="delete_filter">Filter löschen</string>
     <string name="new_filter">Neuer Filter</string>
-    <string name="new_filter_desc">Bitte geben sie einen Namen für den neuen Filter ein. Dieser wird zur Liste der Kategorien hinzugefügt.</string>
+    <string name="new_filter_desc">Bitte geben Sie einen Namen für den neuen Filter ein. Dieser wird zur Liste der Kategorien hinzugefügt.</string>
     <string name="selected_categories">Ausgewählte Kategorien</string>
     <string name="create_custom_poi">Benutzerdefinierten Filter erstellen</string>
     <string name="custom_search">Benutzerdefinierte Suche</string>
@@ -2596,4 +2596,11 @@ und vieles mehr ...
     <string name="lang_sr_latn">Serbisch (lateinisch)</string>
     <string name="lang_zh_hk">Chinesisch (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Wasser</string>
+    <string name="rendering_attr_contourWidth_description">Breite der Höhenlinien</string>
+    <string name="rendering_attr_contourWidth_name">Breite der Höhenlinien</string>
+    <string name="rendering_attr_contourDensity_description">Dichte der Höhenlinien</string>
+    <string name="rendering_attr_contourDensity_name">Dichte der Höhenlinien</string>
+    <string name="rendering_value_high_name">Höhe</string>
+    <string name="rendering_value_medium_w_name">Mittel</string>
+    <string name="rendering_value_low_name">Niedrig</string>
     </resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 37b9e2efd9..a9c7b89bff 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -3393,4 +3393,6 @@
 	<string name="poi_tower_construction_dome">Construcción: Domo</string>
 	<string name="poi_tower_construction_concealed">Construcción: Oculta</string>
 
+<string name="poi_railway_yard">Estación ferroviaria de carga</string>
+
 </resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index f39a077763..58eb97e051 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2503,4 +2503,11 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
     <string name="lang_sr_latn">Serbio (latín)</string>
     <string name="lang_zh_hk">Chino (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Agua</string>
+    <string name="rendering_attr_contourDensity_description">Densidad de las curvas de nivel</string>
+    <string name="rendering_attr_contourDensity_name">Densidad de curvas de nivel</string>
+    <string name="rendering_value_high_name">Alto</string>
+    <string name="rendering_value_medium_w_name">Mediano</string>
+    <string name="rendering_value_low_name">Bajo</string>
+    <string name="rendering_attr_contourWidth_description">Anchura de las curvas de nivel</string>
+    <string name="rendering_attr_contourWidth_name">Anchura de curvas de nivel</string>
     </resources>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index a6d1a5910d..b5fda68dc8 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -3155,4 +3155,6 @@
 	<string name="poi_tower_construction_dome">Construcción: Domo</string>
 	<string name="poi_tower_construction_concealed">Construcción: Oculta</string>
 
+<string name="poi_railway_yard">Estación ferroviaria de carga</string>
+
 </resources>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index be95e77463..72ae5c5ed3 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2502,4 +2502,11 @@ Si amas a OsmAnd, OSM y quieres apoyarlos, esta es una perfecta manera de hacerl
     <string name="lang_sr_latn">Serbio (latín)</string>
     <string name="lang_zh_hk">Chino (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Agua</string>
+    <string name="rendering_attr_contourDensity_description">Densidad de las curvas de nivel</string>
+    <string name="rendering_attr_contourDensity_name">Densidad de curvas de nivel</string>
+    <string name="rendering_value_high_name">Alto</string>
+    <string name="rendering_value_medium_w_name">Mediano</string>
+    <string name="rendering_value_low_name">Bajo</string>
+    <string name="rendering_attr_contourWidth_description">Anchura de las curvas de nivel</string>
+    <string name="rendering_attr_contourWidth_name">Anchura de curvas de nivel</string>
     </resources>
diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index b63a9a526a..ae719b015f 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -798,44 +798,44 @@
 	<string name="poi_payment_telephone_cards_no">Ez dira telefono txartelak onartzen</string>
 	<string name="poi_payment_credit_cards_yes">Kreditu txartelak onartzen dira</string>
 	<string name="poi_payment_credit_cards_no">Ez dira kreditu txartelak onartzen</string>
-	<string name="poi_payment_notes_yes">Billeteak onartzen dira</string>
+	<string name="poi_payment_notes_yes">Billeteak</string>
 	<string name="poi_payment_notes_no">Ez dira billeteak onartzen</string>
-	<string name="poi_payment_cash_yes">Eskudirua onartzen da</string>
+	<string name="poi_payment_cash_yes">Eskudirua</string>
 	<string name="poi_payment_cash_no">Ez da eskudirua onartzen</string>
-	<string name="poi_payment_debit_cards_yes">Zordunketa-txartelak onartzen dira</string>
+	<string name="poi_payment_debit_cards_yes">Zordunketa-txartelak</string>
 	<string name="poi_payment_debit_cards_no">Ez dira zordunketa-txartelak onartzen</string>
-	<string name="poi_payment_bitcoin_yes">Bitcoin onartzen da</string>
+	<string name="poi_payment_bitcoin_yes">Bitcoin</string>
 	<string name="poi_payment_bitcoin_no">Ez da bitcoin onartzen</string>
-	<string name="poi_payment_visa_yes">Visa txartelak onartzen dira</string>
+	<string name="poi_payment_visa_yes">Visa</string>
 	<string name="poi_payment_visa_no">Ez dira Visa txartelak onartzen</string>
-	<string name="poi_payment_mastercard_yes">MasterCard onartzen da</string>
+	<string name="poi_payment_mastercard_yes">MasterCard</string>
 	<string name="poi_payment_mastercard_no">Ez da MasterCard onartzen</string>
 	<string name="poi_payment_none">Doakoa</string>
-	<string name="poi_payment_account_cards_yes">Kontu txartelak onartzen dira</string>
+	<string name="poi_payment_account_cards_yes">Kontu txartelak</string>
 	<string name="poi_payment_account_cards_no">Ez dira kontu txartelak onartzen</string>
-	<string name="poi_payment_maestro_yes">Maestro txartelak onartzen dira</string>
+	<string name="poi_payment_maestro_yes">Maestro txartelak</string>
 	<string name="poi_payment_maestro_no">Ez dira Maestro txartelak onartzen</string>
-	<string name="poi_payment_american_express_yes">American Express (AMEX) txartelak onartzen dira</string>
+	<string name="poi_payment_american_express_yes">American Express (AMEX)</string>
 	<string name="poi_payment_american_express_no">Ez dira American Express (AMEX) txartelak onartzen</string>
-	<string name="poi_payment_diners_club_yes">Diners Club txartelak onartzen dira</string>
+	<string name="poi_payment_diners_club_yes">Diners Club</string>
 	<string name="poi_payment_diners_club_no">Ez dira Diners Club txartelak onartzen</string>
-	<string name="poi_payment_dkv_yes">DKV onartzen da</string>
+	<string name="poi_payment_dkv_yes">DKV</string>
 	<string name="poi_payment_dkv_no">Ez da DKV onartzen</string>
-	<string name="poi_payment_uta_yes">UTA txartelak onartzen dira</string>
+	<string name="poi_payment_uta_yes">UTA</string>
 	<string name="poi_payment_uta_no">Ez dira UTA txartelak onartzen</string>
-	<string name="poi_payment_efectivo_yes"/>
-	<string name="poi_payment_visa_electron_yes">Visa Electron txartelak onartzen dira</string>
+	<string name="poi_payment_efectivo_yes">Efectivo txartela</string>
+	<string name="poi_payment_visa_electron_yes">Visa Electron</string>
 	<string name="poi_payment_visa_electron_no">Ez dira Visa Electron txartelak onartzen</string>
-	<string name="poi_payment_litecoin_yes">Litecoin onartzen da</string>
+	<string name="poi_payment_litecoin_yes">Litecoin</string>
 	<string name="poi_payment_litecoin_no">Ez da Litecoin onartzen</string>
-	<string name="poi_payment_cheque_yes">Txekeak onartzen dira</string>
+	<string name="poi_payment_cheque_yes">Txekeak</string>
 	<string name="poi_payment_cheque_no">Ez dira txekeak onartzen</string>
-	<string name="poi_payment_pikepass_yes">PIKEPASS onartzen da</string>
+	<string name="poi_payment_pikepass_yes">PIKEPASS</string>
 	<string name="poi_payment_pikepass_no">Ez da PIKEPASS onartzen</string>
-	<string name="poi_payment_visa_debit_yes">Visa zordunketa txartelak onartzen dira</string>
+	<string name="poi_payment_visa_debit_yes">Visa zordunketa txartelak</string>
 	<string name="poi_payment_visa_debit_no">Ez dira Visa zordunketa txartelak onartzen</string>
 	<string name="poi_payment_cryptocurrencies_no">Ez dira kripto-monetak onartzen</string>
-	<string name="poi_payment_others_yes">Bestelako ordainketa metodoak onartzen dira</string>
+	<string name="poi_payment_others_yes">Bestelakoak</string>
 	<string name="poi_payment_others_no">Ez dira bestelako ordainketa metodoak onartzen</string>
 	<string name="poi_chimney">Tximinia</string>
 	<string name="poi_palm">Palmera</string>
@@ -1049,7 +1049,7 @@
 	<string name="poi_information_sign">Seinalea</string>
 	<string name="poi_information_audioguide">Audio-gida</string>
 	<string name="poi_information_bicyclemap">Bizikletarako mapa</string>
-	<string name="poi_payment_discover_card_yes">Discover txartela onartzen da</string>
+	<string name="poi_payment_discover_card_yes">Discover txartela</string>
 	<string name="poi_payment_discover_card_no">Ez da Discover txartela onartzen</string>
 	<string name="poi_running">Korrika egitea</string>
 	<string name="poi_karting">Karting</string>
@@ -1102,9 +1102,9 @@
 	<string name="poi_religion_spiritualist">Espiritualismoa</string>
 	<string name="poi_religion_pagan">Paganismoa</string>
 	<string name="poi_religion_tenrikyo">Tenrikyo</string>
-	<string name="poi_payment_v_pay_yes">V PAY txartelak onartzen dira</string>
+	<string name="poi_payment_v_pay_yes">V PAY</string>
 	<string name="poi_payment_v_pay_no">V PAY txartelak ez dira onartzen</string>
-	<string name="poi_payment_cibus_yes">Cibus txartelak onartzen dira</string>
+	<string name="poi_payment_cibus_yes">Cibus</string>
 	<string name="poi_payment_cibus_no">Cibus txartelak ez dira onartzen</string>
 	<string name="poi_payment_wire_transfer_yes">Transferentzia elektronikoak onartzen dira</string>
 	<string name="poi_payment_wire_transfer_no">Transferentzia elektronikoak ez dira onartzen</string>
@@ -1396,14 +1396,14 @@
 	<string name="poi_shower_outdoor">Dutxa: kanpoan</string>
 	<string name="poi_shower_cold">Dutxa: hotza</string>
 	<string name="poi_shower_indoor">Dutxa: barruan</string>
-	<string name="poi_caravans_yes">Karabanak: bai</string>
+	<string name="poi_caravans_yes">Bai</string>
 	<string name="poi_caravans_no">Karabanak: ez</string>
 	<string name="poi_impromptu_yes">Bat-batekoa: bai</string>
 	<string name="poi_impromptu_no">Bat-batekoa: ez</string>
 	<string name="poi_sanitary_dump_station_yes">Komuneko hondakinen estazioa: bai</string>
 	<string name="poi_sanitary_dump_station_no">Komuneko hondakinen estazioa: ez</string>
 	<string name="poi_sanitary_dump_station_customers">Komuneko hondakinen estazioa: bezeroak besterik ez</string>
-	<string name="poi_power_supply_yes">Elektrizitate iturria: bai</string>
+	<string name="poi_power_supply_yes">Bai</string>
 	<string name="poi_power_supply_no">Elektrizitate iturria: ez</string>
 	<string name="poi_power_supply_cee_17_blue">Elektrizitate iturria (hargunea): CEE 17 urdina</string>
 	<string name="poi_power_supply_cee_7_4">Elektrizitate iturria (hargunea): CEE 7/4</string>
@@ -2126,4 +2126,40 @@
 	<string name="poi_emergency_infrastructure">Larrialdietarako azpiegitura</string>
 	<string name="poi_phone">Telefonoa</string>
 	<string name="poi_website">Webgunea</string>
+	<string name="poi_payment_electronic_purses_yes">Moneta elektronikoak</string>
+	<string name="poi_payment_electronic_purses_no">Ez dira onartzen moneta elektronikoak</string>
+	<string name="poi_payment_efectivo_no">Ez da onartzen efectivo txartela</string>
+	<string name="poi_payment_girocard_yes">Girocard</string>
+	<string name="poi_payment_girocard_no">Ez da onartzen Girocard txartela</string>
+	<string name="poi_payment_pikepass_designated">PIKEPASS (izendatua)</string>
+	<string name="poi_payment_routex_yes">Routex</string>
+	<string name="poi_payment_routex_no">Ez dira Routex erregai txartelak onartzen</string>
+	<string name="poi_payment_bancomat_yes">Bancomat</string>
+	<string name="poi_payment_bancomat_no">Ez dira Bancomat txartelak onartzen</string>
+	<string name="poi_payment_prepaid_ticket_yes">Aurrez ordaindutako tiketak</string>
+	<string name="poi_payment_jcb_yes">JCB</string>
+	<string name="poi_payment_jcb_no">Ez dira JCB txartelak onartzen</string>
+	<string name="poi_payment_laser_yes">Laser</string>
+	<string name="poi_payment_laser_no">Ez dira Laser txartelak onartzen</string>
+	<string name="poi_payment_ep_quick_yes">Quick</string>
+	<string name="poi_payment_ep_quick_no">Ez dira Quick txartelak onartzen</string>
+	<string name="poi_payment_eurowag_yes">Eurowag</string>
+	<string name="poi_payment_eurowag_no">Ez dira Eurowag txartelak onartzen</string>
+	<string name="poi_payment_e_zpass_yes">E‑ZPass</string>
+	<string name="poi_payment_e_zpass_no">Ez dira E‑ZPass txartelak onartzen</string>
+	<string name="poi_payment_euroshell_yes">Euroshell</string>
+	<string name="poi_payment_euroshell_no">Ez dira Euroshell erregai txartelak onartzen</string>
+	<string name="poi_payment_kitcard_yes">KITCard</string>
+	<string name="poi_payment_kitcard_no">Ez dira KITCard txartelak onartzen</string>
+	<string name="poi_payment_westfalen_card_yes">Westfalen</string>
+	<string name="poi_payment_westfalen_card_no">Ez dira Westfalen txartelak onartzen</string>
+	<string name="poi_payment_dogecoin_yes">Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Ez dira Dogecoin txartelak onartzen</string>
+	<string name="poi_animal_boarding">Animalien ostatua</string>
+	<string name="poi_animal_boarding_dog">Ostatu mota: txakurrak</string>
+	<string name="poi_animal_boarding_cat">Ostatu mota: katuak</string>
+	<string name="poi_animal_boarding_dog_cat">Ostatu mota: txakurrak, katuak</string>
+	<string name="poi_animal_boarding_horse">Ostatu mota: zaldiak</string>
+
+	<string name="poi_social_facility_shelter">Aterpea</string>
 	</resources>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 553c983ede..338288990e 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2672,4 +2672,6 @@ OsmAnd aplikazioarekin laguntza behar baduzu, jarri kontaktuan gure laguntza tal
     <string name="lang_sr_latn">Serbiera (Latinoa)</string>
     <string name="lang_zh_hk">Txinera (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Ura</string>
+    <string name="rendering_attr_contourWidth_description">Sestra-kurben zabalera</string>
+    <string name="rendering_attr_contourWidth_name">Sestra-kurben zabalera</string>
     </resources>
diff --git a/OsmAnd/res/values-fi/phrases.xml b/OsmAnd/res/values-fi/phrases.xml
index bca0c624b0..fc1499ef9c 100644
--- a/OsmAnd/res/values-fi/phrases.xml
+++ b/OsmAnd/res/values-fi/phrases.xml
@@ -50,4 +50,437 @@
 	<string name="poi_payment_toll_type">Maksutapa</string>
 	<string name="poi_traffic_signals_sound">Ääni</string>
 	<string name="poi_highway_crossing_type">Tapa</string>
+	<string name="poi_service_car">Palvelu</string>
+	<string name="poi_self_service">Itsepalvelu</string>
+	<string name="poi_automated">Automatisoitu</string>
+	<string name="poi_parking_type">Tyyppi</string>
+	<string name="poi_subway_station_filter">Metroasema</string>
+	<string name="poi_ferry_terminal_cargo">Rahti</string>
+	<string name="poi_bicycle_parking_type">Tyyppi</string>
+	<string name="poi_aerialway_heating">Lämmitys</string>
+	<string name="poi_pump">Pumppu</string>
+	<string name="poi_telescope_type">Tyyppi</string>
+	<string name="poi_animal_training_type">Tyyppi</string>
+	<string name="poi_embassy_type">Tyyppi</string>
+	<string name="poi_city_capital">Pääkaupunki</string>
+	<string name="poi_healthcare_alternative_types">Erikoisuus</string>
+	<string name="poi_free_flying_characteristics">Ominainen</string>
+	<string name="poi_archaeological_site_type">Tyyppi</string>
+	<string name="poi_star_rating">Tähtiluokitus</string>
+	<string name="poi_religion_type">Uskonto</string>
+	<string name="poi_information_type">Tyyppi</string>
+	<string name="poi_information_contents">Sisältö</string>
+	<string name="poi_clock_option">Lisä-</string>
+	<string name="poi_scout_camp">Partioleiri</string>
+	<string name="poi_backcountry">Syrjäseutu</string>
+	<string name="poi_resort_type">Tyyppi</string>
+	<string name="poi_piste_difficulty">Rinteen vaikeus</string>
+	<string name="poi_piste_grooming">Rinteen hoito</string>
+	<string name="poi_theatre_genre">Lajityyppi</string>
+	<string name="poi_outdoor_seating">Istumapaikat ulkona</string>
+	<string name="poi_fee">Pääsymaksu</string>
+	<string name="poi_smoking">Tupakointi</string>
+	<string name="poi_delivery">Jakelu</string>
+	<string name="poi_drive_in">Drive-in</string>
+	<string name="poi_drive_through">Läpiajo</string>
+	<string name="poi_takeaway">Noutoravintola</string>
+	<string name="poi_cocktails">Cocktaileja</string>
+	<string name="poi_microbrewery">Pienpanimo</string>
+	<string name="poi_beauty_salon_service">Palvelu</string>
+	<string name="poi_recycling_type">Tyyppi</string>
+	<string name="poi_recycling_accepted_waste">Hyväksytty jäte</string>
+	<string name="poi_shelter_type">Tyyppi</string>
+	<string name="poi_fireplace">Tulisija</string>
+	<string name="poi_seasonal">Kausittainen</string>
+	<string name="poi_massage_type">Hierontatyyppi</string>
+	<string name="poi_tents">Teltat</string>
+	<string name="poi_washing_machine">Pesukone</string>
+	<string name="poi_caravans">Matkailuvaunut</string>
+	<string name="poi_power_supply">Virtalähde</string>
+	<string name="poi_home_visit">Kotikäynti</string>
+	<string name="poi_dish">Lautasantenni</string>
+	<string name="poi_payment_transport_type">Maksutapa (kuljetus)</string>
+	<string name="poi_social_facility_type">Tyyppi</string>
+	<string name="poi_social_facility_for">Kohderyhmä</string>
+	<string name="poi_vacuum_cleaner_filter">Pölynimuri</string>
+	<string name="poi_free_flying_characteristic">Ominaispiirre</string>
+
+<string name="poi_road_obstacle">Tie-este</string>
+	<string name="poi_personal_transport">Henkilökuljetus</string>
+	<string name="poi_public_transport">Julkinen liikenne</string>
+	<string name="poi_air_transport">Lentoliikenne</string>
+	<string name="poi_water_transport">Vesiliikenne</string>
+	<string name="poi_bicycle_transport">Polkupyöräliikenne</string>
+	<string name="poi_aerialway_transport">Ilmakuljetus</string>
+	<string name="poi_hiking_routes">Vaellusreitit</string>
+	<string name="poi_water_supply">Vesipiste</string>
+	<string name="poi_power">Virtalähde</string>
+	<string name="poi_communication">Kommunikointi</string>
+	<string name="poi_landuse">Maankäyttö</string>
+	<string name="poi_administrative">Hallinnollinen</string>
+	<string name="poi_internet_access">Internet</string>
+	<string name="poi_club">Kerho</string>
+	<string name="poi_sustenance">Ruoka</string>
+	<string name="poi_cafe_and_restaurant">Kahvila ja ravintola</string>
+	<string name="poi_service">Palvelu</string>
+	<string name="poi_craft">Käsityöt</string>
+	<string name="poi_finance">Rahoitus</string>
+	<string name="poi_natural">Luonto</string>
+	<string name="poi_seamark">Merenkulku</string>
+	<string name="poi_military">Sotilaallinen</string>
+	<string name="poi_osmwiki">Wikipedia</string>
+	<string name="poi_user_defined_other">Käyttäjän määrittämä</string>
+
+	<string name="poi_bakery">Leipomo</string>
+	<string name="poi_alcohol">Alkoholikauppa</string>
+	<string name="poi_cheese">Juustokauppa</string>
+	<string name="poi_chocolate">Suklaakauppa</string>
+	<string name="poi_coffee">Kahvikauppa</string>
+	<string name="poi_mall">Posti</string>
+	<string name="poi_beverages">Virvoitusjuomakauppa</string>
+	<string name="poi_butcher">Lihakauppa</string>
+	<string name="poi_deli">Herkkukauppa</string>
+	<string name="poi_farm">Maatilamyymälä</string>
+	<string name="poi_greengrocer">Vihanneskauppa</string>
+	<string name="poi_seafood">Kalakauppa</string>
+	<string name="poi_ice_cream">Jäätelöbaari</string>
+	<string name="poi_supermarket">Supermarket</string>
+	<string name="poi_tea">Teekauppa</string>
+	<string name="poi_pasta">Pastakauppa</string>
+	<string name="poi_pastry">Leivoskauppa</string>
+	<string name="poi_dairy">Maitokauppa</string>
+	<string name="poi_vending_machine">Myyntiautomaatti</string>
+	<string name="poi_wine">Viinikauppa</string>
+	<string name="poi_books">Kirjakauppa</string>
+	<string name="poi_bicycle">Pyöräkauppa</string>
+	<string name="poi_antiques">Antiikkikauppa</string>
+	<string name="poi_art">Taidekauppa</string>
+	<string name="poi_baby_goods">Vauvan tarvikkeet</string>
+	<string name="poi_bag">Laukkukauppa</string>
+	<string name="poi_bathroom_furnishing">Kylpyhuonetarvikkeet</string>
+	<string name="poi_bed">Vuodevaatekauppa</string>
+	<string name="poi_boutique">Fashionputiikki</string>
+	<string name="poi_camera">Kamerat ja tarvikkeet</string>
+	<string name="poi_carpet">Mattokauppa</string>
+	<string name="poi_chemist">Apteekki</string>
+	<string name="poi_shoes">Kenkäkauppa</string>
+	<string name="poi_candles">Makeiskauppa</string>
+	<string name="poi_computer">Tietokonekauppa</string>
+	<string name="poi_copyshop">Kopiointipalvelu</string>
+	<string name="poi_curtain">Verhokauppa</string>
+	<string name="poi_fabric">Kangaskauppa</string>
+<string name="poi_dive">Sukellustarvikkeet</string>
+	<string name="poi_doors">Ovet</string>
+	<string name="poi_erotic">Aikuisviihde</string>
+	<string name="poi_fashion">Muotikauppa</string>
+	<string name="poi_fishing">Kalastusvälineet</string>
+	<string name="poi_florist">Kukkakauppa</string>
+	<string name="poi_furniture">Huonekalukauppa</string>
+	<string name="poi_garden_centre">Puutarhakauppa</string>
+	<string name="poi_garden_furniture">Puutarhakalustekauppa</string>
+	<string name="poi_gas">Nestekaasukauppa</string>
+	<string name="poi_gift">Lahjakauppa</string>
+	<string name="poi_hardware">Rautakauppa</string>
+	<string name="poi_jewelry">Jalokivikauppa</string>
+	<string name="poi_kiosk">Kioski</string>
+	<string name="poi_leather">Nahkakauppa</string>
+	<string name="poi_mobile_phone">Matkapuhelinkauppa</string>
+	<string name="poi_motorcycle">Moottoripyöräkauppa</string>
+	<string name="poi_music">Musiikkikauppa</string>
+	<string name="poi_sports">Urheilutarvikekauppa</string>
+	<string name="poi_ticket">Lippumyymälä</string>
+	<string name="poi_toys">Lelukauppa</string>
+	<string name="poi_tyres">Rengaskauppa</string>
+	<string name="poi_video">Videokauppa</string>
+	<string name="poi_window_blind">Kaihdinkauppa</string>
+	<string name="poi_department_store">Tavaratalo</string>
+	<string name="poi_electronics">Elektroniikkakauppa</string>
+	<string name="poi_car">Autokauppa</string>
+	<string name="poi_car_parts">Autotarvikekauppa</string>
+	<string name="poi_cosmetics">Kosmetiikka</string>
+	<string name="poi_watches">Kellokauppa</string>
+	<string name="poi_games">Pelikauppa</string>
+	<string name="poi_video_games">Videopelit</string>
+	<string name="poi_pyrotechnics">Ilotulitteet</string>
+	<string name="poi_weapons">Asekauppa</string>
+	<string name="poi_perfumery">Parfyymikauppa</string>
+	<string name="poi_spices">Maustekauppa</string>
+	<string name="poi_honey">Hunajakauppa</string>
+	<string name="poi_police">Poliisi</string>
+	<string name="poi_fire_station">Paloasema</string>
+	<string name="poi_emergency_phone">Hätäpuhelin</string>
+	<string name="poi_ambulance_station">Ambulanssiasema</string>
+	<string name="poi_ses_station">SES asema</string>
+	<string name="poi_ford">Kahluupaikka</string>
+	<string name="poi_ford_stepping_stones">Astinkivisilta</string>
+	<string name="poi_mountain_pass">Vuoristosola</string>
+	<string name="poi_gate">Portti</string>
+	<string name="poi_city_wall">Kaupungin muuri</string>
+	<string name="poi_toll_booth">Tullikoju</string>
+	<string name="poi_border_control">Rajavalvonta</string>
+	<string name="poi_traffic_signals">Pysähtymisvalo</string>
+
+	<string name="poi_car_repair">Autokorjaamo</string>
+	<string name="poi_service_tyres">Renkaat</string>
+	<string name="poi_vehicle_inspection">Ajoneuvon katsastus</string>
+	<string name="poi_car_wash">Autopesu</string>
+	<string name="poi_fuel">Huoltoasema</string>
+	<string name="poi_fuel_diesel">Diesel</string>
+	<string name="poi_fuel_biodiesel">Bio diesel</string>
+	<string name="poi_fuel_octane_80">Oktaanit 80</string>
+	<string name="poi_fuel_octane_91">Oktaanit 91</string>
+	<string name="poi_fuel_octane_92">Oktaanit 92</string>
+	<string name="poi_fuel_octane_95">Oktaanit 95</string>
+	<string name="poi_fuel_octane_98">Oktaanit 98</string>
+	<string name="poi_fuel_octane_100">Oktaanit 100</string>
+	<string name="poi_fuel_ethanol">Etanooli</string>
+	<string name="poi_fuel_methanol">Metanooli</string>
+	<string name="poi_fuel_e10">E10</string>
+	<string name="poi_fuel_e20">E20</string>
+	<string name="poi_fuel_e85">E85</string>
+	<string name="poi_fuel_biogas">Biogas</string>
+	<string name="poi_waterway_fuel">Huoltoasema veneille</string>
+	<string name="poi_charging_station">Latausasema</string>
+	<string name="poi_compressed_air">Paineilma</string>
+	<string name="poi_parking">Pysäköinti</string>
+	<string name="poi_motorcycle_parking">Moottoripyöräpysäköinti</string>
+	<string name="poi_parking_entrance">Pysäköinnin sisäänajo</string>
+	<string name="poi_garages">Tallit</string>
+
+	<string name="poi_public_transport_platform">Julkisen liikenteen pysäkki</string>
+	<string name="poi_bus_stop">Bussipysäkki</string>
+	<string name="poi_public_transport_stop_position">Julkisen liikenteen pysäkin sijainti</string>
+	<string name="poi_tram_stop">Raitiovaunupysäkki</string>
+	<string name="poi_public_transport_station">Julkisen liikenteen asema</string>
+	<string name="poi_bus_station">Bussiasema</string>
+	<string name="poi_railway_station">Rautatieasema</string>
+	<string name="poi_railway_platform">Rautatielaituri</string>
+	<string name="poi_halt">Rautatiepysäkki</string>
+	<string name="poi_subway_entrance">Metron sisäänkäynti</string>
+	<string name="poi_subway_station">Metroasema</string>
+	<string name="poi_taxi">Taksiasema</string>
+
+	<string name="poi_aerodrome">Lentoasema</string>
+	<string name="poi_helipad">Helikopterikenttä</string>
+	<string name="poi_runway">Kiitorata</string>
+	<string name="poi_ferry_terminal">Lauttaterminaali</string>
+	<string name="poi_lighthouse">Majakka</string>
+
+	<string name="poi_bicycle_rental">Polkupyörävuokraamo</string>
+	<string name="poi_bicycle_parking">Polkupyöräpysäköinti</string>
+
+	<string name="poi_tunnel">Tunneli</string>
+	<string name="poi_bridge">Silta</string>
+
+	<string name="poi_speed_camera">Nopeuskamera</string>
+	<string name="poi_motorway_junction">Moottoritieliittymä</string>
+	<string name="poi_junction">Liittymä</string>
+	<string name="poi_rest_area">Lepoalue</string>
+
+	<string name="poi_water_well">Vesipiste</string>
+	<string name="poi_boatyard">Veneveistämö</string>
+	<string name="poi_wastewater_plant">Vedenpuhdistamo</string>
+	<string name="poi_water_tower">Vesitorni</string>
+	<string name="poi_dam">Pato</string>
+	<string name="poi_power_transformer">Muuntaja</string>
+	<string name="poi_post_office">Postitoimisto</string>
+	<string name="poi_post_box">Postilaatikko</string>
+	<string name="poi_telephone">Puhelin</string>
+	<string name="poi_observation_tower">Havaintotorni</string>
+	<string name="poi_bell_tower">Kellotorni</string>
+	<string name="poi_cooling_tower">Jäähdytystorni</string>
+	<string name="poi_lighting_tower">Ukkosenjohdatin</string>
+	<string name="poi_recycling">Kierrätys</string>
+
+	<string name="poi_recycling_centre">Kierrätyskeskus</string>
+	<string name="poi_recycling_container">Kontti</string>
+	<string name="poi_recycling_glass">Lasi</string>
+	<string name="poi_recycling_paper">Paperi</string>
+	<string name="poi_recycling_clothes">Tekstiilit</string>
+	<string name="poi_recycling_cans">Tölkit</string>
+	<string name="poi_recycling_glass_bottles">Lasipullot</string>
+	<string name="poi_recycling_plastic">Muovi</string>
+	<string name="poi_recycling_scrap_metal">Jätemetalli</string>
+	<string name="poi_recycling_batteries">Patterit</string>
+	<string name="poi_recycling_plastic_bottles">Muovipullot</string>
+	<string name="poi_recycling_waste">Jäte (mustat muovisäkit)</string>
+	<string name="poi_recycling_plastic_packaging">Muovinen pakkausjäte</string>
+	<string name="poi_recycling_newspaper">Sanomalehdet</string>
+	<string name="poi_recycling_cartons">Kartonki</string>
+	<string name="poi_recycling_cardboard">Pahvi</string>
+	<string name="poi_recycling_magazines">Lehdet</string>
+	<string name="poi_recycling_paper_packaging">Paperipakkaukset</string>
+	<string name="poi_recycling_wood">Puu</string>
+	<string name="poi_recycling_books">Kirjat</string>
+	<string name="poi_recycling_shoes">Kengät</string>
+	<string name="poi_recycling_aluminium">Alumiini</string>
+	<string name="poi_recycling_organic">Orgaaninen jäte</string>
+	<string name="poi_recycling_beverage_cartons">Juomakartongit</string>
+	<string name="poi_recycling_garden_waste">Puutarhajäte</string>
+	<string name="poi_recycling_metal">Metalli</string>
+	<string name="poi_payment_visa_electron_yes">Visa Electron</string>
+	<string name="poi_payment_visa_electron_no">Visa Electron korttia ei hyväksytä</string>
+	<string name="poi_payment_cheque_yes">Shekit</string>
+	<string name="poi_payment_cheque_no">Shekkejä ei hyväksytä</string>
+	<string name="poi_payment_visa_debit_yes">Visa Debit kortit</string>
+	<string name="poi_payment_visa_debit_no">Visa Debit kortteja ei hyväksytä</string>
+	<string name="poi_payment_others_yes">Muut</string>
+	<string name="poi_payment_others_no">Muita maksutapoja ei hyväksytä</string>
+	<string name="poi_payment_bancomat_yes">Bancomat</string>
+	<string name="poi_payment_bancomat_no">Bancomat ei hyväksytä</string>
+	<string name="poi_vending_public_transport_tickets">Julkisen liikenteen liput</string>
+	<string name="poi_vending_drinks">Juomat</string>
+	<string name="poi_vending_sweets">Makeiset</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Pakettien nouto ja postitus</string>
+	<string name="poi_vending_condoms">Kondoomit</string>
+	<string name="poi_vending_stamps">Postimerkit</string>
+	<string name="poi_vending_bicycle_tube">Polkupyörän sisäkumit</string>
+	<string name="poi_vending_food">Ruoka</string>
+	<string name="poi_vending_drinks_food">Juomat ja ruoka</string>
+	<string name="poi_vending_fuel">Polttoaineen myynti</string>
+	<string name="poi_vending_parcel_pickup">Pakettien nouto</string>
+	<string name="poi_vending_parcel_mail_in">Pakettien postitus</string>
+	<string name="poi_vending_milk">Maito</string>
+	<string name="poi_vending_bread">Leipä</string>
+	<string name="poi_vending_chewing_gums">Purukumi</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Pysäköintimaksut; julkisen liikenteen liput</string>
+	<string name="poi_vending_coffee">Kahvi</string>
+	<string name="poi_vending_toll">Tullimaksut</string>
+	<string name="poi_vending_tickets">Lippujen myynti</string>
+	<string name="poi_vending_water">Veden myynti</string>
+	<string name="poi_vending_animal_food">Eläinten ruoka</string>
+	<string name="poi_vending_public_transport_plans">Julkisen liikenteen aikataulut</string>
+	<string name="poi_vending_drinks_sweets">Juomat ja makeiset</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Kynttilät</string>
+	<string name="poi_vending_toys">Lelut</string>
+	<string name="poi_vending_ice_cream">Jäätelö</string>
+	<string name="poi_vending_sim_cards">SIM kortit</string>
+
+	<string name="poi_memorial_statue">Patsas</string>
+	<string name="poi_memorial_stone">Kivi</string>
+	<string name="poi_memorial_vehicle">Ajoneuvo</string>
+	<string name="poi_historic_quarry">Historiallinen louhos</string>
+
+	<string name="poi_wetland_wet_meadow">Kostea niitty</string>
+	<string name="poi_wetland_bog">Neva</string>
+	<string name="poi_wetland_marsh">Suo</string>
+	<string name="poi_wetland_reedbed">Ruovikko</string>
+	<string name="poi_wetland_swamp">Räme</string>
+	<string name="poi_wetland_saltern">Suola-alue</string>
+	<string name="poi_wetland_tidalflat">Vuorovesi tasanne</string>
+	<string name="poi_wetland_saltmarsh">Suolainen kosteikko</string>
+	<string name="poi_wetland_mangrove">Mangrove</string>
+	<string name="poi_wetland_string_bog">Aapasuo</string>
+	<string name="poi_wetland_fen">Letto</string>
+	<string name="poi_wetland_palsa_bog">Palsasuo</string>
+	<string name="poi_wetland_mud">Muta</string>
+
+	<string name="poi_beach_sand">Hiekka</string>
+	<string name="poi_beach_shingle">Pienet kivet</string>
+	<string name="poi_beach_rocky">Louhikko</string>
+
+	<string name="poi_chimney">Savupiippu</string>
+	<string name="poi_palm">Palmu</string>
+	<string name="poi_cypress">Sypressi</string>
+	<string name="poi_flagpole">Lipputanko</string>
+
+	<string name="poi_bench_yes">Kyllä</string>
+	<string name="poi_bench_no">Ilman penkkiä</string>
+	<string name="poi_bin_yes">Korilla</string>
+	<string name="poi_bin_no">Ilman koria</string>
+
+	<string name="poi_shelter_type_public_transport">Julkinen liikenne</string>
+	<string name="poi_shelter_type_picnic_shelter">Picnic</string>
+	<string name="poi_shelter_type_weather_shelter">Säätila</string>
+	<string name="poi_shelter_type_building">Rakennus</string>
+	<string name="poi_internet_access_type_wlan">Wi-Fi</string>
+	<string name="poi_internet_access_type_terminal">Terminaali</string>
+	<string name="poi_note">Huomautus</string>
+	<string name="poi_historic_aircraft">Historiallinen lentokone</string>
+
+	<string name="poi_elevator_yes">Hissillä</string>
+	<string name="poi_elevator_no">Ilman hissiä</string>
+
+	<string name="poi_technical_monument">Tekninen monumentti</string>
+
+	<string name="poi_office_camping">Leirintäalueen toimisto</string>
+	<string name="poi_guide">Opastuskeskus</string>
+	<string name="poi_consulting">Konsultointitoimisto</string>
+	<string name="poi_cooperative">Osuuskuntatoimisto</string>
+	<string name="poi_office_forestry">Metsänhoidon toimisto</string>
+	<string name="poi_logistics">Logistiikkatoimisto</string>
+	<string name="poi_parish">Kirkkoherranvirasto</string>
+	<string name="poi_publisher">Julkaisun toimisto</string>
+
+	<string name="poi_fuel_91ul">91UL polttoaine</string>
+	<string name="poi_fuel_100ll">100LL polttoaine</string>
+	<string name="poi_fuel_jeta1">Jet A-1 polttoaine</string>
+	<string name="poi_fuel_adblue">AdBlue polttoaine</string>
+
+	<string name="poi_fuel_wood">Polttoaine: puu</string>
+	<string name="poi_fuel_charcoal">Polttoaine: puuhiili</string>
+	<string name="poi_fuel_coal">Polttoaine: hiili</string>
+
+	<string name="poi_street_lamp">Katulamppu</string>
+
+	<string name="poi_crop_rice">Tuotanto: riisi</string>
+	<string name="poi_crop_grass">Tuotanto: ruoho</string>
+	<string name="poi_crop_corn">Tuotanto: maissi</string>
+	<string name="poi_crop_cereal">Tuotanto: viljakasvi</string>
+	<string name="poi_crop_sugarcane">Tuotanto: sokeriruoko</string>
+	<string name="poi_crop_wheat">Tuotanto: vehnä</string>
+	<string name="poi_crop_soy">Tuotanto: soija</string>
+	<string name="poi_crop_barley">Tuotanto: ohra</string>
+	<string name="poi_crop_vegetables">Tuotanto: vihannekset</string>
+	<string name="poi_crop_hop">Tuotanto: humala</string>
+	<string name="poi_crop_rape">Tuotanto: rapsi</string>
+	<string name="poi_crop_beet">Tuotanto: juurikas</string>
+	<string name="poi_crop_lavender">Tuotanto: laventeli</string>
+	<string name="poi_crop_tea">Tuotanto: tee</string>
+	<string name="poi_crop_coffee">Tuotanto: kahvi</string>
+	<string name="poi_crop_poultry">Tuotanto: siipikarja</string>
+	<string name="poi_crop_sunflower">Tuotanto: auringonkukka</string>
+	<string name="poi_crop_raspberry">Tuotanto: vadelma</string>
+	<string name="poi_crop_tobacco">Tuotanto: tupakka</string>
+	<string name="poi_crop_strawberry">Tuotanto: mansikka</string>
+	<string name="poi_crop_vegetables_flowers">Tuotanto: vihannekset, kukat</string>
+	<string name="poi_crop_cassava">Tuotanto: kassava</string>
+	<string name="poi_crop_cranberry">Tuotanto: karpalo</string>
+	<string name="poi_crop_asparagus">Tuotanto: parsa</string>
+	<string name="poi_crop_flowers">Tuotanto: kukat</string>
+
+	<string name="poi_clothes_women">Naiset</string>
+	<string name="poi_clothes_underwear">Alusasu</string>
+	<string name="poi_clothes_men">Miehet</string>
+	<string name="poi_clothes_wedding">Hääpuvut</string>
+	<string name="poi_clothes_sports">Urheilut</string>
+	<string name="poi_clothes_babies">Vauvat</string>
+	<string name="poi_clothes_denim">Denim</string>
+	<string name="poi_clothes_workwear">Työasu</string>
+	<string name="poi_clothes_hats">Hatut</string>
+	<string name="poi_clothes_fur">Turkis</string>
+	<string name="poi_clothes_leather">Nahka</string>
+	<string name="poi_clothes_costumes">Puvut</string>
+	<string name="poi_clothes_traditional">Perinteinen</string>
+	<string name="poi_clothes_suits">Puvut</string>
+	<string name="poi_clothes_maternity">Äitiys</string>
+	<string name="poi_clothes_vintage">Klassinen</string>
+	<string name="poi_clothes_oversize">Ylisuuri</string>
+	<string name="poi_clothes_schoolwear">Koulu</string>
+	<string name="poi_clothes_swimwear">Uima-asu</string>
+	<string name="poi_clothes_socks">Sukat</string>
+	<string name="poi_clothes_shirts">Paidat</string>
+	<string name="poi_clothes_dance">Tanssi</string>
+	<string name="poi_clothes_military">Sotilaallinen</string>
+
+	<string name="poi_historic_milestone">Historiallinen merkkipaalu</string>
+
+	<string name="poi_shoes_children">Lapset</string>
+	<string name="poi_shoes_women">Naiset</string>
+	<string name="poi_shoes_sport">Urheilut</string>
+	<string name="poi_shoes_men">Miehet</string>
+	<string name="poi_shoes_orthopedic">Ortopedinen</string>
+
+	<string name="poi_historic_manor">Historiallinen kartano</string>
 	</resources>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 40ae26fad6..6fc9ef28bf 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -834,7 +834,12 @@ Pit %2$s</string>
 	<string name="osmand_rastermaps_plugin_description">"Tällä lisäosalla voit päästä monenlaisiin online (ns. laatta tai rasteri) karttoihin, esimääritellyistä Openstreetmap laatoista (kuten Mapnik) satelliitti kuviin ja erityistarkoitus tasoihin kuten sääkarttoihin, ilmasto karttoihin, geologisiin karttoihin, mäkisävy tasoihin, jne.\n\nMitä tahansa näistä kartoista voidaan käyttää pää (pohja) karttana näytettäessä OsmAnd karttaruudulla, tai päällys- tai aluskerroksena toiselle pohjakartalle (kuten OsmAndin perus offline kartat). Saadaksesi mikä tahansa aluskerros näkyvämmäksi, tiettyjä osia OsmAnd vektorikartoista voi helposti piilottaa \'Kartta asetukset\' valikosta tarvittaessa.\n\nLaattakarttoja voi saada suoraan online lähteistä, tai voidaan valmistaa offline käyttöön (tai manuaalisesti kopioida OsmAndin kansioon) sqlite tietokantana jonka voi teihdä eri kolmannen osapuolen karttavalmistelu työkaluilla. "</string>
 	<string name="record_plugin_description">"Tämä lisäosa ottaa käyttöön toiminnallisuudet nauhoittaa ja tallentaa jälkiä manuaalisesti koskettamalla GPX nauhoitus toimintoja karttaruudulla, tai myös automaattisesti tallentaa kaikki navigointireitit GPX tiedostoon.\n\nNauhoitetut jäljet voidaan jakaa ystävillesi tai käyttää OSM osallistumisissa. Urheilijat voivat nauhoittaa jälkiä harjoittelun seuraamiseen. Jotain perus jälkianalyysejä voidaan tehdä suoraan OsmAndissa, kuten kierrosaikoja, keskimääräistä nopeutta jne., ja jälkiä voi tietysty myös myöhemmin analysoida erityisissä kolmannen osapuolen analysointi työkaluissa. "</string>
 	<string name="osmo_plugin_name">OsMo seuranta</string>
-	<string name="osmo_plugin_description">"Tämä lisäosa tarjoaa toiminnot OsMo kehittyneeseen live seurantaan, katso http://osmo.mobi.\n\nVoit seurata muita laitteita ja olla seurattuna. Voit spontaanisti luoda anonyymejä ryhmiä, jakaa toistenne sijainnin, ja viestitellä. Mukana tulee eri vaihtoehtoja harjoituksen seuraamiseen tai jatkuvaan seuraamiseen.\n\nAnonyymejä ryhmiä luodaan määritellyiksi päivämääriksi ja rajoitettuna määrättyihin toimintohin, esimerkiksi ei ole etäohjausta eikä ryhmän pääkäyttäjää. Täysin toimivia ryhmiä, toisaalta, voi luoda verkkosivuilla ja vain rekisteröityneillä käyttäjillä on pääsy niihin. "</string>
+	<string name="osmo_plugin_description">"Tämä lisäosa tarjoaa toiminnot OsMo kehittyneeseen live seurantaan, katso http://osmo.mobi.
+
+Voit seurata muita laitteita ja olla seurattuna. Voit spontaanisti luoda anonyymejä ryhmiä, jakaa toistenne sijainnin, ja viestitellä. Mukana tulee eri vaihtoehtoja harjoituksen seuraamiseen tai jatkuvaan seuraamiseen.
+
+Anonyymejä ryhmiä luodaan määritellyiksi päivämääriksi ja rajoitettuna määrättyihin toimintohin, toisin sanoeni ei etäohjausta eikä ryhmän pääkäyttäjää. Täysin toimivia ryhmiä, toisaalta, voi luoda verkkosivuilla ja vain rekisteröityneillä käyttäjillä on pääsy niihin.
+ "</string>
 	<string name="srtm_paid_version_title">Korkeuskäyrät lisäosa</string>
 	<string name="osmand_srtm_short_description_80_chars">OsmAnd lisäosa offline korkeuskäyrille</string>
 	<string name="osmand_srtm_long_description_1000_chars">"Tämä lisäosa tarjoaa sekä korkeuskäyrä päällyskerros ja (helpotus) mäkisävy tason näytettäväksi OsmAnd offline karttojen päällä. Tätä toiminnallisuutta arvostavat paljon urheilijat, retkeilijät, vuoristo seikkailijat, ja ketkä tahansa maisemien ihailusta kiinnostuneet.\n\nMaailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläistä) perustuu mittauksiin jotka on tehnyt SRTM (Shuttle Radar Topography Mission) ja ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), ja kuvausvälineet mukana kulkeva Terra, NASAn maapallontarkkailujärjestelmän lippulaiva satelliitti. ASTER on yhteistyö NASAn, Japanin talous-, kauppa ja teollisuusministeriön (METI), ja Japanin avaruusjärjestelmien (J-spacesystems) välillä. "</string>
@@ -954,7 +959,7 @@ Pit %2$s</string>
     <string name="search_my_location">Hae sijaintini</string>
     <string name="no_update_info">Älä näytä päivityksiä</string>
     <string name="update_all_maps_now">Haluatko päivittää kaikki kartat nyt?</string>
-    <string name="clear_tile_data">Puhdista kaikki kuvakkeet</string>
+    <string name="clear_tile_data">Poista kaikki tiilet</string>
     <string name="routing_attr_short_way_name">Polttoainetaudellisella tavalla</string>
     <string name="routing_attr_short_way_description">Käytä polttoainetaloudellista tapaa (tavallisesti lyhyempi)</string>
     <string name="shared_string_change">Muuta</string>
@@ -1589,7 +1594,7 @@ Jälki %2$s</string>
     <string name="local_indexes_cat_av">Audio/Video data</string>
     <string name="dropbox_plugin_name">Dropbox lisäosa</string>
     <string name="download_roads_only_maps">Ainoastaan tiet kartta</string>
-    <string name="rendering_attr_noAdminboundaries_name">Piilota rajat</string>
+    <string name="rendering_attr_noAdminboundaries_name">Rajat</string>
     <string name="rendering_attr_showRoadMaps_description">Valitse koska näyttää \"ainoastaan tiet\" kartta:</string>
     <string name="rendering_attr_showRoadMaps_name">Ainoastaan tiet kartta</string>
     <string name="safe_mode">Vikasietotila</string>
@@ -1608,7 +1613,7 @@ Jälki %2$s</string>
     <string name="global_app_allocated_memory_descr">Muistia varattu %1$s MB (Android raja %2$s MB, Dalvik %3$s MB).</string>
     <string name="share_route_as_gpx">Jaa reitti GPX tiedostona</string>
     <string name="share_route_subject">Reitti jaettu käyttäen OsmAnd</string>
-    <string name="rendering_attr_noPolygons_name">Piilota monikulmiot</string>
+    <string name="rendering_attr_noPolygons_name">Monikulmiot</string>
     <string name="rendering_attr_appMode_name">Hahmotustila</string>
     <string name="rendering_attr_appMode_description">Optimoi kartta</string>
     <string name="rendering_attr_contourLines_description">Näytä alkaen zoomaustasosta (tarvitsee korkeuskäyrätietoja):</string>
@@ -2026,4 +2031,124 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="drawer">Jäsentämätön luettelo</string>
     <string name="plugin_touringview_name">Tiekarttanäyttö</string>
 	<string name="avoid_roads_msg">Voit muuttaa toiselle reitille valitsemalla vältettäviä teitä</string>
+    <string name="rendering_attr_contourWidth_description">Korkeuskäyräviivojen leveys</string>
+    <string name="rendering_attr_contourWidth_name">Korkeuskäyriäviivojen leveys</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Vesi</string>
+    <string name="legacy_search">Periytyvä haku</string>
+    <string name="show_legacy_search">Näytä periytyvä haku</string>
+    <string name="release_2_4">"
+ • Uusi tehokas vapaan tekstin haku
+
+
+ • Autoradiojärjestelmä / kovaääninen puhelin yhdistäminen Bluetooth avulla
+
+
+ • Parannettu reittiopasatus, ääniviestitys ja käännöskaistojen osoitus
+
+
+ • Parannettu liikennetaso reitin hahmottamisella
+
+
+ • Lisätty kohteita sekä tuki paikallisille kohteille
+
+
+ • Paljo muita parannuksia ja virheiden korjauksia
+
+
+ ja lisää…
+ "</string>
+    <string name="av_audio_bitrate">Audion bittinopeus</string>
+    <string name="av_audio_bitrate_descr">Valitse audion bittinopeus</string>
+    <string name="none_selected_gpx">GPX tiedostoa ei valittu. Valitaksesi paina ja pidä käytettävissä olevalla jäljellä.</string>
+    <string name="osmo_create_groups_confirm">Luodaksesi ryhmiä tulee Sinun olla OsMo\'on rekisteröitynyt käyttäjä.</string>
+    <string name="osmo_credentials_not_valid">OsMo käyttäjätietosi eivät ole oikein.</string>
+    <string name="osmo_regenerate_login_ids">Generoi uudelleen käyttäjä id:si</string>
+    <string name="osmo_cancel_moving_target">Peruuta kohteen liikuttelu</string>
+    <string name="osmo_set_moving_target">Aseta liikkuvaksi kohteeksi</string>
+    <string name="lang_sr_latn">Serbia (latinalaisin)</string>
+    <string name="lang_zh_hk">Kiina (Hong Kong)</string>
+    <string name="speech_rate_descr">Määrittele puheen nopeus TTS:lle</string>
+    <string name="speech_rate">Puheen nopeus</string>
+    <string name="edit_tilesource_elliptic_tile">elliptinen merkator</string>
+    <string name="clear_intermediate_points">Poista välikohteet</string>
+    <string name="keep_intermediate_points">Säilytä välikohteet</string>
+    <string name="new_directions_point_dialog">Olet jo asettanut välikohteita.</string>
+    <string name="use_kalman_filter_compass_descr">Vähentää kohinaa kompassilukemissa mutta lisää hitautta</string>
+    <string name="use_magnetic_sensor_descr">Käytä magneetista sensoria määrittäesä kompassin arvoja suuntasensorin sijaan</string>
+    <string name="use_magnetic_sensor">Käytä magneetista sensoria</string>
+    <string name="srtm_paid_version_msg">Harkitse ostavasi Korkeuskäyrä laajennuksen Kaupasta tukeaksesi jatkokehitystä.</string>
+    <string name="recording_playing">Audio halutusta nauhoituksesta soitetaan.
+%1$s</string>
+    <string name="recording_context_menu_arecord">Tee audio muistiinpano</string>
+    <string name="rendering_attr_alpineHiking_name">Alppivaelluksen mittakaava (SAC)</string>
+    <string name="rendering_attr_alpineHiking_description">Hahmota polut SAC mittakaavan mukaisesti</string>
+    <string name="rendering_attr_hikingRoutesOSMC_description">Hahmota polut OSMC jälkien pohjalta</string>
+
+    <string name="keep_informing">Toista suunnistusohjeet</string>
+    <string name="auto_follow_location_enabled">Keskitä käytettävä kartta automaattisesti.</string>
+    <string name="data_to_search_poi_not_available">Paikallista dataa POI estsimiseksi ei ole käytettävissä.</string>
+    <string name="overlay_transparency_descr">Muokkaa peitteen läpinäkyvyyttä</string>
+    <string name="overlay_transparency">Peitteen läpinäkyvyys</string>
+    <string name="map_transparency_descr">Muokkaa peruskartan läpinäkyvyyttä</string>
+    <string name="map_transparency">Peruskartan läpinäkyvyys</string>
+    <string name="tile_source_already_installed">Kartta on jo asennettu, asetukset päivitetään</string>
+    <string name="select_tile_source_to_install">Valitse (tiili) kartat asennettavaksi tai päivitettäväksi</string>
+    <string name="internet_not_available">Internet yhteys tarvitaan tähän toimintoon mutta se ei ole käytettävissä</string>
+    <string name="install_more">Asenna lisää…</string>
+    <string name="level_to_switch_vector_raster_descr">Minimi zoomaustaso käytettäväksi vektorikartoilla</string>
+    <string name="level_to_switch_vector_raster">Min vektorien zoomaustaso</string>
+    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> karttaluokittelu kuvin</string>
+    <string name="error_doing_search">Tapahtui virhe offline haussa</string>
+    <string name="system_locale">Järjestelmä</string>
+    <string name="preferred_locale_descr">Valitse näytettävä kieli (ole hyvä ja käynnnistä OsmAnd uudestaan muutoksen jälkeen)</string>
+    <string name="preferred_locale">Näytettävä kieli</string>
+    <string name="incomplete_locale">epätäydellinen</string>
+    <string name="send_location_way_choose_title">Jaa sijainti käyttäen</string>
+    <string name="send_location_sms_pattern">Sijainti: %1$s
+%2$s</string>
+    <string name="add_waypoint_dialog_added">GPX Väyläpiste \'\'{0}\'\' lisättiin onnistuneesti</string>
+    <string name="add_waypoint_dialog_title">Lisää väyläpiste tallennettuun GPX jälkeen</string>
+    <string name="context_menu_item_add_waypoint">Lisää GPX väyläpiste</string>
+    <string name="amenity_type_administrative">Hallinnollinen</string>
+    <string name="indexing_address">Indeksoidaan osoitteita.…</string>
+    <string name="indexing_map">Indeksoidaan karttaa…</string>
+    <string name="indexing_poi">Indeksoidaan POI…</string>
+    <string name="old_map_index_is_not_supported">Poistettua karttadatan formaattia \'\'{0}\'\' ei tueta</string>
+    <string name="version_index_is_big_for_memory">Indeksi \'\'{0}\'\' ei mahtunut muistiin</string>
+    <string name="version_index_is_not_supported">Indeksin \'\'{0}\'\' versiota ei tueta</string>
+    <string name="daynight_descr">Valitse päivä/yö tilan vaihtamisen sääntö</string>
+    <string name="maps_could_not_be_downloaded">Tätä karttaa ei voitu ladata</string>
+    <string name="poi_context_menu_website">Näytä POIn verkkosivut</string>
+    <string name="poi_context_menu_call">Näytä POIn puhelinnumero</string>
+    <string name="use_high_res_maps">Korkean resoluution näyttö</string>
+    <string name="no_vector_map_loaded">Vektorikarttoja ei ladattu</string>
+    <string name="map_route_by_gpx">Suunnista käyttäen GPX</string>
+    <string name="gpx_files_not_found">GPX tiedostoja ei löytynyt jälkien hakemistosta</string>
+    <string name="error_reading_gpx">Virhe luettaessa GPX dataa</string>
+    <string name="vector_data">Offline vektorikartat</string>
+    <string name="poi_context_menu_modify">Muokkaa POI</string>
+    <string name="no_fav_to_save">Ei suosikkipisteitä tallennettavaksi</string>
+    <string name="layer_route">Reitti</string>
+    <string name="layer_osm_bugs">OSM Muistiinpanot (online)</string>
+    <string name="layer_poi">POI…</string>
+    <string name="menu_layers">Karttatasot</string>
+    <string name="poi_dialog_comment_default">POIn muutos</string>
+    <string name="navigation_intent_invalid">Virheellinen formaatti: %s</string>
+    <string name="use_fast_recalculation">Älykäs reitin uudelleen laskenta</string>
+    <string name="use_fast_recalculation_desc">Laske uudelleen ainoastaan reitin alkuosa pidemmille matkoille</string>
+    <string name="rate_this_app">Arvostele tämä sovellutus</string>
+    <string name="user_hates_app_get_feedback">Kerro meille miksi.</string>
+    <string name="user_hates_app_get_feedback_long">Ole hyvä ja kerro meille mitä haluaisit muuttaa tässä sovelluksessa.</string>
+    <string name="failed_to_upload">Vieminen epäonnistui</string>
+    <string name="successfully_uploaded_pattern">Viety onnistuneesti {0}/{1}</string>
+    <string name="offline_maps_and_navigation">Offline Kartat
+&amp; Suunnistus</string>
+    <string name="commit_poi"/>
+    <string name="tab_title_advanced"/>
+    <string name="confirm_download_roadmaps"/>
+    <string name="free_downloads_used">Käytetyt ilmaiset lataukset</string>
+    <string name="free_downloads_used_description">Näyttää käytetyt ilmaiset lataukset</string>
+
+    <string name="application_dir_description">Valitse inne haluat tallentaa kartat ja muut datatiedostot.</string>
+
     </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 169ffbd945..6600eaad41 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1835,7 +1835,7 @@ Pour revenir à l’un des styles de carte classique de OsmAnd, désactivez simp
     <string name="shared_string_logoff">Se déconnecter</string>
     <string name="rendering_value_disabled_name">Désactivé</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Couleur de l\'itinéraire basée sur les symboles de randonnée OSMC</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Couleur selon l\'étendue de l\'itinéraire</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Couleur selon l\'affiliation de l\'itinéraire</string>
     <string name="osm_edit_context_menu_delete">Supprimer la modification OSM</string>
     <string name="shared_string_show_details">Afficher les détails</string>
     <string name="read_full_article">Lire l\'article complet (en ligne)</string>
@@ -2480,4 +2480,14 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\'
     <string name="lang_sr_latn">Serbe (Latin)</string>
     <string name="lang_zh_hk">Chinois (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Eau</string>
+    <string name="rendering_attr_contourWidth_description">Épaisseur des traits pour les courbes de niveaux</string>
+    <string name="rendering_attr_contourWidth_name">Épaisseur des courbes de niveaux</string>
+    <string name="rendering_attr_contourDensity_name">Densité des courbes de niveaux</string>
+    <string name="rendering_value_high_name">Élevé</string>
+    <string name="rendering_value_medium_w_name">Moyen</string>
+    <string name="rendering_value_low_name">Faible</string>
+    <string name="rendering_attr_contourDensity_description">Densité des courbes de niveaux</string>
+    <string name="legacy_search">Recherche héritée</string>
+    <string name="show_legacy_search">Afficher la recherche héritée</string>
+    <string name="show_legacy_search_desc">Activer la recherche héritée dans la liste déroulante</string>
     </resources>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 576442a002..5fd53b81a2 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -126,17 +126,17 @@
 	<string name="poi_resource_water">Vatn</string>
 	<string name="poi_shelter_type_public_transport">Almenningssamgöngur</string>
 	<string name="poi_shelter_type_building">Bygging</string>
-	<string name="poi_internet_access_type_terminal">Flugstöð</string>
+	<string name="poi_internet_access_type_terminal">Tölva</string>
 	<string name="poi_route_bus_ref">Strætisvagn</string>
 	<string name="poi_route_train_ref">Lest</string>
 	<string name="poi_route_light_rail_ref">Smálest</string>
-	<string name="poi_clothes_schoolwear">Skóli</string>
+	<string name="poi_clothes_schoolwear">Skólaföt</string>
 	<string name="poi_social_facility_shelter">Skýli</string>
 	<string name="poi_social_facility_for_disabled">Óvirkt</string>
 	<string name="poi_site_type_city">Borg</string>
 	<string name="poi_fire_hydrant_style_water_source_stream">Lækur</string>
 	<string name="poi_aerodrome_type_public">Opinbert</string>
-	<string name="poi_aerodrome_type_military">Herþjónusta</string>
+	<string name="poi_aerodrome_type_military">Hernaðar</string>
 	<string name="poi_aerodrome_type_private">Einka</string>
 
 	<string name="poi_wiki_link">Wikipedia</string>
@@ -698,7 +698,7 @@
 
 	<string name="poi_width">Breidd</string>
 
-	<string name="poi_architect_name">Arkítektar</string>
+	<string name="poi_architect_name">Arkítekt</string>
 
 	<string name="poi_industrial_oil">Tegund: olíuiðnaður</string>
 	<string name="poi_industrial_factory">Tegund: verksmiðja</string>
@@ -1148,4 +1148,372 @@
 	<string name="poi_salt_no">Salt: nei</string>
 	<string name="poi_aerodrome_type_international">Alþjóðlegt</string>
 	<string name="poi_aerodrome_type_regional">Svæðisbundið</string>
+	<string name="poi_internet_access_terminal">Internetaðgangur: tölva</string>
+	<string name="poi_information_terminal">Miðstöð</string>
+	<string name="poi_traffic_signals_sound_walk">Aðeins þegar umferð gangandi er leyfð</string>
+
+	<string name="poi_aerialway_bicycle_no">Reiðhjól: ekki leyfð</string>
+	<string name="poi_aerialway_bicycle_summer">Leyfð á sumrin</string>
+	<string name="poi_shelter_type_weather_shelter">Veður</string>
+	<string name="poi_shelter_type_sun_shelter">Sólskýli</string>
+	<string name="poi_internet_access_type_wlan">Þráðlaust Wi-Fi net</string>
+	<string name="poi_internet_access_type_wired">Um kapal</string>
+	<string name="poi_internet_access_type_no">Ekki internetaðgangur</string>
+	<string name="poi_internet_access_type_yes">Með internetaðgangi</string>
+
+	<string name="poi_maxwidth">Hámarksbreidd</string>
+	<string name="poi_iata">IATA-kóði</string>
+	<string name="poi_icao">ICAO-kóði</string>
+	<string name="poi_faa">FAA-kóði</string>
+	
+	<string name="poi_architecture_modern">Byggingastíll: módernískur</string>
+	<string name="poi_architecture_stalinist_neoclassicism">Byggingastíll: stalínísk nýklassík</string>
+	<string name="poi_architecture_contemporary">Byggingastíll: samtímalegur</string>
+	<string name="poi_architecture_umgebinde">Byggingastíll: umgebinde</string>
+	<string name="poi_architecture_art_nouveau">Byggingastíll: art nouveau</string>
+	<string name="poi_architecture_neoclassicism">Byggingastíll: nýklassík</string>
+	<string name="poi_architecture_victorian">Byggingastíll: viktoríanskur</string>
+	<string name="poi_architecture_brutalism">Byggingastíll: brútalismi</string>
+	<string name="poi_architecture_classicism">Byggingastíll: klassískur</string>
+	<string name="poi_architecture_gothic">Byggingastíll: gotneskur</string>
+	<string name="poi_architecture_baroque">Byggingastíll: barokk</string>
+	<string name="poi_architecture_wilhelminian_style">Byggingastíll: vilhelmínskur</string>
+	<string name="poi_architecture_renaissance">Byggingastíll: endurreisn</string>
+	<string name="poi_architecture_romanesque">Byggingastíll: rómantískur</string>
+
+	<string name="poi_tunnel_railway">Lestagöng</string>
+	<string name="poi_bridge_pedestrian">Göngubrú</string>
+	<string name="poi_bridge_bicycle">Hjólreiðabrú</string>
+	<string name="poi_bridge_railway">Járnbrautabrú</string>
+	<string name="poi_surface_unpaved">Yfirborð: óbundið</string>
+	<string name="poi_surface_paved">Yfirborð: steinlagt</string>
+	<string name="poi_surface_asphalt">Yfirborð: asfalt</string>
+	<string name="poi_surface_concrete">Yfirborð: steinsteypa</string>
+	<string name="poi_surface_pebblestone">Yfirborð: steinvölur</string>
+	<string name="poi_surface_stone">Yfirborð: steinn</string>
+	<string name="poi_surface_metal">Yfirborð: málmur</string>
+	<string name="poi_surface_wood">Yfirborð: timbur</string>
+	<string name="poi_surface_gravel">Yfirborð: möl</string>
+	<string name="poi_surface_fine_gravel">Yfirborð: fín möl</string>
+	<string name="poi_surface_compacted">Yfirborð: þjappað</string>
+	<string name="poi_surface_sand">Yfirborð: sandur</string>
+	<string name="poi_surface_grass">Yfirborð: gras</string>
+	<string name="poi_surface_mud">Yfirborð: leðja</string>
+	<string name="poi_surface_ice">Yfirborð: ísing</string>
+	<string name="poi_surface_salt">Yfirborð: salt</string>
+	<string name="poi_surface_snow">Yfirborð: snjór</string>
+
+	<string name="poi_route_trolleybus_ref">Rafknúinn strætisvagn</string>
+	<string name="poi_route_tram_ref">Sporvagn</string>
+	<string name="poi_route_monorail_ref">Einteinungur</string>
+	<string name="poi_route_funicular_ref">Dráttarlest</string>
+	<string name="poi_route_ferry_ref">Ferja</string>
+
+	<string name="poi_route_railway_ref">Leið járnbrautar</string>
+
+	<string name="poi_historic_yes">Sögulegur hlutur</string>
+	<string name="poi_surveillance_yes">Eftirlit: já</string>
+	<string name="poi_shop_additional_yes">Með verslun</string>
+
+	<string name="poi_service_bicycle_retail_yes">Smásala</string>
+	<string name="poi_service_bicycle_retail_no">Hjólasala: nei</string>
+	<string name="poi_service_bicycle_repair_yes">Viðgerðir</string>
+	<string name="poi_service_bicycle_repair_no">Hjólaviðgerðir: nei</string>
+	<string name="poi_service_bicycle_rental_yes">Leiga</string>
+	<string name="poi_service_bicycle_rental_no">Hjólaleiga: nei</string>
+	<string name="poi_service_bicycle_pump_yes">Loftdæla</string>
+	<string name="poi_service_bicycle_pump_no">Loftdæla fyrir hjól: nei</string>
+	<string name="poi_service_bicycle_cleaning_yes">Hreinsun</string>
+	<string name="poi_service_bicycle_charging_yes">Hleðsla reiðhjóla: já</string>
+	<string name="poi_service_bicycle_charging_no">Hleðsla reiðhjóla: nei</string>
+	<string name="poi_wildlife_hide">Staður til skoðunar villtra dýra</string>
+
+	<string name="poi_training_language">Þjálfun: tungumál</string>
+	<string name="poi_training_music">Þjálfun: tónlist</string>
+	<string name="poi_training_dance">Þjálfun: dans</string>
+	<string name="poi_training_sport">Þjálfun: íþróttir</string>
+	<string name="poi_training_art">Þjálfun: listir</string>
+	<string name="poi_training_cooking">Þjálfun: matreiðsla</string>
+	<string name="poi_training_computer">Þjálfun: tölvur</string>
+	<string name="poi_training_yoga">Þjálfun: jóga</string>
+	<string name="poi_training_martial_art">Þjálfun: bardagaíþróttir</string>
+	<string name="poi_training_aviation">Þjálfun: flug</string>
+	<string name="poi_training_hairdressing">Þjálfun: hárgreiðsla</string>
+
+	<string name="poi_industrial_auto_wrecker">Tegund: bílarif</string>
+	<string name="poi_historic_aircraft">Söguleg flugvél</string>
+
+	<string name="poi_elevator_yes">Með lyftu</string>
+	<string name="poi_elevator_no">Án lyftu</string>
+
+	<string name="poi_office_camping">Skrifstofa tjaldstæðis</string>
+	<string name="poi_office_forestry">Skrifstofa skógarvarða</string>
+	<string name="poi_parish">Sóknarskrifstofa</string>
+	<string name="poi_fuel_91ul">Eldsneyti 91UL</string>
+	<string name="poi_fuel_100ll">Eldsneyti 100LL</string>
+	<string name="poi_fuel_jeta1">Eldsneyti Jet A-1</string>
+	<string name="poi_fuel_adblue">Eldsneyti AdBlue</string>
+
+	<string name="poi_fuel_wood">Eldsneyti: viður</string>
+	<string name="poi_fuel_charcoal">Eldsneyti: viðarkol</string>
+	<string name="poi_fuel_coal">Eldsneyti:; kol</string>
+
+	<string name="poi_street_lamp">Ljósastaur</string>
+
+	<string name="poi_escape_lane">Útafakstursakrein</string>
+
+	<string name="poi_crop_rice">Afurð: hrísgrjón</string>
+	<string name="poi_crop_grass">Afurð: gras</string>
+	<string name="poi_crop_corn">Afurð: maís</string>
+	<string name="poi_crop_cereal">Afurð: korn</string>
+	<string name="poi_crop_sugarcane">Afurð: sykurreyr</string>
+	<string name="poi_crop_wheat">Afurð: hveiti</string>
+	<string name="poi_crop_soy">Afurð: soja</string>
+	<string name="poi_crop_barley">Afurð: bygg</string>
+	<string name="poi_crop_vegetables">Afurð: grænmeti</string>
+	<string name="poi_crop_hop">Afurð: humlar</string>
+	<string name="poi_crop_rape">Afurð: repja</string>
+	<string name="poi_crop_beet">Afurð: rófur</string>
+	<string name="poi_crop_lavender">Afurð: lavander</string>
+	<string name="poi_crop_tea">Afurð: te</string>
+	<string name="poi_crop_coffee">Afurð: kaffi</string>
+	<string name="poi_crop_poultry">Afurð: alifuglar</string>
+	<string name="poi_crop_sunflower">Afurð: sólblóm</string>
+	<string name="poi_crop_raspberry">Afurð: hindber</string>
+	<string name="poi_crop_tobacco">Afurð: tóbak</string>
+	<string name="poi_crop_strawberry">Afurð: jarðarber</string>
+	<string name="poi_crop_vegetables_flowers">Afurð: grænmeti, blóm</string>
+	<string name="poi_crop_cassava">Afurð: kassava</string>
+	<string name="poi_crop_cranberry">Afurð: trönuber</string>
+	<string name="poi_crop_asparagus">Afurð: aspas</string>
+	<string name="poi_crop_flowers">Afurð: blóm</string>
+
+	<string name="poi_surveillance_indoor">Eftirlit: innandyra</string>
+	<string name="poi_surveillance_outdoor">Eftirlit: utandyra</string>
+	<string name="poi_surveillance_public">Eftirlit: opinbert</string>
+
+	<string name="poi_clothes_women">Konur</string>
+	<string name="poi_clothes_underwear">Undirföt</string>
+	<string name="poi_clothes_men">Karlar</string>
+	<string name="poi_clothes_wedding">Brúðkaupsfatnaður</string>
+	<string name="poi_clothes_sports">Íþróttir</string>
+	<string name="poi_clothes_babies">Ungabörn</string>
+	<string name="poi_clothes_denim">Gallafatnaður</string>
+	<string name="poi_clothes_workwear">Vinnuföt</string>
+	<string name="poi_clothes_hats">Hattar</string>
+	<string name="poi_clothes_fur">Loðfeldir</string>
+	<string name="poi_clothes_leather">Leður</string>
+	<string name="poi_clothes_costumes">Búningar</string>
+	<string name="poi_clothes_traditional">Hefðbundið</string>
+	<string name="poi_clothes_suits">Jakkaföt</string>
+	<string name="poi_clothes_maternity">Óléttuklæðnaður</string>
+	<string name="poi_clothes_vintage">Gamaldags</string>
+	<string name="poi_clothes_oversize">Yfirstærðir</string>
+	<string name="poi_clothes_swimwear">Sundföt</string>
+	<string name="poi_clothes_socks">Sokkar</string>
+	<string name="poi_clothes_shirts">Skyrtur</string>
+	<string name="poi_clothes_dance">Dans</string>
+	<string name="poi_clothes_military">Hernaðar</string>
+
+	<string name="poi_shoes_children">Börn</string>
+	<string name="poi_shoes_women">Konur</string>
+	<string name="poi_shoes_sport">Íþróttir</string>
+	<string name="poi_shoes_men">Karlar</string>
+	<string name="poi_massage_thai">Tælenskt</string>
+	<string name="poi_massage_sexual">Kynlífs</string>
+	<string name="poi_massage_chinese">Kínverskt</string>
+	<string name="poi_massage_therapeutic">Heilsumeðferð</string>
+
+	<string name="poi_massage_yes">Nuddþjónustur</string>
+	<string name="poi_tents_yes">Leyft</string>
+	<string name="poi_tents_no">Tjöld ekki leyfð</string>
+	<string name="poi_dog_yes">Hundar leyfðir</string>
+	<string name="poi_dog_no">Hundar ekki leyfðir</string>
+
+	<string name="poi_horse_yes">Hestar leyfðir</string>
+	<string name="poi_horse_no">Hestar ekki leyfðir</string>
+	<string name="poi_animal_yes">Dýr leyfð</string>
+	<string name="poi_animal_no">Dýr ekki leyfð</string>
+
+	<string name="poi_historic_gallows">Sögulegir gálgar</string>
+	<string name="poi_openfire_yes">Leyft að vera með opinn eld</string>
+	<string name="poi_openfire_no">Ekki leyft að vera með opinn eld</string>
+	<string name="poi_scout_yes">Skátatjaldsvæði: já</string>
+	<string name="poi_scout_no">Skátatjaldsvæði: nei</string>
+	<string name="poi_group_only_yes">Einungis hópar: já</string>
+	<string name="poi_group_only_no">Einungis hópar: nei</string>
+	<string name="poi_washing_machine_no">Þvottavél: nei</string>
+	<string name="poi_shower_no">Steypibað: nei</string>
+	<string name="poi_shower_hot">Steypibað: hitað</string>
+	<string name="poi_shower_outdoor">Steypibað: utandyra</string>
+	<string name="poi_shower_cold">Steypibað: kalt</string>
+	<string name="poi_shower_indoor">Steypibað: innandyra</string>
+	<string name="poi_caravans_no">Hjólhýsi: nei</string>
+	<string name="poi_impromptu_yes">Án pöntunar: já</string>
+	<string name="poi_impromptu_no">Án pöntunar: nei</string>
+	<string name="poi_sanitary_dump_station_yes">Stöð fyrir hreinlætisúrgang: já</string>
+	<string name="poi_sanitary_dump_station_no">Stöð fyrir hreinlætisúrgang: nei</string>
+	<string name="poi_power_supply_no">Rafmagnsinnstungur: nei</string>
+	<string name="poi_power_supply_cee_17_blue">Rafmagnsinnstungur: CEE 17 blátt</string>
+	<string name="poi_power_supply_cee_7_4">Rafmagnsinnstungur: CEE 7/4</string>
+	<string name="poi_power_supply_cee_7_5">Rafmagnsinnstungur: CEE 7/5</string>
+	<string name="poi_power_supply_nema_5_15">Rafmagnsinnstungur: NEMA 5-15</string>
+
+	<string name="poi_capacity_tents">Hámarksfjöldi tjalda</string>
+	<string name="poi_capacity_caravans">Hámarksfjöldi hjólhýsa</string>
+	<string name="poi_social_facility_day_care">Dagvistun</string>
+
+	<string name="poi_kiln">Brennsluofn</string>
+	<string name="poi_product_brick">Afurð: múrsteinar</string>
+	<string name="poi_product_quicklime">Afurð: brennt kalk</string>
+	<string name="poi_product_leather">Afurð: leður</string>
+	<string name="poi_product_lime">Afurð: kalk</string>
+	<string name="poi_product_beer">Afurð: bjór</string>
+	<string name="poi_product_charcoal">Afurð: viðarkol</string>
+	<string name="poi_product_meat">Afurð: kjöt</string>
+
+	<string name="poi_wheelchair_description">Lýsing fyrir notendur hjólastóla</string>
+	<string name="poi_blind_description">Lýsing fyrir sjónskerta</string>
+	<string name="poi_deaf_description">Lýsing fyrir heyrnarskerta</string>
+
+	<string name="poi_handrail_yes">Handrið: já</string>
+	<string name="poi_ramp_yes">Rampur: já</string>
+	<string name="poi_ramp_no">Rampur: nei</string>
+	<string name="poi_ramp_wheelchair_yes">Hjólastólarampur: já</string>
+	<string name="poi_ramp_wheelchair_no">Hjólastólarampur: nei</string>
+	<string name="poi_ramp_stroller_yes">Rampur (barnakerrur): já</string>
+	<string name="poi_ramp_stroller_no">Rampur (barnakerrur): nei</string>
+	<string name="poi_ramp_bicycle_yes">Reiðhjólarampur: já</string>
+	<string name="poi_ramp_bicycle_no">Reiðhjólarampur: nei</string>
+	<string name="poi_ramp_luggage_yes">Farangursrampur: já</string>
+	<string name="poi_ramp_luggage_no">Farangursrampur: nei</string>
+	<string name="poi_step_count">Fjöldi þrepa</string>
+	<string name="poi_step_condition_even">Ástand þrepa: jöfn</string>
+	<string name="poi_step_condition_uneven">Ástand þrepa: ójöfn</string>
+	<string name="poi_step_condition_rough">Ástand þrepa: hrjúf</string>
+
+	<string name="poi_historic_civilization_ancient_roman">Menning: forn-rómversk (753 f.kr – 284 e.kr.)</string>
+	<string name="poi_historic_civilization_etruscan">Menning: etrúsk (12.– 6. öld e.kr.)</string>
+	<string name="poi_historic_civilization_prehistoric">Menning: forsöguleg</string>
+	<string name="poi_historic_civilization_ancient_greek">Menning: forn-grísk</string>
+	<string name="poi_historic_civilization_roman">Menning: rómversk</string>
+	<string name="poi_historic_civilization_ancient_egyptian">Menning: forn-egypsk (til 332 f.kr)</string>
+	<string name="poi_historic_civilization_celtic">Menning: keltnesk</string>
+	<string name="poi_historic_civilization_western_roman">Menning: vestur-rómversk (285 e.kr. – 476 e.kr.)</string>
+	<string name="poi_material_wood">Efni: viður</string>
+	<string name="poi_material_metal">Efni: málmur</string>
+	<string name="poi_material_reinforced_concrete">Efni: járnbent steinsteypa</string>
+	<string name="poi_material_concrete">Efni: steinsteypa</string>
+	<string name="poi_material_steel">Efni: stál</string>
+	<string name="poi_material_stone">Efni: steinn</string>
+	<string name="poi_material_masonry">Efni: steinhleðsla</string>
+	<string name="poi_material_brick">Efni: múrsteinn</string>
+	<string name="poi_material_plastic">Efni: plast</string>
+	<string name="poi_material_sandstone">Efni: sandsteinn</string>
+	<string name="poi_material_granite_stone">Efni: granítsteinn</string>
+	<string name="poi_material_metal_wood">Efni: málmur: viður</string>
+	<string name="poi_material_glass">Efni: gler</string>
+	<string name="poi_material_bronze">Efni: brons</string>
+	<string name="poi_material_earth">Efni: mold</string>
+	<string name="poi_material_composite">Efni: samsett</string>
+	<string name="poi_material_limestone">Efni: kalksteinn</string>
+	<string name="poi_material_marble">Efni: marmari</string>
+	<string name="poi_material_aluminium">Efni: ál</string>
+
+	<string name="poi_site_type_settlement">Landnám</string>
+	<string name="poi_historic_farm">Sögulegt býli</string>
+	<string name="poi_historic_railway_station">Söguleg járnbrautarstöð</string>
+
+	<string name="poi_historic_railway">Söguleg járnbraut</string>
+
+	<string name="poi_building_type_temple">Tegund byggingar: bænhús</string>
+	<string name="poi_building_type_synagogue">Tegund byggingar: sýnagóga</string>
+	<string name="poi_prison_camp">Fyrrverandi fangabúðir</string>
+	<string name="poi_temperature">Hitastig</string>
+	<string name="poi_cargo_passengers">Farþegar</string>
+	<string name="poi_cargo_vehicle">Farartæki</string>
+	<string name="poi_cargo_bicycle">Reiðhjól</string>
+	<string name="poi_cargo_container">Gámar</string>
+	<string name="poi_fitness_station">Líkamsræktarstöð</string>
+
+	<string name="poi_fireworks">Flugeldaverslun</string>
+
+	<string name="poi_health_specialty_maternity_yes">Fæðingardeild</string>
+	<string name="poi_fitness_centre">Líkamsræktarmiðstöð</string>
+	<string name="poi_fitness">Líkamsrækt</string>
+
+	<string name="poi_billiards">Billjarð</string>
+
+	<string name="poi_microwave_oven_yes">Örbylgjuofn: já</string>
+	<string name="poi_microwave_oven_no">Örbylgjuofn: nei</string>
+	<string name="poi_water_heater_yes">Vatnshitari: já</string>
+	<string name="poi_water_heater_no">Vatnshitari: nei</string>
+
+	<string name="poi_parking_surface">Tegund: yfirborð</string>
+	<string name="poi_running">Hlaup</string>
+	<string name="poi_disc_golf">Frisbígolf</string>
+	<string name="poi_futsal">Innanhúsfótbolti</string>
+	<string name="poi_squash">Skvass</string>
+	<string name="poi_boxing">Hnefaleikar</string>
+
+	<string name="poi_inscription_n">Áletrun:N</string>
+	<string name="poi_inscription_nw">Áletrun:NV</string>
+	<string name="poi_inscription_w">Áletrun:V</string>
+	<string name="poi_inscription_sw">Áletrun:SV</string>
+	<string name="poi_inscription_s">Áletrun:S</string>
+	<string name="poi_inscription_se">Áletrun:SA</string>
+	<string name="poi_inscription_e">Áletrun:A</string>
+	<string name="poi_inscription_ne">Áletrun:NA</string>
+
+	<string name="poi_construction_yes">Í byggingu</string>
+	<string name="poi_protected_area">Verndarsvæði</string>
+	<string name="poi_plant_nursery">Græðlingaræktun</string>
+
+	<string name="poi_water_tap">Vatnshani</string>
+	<string name="poi_free_flying_site_takeoff">Fligtak</string>
+	<string name="poi_free_flying_site_landing">Lending</string>
+	<string name="poi_free_flying_site_training">Þjálfun</string>
+	<string name="poi_free_flying_official_yes">Opinbert: já</string>
+	<string name="poi_free_flying_official_no">Opinbert: nei</string>
+	<string name="poi_emergency_yes">Neyðartilfelli: já</string>
+	<string name="poi_emergency_no">Neyðartilfelli: nei</string>
+	<string name="poi_fire_hydrant_style_water_source_main">Aðal</string>
+	<string name="poi_fire_hydrant_style_water_source_pond">Tjörn</string>
+	<string name="poi_fire_hydrant_style_water_source_cistern">Tankur</string>
+	<string name="poi_street_cabinet_power">Tegund skáps: rafmagn</string>
+	<string name="poi_street_cabinet_telecom">Tegund skáps: samskipti</string>
+	<string name="poi_street_cabinet_cable_tv">Tegund skáps: kapalsjónvarp</string>
+	<string name="poi_street_cabinet_gas">Tegund skáps: gas</string>
+	<string name="poi_street_cabinet_postal_service">Tegund skáps: póstþjónusta</string>
+	<string name="poi_street_cabinet_waste">Tegund skáps: úrgangur</string>
+	<string name="poi_street_cabinet_water_management">Tegund skáps: vatnsmiðlun</string>
+	<string name="poi_street_cabinet_street_lighting">Tegund skáps: götulýsing</string>
+
+	<string name="poi_bicycle_parking_lockers">Geymsluskápar</string>
+	<string name="poi_depth">Dýpt</string>
+
+	<string name="poi_salt_yes">Salt</string>
+	<string name="poi_summer_camp">Sumarbúðir</string>
+	<string name="poi_aerodrome_type_military_public">Hernaðar/almennings</string>
+	<string name="poi_ventilation_shaft">Loftræstigöng</string>
+
+	<string name="poi_telescope">Sjónauki</string>
+	<string name="poi_barometer_yes">Loftvog</string>
+	<string name="poi_barometer_no">Loftvog: nei</string>
+	<string name="poi_thermometer_yes">Hitamælir</string>
+	<string name="poi_thermometer_no">Hitamælir: nei</string>
+	<string name="poi_hygrometer_yes">Rakamælir</string>
+	<string name="poi_hygrometer_no">Rakamælir: nei</string>
+	<string name="poi_min_age">Lágmarksaldur</string>
+
+	<string name="poi_traffic_mirror">Umferðarspegill</string>
+
+	<string name="poi_water_tank">Vatnstankur</string>
+
+	<string name="poi_xmas">Jól</string>
+	<string name="poi_xmas_tree">Jólatré</string>
+	<string name="poi_additional_type">Aukalegt</string>
+	<string name="poi_bicycle_service">Reiðhjólaþjónusta</string>
+	<string name="poi_fire_hydrant_water_source">Vatnsuppspretta</string>
+	<string name="poi_automated">Sjálfvirk</string>
 	</resources>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 80dabd2d42..175c447db3 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -903,7 +903,7 @@ Ferill %2$s</string>
     <string name="edit_tilesource_url_to_load">Slóð (URL)</string>
     <string name="distance_measurement_finish_subtrack">Byrja nýjan undirferil</string>
     <string name="shared_location">Deild staðsetning</string>
-    <string name="rendering_attr_noPolygons_name">Fela fláka</string>
+    <string name="rendering_attr_noPolygons_name">Flákar</string>
     <string name="rendering_attr_appMode_description">Besta kort fyrir</string>
     <string name="rendering_attr_contourLines_name">Birta hæðarlínur</string>
     <string name="address_search_desc">Leit að heimilisfangi</string>
@@ -1792,4 +1792,62 @@ Punktar</string>
     <string name="local_openstreetmap_uploadall">Senda allt inn</string>
     <string name="local_openstreetmap_delete">Eyða breytingu</string>
     <string name="show_current_gpx_title">Eyða núverandi ferli</string>
+    <string name="rendering_attr_contourWidth_description">Breidd hæðarlína</string>
+    <string name="rendering_attr_contourWidth_name">Breidd hæðarlína</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Vatn</string>
+    <string name="local_recordings_delete_all_confirm">Þú ert að fara að eyða %1$d minnispunktum. Ertu viss?</string>
+    <string name="audionotes_plugin_name">Hljóð/myndskeiðs-minnispunktar</string>
+    <string name="speech_rate_descr">Tilgreindu talhraða fyrir TTS</string>
+    <string name="stop_routing_confirm">Ertu viss um að þú viljir stöðva leiðsögnina?</string>
+    <string name="precise_routing_mode_descr">Virkja þetta til að reikna nákvæmar leiðir án hnökra. Er ennþá takmarkað út frá vegalengdum og fremur hægvirkt.</string>
+    <string name="precise_routing_mode">Nákvæmt leiðaval (alfa-tilraunaútgáfa)</string>
+    <string name="dropbox_plugin_description">Dropbox-viðbótin gerir þér kleift að samstilla ferla og minnispunkta við hljóð/myndskeið með því að nota Dropbox-aðganginn þinn.</string>
+    <string name="av_def_action_choose">Velja eftir beiðni</string>
+    <string name="av_def_action_video">Taka upp myndskeið</string>
+    <string name="av_def_action_audio">Taka upp hljóð</string>
+    <string name="av_widget_action_descr">Veldu sjálfgefna aðgerð viðmótshluta</string>
+    <string name="av_widget_action">Sjálfgefin aðgerð viðmótshluta</string>
+    <string name="av_video_format_descr">Veldu úttakssnið myndmerkis</string>
+    <string name="av_video_format">Frálagssnið myndmerkis</string>
+    <string name="av_use_external_camera">Nota myndavélarforritið</string>
+    <string name="layer_recordings">Upptaka á lagi</string>
+    <string name="local_openstreetmap_were_uploaded">{0} merkisstaðir/minnispunktar voru sendir inn</string>
+    <string name="local_openstreetmap_settings">Merkisstaðir/minnispunktar sem vistaðir eru á tæki</string>
+    <string name="local_openstreetmap_settings_descr">Birta og sýsla með merkisstaði/minnispunkta sem skráðir eru í staðværum gagnagrunni</string>
+    <string name="index_name_tts_voice">Raddskipanir (TTS-raddgerfill, forgangur)</string>
+    <string name="local_indexes_cat_tts">Raddskipanir (TTS)</string>
+    <string name="ttsvoice">TTS-rödd</string>
+    <string name="map_text_size_descr">Stilla stærð leturs fyrir nöfn á kortinu</string>
+    <string name="trace_rendering">Aflúsunarupplýsingar myndgerðar</string>
+    <string name="trace_rendering_descr">Birta afköst myndgerðar</string>
+    <string name="gpx_option_reverse_route">Snúa við stefnu GPX</string>
+    <string name="choose_audio_stream">Frálag raddleiðsagnar</string>
+    <string name="voice_stream_music">Hljóð margmiðlun/tónlist</string>
+    <string name="level_to_switch_vector_raster_descr">Lágmarks aðdráttarstig við notkun vektorkorta</string>
+    <string name="level_to_switch_vector_raster">Lágm. aðdráttur vektora</string>
+    <string name="create_poi_link_to_osm_doc"><u>Nettengd OSM</u> kortaflokkun með myndum</string>
+    <string name="poi_filter_namefinder">Nettengd NafnaLeit</string>
+    <string name="version_index_is_big_for_memory">Vísirinn \'\'{0}\'\' passaði ekki í minni</string>
+    <string name="osmand_net_previously_installed">Fyrri útgáfa OsmAnd er uppsett. Öll ónettengd gögn verða studd af nýju útgáfunni. Hinsvegar ætti að flytja út eftirlætispunkta í eldri útgáfunni og flytja aftur inn í nýju útgáfunni.</string>
+    <string name="voice_is_not_available_msg">Engin raddleiðsögn er tiltæk, farðu í \'Stillingar\' → \'Almennt\' → \'Raddleiðsögn\' og veldu eða náðu í pakka með raddskipunum.</string>
+    <string name="renderer_load_sucess">Það tókst að hlaða myndgerðarforritinu inn</string>
+    <string name="renderer_load_exception">Frávik kom upp: ekki tókst að hlaða myndgerðarforritinu inn</string>
+    <string name="fav_file_to_load_not_found">GPX-skrá með eftirlætum fannst ekki í {0}</string>
+    <string name="none_region_found">Engin ónettengd gögn um héruð fundust á SD-korti. Náðu í héruðin af internetinu.</string>
+    <string name="poi_namefinder_query_empty">Settu inn leitarskilyrði til að finna merkisstað</string>
+    <string name="layer_osm_bugs">OSM-minnispunktar (nettengt)</string>
+    <string name="background_service_wait_int_descr">Hámarksbiðtími eftir hverri bakgrunnsleiðréttingu á staðsetningu</string>
+    <string name="background_service_wait_int">Hámarksbið eftir leiðréttingu</string>
+    <string name="background_service_int_descr">Veldu millibil þess sem bakgrunnsþjónustu er vakin upp</string>
+    <string name="background_service_provider_descr">Veldu staðsetningarþjónustu til að nota með bakgrunnsþjónustu</string>
+    <string name="background_service_provider">Staðsetningarþjónusta</string>
+    <string name="off_router_service_no_gps_available">Leiðsagnarþjónusta í bakgrunni krefst þess að staðsetningarþjónusta sé í gangi.</string>
+    <string name="opening_hours_not_supported">Snið opnunartíma er ekki stutt við breytingar</string>
+    <string name="commiting_node">Sendi inn hnút…</string>
+    <string name="incremental_search_street">Stigvaxandi leit götu</string>
+    <string name="incremental_search_building">Stigvaxandi leit byggingar</string>
+    <string name="poi_error_info_not_loaded">Upplýsingum um hnút var ekki hlaðið inn</string>
+    <string name="use_fast_recalculation">Snjöll endurreiknun leiðar</string>
+    <string name="use_fast_recalculation_desc">Einungis endurreikna upphafshluta leiðar fyrir langar ferðir</string>
+    <string name="confirm_download_roadmaps">Ertu viss um að þú viljir sækja kort eingöngu með vegum, jafnvel þó þú sért þegar með staðlaða (fulla útgáfu) korts?</string>
     </resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 6804054a1a..db503b281d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -3369,4 +3369,6 @@
 	<string name="poi_tower_construction_dome">Конструкция: радом</string>
 	<string name="poi_tower_construction_concealed">Конструкция: замаскированная</string>
 
+	<string name="poi_railway_yard">Грузовая станция</string>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index c879ed049e..f3a0a5e2a7 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,5 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="rendering_attr_contourDensity_description">Частота горизонталей</string>
+    <string name="rendering_attr_contourDensity_name">Частота горизонталей</string>
+    <string name="rendering_value_high_name">Высокая</string>
+    <string name="rendering_value_medium_w_name">Средняя</string>
+    <string name="rendering_value_low_name">Низкая</string>
+    <string name="rendering_attr_contourWidth_description">Толщина горизонталей</string>
+    <string name="rendering_attr_contourWidth_name">Толщина горизонталей</string>
     <string name="rendering_attr_hideWaterPolygons_description">Воду</string>
     <string name="legacy_search">Старый поиск</string>
     <string name="show_legacy_search">Показывать старый поиск</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index aaf31a05c1..5cf99da719 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -346,7 +346,7 @@ Su grupu chi no est istadu iscantzelladu a pustis de carchi mese benit impostadu
     <string name="download_regular_maps">Mapas regulares</string>
     <string name="download_roads_only_maps">Mapas cun petzi istradas</string>
 
-    <string name="rendering_attr_noAdminboundaries_name">Cua sas làcanas</string>
+    <string name="rendering_attr_noAdminboundaries_name">Làcanas</string>
     <string name="rendering_attr_noAdminboundaries_description">Cua sas làcanas regionales (livellos amministrativos 5–9)</string>
 
 
@@ -907,7 +907,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="share_route_subject">Àndala cumpartzida tràmite OsmAnd</string>
     <string name="route_kl">Mantène sa manca e sighi</string>
     <string name="route_kr">Mantène sa destra e sighi</string>
-    <string name="rendering_attr_noPolygons_name">Cua sos polìgonos</string>
+    <string name="rendering_attr_noPolygons_name">Polìgonos</string>
     <string name="rendering_attr_appMode_name">Modalidade de disinnu</string>
     <string name="rendering_attr_contourLines_name">Ammustra curvas de livellu</string>
     <string name="local_index_routing_data">Datos àndala</string>
@@ -2654,4 +2654,12 @@ Si istimas OsmAnd e OSM e los boles suportare, custa est una manera perfeta pro
     <string name="legacy_search">Chirca betza</string>
     <string name="show_legacy_search">Ammustra sa chirca betza</string>
     <string name="show_legacy_search_desc">Abìlita sa chirca betza dae sa lista</string>
+    <string name="rendering_attr_contourWidth_description">Ispessore curvas de livellu</string>
+    <string name="rendering_attr_contourWidth_name">Ispessore curvas de livellu</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Abba</string>
+    <string name="rendering_attr_contourDensity_description">Densidade de curvas de livellu</string>
+    <string name="rendering_attr_contourDensity_name">Densidade de curvas de livellu</string>
+    <string name="rendering_value_high_name">Arta</string>
+    <string name="rendering_value_medium_w_name">Mesana</string>
+    <string name="rendering_value_low_name">Bassa</string>
     </resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index ce2e31bd9b..3983e034f2 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -747,7 +747,7 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m
     <string name="transport_search_desc">Hľadanie hromadnej dopravy</string>
     <string name="favourites_search_desc">Hľadanie obľúbeného bodu</string>
     <string name="rendering_attr_noPolygons_description">Zobraziť plošné krajinné objekty na mape priehľadne</string>
-    <string name="rendering_attr_noPolygons_name">Skryť polygóny</string>
+    <string name="rendering_attr_noPolygons_name">Polygóny</string>
     <string name="rendering_attr_appMode_name">Vykresľovací režim</string>
     <string name="rendering_attr_appMode_description">Prispôsobenie mapy pre príslušný užívateľský profil</string>
     <string name="rendering_attr_contourLines_name">Zobraziť vrstevnice</string>
@@ -885,7 +885,7 @@ Niektoré z hlavných funkcií:
     
     <string name="map_widget_max_speed">Obmedzenie rýchlosti</string>
     <string name="monitoring_control_start">GPX</string>
-    <string name="rendering_attr_noAdminboundaries_name">Skryť hranice</string>
+    <string name="rendering_attr_noAdminboundaries_name">Hranice oblastí</string>
     <string name="rendering_attr_noAdminboundaries_description">Potlačiť zobrazenie hraníc regiónov (administratívne úrovne 5 až 9)</string>
     <string name="index_srtm_parts">časti</string>
     <string name="index_srtm_ele">Vrstevnice</string>
@@ -2509,4 +2509,7 @@ Ak potrebuje pomoc s aplikáciou OsmAnd, kontaktuje podporu: support@osmand.net.
     <string name="routing_attr_allow_motorway_description">Povoliť použiť diaľnice</string>
     <string name="lang_sr_latn">Srbsky (Latinka)</string>
     <string name="lang_zh_hk">Čínsky (Hong Kong)</string>
+    <string name="rendering_attr_contourWidth_description">Hrúbka vrstevníc</string>
+    <string name="rendering_attr_contourWidth_name">Hrúbka vrstevníc</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Voda</string>
     </resources>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index ad4cca01c3..08557b5ffe 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -203,7 +203,7 @@ Du hittar din parkeringsplats och -tid på instrumentbrädan och i widgeten på
     <string name="asap">Snarast</string>
     <string name="route_roundabout">Rondell: ta %1$d avfarten och kör</string>
     <string name="rendering_attr_noPolygons_description">Gör alla ytor på kartan transparenta</string>
-    <string name="rendering_attr_noPolygons_name">Dölj polygoner</string>
+    <string name="rendering_attr_noPolygons_name">Polygoner</string>
     <string name="rendering_attr_appMode_name">Renderingsläge</string>
     <string name="rendering_attr_contourLines_description">Visning från zoomnivå (kräver höjdkurvsdata):</string>
     <string name="rendering_attr_contourLines_name">Visa höjdkurvor</string>
@@ -798,7 +798,7 @@ Nyttjat utrymme är {1} MB.
     <string name="rendering_attr_roadColors_name">Färgschema för vägar</string>
     <string name="no_route">Ingen rutt</string>
 
-    <string name="rendering_attr_noAdminboundaries_name">Dölj gränser</string>
+    <string name="rendering_attr_noAdminboundaries_name">Gränser</string>
     <string name="rendering_attr_noAdminboundaries_description">Undertryck visning av regionala gränser (adminnivåer 5-9)</string>
 
 
@@ -2403,4 +2403,10 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
  och mer …
  "</string>
     <string name="christmas_desc">Med tanke på den kommande julen och nyåret så kan du välja att visa POI som har med julen att göra: julgranar, julmarknader med mera.</string>
+    <string name="rendering_attr_contourWidth_name">Bredd på konturlinjer</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Vatten</string>
+    <string name="osm_live_payment_desc">Avgift för prenumerationen dras varje månad. Du kan avbryta din prenumeration på Google Play när som helst.</string>
+    <string name="donation_to_osm_desc">Delar av din gåva skickas till OSM-användare som skickat in ändringar till OpenStreeMap. Prenumerationskostnaden förblir densamma.</string>
+    <string name="osm_live_subscription_desc">En prenumeration aktiverar uppdateringar varje timme, dag eller vecka och obegränsade nedladdningar av alla kartor globalt.</string>
+    <string name="osm_live_banner_desc">Erhåll obegränsade nedladdningar av kartor samt kartuppdateringar oftare än en gång i månaden: varje vecka, varje dag eller varje timme.</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 76bfa24cd1..55c94bc19a 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2677,4 +2677,11 @@ Facebook：https://www.facebook.com/osmandapp
     <string name="lang_sr_latn">塞爾維亞語（拉丁語）</string>
     <string name="lang_zh_hk">中文（香港）</string>
     <string name="rendering_attr_hideWaterPolygons_description">水</string>
+    <string name="rendering_attr_contourWidth_description">等高線的線寬</string>
+    <string name="rendering_attr_contourWidth_name">等高線的線寬</string>
+    <string name="rendering_attr_contourDensity_description">等高線的密度</string>
+    <string name="rendering_attr_contourDensity_name">等高線的密度</string>
+    <string name="rendering_value_high_name">高</string>
+    <string name="rendering_value_medium_w_name">中</string>
+    <string name="rendering_value_low_name">低</string>
     </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 3bc50bb283..d254ca8636 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -3335,4 +3335,6 @@
 	<string name="poi_tower_construction_dome">Construction: dome</string>
 	<string name="poi_tower_construction_concealed">Construction: concealed</string>
 
+	<string name="poi_railway_yard">Freight station</string>
+
 </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index f67f962a0a..7a07f53041 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,13 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="rendering_attr_contourDensity_description">Contour lines density</string>
+    <string name="rendering_attr_contourDensity_name">Contour lines density</string>
+    <string name="rendering_value_high_name">High</string>
+    <string name="rendering_value_medium_w_name">Medium</string>
+    <string name="rendering_value_low_name">Low</string>
+    <string name="rendering_attr_contourWidth_description">Contour lines width</string>
+    <string name="rendering_attr_contourWidth_name">Contour lines width</string>
     <string name="rendering_attr_hideWaterPolygons_description">Water</string>
     <string name="legacy_search">Legacy search</string>
     <string name="show_legacy_search">Show legacy search</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
index 9b6987b700..df7f1d4b64 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
@@ -375,7 +375,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 					record = false;
 				}
 				float precision = settings.SAVE_TRACK_PRECISION.get();
-				if(precision > 0 && (!location.hasAccuracy() || location.getAccuracy() < precision)) {
+				if(precision > 0 && (!location.hasAccuracy() || location.getAccuracy() > precision)) {
 					record = false;
 				}
 				float minSpeed = settings.SAVE_TRACK_MIN_SPEED.get();
diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
index 407e6794d7..3768aedccc 100644
--- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
@@ -164,7 +164,20 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 			mTtsContext = ctx;
 			ttsVoiceName = "";
 			ttsRequests = 0;
-			final float speechRate = cSpeechRate; 
+			final float speechRate = cSpeechRate;
+
+			final String[] languageFields = (language + "____.").split("[\\_\\-]");
+			Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]);
+			// #3344: Try Locale builder instead of constructor (only available from API 21), also supports script
+			if (android.os.Build.VERSION.SDK_INT >= 21) {
+				try {
+					newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setRegion(languageFields[1]).setVariant(languageFields[2]).setScript(languageFields[3]).build();
+				} catch (RuntimeException e) {
+					// Falls back to constructor
+				}
+			}
+			final Locale newLocale = newLocale0;
+
 			mTts = new TextToSpeech(ctx, new OnInitListener() {
 				@Override
 				public void onInit(int status) {
@@ -173,9 +186,8 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 						internalClear();
 					} else if (mTts != null) {
 						speechAllowed = true;
-						switch (mTts.isLanguageAvailable(new Locale(language))) {
+						switch (mTts.isLanguageAvailable(newLocale)) {
 							case TextToSpeech.LANG_MISSING_DATA:
-								ttsVoiceName = "setLanguage: LANG_MISSING_DATA";
 								if (isSettingsActivity(act)) {
 									AlertDialog.Builder builder = createAlertDialog(
 										R.string.tts_missing_language_data_title,
@@ -186,29 +198,23 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 										act);
 									builder.show();
 								}
-								// Proceed anyway in this case, look like breaking here caused Issue #3344
-								//break;
+								ttsVoiceName = newLocale.getDisplayName() + ": LANG_MISSING_DATA";
+								ttsVoiceName = ttsVoiceName + "\n\n" + getVoiceUsed();
+								break;
 							case TextToSpeech.LANG_AVAILABLE:
-								ttsVoiceName = "".equals(ttsVoiceName) ? "setLanguage: LANG_AVAILABLE" : ttsVoiceName;
+								ttsVoiceName = newLocale.getDisplayName() + ": LANG_AVAILABLE";
 							case TextToSpeech.LANG_COUNTRY_AVAILABLE:
-								ttsVoiceName = "".equals(ttsVoiceName) ? "setLanguage: LANG_COUNTRY_AVAILABLE" : ttsVoiceName;
+								ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName;
 							case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE:
-								ttsVoiceName = "".equals(ttsVoiceName) ? "setLanguage: LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName;
-								mTts.setLanguage(new Locale(language));
-								if (android.os.Build.VERSION.SDK_INT >= 21) {
-									if (mTts.getVoice() != null) {
-										ttsVoiceName = ttsVoiceName + "\n\n" + mTts.getVoice().toString();
-									}
-								} else {
-										ttsVoiceName = ttsVoiceName + "\n\n" + mTts.getLanguage() + " (Voice details not reported in API<21)";
-								}
+								mTts.setLanguage(newLocale);
 								if(speechRate != 1) {
 									mTts.setSpeechRate(speechRate);
 								}
+								ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName;
+								ttsVoiceName = ttsVoiceName + "\n\n" + getVoiceUsed();
 								break;
 							case TextToSpeech.LANG_NOT_SUPPORTED:
 								//maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition
-								ttsVoiceName = "setLanguage: LANG_NOT_SUPPORTED";
 								if (isSettingsActivity(act)) {
 									AlertDialog.Builder builder = createAlertDialog(
 											R.string.tts_language_not_supported_title,
@@ -220,6 +226,8 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 											act);
 									builder.show();
 								}
+								ttsVoiceName = newLocale.getDisplayName() + ": LANG_NOT_SUPPORTED";
+								ttsVoiceName = ttsVoiceName + "\n\n" + getVoiceUsed();
 								break;
 						}
 					}
@@ -228,6 +236,17 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 				private boolean isSettingsActivity(final Context ctx) {
 					return ctx instanceof SettingsActivity;
 				}
+				
+				private String getVoiceUsed() {
+					if (android.os.Build.VERSION.SDK_INT >= 21) {
+						if (mTts.getVoice() != null) {
+							return mTts.getVoice().toString();
+						}
+					} else {
+							return mTts.getLanguage() + " (Voice details not reported in API<21)";
+					}
+					return "";
+				}
 			});
 			mTts.setOnUtteranceCompletedListener(new OnUtteranceCompletedListener() {
 				// The call back is on a binder thread.