diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
index caaedd891b..2f24bddba8 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@@ -60,13 +60,13 @@ public class BinaryInspector {
 		// test cases show info
 		if(args.length == 1 && "test".equals(args[0])) {
 			in.inspector(new String[]{
-				//"-vpoi",
-//				"-vmap", "-vmapobjects", 
+//				"-vpoi",
+				"-vmap", "-vmapobjects", 
 //				"-vrouting",
 //				"-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings", 
 				//"-zoom=16",
-				//"-bbox=4,55,7,50", 
-//				"/home/victor/projects/osmand/osm-gen/Map.obf"
+//				"-bbox=1.74,51.17,1.75,51.16", 
+				"/home/victor/projects/osmand/osm-gen/Map.obf"
 					});
 		} else {
 			in.inspector(args);
@@ -727,7 +727,7 @@ public class BinaryInspector {
 		for(int i=0; i<obj.getPointsLength(); i++) {
 			float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
 			float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
-			b.append(x).append(" / ").append(y).append(" , ");
+			b.append(y).append(" / ").append(x).append(" , ");
 		}
 	}
 
diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
index 94323bd3e5..354901115f 100644
--- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
+++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
@@ -305,6 +305,7 @@ public class MapRenderingTypes {
 			rType.poiSpecified = parent.poiSpecified;
 			rType.poiCategory = parent.poiCategory;
 			rType.poiPrefix = parent.poiPrefix;
+			rType.poiWithNameOnly = parent.poiWithNameOnly;
 			rType.namePrefix = parent.namePrefix;
 			rType = registerRuleType(rType);
 		}
@@ -375,15 +376,15 @@ public class MapRenderingTypes {
 		return null;
 	}
 	
-	public AmenityType getAmenityType(String tag, String val){
-		return getAmenityType(tag, val, false);
+	public AmenityType getAmenityType(String tag, String val, boolean hasName){
+		return getAmenityType(tag, val, false, hasName);
 	}
 	
-	public AmenityType getAmenityTypeForRelation(String tag, String val){
-		return getAmenityType(tag, val, true);
+	public AmenityType getAmenityTypeForRelation(String tag, String val, boolean hasName){
+		return getAmenityType(tag, val, true, hasName);
 	}
 	
-	private AmenityType getAmenityType(String tag, String val, boolean relation){
+	private AmenityType getAmenityType(String tag, String val, boolean relation, boolean hasName){
 		// register amenity types
 		Map<String, MapRulType> rules = getEncodingRuleTypes();
 		MapRulType rt = rules.get(constructRuleKey(tag, val));
@@ -391,6 +392,9 @@ public class MapRenderingTypes {
 			if((relation && !rt.relation) || rt.isAdditionalOrText()) {
 				return null;
 			}
+			if(rt.poiWithNameOnly && !hasName) {
+				return null;
+			}
 			return rt.poiCategory;
 		}
 		rt = rules.get(constructRuleKey(tag, null));
@@ -398,6 +402,9 @@ public class MapRenderingTypes {
 			if((relation && !rt.relation) || rt.isAdditionalOrText()) {
 				return null;
 			}
+			if(rt.poiWithNameOnly && !hasName) {
+				return null;
+			}
 			return rt.poiCategory;
 		}
 		return null;
@@ -416,23 +423,18 @@ public class MapRenderingTypes {
 			XmlPullParser parser = PlatformUtil.newXMLPullParser();
 			int tok;
 			parser.setInput(is, "UTF-8");
-			String parentCategory = null;
-			String poiParentCategory = null;
-			String poiParentPrefix  = null;
-			String order = null;
+			MapRulType parentCategory = null;
 			while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
 				if (tok == XmlPullParser.START_TAG) {
 					String name = parser.getName();
 					if (name.equals("category")) { //$NON-NLS-1$
-						parentCategory = parser.getAttributeValue("","name");
-						poiParentCategory = parser.getAttributeValue("","poi_category");
-						poiParentPrefix = parser.getAttributeValue("","poi_prefix");
-						order = parser.getAttributeValue("","order");
-						parseCategoryFromXml(parser, poiParentCategory, poiParentPrefix);
+						parentCategory = parseCategoryFromXml(parser);
 					} else if (name.equals("type")) {
-						parseTypeFromXML(parser, parentCategory, poiParentCategory, poiParentPrefix, order);
+						parseTypeFromXML(parser, parentCategory);
 					} else if (name.equals("routing_type")) {
 						parseRouteTagFromXML(parser);
+					} else if (name.equals("entity_convert")) {
+						parseEntityConvertXML(parser);
 					}
 				}
 			}
@@ -453,14 +455,18 @@ public class MapRenderingTypes {
 		}
 	}
 
+	protected void parseEntityConvertXML(XmlPullParser parser) {
+		
+	}
+
 	protected void parseRouteTagFromXML(XmlPullParser parser) {
 	}
 
-	protected MapRulType parseTypeFromXML(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder) {
-		return parseBaseRuleType(parser, parentCategory, poiParentCategory, poiParentPrefix, parentOrder, true);
+	protected MapRulType parseTypeFromXML(XmlPullParser parser, MapRulType parentCategory) {
+		return parseBaseRuleType(parser, parentCategory, true);
 	}
 
-	protected MapRulType parseBaseRuleType(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder, boolean filterOnlyMap) {
+	protected MapRulType parseBaseRuleType(XmlPullParser parser, MapRulType parentCategory, boolean filterOnlyMap) {
 		String tag = lc(parser.getAttributeValue("", "tag"));
 		String value = lc(parser.getAttributeValue("", "value"));
 		String additional = parser.getAttributeValue("", "additional");
@@ -494,8 +500,8 @@ public class MapRenderingTypes {
 		String order = parser.getAttributeValue("", "order");
 		if(!Algorithms.isEmpty(order)) {
 			rtype.order = Integer.parseInt(order);
-		} else if(!Algorithms.isEmpty(parentOrder)) {
-			rtype.order = Integer.parseInt(parentOrder);
+		} else if (parentCategory != null) {
+			rtype.order = parentCategory.order;
 		}
 		String applyTo = parser.getAttributeValue("", "apply_to");
 		String applyValue = parser.getAttributeValue("", "apply_value");
@@ -506,15 +512,15 @@ public class MapRenderingTypes {
 		if(!rtype.onlyMap) {
 			rtype = registerRuleType(rtype);
 		}
-		
 
-		rtype.category = parentCategory;
-		if (poiParentCategory != null && poiParentCategory.length() > 0) {
-			rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory);
-			rtype.poiSpecified = true;
-		}
-		if (poiParentPrefix != null) {
-			rtype.poiPrefix = poiParentPrefix;
+		rtype.category = parentCategory == null ? null : parentCategory.category;
+		if (parentCategory != null) {
+			if (parentCategory.poiCategory != null) {
+				rtype.poiCategory = parentCategory.poiCategory;
+				rtype.poiSpecified = true;
+			}
+			rtype.poiPrefix = parentCategory.poiPrefix;
+			rtype.poiWithNameOnly = parentCategory.poiWithNameOnly;
 		}
 
 		String poiCategory = parser.getAttributeValue("", "poi_category");
@@ -526,6 +532,10 @@ public class MapRenderingTypes {
 				rtype.poiCategory = AmenityType.getAndRegisterType(poiCategory);
 			}
 		}
+		String poiWithName = parser.getAttributeValue("", "poi_with_name");
+		if (poiWithName != null) {
+			rtype.poiWithNameOnly = Boolean.parseBoolean(poiWithName);
+		}
 		String poiPrefix = parser.getAttributeValue("", "poi_prefix");
 		if (poiPrefix != null) {
 			rtype.poiPrefix = poiPrefix;
@@ -574,7 +584,7 @@ public class MapRenderingTypes {
 						rt.applyToTagValue = null;
 					} else {
 						rt.applyToTagValue.addAll(mapRulType.applyToTagValue);
-						mapRulType.applyToTagValue.add(rt.tagValuePattern);
+						mapRulType.applyToTagValue.addAll(rt.applyToTagValue);
 					}
 				} else {
 					mapRulType.applyToTagValue = null;
@@ -602,18 +612,26 @@ public class MapRenderingTypes {
 		}
 	}
 
-	protected void parseCategoryFromXml(XmlPullParser parser, String poiParentCategory, String poiParentPrefix) {
-		String poi_tag = parser.getAttributeValue("","poi_tag");
-		if (poi_tag != null && poiParentCategory.length() > 0) {
-			MapRulType rtype = new MapRulType();
-			rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory);
+	protected MapRulType parseCategoryFromXml(XmlPullParser parser) {
+		String poiTag = parser.getAttributeValue("", "poi_tag");
+		String poiCategory = parser.getAttributeValue("", "poi_category");
+		MapRulType rtype = new MapRulType();
+		rtype.category = parser.getAttributeValue("", "name");
+		if (!Algorithms.isEmpty(parser.getAttributeValue("", "order"))) {
+			rtype.order = Integer.parseInt(parser.getAttributeValue("", "order"));
+		}
+		if (poiTag != null && poiCategory != null && poiCategory.length() > 0) {
+			rtype.poiCategory = AmenityType.getAndRegisterType(parser.getAttributeValue("", "poi_category"));
 			rtype.poiSpecified = true;
 			rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation"));
-			rtype.poiPrefix = poiParentPrefix;
+			rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name"));
+			rtype.poiPrefix = parser.getAttributeValue("", "poi_prefix");
 			rtype.onlyPoi = true;
-			rtype.tagValuePattern = new TagValuePattern(poi_tag, null);
-			registerRuleType(rtype);
+
+			rtype.tagValuePattern = new TagValuePattern(poiTag, null);
+			return registerRuleType(rtype);
 		}
+		return rtype;
 	}
 	
 	protected static String constructRuleKey(String tag, String val) {
@@ -661,6 +679,10 @@ public class MapRenderingTypes {
 			return value.equals(e.get(tag));
 		}
 		
+		@Override
+		public String toString() {
+			return "tag="+tag + " val=" +value;
+		}
 		@Override
 		public int hashCode() {
 			final int prime = 31;
@@ -704,6 +726,7 @@ public class MapRenderingTypes {
 		
 		protected String category = null;
 		protected String poiPrefix;
+		protected boolean poiWithNameOnly;
 		protected AmenityType poiCategory;
 		// poi_category was specially removed for one tag/value, to skip unnecessary objects
 		protected boolean poiSpecified;
diff --git a/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java b/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java
index f99a4b22c0..8d60c2e333 100644
--- a/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java
+++ b/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java
@@ -114,9 +114,10 @@ public class EntityParser {
 		for(Map<String, String> tags : it) {
 			if (!tags.isEmpty()) {
 				boolean purerelation = relation && !"multipolygon".equals(tags.get("type"));
+				boolean hasName = !Algorithms.isEmpty(tags.get("name"));
 				for (Map.Entry<String, String> e : tags.entrySet()) {
-					AmenityType type = purerelation ? renderingTypes.getAmenityTypeForRelation(e.getKey(), e.getValue())
-							: renderingTypes.getAmenityType(e.getKey(), e.getValue());
+					AmenityType type = purerelation ? renderingTypes.getAmenityTypeForRelation(e.getKey(), e.getValue(), hasName)
+							: renderingTypes.getAmenityType(e.getKey(), e.getValue(), hasName );
 					if (type != null) {
 						String subtype = renderingTypes.getAmenitySubtype(e.getKey(), e.getValue());
 						Amenity a = parseAmenity(entity, type, subtype, tags, renderingTypes);
diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRule.java b/OsmAnd-java/src/net/osmand/render/RenderingRule.java
index 74657b6f93..a153b6337f 100644
--- a/OsmAnd-java/src/net/osmand/render/RenderingRule.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRule.java
@@ -160,6 +160,13 @@ public class RenderingRule {
 		ifElseChildren.add(rr);
 	}
 	
+	public void addToBeginIfElseChildren(RenderingRule rr){
+		if(ifElseChildren == null){
+			ifElseChildren = new ArrayList<RenderingRule>();
+		}
+		ifElseChildren.add(0, rr);
+	}
+	
 	public boolean isGroup() {
 		return isGroup;
 	}
diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java b/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java
index 09af86b0f1..35471fb47d 100644
--- a/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java
@@ -3,6 +3,7 @@ package net.osmand.render;
 
 import net.osmand.PlatformUtil;
 import net.osmand.binary.BinaryMapDataObject;
+import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
 
 import org.apache.commons.logging.Log;
 
@@ -283,16 +284,27 @@ public class RenderingRuleProperty {
 					return val != null && val.equals(val2);
 				}
 				
-				int i = val.indexOf('=');
-				if (i != -1) {
-					String ts = val.substring(0, i);
-					String vs = val.substring(i + 1);
+				int k = val.indexOf('=');
+				if (k != -1) {
+					String ts = val.substring(0, k);
+					String vs = val.substring(k + 1);
 					Integer ruleInd = req.getObject().getMapIndex().getRule(ts, vs);
 					if (ruleInd != null) {
 						if (req.getObject().containsAdditionalType(ruleInd)) {
 							return true;
 						}
 					}
+				} else {
+					String ts = val.substring(0, k);
+					if (ts != null) {
+						int[] additionalTypes = obj.getAdditionalTypes();
+						for (int i = 0; i < additionalTypes.length; i++) {
+							TagValuePair vp = obj.getMapIndex().decodeType(additionalTypes[i]);
+							if (vp != null && ts.equals(vp.tag)) {
+								return true;
+							}
+						}
+					}
 				}
 				return false;
 			}
diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
index a25b3c829d..6cca8467bb 100644
--- a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
@@ -107,8 +107,11 @@ public class RenderingRulesStorage {
 				if (renderingAttributes.containsKey(e.getKey())) {
 					RenderingRule root = renderingAttributes.get(e.getKey());
 					List<RenderingRule> list = e.getValue().getIfElseChildren();
+					e.getValue().addToBeginIfElseChildren(root);
 					for (RenderingRule every : list) {
-						root.addIfElseChildren(every);
+						if(every != root) {
+							root.addIfElseChildren(every);
+						}
 					}
 				} else {
 					renderingAttributes.put(e.getKey(), e.getValue());
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 2ec21f1f25..40d3aa21de 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -5,7 +5,7 @@
 	android:versionCode="201"
 	package="net.osmand.plus">
 
-	<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
+	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19" />
 
 
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/OsmAnd/res/drawable-hdpi/ic_osmo_dark.png b/OsmAnd/res/drawable-hdpi/ic_osmo_dark.png
new file mode 100644
index 0000000000..f4896f6402
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_osmo_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_osmo_light.png b/OsmAnd/res/drawable-hdpi/ic_osmo_light.png
new file mode 100644
index 0000000000..024a0a16a2
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_osmo_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_osmo_dark.png b/OsmAnd/res/drawable-mdpi/ic_osmo_dark.png
new file mode 100644
index 0000000000..cbb6d3d21e
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_osmo_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_osmo_light.png b/OsmAnd/res/drawable-mdpi/ic_osmo_light.png
new file mode 100644
index 0000000000..e10cc8b01f
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_osmo_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png b/OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png
new file mode 100644
index 0000000000..b23be6107f
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png b/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png
new file mode 100644
index 0000000000..92e58b6366
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_osmo_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_osmo_dark.png
new file mode 100644
index 0000000000..4e2fcf7d81
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_osmo_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png b/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png
new file mode 100644
index 0000000000..bab4f8f08f
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png differ
diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favourite_edit_dialog.xml
index fa7fff461f..3ee8fc67dc 100644
--- a/OsmAnd/res/layout/favourite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favourite_edit_dialog.xml
@@ -17,7 +17,6 @@
             android:id="@+id/Name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:inputType="textCapWords"
             android:paddingLeft="3dp"
             android:selectAllOnFocus="true" />
     </TableRow>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index c6bf7bdd8a..74c5d2b473 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -46,7 +46,7 @@
     <string name="wake_on_voice">Ukliučyć ekran</string>
     <string name="wake_on_voice_descr">Ukliučać ekran prystasavańnia pry nablіžeńnі da pavarotu</string>
     <string name="wake_on_voice_never">Nіkolі</string>
-    <string name="select_impassable_road">Vybrać na mapie</string>
+    <string name="select_impassable_road">Vybrać na mapie…</string>
     <string name="impassable_road">Paźbiahać darohі…</string>
     <string name="tip_recent_changes_1_9_t">"Źmieny ŭ 1.9: * Abnoŭlienyja stylі mapy z pakazam pakryćcia daroh, transpartnym slojem і piešachodnymі sіmvalamі * Pošuk POI ŭzdoŭž maršrutu * Paznačeńnie darohі jak nieprachodnaj * Liahčej spampoŭvać і abnaŭliać mapy * Atrymańnie vіzuaĺnaha і hukavaha apaviaščeńnia pry nablіžeńnі da punktu maršrutu * Pakaz maršrutu і іnfarmacyі pra pavaroty * Padtrymka palos dlia pavarotu * Padtrymka Android Wear * Šmat źmienaŭ іnterfiejsu * Asobny zum dlia tekstu na mapie * Spiecyjaĺnyja aŭdyjoapaviaščeńnі ŭ vypadku, kalі vy znachodzіciesia pa-za maršrutam * Funkcyja aŭtaryzacyі OsMo * Vypraŭliena niesumiaščaĺnaść viersіj OsMo "</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Čyhunačnyja maršruty</string>
@@ -390,10 +390,10 @@
     <string name="gpx_option_calculate_first_last_segment">Vylіčyć maršrut OsmAnd dlia pieršaha і apošniaha ŭčastka maršrutu</string>
     <string name="use_displayed_track_for_navigation">Cі chočacie vy vykarystoŭvać adliustravany ślied dlia navіhacyі?</string>
     <string name="keep_and_add_destination_point">Dadać punktam pryznačeńnia</string>
-    <string name="select_gpx">Vybrać GPX …</string>
+    <string name="select_gpx">Vybrać GPX…</string>
     <string name="route_descr_select_destination">Vybrać miesca pryznačeńnia</string>
-    <string name="route_descr_select_on_map">Vybrać na mapie …</string>
-    <string name="route_descr_favorite">Upadabanyja .…</string>
+    <string name="route_descr_select_on_map">Vybrać na mapie…</string>
+    <string name="route_descr_favorite">Upadabanyja.…</string>
     <string name="route_preferences">Nastrojkі maršruta</string>
     <string name="route_info">Іnfarmacyja pra maršrut</string>
     <string name="routing_attr_prefer_motorway_name">Addavać pieravahu aŭtamahіstraliam</string>
@@ -413,8 +413,8 @@
     <string name="android_19_location_disabled">Z viersіі 4.4 Android (KitKat) vy nia možacie zahružać і abnaŭliać mapu ŭ papiarednіm katalohu zachoŭvańnia (%s). Vy chočacie źmianіć kataloh na dazvolieny і skapіjavać usie fajly OsmAnd tudy?\n Zaŭvaha 1: Vašy staryja fajly zastanucca niekranutymі (vy možacie vydalіć іch samastojna).         
 \n Zaŭvaha 2: U novym miescy zachoŭvańnia budzie niemahčyma adnačasova vykarystoŭvać fajly ŭ OsmAnd і OsmAnd+.</string>
     <string name="copying_osmand_one_file_descr">Kapіravańnie fajla (%s) u novaje miesca…</string>
-    <string name="copying_osmand_files_descr">Kapіjavańnie dadzienych OsmAnd u novaje miesca (%s)</string>
-    <string name="copying_osmand_files">Kapіjavańnie dadzienych OsmAnd</string>
+    <string name="copying_osmand_files_descr">Kapіjavańnie dadzienych OsmAnd u novaje miesca (%s)…</string>
+    <string name="copying_osmand_files">Kapіjavańnie dadzienych OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Raźlіčyć pazasiecіŭny maršrut OsmAnd</string>
     <string name="app_mode_truck">Hruzavіk</string>
     <string name="guidance_preferences_descr">Navіhacyjnyja nastrojkі</string>
@@ -1307,8 +1307,7 @@
 	<string name="gpx_option_reverse_route">Razviarnuć kіrunak GPX</string>
 	<string name="gpx_option_destination_point">Vykarystoŭvać biahučy punkt pryznačeńnia</string>
 	<string name="gpx_option_from_start_point">Prajścі ŭvieś šliach spačatku</string>
-	<string name="switch_to_vector_map_to_see">Dlia hetaj pazіcyі dastupnyja lakaĺnyja viektarnyja mapy.\n\t\n\tDlia іch vykarystańnia abiarycie punkt mieniu
-\nalada mapy &gt; rynіca mapy... &gt; akaĺnyja viektarnyja mapy</string>
+	<string name="switch_to_vector_map_to_see">Dlia hetaj pazіcyі dastupnyja lakaĺnyja viektarnyja mapy.\n\t\n\tDlia іch vykarystańnia abiarycie punkt meniu Nalada mapy &gt; Krynіca mapy... &gt; Lakaĺnyja vektarnyja mapy.</string>
 	<string name="choose_audio_stream">Vyvad halasavych padkazak</string>
 	<string name="choose_audio_stream_descr">Abiarycie kanal prajhravańnia halasavych padkazak</string>
 	<string name="voice_stream_voice_call">Kanal tieliefanavańnia</string>
@@ -1805,4 +1804,5 @@
 	<string name="av_camera_pic_size_descr">Pamier fotazdymka z ubudavanaj kamiery</string>
     <string name="navigation_intent_invalid">Niapravіĺny farmat: %s</string>
     <string name="hide_all_waypoints">Vydalіć usie</string>
-</resources>
+<string name="rendering_value__name">Pa zmoŭčańni</string>
+	</resources>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 8ed6c0335a..7c2318db2f 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -594,9 +594,9 @@
 	<string name="poi_seamark_harbour">Гавань</string>
 	<string name="poi_seamark_mooring">Прычал</string>
 	<string name="poi_seamark_notice">Апавяшчэньне (навігацыйны знак)</string>
-	<string name="poi_seamark_radio_station">Радыёстанцыя</string>
+	<string name="poi_seamark_radio_station">Радыёстанцыя (навігацыйны знак)</string>
 	<string name="poi_seamark_signal_station_warning">Сыгнал небясьпекі</string>
-	<string name="poi_seamark_wreck">Караблекрушэньне</string>
+	<string name="poi_seamark_wreck">Караблекрушэньне (навігацыйны знак)</string>
 
 	<string name="poi_military">Ваенная зона</string>
 	<string name="poi_military_airfield">Ваенны аэрадром</string>
@@ -614,7 +614,35 @@
 	<string name="poi_roller_coaster">Амэрыканскія горкі</string>
 	<string name="poi_slide">Жолаб</string>
 	<string name="poi_summer_toboggan">Летнія сані</string>
-	<string name="poi_seamark_rock">Скала</string>
+	<string name="poi_seamark_rock">Скала (навігацыйны знак)</string>
 	<string name="poi_seamark_dry_dock">Сухі док</string>
 	<string name="poi_seamark_floating_dock">Плывучы док</string>
+	<string name="poi_tower">Вежа</string>
+	<string name="poi_mast">Шчогла</string>
+	<string name="poi_radar">Радар</string>
+	<string name="poi_aquarium">Акварыюм</string>
+	<string name="poi_seamark_buoy_isolated_danger">Буй (ізаляваная небясьпека)</string>
+	<string name="poi_seamark_buoy_lateral">Латэральны буй</string>
+	<string name="poi_seamark_dyke">Дамба</string>
+	<string name="poi_seamark_beacon_cardinal">Кардынальны бакен</string>
+	<string name="poi_seamark_beacon_lateral">Латэральны бакен</string>
+	<string name="poi_seamark_buoy_cardinal">Кардынальны буй</string>
+	<string name="poi_seamark_radar_transponder">Радыёлакацыйны транспондар (навігацыйны знак)</string>
+	<string name="poi_seamark_pile">Навігацыйны знак на палях</string>
+	<string name="poi_seamark_signal_station_traffic">Сігнальная станцыя (трафік)</string>
+	<string name="poi_seamark_topmark">Топавая фігура (навігацыйны знак)</string>
+	<string name="poi_seamark_building">Будынак (арыентыр)</string>
+	<string name="poi_seamark_bridge">Мост (арыентыр)</string>
+	<string name="poi_seamark_buoy_safe_water">Бясьпечная вада (буй)</string>
+	<string name="poi_seamark_beacon_safe_water">Бясьпечная вада (бакен)</string>
+	<string name="poi_seamark_harbour_basin">Акваторыя порту</string>
+	<string name="poi_seamark_landmark">Берагавы знак</string>
+	<string name="poi_seamark_light">Агонь маяка</string>
+	<string name="poi_seamark_daymark">Дзённы знак</string>
+	<string name="poi_seamark_light_major">Асноўны агонь маяка</string>
+	<string name="poi_seamark_light_minor">Малы агонь маяка</string>
+	<string name="poi_seamark_light_float">Агонь плывучага маяка</string>
+	<string name="poi_seamark_distance_mark">Пазнака дальнасьці</string>
+	<string name="poi_seamark_light_vessel">Агонь плывучага маяка (судна)</string>
+	<string name="poi_seamark_small_craft_facility">Лодкавая станцыя</string>
 	</resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 3f404b66b3..cbe8a1940d 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -5,9 +5,9 @@
     <string name="auto_zoom_farthest">Драбней</string>
     <string name="map_magnifier">Лупа мапы</string>
     <string name="base_world_map">Асноўная мапа сьвету</string>
-    <string name="about_version">Версія:</string>
+    <string name="about_version">Вэрсія:</string>
     <string name="about_settings">Аб праграме</string>
-    <string name="about_settings_descr">Версія, ліцэнзіі, удзельнікі праекта</string>
+    <string name="about_settings_descr">Вэрсія, ліцэнзіі, удзельнікі праекту</string>
     <string name="tips_and_tricks">Дапамога</string>
     <string name="tip_recent_changes_1_6_t">Зьмены ў 1.6: ↵
 	\n\t* Падтрымка прылад з Full HD; ↵
@@ -24,7 +24,7 @@
     <string name="local_index_tile_data_zooms">Сьцягнутыя маштабы: %1$s</string>
     <string name="local_index_tile_data_expire">Тэрмін дзеяньня (у хвілінах): %1$s</string>
     <string name="local_index_tile_data_downloadable">Можна сьцягнуць: %1$s</string>
-    <string name="local_index_tile_data_maxzoom">Максімальнае павелічэньне: %1$s</string>
+    <string name="local_index_tile_data_maxzoom">Максымальнае павелічэньне: %1$s</string>
     <string name="local_index_tile_data_minzoom">Мінімальнае павелічэньне: %1$s</string>
     <string name="local_index_tile_data_name">Зьвесткі квадрата: %1$s</string>
     <string name="edit_tilesource_successfully">Крыніца квадратаў мапы %1$s пасьпяхова захаваная</string>
@@ -93,7 +93,7 @@
     <string name="intermediate_items_sort_return">Прамежкавыя кропкі шляху адсартаваныя аптымальным чынам ад пачатковай да канчатковай.</string>
     <string name="intermediate_items_sort_by_distance">Упарадкаваць па адлегласьці</string>
     <string name="local_osm_changes_backup_successful">Файл зьмен OSM пасьпяхова створаны ў %1$s</string>
-    <string name="local_osm_changes_backup_failed">Збой рэзервовага капіяванья файлу зьмяненьняў OSM</string>
+    <string name="local_osm_changes_backup_failed">Збой рэзервовага капіяваньня файлу зьмен OSM</string>
     <string name="local_osm_changes_backup">Рэзервовае капіяваньне файлу зьмен OSM</string>
     <string name="delete_point">Выдаліць кропку</string>
     <string name="plugin_distance_point_time">час</string>
@@ -114,7 +114,7 @@
     <string name="distance_measurement_save_gpx">Захаваць як GPX</string>
     <string name="distance_measurement_load_gpx">Адчыніць існы GPX</string>
     <string name="wait_current_task_finished">Калі ласка, пачакайце пакуль бягучая задача не будзе завершаная</string>
-    <string name="use_kalman_filter_compass_descr">Выкарыстоўваць фільтар Калмана каб прадухіліць абэрацыю компасу</string>
+    <string name="use_kalman_filter_compass_descr">Зьніжае шум паказаньняў компасу, але дадае інэрцыю</string>
     <string name="use_kalman_filter_compass">Выкарыстоўваць фільтар Калмана</string>
     <string name="access_mark_final_location_first">Рэжым даступнасьці: Калі ласка, спачатку абярыце пункт прызначэньня</string> 
     <string name="use_magnetic_sensor_descr">Выкарыстоўваць для працы компаса магнітны датчык замест датчыка арыентацыі</string>
@@ -138,7 +138,7 @@
     <string name="osmand_monitoring_plugin_description">Дазволіць адсочваньне месцазнаходжаньня і навігацыю ў рэжыме сну (калі экран выключаны) шляхам пэрыядычнага абуджэньня GPS прыймача.
 Паказаць налады запісу вандровак ў лякальныя GPX файлы ці ў сеткавы вэб-сэрвіс.</string>
     <string name="osmand_monitoring_plugin_name">Запіс сьледу</string>
-    <string name="osmand_background_plugin_description">Налады ўключэньня запісу сьледу і навігацыі ў рэжыме сну (экран выключаны) шляхам перыядычнага абуджэньня GPS прыймача.</string>
+    <string name="osmand_background_plugin_description">Налады ўключэньня запісу сьледу і навігацыі ў фонавым рэжыме (экран выключаны) шляхам пэрыядычнага абуджэньня GPS прыймача.</string>
     <string name="contribution_activity">Усталяваньне версіі</string>
     <string name="choose_osmand_theme_descr">Абраць выгляд праграмы</string>
     <string name="choose_osmand_theme">Выгляд</string>
@@ -261,13 +261,12 @@
     <string name="safe_mode_description">Працаваць у бясьпечным рэжыме (трохі павольней але бяз свойскіх бібліятэк).</string>
     <string name="safe_mode">Бясьпечны рэжым</string>
     <string name="native_library_not_running">Праграма працуе ў бясьпечным рэжыме (адключыць яго ў наладах).</string>
-    <string name="background_service_is_enabled_question">Сьпячы рэжым OsmAnd па-ранейшаму працуе. Хочаце прыпыніць яго?</string>
-    <string name="tip_recent_changes_1_0_0_t">Змены ў версіі 1.0.0:
-	\n\t* Палепшана маршрутызацыя: хутчэй, дакладней, да 250 км
-	\n\t* Уведзены карты дарог
-	\n\t* Карта не губляе прывязкі да пазіцыі пасля перарыванняў
-	\n\t* Уключана служба рэжыма сну падчас навігацыі
-    </string>
+    <string name="background_service_is_enabled_question">Фонавы рэжым OsmAnd па-ранейшаму працуе. Хочаце прыпыніць яго?</string>
+    <string name="tip_recent_changes_1_0_0_t">"Змены ў версіі 1.0.0:
+\n\t* Палепшана маршрутызацыя: хутчэй, дакладней, да 250 км
+\n\t* Уведзены карты дарог
+\n\t* Карта не губляе прывязкі да пазіцыі пасля перарыванняў
+\n\t* Уключана служба фонавага рэжыму падчас навігацыі "</string>
     <string name="close_changeset">Зачыніць мноства зьмен</string>
 	<string name="zxing_barcode_scanner_not_found">Праграма ZXing Barcode Scanner не ўстаноўлена. Шукаць у Market?</string>
 	<string name="rendering_attr_roadColors_description">Выберыце схему колераў дарог:</string>
@@ -496,8 +495,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="map_widget_transparent">Празрыстае афармленьне</string>
 	
 	
-	<string name="bg_service_sleep_mode_off">Ўключыць\n спячы рэжым</string>
-	<string name="bg_service_sleep_mode_on">Спынiць\n рэжым сну</string>
+	<string name="bg_service_sleep_mode_off">Уключыць\n фонавы рэжым</string>
+	<string name="bg_service_sleep_mode_on">Спынiць\n фонавы рэжым</string>
 	<string name="gps_wakeup_interval">Iнтэрвал абуджэньня GPS: %s</string>
 	<string name="int_continuosly">Безперапынны</string>
 	<string name="screen_is_locked">Для разблакоўкі экрана дакраніцеся да значка блакаваньня</string>
@@ -590,10 +589,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="rendering_attr_hmRendered_name">Паказаць больш дэталей мапы</string>
 	<string name="local_index_routing_data">Дадзеныя маршрутызацыі</string>
 	<string name="navigate_point_format">Фармат:</string>
-	<string name="poi_search_desc">Пошук цікавосткаў (POI)</string>
+	<string name="poi_search_desc">Пошук POI</string>
 	<string name="address_search_desc">Пошук па адрасе</string>
 	<string name="navpoint_search_desc">Каардынаты</string>
-	<string name="transport_search_desc">Пошук транспарту</string>
+	<string name="transport_search_desc">Пошук грамадзкага транспарту</string>
 	<string name="favourites_search_desc">Пошук упадабаных</string>
 	<string name="history_search_desc">Гісторыя пошуку</string>
 	<string name="offline_navigation_not_available">Аўтаномная навігацыя OsmAnd часова недаступная.</string>
@@ -603,16 +602,16 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="unknown_from_location">Першапачатковае месцазнаходжаньне не вызначана</string>
 	<string name="unknown_location">Месца пакуль ня вызначанае</string>
 	<string name="modify_transparency">Змяніць празрыстасць (0 - празрысты, 255 - непразрысты)</string>
-	<string name="confirm_interrupt_download">Перапыніць загрузку файла?</string>
-	<string name="first_time_msg">Дзякуй за карыстаньне OsmAnd. Каб карыстацца ўсімі магчымасьцямі праграмы, вам патрэбныя некаторыя пазасеціўныя зьвесткі для вашага рэгіёну. Іх можна зладаваць праз \'Налады\' → \'Кіраваць файламі мапаў\'. Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць цікавосткі і грамадзкі транспарт.</string>    
-	<string name="basemap_was_selected_to_download">Базавая мапа неабходная для карэктнай працы праграмы і аўтаматычна была абраная для загрузкі.</string>
+	<string name="confirm_interrupt_download">Перапыніць cьцягваньне файла?</string>
+	<string name="first_time_msg">Дзякуй за карыстаньне OsmAnd. Каб карыстацца ўсімі магчымасьцямі праграмы, вам патрэбныя некаторыя пазасеціўныя зьвесткі для вашага рэгіёну. Іх можна cьцягнуць праз \'Налады\' → \'Кіраваць файламі мапаў\'. Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць POI і грамадзкі транспарт.</string>    
+	<string name="basemap_was_selected_to_download">Базавая мапа неабходная для карэктнай працы праграмы і аўтаматычна была абраная для cьцягваньня.</string>
 	<string name="select_index_file_to_download">Нічога не знойдзена. Калі вы не знайшлі свой рэгіён, вы можаце стварыць мапу самастойна (гл. http://osmand.net).</string>
 	<string name="local_indexes_cat_tile">Сеціўныя і растравыя мапы</string>
 	<string name="local_indexes_cat_map">Аўтаномныя мапы (вэктарныя)</string>
-	<string name="index_settings_descr">Ладаваньне і кіраваньне файламі мапаў, што захоўваюцца на вашым прыстасаваньні</string>
+	<string name="index_settings_descr">Сьцягваньне і кіраваньне файламі мапаў, што захоўваюцца на вашым прыстасаваньні</string>
 	<string name="map_online_plugin_is_not_installed">Актывуйце модуль онлайн мапаў, каб выбіраць розныя крыніцы для мапаў</string>
 	<string name="map_online_data">Сеціўныя і растравыя мапы</string>
-	<string name="map_online_data_descr">Карыстацца сеціўнымі мапамі (зладаваць і захоўваць на картцы SD)</string>
+	<string name="map_online_data_descr">Карыстацца сеціўнымі мапамі (cьцягнуць і захоўваць на картцы SD)</string>
 	<string name="online_map_settings">Сеціўныя мапы</string>
 	<string name="online_map_settings_descr">Настройка крыніц анлайн або кэшаваных растравых мапаў</string>
 	<string name="map_settings">Налады мапы</string>
@@ -640,13 +639,13 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\t * Графічны інтэрфейс і ўзаемадзеянне * ↵
 		\n\t → - Палепшана ў многіх напрамках → → ↵		
 	</string>
-	<string name="osm_editing_plugin_description">Паказваць налады патрэбныя для зваротнай сувязі OSM накшталт збору/зьменаў цікавосткаў, стварэньня/камэнтаваньня хібаў OSM і дасыланьня запісаных файлаў GPX (патрабуе лагін/пароль OSM).</string>
+	<string name="osm_editing_plugin_description">Паказваць налады патрэбныя для зваротнай сувязі OSM накшталт збору/зьменаў POI, стварэньня/камэнтаваньня хібаў OSM і дасыланьня запісаных файлаў GPX (патрабуе лагін/пароль OSM).</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Вектарныя мапы могуць адлюстроўвацца хутчэй. Падтрымліваецца не ўсімі прыладамі.</string>
 	<string name="play_commands_of_currently_selected_voice">Прайграць каманды абраным голасам</string>
 	<string name="debugging_and_development">Для распрацоўшчыкаў OsmAnd</string>
 	<string name="native_rendering">Хуткая адмалёўка</string>
 	<string name="test_voice_prompts">Пратэставаць галасавыя падказкі</string>    
-	<string name="switch_to_raster_map_to_see">Для бягучай мясцовасьці мапа адсутнічае. Вы можаце загрузіць мапу з дапамогай меню Налады (Кіраваць файламі маапў) або пераключыцца на выкарыстаньне сеткавых мапаў.</string>
+	<string name="switch_to_raster_map_to_see">Для бягучай мясцовасьці мапа адсутнічае. Вы можаце cьцягнуць мапу з дапамогай меню Налады (Кіраваць файламі мапаў) або пераключыцца на выкарыстаньне сеткавых мапаў.</string>
 	<string name="tip_recent_changes_0_7_2_t">Змены 0.7.2: ↵ 
 		\n\t - Хуткі рэндэрынг для ўсіх прылад ↵ 
 		\n\t - Лакальнае рэдагаванне POI
@@ -726,17 +725,16 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для трэкаў і шляхоў</string>
 	<string name="offline_edition">Аўтаномнае рэдагаваньне</string>
 	<string name="offline_edition_descr">Заўсёды выкарыстоўваць аўтаномнае рэдагаваньне</string>
-	<string name="tip_recent_changes_0_7_1_t">Змены ў 0.7.1 : ↵
-		\n\t - Лакальнае рэдагаванне POI ↵
-		\n\t - Параметры адсочваньня - перыядычная перадача каардынатаў у вэб-сэрвіс (як наладзіць вэб-сэрвіс адсочваньня - чытайце ў HowTo) ↵
-		\n\t - Паказ бягучага сьледу на мапе↵
-		\n\t - Вызначэнне напрамка руху: паведамленне \'Зрабіце разварот\' паказваецца і аб\'яўляецца, калі вы рухаецеся ў процілеглым кірунку, або прапусцілі паварот ↵
-		\n\t - Новае галасавое паведамленне \'Маршрут пералічаны\' ↵
-		\n\t - Візуальная індыкацыя бліжэйшага павароту, у межах 100 м стрэлка кірунку мяняе колер ↵
-		\n\t - Актуальнасць дэактываваных індэксных файлаў таксама паказваецца ў меню Загрузка, цёмна-блакітным або цёмна-зялёным ↵
-		\n\t - Іншыя змены ↵
-	</string>
-	<string name="update_poi_does_not_change_indexes">Зьмены POI у праграме не ўплываюць на зладаваныя файлы мапы, зьмены захоўваюцца толькі ў лякальныя файлы.</string>
+	<string name="tip_recent_changes_0_7_1_t">"Змены ў 0.7.1 : ↵
+\n\t - Лакальнае рэдагаванне POI ↵
+\n\t - Параметры адсочваньня - перыядычная перадача каардынатаў у вэб-сэрвіс (як наладзіць вэб-сэрвіс адсочваньня - чытайце ў HowTo) ↵
+\n\t - Паказ бягучага сьледу на мапе↵
+\n\t - Вызначэнне напрамка руху: паведамленне \'Зрабіце разварот\' паказваецца і аб\'яўляецца, калі вы рухаецеся ў процілеглым кірунку, або прапусцілі паварот ↵
+\n\t - Новае галасавое паведамленне \'Маршрут пералічаны\' ↵
+\n\t - Візуальная індыкацыя бліжэйшага павароту, у межах 100 м стрэлка кірунку мяняе колер ↵
+\n\t - Актуальнасць дэактываваных індэксных файлаў таксама паказваецца ў меню Сьцягнуць, цёмна-блакітным або цёмна-зялёным ↵
+\n\t - Іншыя змены ↵ "</string>
+	<string name="update_poi_does_not_change_indexes">Зьмены POI у праграме не ўплываюць на cьцягнутыя файлы мапаў, зьмены захоўваюцца толькі ў лякальныя файлы.</string>
 	<string name="local_openstreetmap_uploading">Перадача …</string>
 	<string name="local_openstreetmap_were_uploaded">{0} POI/Памылкі былі адасланы</string>
 	<string name="local_openstreetmap_uploadall">Адаслаць усё</string>
@@ -754,8 +752,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="live_monitoring_url">Вэб-адрас для сеткавага сачэньня</string>
 	<string name="gpx_monitoring_disabled_warn">Калі ласка, дазвольце \'Запіс сьледу ў GPX файл\' у наладах.</string>
 	<string name="show_current_gpx_title">Паказаць бягучы сьлед</string>
-	<string name="tip_recent_changes_0_7_0_t">Зьмены ў 0.7.0: \n\t- Пазасеткавыя зьвесткі вікіпэдыі з артыкуламі \n\t- Абноўленыя мапы \n\t- Іншыя невялікія пашырэньні</string>    
-	<string name="free_version_message">Гэтая бясплатная версія OsmAnd абмяжоўваецца %1$s загрузкамі і не падтрымлівае аўтаномныя артыкулы Вікіпедыі.</string>
+	<string name="tip_recent_changes_0_7_0_t">"Зьмены ў 0.7.0:
+\n\t- Пазасеткавыя зьвесткі вікіпэдыі з артыкуламі
+\n\t- Абноўленыя мапы
+\n\t- Іншыя невялікія пашырэньні "</string>    
+	<string name="free_version_message">Гэтая бясплатная вэрсія OsmAnd абмяжоўваецца %1$s cьцягваньнямі і не падтрымлівае аўтаномныя артыкулы Вікіпэдыі.</string>
 	<string name="free_version_title">Бясплатная вэрсія</string>
 	<string name="poi_context_menu_showdescription">Паказваць апісаньні POI</string>
 	<string name="index_name_north_america">Паўночная Амэрыка</string>
@@ -797,7 +798,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\t* \'Па кірунку руху\' - Карта будзе паварочвацца ў адпаведнасці з напрамкам Вашага руху. Зверху - кірунак руху. ↵ 
 		\n\t* \'Па кірунку компаса\' - Карта будзе паварочвацца так, каб сумясціць поўнач карты і паўночны напрамак (выкарыстоўваюцца паказанні компаса ў прыладзе). ↵
 	</string>
-	<string name="binary_map_download_success">"Загрузка скончана. ↵
+	<string name="binary_map_download_success">"Сьцягваньне скончана. ↵
 \n\t\n\tАктывацыя мапаў праз \'Меню\' → \'Мапа\' → \'Крыніца мапы ...\' → \'Оффлайн вектарныя мапы\". ↵ → "</string>
 	<string name="tip_day_night_mode">Рэжым дзень/ноч</string>
 	<string name="tip_day_night_mode_t_v2">"Для лакальных вектарных карт можна змяняць выгляд у залежнасці ад часу сутак: днём (светлы), ноччу (цёмны). Начны рэжым бяспечны для выкарыстання кіроўцамі ў цемры ↵
@@ -814,8 +815,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\nПра памылкі на карце можна неадкладна паведамляць праз \'Памылкі OSM\' і супольнасць OSM зможа іх хутка выправіць. Для дадання паведамлення пра памылку скарыстайцеся камандай \'Памылка ў OSM\' з кантэкстнага меню карты. Дадайце апісанне праблемы і адпраўце яе націснуўшы \'Дадаць\'. ↵
 		\n\nOsmAnd падтрымлівае кэшаванне вашых правак, калі злучэнне з інтэрнэтам няма (гл. адпаведныя наладкі), але для перадачы OSM POI і справаздач пра памылкі ў OSM вам трэбна інтэрнэт злучэнне. ↵
 	</string>
-	<string name="download_files_not_enough_space">Няма вольнага месца каб зладаваць %1$s MB (вольна: %2$s).</string>
-	<string name="download_files_question_space">Вольнага месца зараз {2} MB! Зладаваць {0} файлы ({1} MB)?</string>
+	<string name="download_files_not_enough_space">Няма вольнага месца каб сьцягнуць %1$s МБ (вольна: %2$s).</string>
+	<string name="download_files_question_space">Вольнага месца зараз {2} МБ! Сьцягнуць {0} файл(аў) ({1} МБ)?</string>
 	<string name="tip_navigation">Навігацыя</string>
 	<string name="tip_navigation_t">"Каб атрымаць маршрут да патрэбнага месца, вы можаце націснуць і трымаць пальцам карту ў патрэбным месцы (потым выбраць «Маршрут у» ў вакенцы маркера) або «Маршруты» пасля выбару любога пункта ў выніках пошуку або закладках. ↵
 \n\nМесца прызначэньня будзе пазначана сьцяжком, таксама OsmAnd пакажа адлегласць да яго і напрамак (аранжавым трохвугольнікам). ↵
@@ -871,7 +872,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="old_poi_file_should_be_deleted">Файл POI \'%1$s\' залішні і можа быць выдалены.</string>
 	<string name="update_poi_file_not_found">Лякальны файл для падтрымкі зьменаў у POI ня знойдзены і ня можа быць створаны.</string>
 	<string name="button_upgrade_osmandplus">Абнавіць да OsmAnd+</string>
-	<string name="map_version_changed_info">Сэрвер утрымлівае файлы мапаў, якія не сумяшчальныя з вашай вэрсіяй праграмы. Каб зладаваць і карыстацца імі трэба абнавіць праграму да новай вэрсіі.</string>
+	<string name="map_version_changed_info">Сэрвер утрымлівае файлы мапаў, якія не сумяшчальныя з вашай вэрсіяй праграмы. Каб сьцягнуць і карыстацца імі трэба абнавіць праграму да новай вэрсіі.</string>
 	<string name="local_index_mi_rename">Пераназваць</string>
 	<string name="show_gpx_route">Паказаць на мапе</string>
 	<string name="poi_filter_nominatim">Сеткавы Nominatim</string>
@@ -882,8 +883,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_position_undefined">Нявызначана</string>
 	<string name="search_position_fixed">Вызначана</string>
 	<string name="search_position_current_location">Бягучае месцазнаходжаньне…</string>
-	<string name="search_position_map_view">Апошні выгляд мапы</string>
-	<string name="select_search_position">Шукаць блізу:</string>
+	<string name="search_position_map_view">Бягучы цэнтар мапы</string>
+	<string name="select_search_position">Пачатак:</string>
 	<string name="context_menu_item_search">Шукаць навокал</string>
 	<string name="save_route_dialog_title">Захаваць шлях як GPX сьлед</string>
 	<string name="route_successfully_saved_at">Маршрут пасьпяхова захаваны як \'%1$s\'.</string>
@@ -905,8 +906,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="favourites_edit_dialog_name">Назва</string>
 	<string name="favourites_edit_dialog_category">Катэгорыя</string>
 	<string name="vector_map_not_needed">Не, дзякуй</string>
-	<string name="basemap_missing">Няма асноўнай мапы сьвету (якая пакрывае ўвесь сьвет на малых маштабах). Каб мець поўнае асяродзьдзе трэба зладаваць World_basemap_x.obf.</string>
-	<string name="vector_data_missing">Няма пазасеціўных зьвестак на картцы SD. Каб карыстацца мапай па-за сеткай, трэба іх зладаваць.</string>
+	<string name="basemap_missing">Няма асноўнай мапы сьвету (якая пакрывае ўвесь сьвет на малых маштабах). Каб мець поўнае асяродзьдзе трэба сьцягнуць World_basemap_x.obf.</string>
+	<string name="vector_data_missing">Няма пазасеціўных зьвестак на картцы SD. Каб карыстацца мапай па-за сеткай, трэба іх сьцягнуць.</string>
 	<string name="local_index_gpx_info_show">\n\nНаціснуць і трымаць для наладаў</string>
 	
 	
@@ -922,16 +923,16 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="local_index_mi_backup">Дэактываваць</string>
 	<string name="local_index_mi_delete">Выдаліць</string>
 	<string name="local_index_mi_reload">Перачытаць з карткі SD</string>
-	<string name="local_index_download">Зладаваць</string>
-	<string name="local_index_poi_data">Зьвесткі цікавосткаў</string>
+	<string name="local_index_download">Сьцягнуць</string>
+	<string name="local_index_poi_data">Зьвесткі POI</string>
 	<string name="local_index_address_data">Адрас</string>
-	<string name="local_index_transport_data">Транспартныя дадзеныя</string>
+	<string name="local_index_transport_data">Зьвесткi грамадзкага транспарту</string>
 	<string name="local_index_map_data">Дадзеныя мапы</string>
 	<string name="local_indexes_cat_backup">Не актыўны</string>
 	<string name="local_indexes_cat_tts">Галасавыя зьвесткі (TTS)</string>
 	<string name="local_indexes_cat_voice">Галасавыя зьвесткі (запісаныя)</string>
 	<string name="local_indexes_cat_gpx">Зьвесткі GPX</string>
-	<string name="local_indexes_cat_poi">Зьвесткі цікавосткаў</string>
+	<string name="local_indexes_cat_poi">Зьвесткі POI</string>
 	<string name="ttsvoice">TTS голас</string>
 	<string name="search_offline_clear_search">Новы пошук</string>
 	<string name="map_text_size_descr">Выберыце памер шрыфта для назваў на мапе</string>
@@ -958,13 +959,13 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="gpx_option_reverse_route">Развярнуць кірунак GPX</string>
 	<string name="gpx_option_destination_point">Выкарыстоўваць бягучы пункт прызначэньня</string>
 	<string name="gpx_option_from_start_point">Прайсьці ўвесь шлях спачатку</string>
-	<string name="switch_to_vector_map_to_see">Для гэтай пазіцыі даступныя лакальныя вектарныя мапы.\n\t\n\tДля іх выкарыстаньня абярыце пункт меню \'Налада мапы\' → \'Крыніца мапы...\' → \'Лакальныя вектарныя мапы\'.</string>
+	<string name="switch_to_vector_map_to_see">Для гэтага рэгіёну даступныя лякальныя вэктарныя мапы.\n\t\n\tДля іх выкарыстаньня абярыце пункт мэню \'Налада мапы\' → \'Крыніца мапы...\' → \'Лякальныя вэктарныя мапы\'.</string>
 	<string name="choose_audio_stream">Вывад галасавых падказак</string>
 	<string name="choose_audio_stream_descr">Абярыце канал прайграваньня галасавых падказак</string>
 	<string name="voice_stream_voice_call">Канал телефанаваньня</string>
 	<string name="voice_stream_notification">Канал апавяшчэньня</string>
 	<string name="voice_stream_music">Мэдыя/музычны канал</string>
-	<string name="warning_tile_layer_not_downloadable">Праграма не можа спампаваць слой мапы %1$s, паспрабуйце пераўсталяваць яго.</string>
+	<string name="warning_tile_layer_not_downloadable">Праграма не можа сьцягнуць слой мапы %1$s, паспрабуйце пераўсталяваць яе.</string>
 	<string name="overlay_transparency_descr">Зьмяніць празрыстасць накладзенага слою</string>
 	<string name="overlay_transparency">Празрыстасць накладаньня</string>
 	<string name="map_transparency_descr">Зьмяніць празрыстасць асноўнай мапы</string>
@@ -1049,14 +1050,14 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="amenity_type_transportation">Транспарт</string>
 	<string name="indexing_address">Індэксаваньне адрасоў…</string>
 	<string name="indexing_map">Індэксаваньне мапаў…</string>
-	<string name="indexing_poi">Індэксаваньне цікавосткаў…</string>
+	<string name="indexing_poi">Індэксаваньне POI…</string>
 	<string name="indexing_transport">Індэксуецца транспарт…</string>
 	<string name="input_output_error">Надарылася I/O памылка</string>
 	<string name="km">км</string>
 	<string name="km_h">км/г</string>
 	<string name="m">м</string>
 	<string name="old_map_index_is_not_supported">Састарэлы фармат дадзеных мапы \'\'{0}\'\' не падтрымліваецца</string>
-	<string name="poi_filter_closest_poi">Бліжэйшыя цікавосткі</string>
+	<string name="poi_filter_closest_poi">Бліжэйшыя POI</string>
 	<string name="poi_filter_custom_filter">Свой фільтар</string>
 	<string name="poi_filter_namefinder">Сеткавы NameFinder</string>
 	<string name="reading_cached_tiles">Чытаньне кэшаваных растравых мапаў…</string>
@@ -1070,13 +1071,13 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	
 	<string name="osmand_net_previously_installed">У вас ўсталяваная папярэдняя версія OsmAnd. Усе лакальныя дадзеныя падтрымліваюцца новай версіяй. Але захаваныя кропкі трэба экспартаваць з папярэдняй версіі і імпартаваць у новую.</string>
 	<string name="build_installed">Зборка {0} пасьпяхова ўсталявана ({1}).</string>
-	<string name="downloading_build">Загружаецца зборка…</string>
+	<string name="downloading_build">Сьцягваецца зборка…</string>
 	<string name="install_selected_build">Хочаце ўсталяваць OsmAnd - {0} з {1} {2} МБ?</string>
 	<string name="loading_builds_failed">Не ўдалося атрымаць сьпіс зборак OsmAnd</string>
 	<string name="loading_builds">Загружаюцца зборкі OsmAnd…</string>
 	<string name="select_build_to_install">Выберыце зборку OsmAnd для ўстаноўкі</string>
 	<string name="gps_status_app_not_found">Праграма статуса GPS не ўсталяваная. Пашукаць яе ў Market?</string>
-	<string name="voice_is_not_available_msg">Галасавыя каманды не даступныя. Калі ласка, перайдзіце ў \"Налады\" → \"Агульныя\" → \"Галасавыя дадзеныя\" і абярыце ці спампуйце пакет галасавых падказак.</string>
+	<string name="voice_is_not_available_msg">Галасавыя каманды не даступныя. Калі ласка, перайдзіце ў \"Налады\" → \"Агульныя\" → \"Галасавыя дадзеныя\" і абярыце ці сьцягніце пакет галасавых падказак.</string>
 	<string name="voice_is_not_available_title">Галасавыя падказкі не абраныя</string>
 	<string name="daynight_mode_day">Дзень</string>
 	<string name="daynight_mode_night">Ноч</string>
@@ -1084,18 +1085,18 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="daynight_mode_sensor">Сэнсар сьвятла</string>
 	<string name="daynight_descr">Выберыце правіла пераключэньня рэжыму дзень/ноч</string>
 	<string name="daynight">Рэжым дзень/ноч</string>
-	<string name="download_files_question">Спампаваць {0} файл(ы) ({1} MB)?</string>
+	<string name="download_files_question">Сьцягнуць {0} файл(ы) ({1} МБ)?</string>
 	<string name="items_were_selected">{0} абрана</string>
-	<string name="filter_existing_indexes">Зладаванае</string>
+	<string name="filter_existing_indexes">Сьцягнутае</string>
 	<string name="deselect_all">Прыбраць вылучэньне ўсіх</string>
 	<string name="select_all">Вылучыць усе</string>
 	<string name="reload">Абнавіць</string>
 	<string name="fast_route_mode">Найхутчэйшы шлях</string>
 	<string name="fast_route_mode_descr">Пазначыць каб разьлічваць найхутчэйшы шлях, ці зьняць пазнаку для найкарацейшага шляху </string>
-	<string name="tiles_to_download_estimated_size">На маштабе {0} загрузіць {1} фрагментаў ({2} МБ)</string>
-	<string name="context_menu_item_download_map">Спампаваць мапу</string>
+	<string name="tiles_to_download_estimated_size">На маштабе {0} сьцягнуць {1} фрагмэнтаў ({2} МБ)</string>
+	<string name="context_menu_item_download_map">Сьцягнуць мапу</string>
 	<string name="select_max_zoom_preload_area">Выберыце максімальнае павелічэньне для папярэдняй загрузкі</string>
-	<string name="maps_could_not_be_downloaded">Гэтая мапа не можа быць загружана</string>
+	<string name="maps_could_not_be_downloaded">Гэтую мапу нельга сьцягнуць</string>
 	<string name="continuous_rendering">Бесперапынная адмалёўка</string>
 	<string name="continuous_rendering_descr">Паказваць бесперапынную адмалёўку замест выявы цалкам</string>
 	<string name="rendering_exception">Памылка пры адмалёўцы абранай вобласьці</string>
@@ -1109,10 +1110,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="download_type_to_filter">набярыце каб фільтраваць</string>
 	<string name="use_high_res_maps">Дысплей высокай рэзалюцыі</string>
 	<string name="use_high_res_maps_descr">Не расьцягваць (з размыццём) растравыя мапы на дысплеях з высокай шчыльнасьцю</string>
-	<string name="download_files">Зладаваць</string>
-	<string name="context_menu_item_search_transport">Пошук транспарту</string>
-	<string name="transport_searching_transport">Пошук транспарту (няма цэлі):</string>
-	<string name="transport_searching_route">Пошук транспарту ({0} да цэлі):</string>
+	<string name="download_files">Сьцягнуць</string>
+	<string name="context_menu_item_search_transport">Шукаць грамадзкi транспарт</string>
+	<string name="transport_searching_transport">Вынiк пошуку транспарту (няма цэлі):</string>
+	<string name="transport_searching_route">Вынiк пошуку транспарту ({0} да цэлі):</string>
 	<string name="transport_search_none">няма</string>
 	<string name="transport_search_again">Шукаць транспарт зноў</string>
 	<string name="map_index">Мапа</string>
@@ -1123,11 +1124,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="layer_gpx_layer">GPX сьлед…</string>
 	<string name="error_reading_gpx">Памылка пры чытаньні GPX дадзеных</string>
 	<string name="vector_data">Лакальныя вектарныя мапы</string>
-	<string name="transport_context_menu">Пошук транспарту на прыпынку</string>
+	<string name="transport_context_menu">Шукаць транспарт на прыпынку</string>
 	<string name="point_on_map">Месца:\n %1$.5f шыр.\n %2$.5f даў.</string>
 	<string name="osb_bug_name">Памылка</string>
-	<string name="poi_context_menu_modify">Зьмяніць цікавостку</string>
-	<string name="poi_context_menu_delete">Выдаліць цікавостку</string>
+	<string name="poi_context_menu_modify">Правіць POI</string>
+	<string name="poi_context_menu_delete">Выдаліць POI</string>
 	<string name="rotate_map_compass_opt">Па компасе</string>
 	<string name="rotate_map_bearing_opt">У напрамку руху</string>
 	<string name="rotate_map_none_opt">Не варочаць (поўнач уверсе)</string>
@@ -1142,17 +1143,17 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="export_fav">Экспартаваць</string>
 	<string name="error_occurred_loading_gpx">Памылка пры загрузцы GPX</string>
 	<string name="send_report">Даслаць справаздачу</string>
-	<string name="none_region_found">На SD-карце не знойдзена лакальных дадзеных для рэгіёнаў. Спампаваць рэгіёны з Інтэрнэту.</string>
+	<string name="none_region_found">На SD-карце не знойдзена лякальных дадзеных для рэгіёнаў. Сьцягнуць рэгіёны з Інтэрнэту.</string>
 	<string name="poi_namefinder_query_empty">Увядзіце запыт для пошуку POI</string>
 	<string name="any_poi">Усе</string>
-	<string name="layer_transport_route">Маршрут перавозкі</string>
+	<string name="layer_transport_route">Маршрут транспарту</string>
 	<string name="thanks_yandex_traffic">Дзякуй Яндэксу за дарожную інфармацыю.</string>
 	<string name="layer_yandex_traffic">Яндэкс заторы</string>
 	<string name="layer_route">Маршрут</string>
 	<string name="layer_favorites">Упадабаныя</string>
 	<string name="layer_osm_bugs">OSM памылкі (онлайн)</string>
 	<string name="layer_transport">Прыпынкі транспарту</string>
-	<string name="layer_poi">Цікавосткі…</string>
+	<string name="layer_poi">POI…</string>
 	<string name="layer_map">Крыніца мапы…</string>
 	<string name="menu_layers">Слаі мапы</string>
 	<string name="context_menu_item_search_poi">Пошук POI</string>
@@ -1160,19 +1161,19 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="use_trackball">Выкарыстоўвайце трэкбол</string>
 	<string name="background_service_wait_int_descr">Задаць максімальны час чаканьня для кожнага фонавага вызначэньня каардынатаў</string>
 	<string name="background_service_wait_int">Максімальны час чаканьня вызначэньня каардынат</string>
-	<string name="service_stop_background_service">Выключыць навігацыю OsmAnd для рэжыму сну</string>
+	<string name="service_stop_background_service">Выключыць фонавы рэжым навігацыі OsmAnd</string>
 	<string name="where_am_i">Дзе я?</string>
 	<string name="process_navigation_service">Навігацыйны сэрвіс OsmAnd</string>
 	<string name="network_provider">Сетка</string>
 	<string name="gps_provider">GPS</string>
 	<string name="int_seconds">сэкундаў</string>
 	<string name="int_min">хв.</string>
-	<string name="background_service_int_descr">Абярыце інтэрвал абуджэньня для спячага рэжыму</string>
+	<string name="background_service_int_descr">Абярыце інтэрвал абуджэньня для фонавага рэжыму</string>
 	<string name="background_service_int">Інтэрвал абуджэньня GPS</string>
-	<string name="background_service_provider_descr">Абярыце крыніцу каардынат для выкарыстаньня падчас спячага рэжыму</string>
+	<string name="background_service_provider_descr">Абярыце крыніцу каардынат для выкарыстаньня фонавым сэрвісам</string>
 	<string name="background_service_provider">Крыніца каардынат</string>
 	<string name="background_router_service_descr">Запускае OsmAnd ў фонавым рэжыме для адсочвання месцазнаходжаньня пры выключаным экране</string>
-	<string name="background_router_service">Працаваць ў рэжыме сну</string>
+	<string name="background_router_service">Працаваць ў фонавым рэжыме</string>
 	<string name="off_router_service_no_gps_available">Фонаваму сэрвісу неабходная інфармацыя пра месцазнаходжаньне.</string>
 	<string name="hide_poi_filter">Схаваць фільтр</string>
 	<string name="show_poi_filter">Паказаць фільтр</string>
@@ -1197,9 +1198,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="route_tu">Развярніцеся і рухайцеся</string>
 	<string name="route_head">Рухайцеся</string>
 	<string name="first_time_continue">Далей</string>
-	<string name="first_time_download">Зладаваць рэгіёны</string>
+	<string name="first_time_download">Сьцягнуць рэгіёны</string>
 	<string name="search_poi_location">Пошук сігналу…</string>
-	<string name="search_near_map">Пошук побач з апошнім месцам на мапе</string>
+	<string name="search_near_map">Шукаць побач з бягучым цэнтрам мапы</string>
 	<string name="search_nearby">Шукаць паблізу</string>
 	<string name="map_orientation_default">Па змаўчаньні</string>
 	<string name="map_orientation_portrait">Вэртыкальная</string>
@@ -1211,7 +1212,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="transport_Routes">Маршруты</string>
 	<string name="transport_Stop">Прыпынак</string>
 	<string name="transport_stops">прыпынкаў</string>
-	<string name="transport_search_after">Наступны маршрут</string>	
+	<string name="transport_search_after">Далейшы маршрут</string>	
 	<string name="transport_search_before">Папярэдні маршрут</string>
 	<string name="transport_finish_search">Скончыць пошук</string>
 	<string name="transport_stop_to_go_out">Выберыце прыпынак для сходу</string>
@@ -1221,7 +1222,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="transport_route_distance">Даўжыня маршруту</string>
 	<string name="transport">Транспарт</string>
 	<string name="default_buttons_ok">Добра</string>
-	<string name="show_transport_over_map_description">Паказаць прыпынкі грамадскага транспарту на мапе</string>
+	<string name="show_transport_over_map_description">Паказаць прыпынкі грамадзкага транспарту на мапе</string>
 	<string name="show_transport_over_map">Паказваць прыпынкі транспарту</string>
 	<string name="hello">Навігацыйная праграма OsmAnd</string>
 	<string name="update_poi_success">Дадзеныя POI былі пасьпяхова абноўленыя ({0} аб\'ектаў загружана)</string>
@@ -1229,7 +1230,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="update_poi_error_loading">Памылка пры загрузцы дадзеных з сервера</string>
 	<string name="update_poi_no_offline_poi_index">Для гэтай мясцовасці адсутнічаюць лакальныя дадзеныя аб POI</string>
 	<string name="update_poi_is_not_available_for_zoom">Абнаўленьне POI не даступна для малых узроўняў маштабаваньня</string>
-	<string name="context_menu_item_update_poi">Абнаўленьне POI</string>
+	<string name="context_menu_item_update_poi">Абнавіць POI</string>
 	<string name="context_menu_item_update_map_confirm">Абнавіць лакальныя дадзеныя праз Інтэрнэт?</string>
 	<string name="search_history_city">Горад: {0}</string>
 	<string name="search_history_street">Вуліца: {0}, {1}</string>
@@ -1248,19 +1249,19 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_offline_address">Пазасеціўны пошук</string>
 	<string name="search_online_address">Сеціўны пошук</string>
 	<string name="max_level_download_tile">Максімальнае павелічэньне онлайн мапаў</string>
-	<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэньня для загрузкі онлайн растравых мапаў</string>
+	<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэньня для сьцягваньня растравых мапаў з Інтэрнэту</string>
 	<string name="route_general_information">Агульная адлегласьць %1$s, час у дарозе %2$d г. %3$d хв.</string>
 	<string name="router_service_descr">Абраць сеціўны ці пазасеціўны сэрвіс навігацыі</string>
 	<string name="router_service">Сэрвіс навігацыі</string>
 	<string name="sd_dir_not_accessible">Каталёг на SD-карце недаступны для захоўваньня!</string>
-	<string name="download_question">Download {0} - {1} ?</string>
+	<string name="download_question">Сьцягнуць {0} - {1} ?</string>
 	<string name="download_question_exist">Лакальная мапа для {0} ужо існуе ({1}). Хочаце яе абнавіць ({2})?</string>
 	<string name="address">Адрас</string>
-	<string name="download_index_success">Загрузка пасьпяховая</string>
+	<string name="download_index_success">Пасьпяхова сьцягнута</string>
 	<string name="error_io_error">Адбылася памылка ўводу/вываду</string>
-	<string name="downloading_file_new">Ладаваньне…</string>
-	<string name="downloading">Ладаваньне…</string>
-	<string name="downloading_list_indexes">Зладоўваем сьпіс даступных рэгіёнаў…</string>
+	<string name="downloading_file_new">Сьцягваньне…</string>
+	<string name="downloading">Сьцягваньне…</string>
+	<string name="downloading_list_indexes">Сьцягваецца сьпіс даступных рэгіёнаў…</string>
 	<string name="list_index_files_was_not_loaded">Сьпіс даступных рэгіёнаў ня быў зладаваны з osmand.net.</string>
 	<string name="show_poi_on_map">Паказаць на мапе</string>
 	<string name="fav_points_edited">Захаваная кропка была зьменена</string>
@@ -1275,7 +1276,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="opening_changeset">Адкрыцьцё пакета паправак…</string>
 	<string name="closing_changeset">Закрыцьцё пакета паправак…</string>
 	<string name="commiting_node">Захаваньне аб\'екта…</string>
-	<string name="loading_poi_obj">Загрузка POI…</string>
+	<string name="loading_poi_obj">Чытаньне POI…</string>
 	<string name="auth_failed">Не атрымалася выканаць аўтарызацыю</string>
 	<string name="failed_op">не ўдалося</string>
 	<string name="converting_names">Канвертацыя мясцовых/ангельскіх назваў…</string>
@@ -1301,8 +1302,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="finished_task">Скончана</string>
 	<string name="reload_indexes_descr">Перачытаць лакальныя вектарныя мапы з SD</string>
 	<string name="reload_indexes">Перачытаць лакальныя дадзеныя</string>
-	<string name="download_indexes_descr">Загрузіць або абнавіць мапы для лакальнага выкарыстаньня з Інтэрнэту</string>
-	<string name="download_indexes">Зладаваць пазасеткавыя зьвесткі</string>
+	<string name="download_indexes_descr">Сьцягнуць або абнавіць мапы для лякальнага выкарыстаньня з Інтэрнэту</string>
+	<string name="download_indexes">Сьцягнуць пазасеткавыя зьвесткі</string>
 	<string name="use_online_routing_descr">Выкарыстоўваць Інтэрнэт для разьліку маршруту</string>
 	<string name="use_online_routing">Выкарыстоўваць онлайн навігацыю</string>
 	<string name="osm_settings_descr">Лагін і пароль для Openstreetmap.org (OSM)</string>
@@ -1314,7 +1315,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="settings">Налады</string>
 	<string name="save_current_track_descr">Захаваць бягучы сьлед на SD зараз</string>
 	<string name="save_current_track">Захаваць бягучы GPX сьлед</string>
-	<string name="save_track_interval">Інтэрвал захоўванья падчас навігацыі</string>
+	<string name="save_track_interval">Інтэрвал захоўваньня падчас навігацыі</string>
 	<string name="save_track_interval_descr">Пазначыць інтэрвал захоўваньня пунктаў сьледу падчас навігацыі</string>
 	<string name="save_track_to_gpx_descrp">Сьляды будуць захаваныя ў каталог track падчас навігацыі</string>
 	<string name="save_track_to_gpx">Запісваць сьлед у GPX файл</string>
@@ -1346,7 +1347,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="map_preferences">Мапа</string>
 	<string name="settings_activity">Налады</string>
 	<string name="show_gps_coordinates_text">Паказаць GPS каардынаты на мапе</string>
-	<string name="use_internet_to_download_tile">Выкарыстоўваць Інтэрнэт, каб спампаваць фрагмэнты мапы, што адсутнічаюць</string>
+	<string name="use_internet_to_download_tile">Выкарыстоўваць Інтэрнэт, каб сьцягваць фрагмэнты мапы, што адсутнічаюць</string>
 	<string name="app_description">Навігацыйная праграма</string>
 	<string name="exit_Button">Выхад</string>
 	<string name="map_Button">Мапа</string>
@@ -1354,7 +1355,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="favorites_Button">Мае мясьціны</string>
 	<string name="search_button">Пошук</string>
 	<string name="search_activity">Пошук</string>
-	<string name="searchpoi_activity">Абраць цікавостку</string>
+	<string name="searchpoi_activity">Абраць POI</string>
 	<string name="search_POI_level_btn">Знайсьці яшчэ</string>
 	<string name="incremental_search_street">Шукаць вуліцу</string>
 	<string name="incremental_search_building">Шукаць дом</string>
@@ -1385,7 +1386,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="context_menu_item_add_favorite">Дадаць да ўпадабаных</string>
 	<string name="context_menu_item_update_map">Абнавіць мапу</string>
 	<string name="context_menu_item_open_bug">Паведаміць пра памылку на мапе</string>
-	<string name="context_menu_item_create_poi">Стварыць цікавостку</string>
+	<string name="context_menu_item_create_poi">Стварыць POI</string>
 	<string name="default_buttons_yes">Так</string>
 	<string name="default_buttons_cancel">Скасаваць</string>
 	<string name="default_buttons_apply">Застасаваць</string>
@@ -1407,26 +1408,26 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="osb_comment_dialog_author">Імя аўтара</string>
 	<string name="osb_comment_dialog_title">Даданьне каментара да памылкі</string>
 	<string name="osb_comment_dialog_add_button">Дадаць камэнтар</string>
-	<string name="osb_comment_dialog_success">Гэты каментар быў пасьпяхова дададзены</string>
+	<string name="osb_comment_dialog_success">Гэты камэнтар быў пасьпяхова дададзены</string>
 	<string name="osb_comment_dialog_error">Выключная сітуацыя: каментар не быў дададзены</string>
 	<string name="osb_close_menu_item">Зачыніць памылку</string>
 	<string name="osb_close_dialog_title">Закрыцьцё памылкі</string>
 	<string name="osb_close_dialog_close_button">Зачыніць памылку</string>
 	<string name="osb_close_dialog_success">Памылка была пасьпяхова зачынена</string>
 	<string name="osb_close_dialog_error">Выключная сітуацыя: памылка не была зачынена</string>
-	<string name="poi_edit_title">Рэдагаваць цікавостку</string>
-	<string name="poi_create_title">Стварыць цікавостку</string>
+	<string name="poi_edit_title">Правіць POI</string>
+	<string name="poi_create_title">Стварыць POI</string>
 	<string name="poi_error_poi_not_found">POI не знойдзена або не зьяўляецца кропкай</string>
 	<string name="poi_remove_confirm_template">Выдаліць {0} (дадаць каментар)?</string>
-	<string name="poi_remove_title">Выдаліць цікавостку</string>
+	<string name="poi_remove_title">Выдаліць POI</string>
 	<string name="default_buttons_delete">Выдаліць</string>
-	<string name="poi_remove_success">Цікавостка выдаленая</string>
+	<string name="poi_remove_success">POI выдаленая</string>
 	<string name="poi_action_add">дадаць</string>
 	<string name="poi_action_change">зьмяніць</string>
 	<string name="poi_action_succeded_template">Дзеяньне {0} пасьпяхова завершана.</string>
 	<string name="poi_error_unexpected_template">Нечаканая памылка пры выкананьні дзеяньня {0}.</string>
 	<string name="poi_error_io_error_template">Адбылася памылка ўводу/вываду пры выкананьні дзеяньня {0}.</string>
-	<string name="poi_error_info_not_loaded">Адбылася памылка пры загрузцы інфармацыі аб POI</string>
+	<string name="poi_error_info_not_loaded">Адбылася памылка пры чытаньні інфармацыі пра POI</string>
 	<string name="poi_dialog_name">Назва</string>
 	<string name="poi_dialog_opening_hours">Гадзіны працы</string>
 	<string name="poi_dialog_comment">Каментар</string>
@@ -1468,7 +1469,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="lang_bs">баснійская</string>
 	<string name="lang_bg">балгарская</string>
 	<string name="lang_ca">каталонская</string>
-	<string name="lang_cs">чэшская</string>
+	<string name="lang_cs">чэская</string>
 	<string name="lang_da">дацкая</string>
 	<string name="lang_nl">галяндзкая</string>
 	<string name="lang_fi">фінская</string>
@@ -1502,10 +1503,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="index_name_canada">Паўночная Амэрыка - Канада</string>
     <string name="index_name_italy">Эўропа - Італія</string>
     <string name="index_name_gb">Эўропа - Вялікабрытанія</string>
-    <string name="calculate_osmand_route_without_internet">Вылічыць сегмент маршруту OsmAnd без Інтэрнэту</string>
+    <string name="calculate_osmand_route_without_internet">Вылічыць адрэзак маршруту OsmAnd без Інтэрнэту</string>
     <string name="gpx_option_calculate_first_last_segment">Вылічыць маршрут OsmAnd для першага і апошняга ўчастка маршруту</string>
     <string name="use_displayed_track_for_navigation">Ці хочаце вы выкарыстоўваць адлюстраваны сьлед для навігацыі?</string>
-    <string name="route_descr_select_on_map">Выбраць на мапе …</string>
+    <string name="route_descr_select_on_map">Выбраць на мапе…</string>
     <string name="route_info">Інфармацыя пра маршрут</string>
     <string name="routing_attr_prefer_motorway_name">Аддаваць перавагу аўтамагістралям</string>
 	<string name="routing_attr_short_way_name">Самы кароткі шлях</string>
@@ -1521,9 +1522,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="routing_attr_weight_name">Абмежаваньне вагі</string>
 	<string name="routing_attr_weight_description">Задайце вагу аўтамабіля для пракладаньня маршрутаў</string>
     <string name="application_dir_change_warning2">Вы хочаце каб OsmAnd таксама скапіяваў свае зьвесткі ў новае месца? Абярыце \"Не\" каб OsmAnd проста стварыў і выкарыстоўваў новы каталёг.</string>
-    <string name="copying_osmand_one_file_descr">Капіраваньне файла (%s) у новае месца...</string>
-    <string name="copying_osmand_files_descr">Капіяваньне дадзеных OsmAnd у новае месца (%s)</string>
-    <string name="copying_osmand_files">Капіяваньне дадзеных OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Капіраваньне файла (%s) у новае месца…</string>
+    <string name="copying_osmand_files_descr">Капіяваньне дадзеных OsmAnd у новае месца (%s)…</string>
+    <string name="copying_osmand_files">Капіяваньне дадзеных OsmAnd…</string>
     <string name="app_mode_truck">Грузавік</string>
     <string name="speech_rate_descr">Задайце хуткасць вымаўленьня для TTS</string>
     <string name="speech_rate">Хуткасьць вымаўленьня</string>
@@ -1542,7 +1543,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="remember_choice">Запомніць мой выбар</string>
     <string name="index_item_world_basemap">Сусьветная аглядная мапа</string>
     <string name="index_item_world_ski">Сусьветная лыжная мапа</string>
-    <string name="select_gpx">Выбраць GPX …</string>
+    <string name="select_gpx">Абраць GPX …</string>
     <string name="routing_attr_prefer_motorway_description">Аддаваць перавагу аўтамагістралям</string>
 	<string name="animate_routing_route">Імітацыя з выкарыстаньнем разлічанага маршруту </string>
     <string name="animate_routing_gpx">Імітацыя з выкарыстаньнем GPX-сьледу</string>
@@ -1552,7 +1553,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="index_item_world_bitcoin_payments">Bitcoin плацяжы ўсяго сьвету</string>
 	<string name="keep_and_add_destination_point">Дадаць пунктам прызначэньня</string>
     <string name="route_descr_select_destination">Выбраць месца прызначэньня</string>
-    <string name="route_descr_favorite">Упадабаныя .…</string>
+    <string name="route_descr_favorite">Упадабаныя…</string>
     <string name="route_preferences">Настройкі маршрута</string>
     <string name="calculate_osmand_route_gpx">Разьлічыць пазасеціўны маршрут OsmAnd</string>
     <string name="guidance_preferences_descr">Навігацыйныя настройкі</string>
@@ -1563,7 +1564,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="app_mode_hiking">Пешы турызм</string>
     <string name="app_mode_boat">Судна</string>
     <string name="tip_faq_t">Калі ласка, наведайце https://code.google.com/p/osmand/wiki/FAQ каб пабачыць часта задаваныя пытаньні.</string>
-    <string name="local_osm_changes_delete_all_confirm">Вы зьбіраецеся выдаліць %1$d змены OSM. Вы ўпэўненыя?</string>
+    <string name="local_osm_changes_delete_all_confirm">Вы зьбіраецеся выдаліць %1$d зьмены OSM. Вы ўпэўненыя?</string>
     <string name="animate_routing_route_not_calculated">Калі ласка, спачатку разьлічыце маршрут</string>
     <string name="osmodroid_unseek">Не адсочваць аб\'ект</string>
     <string name="android_19_location_disabled">З версіі 4.4 Android (KitKat) вы ня можаце загружаць і абнаўляць мапу ў папярэднім каталогу захоўваньня (%s). Вы хочаце зьмяніць каталог на дазволены і скапіяваць усе файлы OsmAnd туды?\n Заўвага 1: Вашы старыя файлы застануцца некранутымі (вы можаце выдаліць іх самастойна).         
@@ -1583,7 +1584,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="app_modes_choose_descr">Выберыце профілі карыстання бачныя ў праграме</string>
     <string name="voice_pref_title">Голас</string>
     <string name="misc_pref_title">Рознае</string>
-    <string name="localization_pref_title">Лакалізацыя</string>
+    <string name="localization_pref_title">Лякалізацыя</string>
     <string name="interrupt_music">Перапыненьне музыкі</string>
 	<string name="osmo_settings_uuid">Унікальны ідэнтыфікатар прылады</string>
     <string name="osmo_settings_descr">Глянуць унікальны рэгістрацыйны ключ прыстасаваньня і наладзіць асабісты канал адсочваньня</string>
@@ -1609,13 +1610,12 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	\n\t* \'Турыстычны\' варыянт стылю мапы з большай колькасьцю дэталяў, новымі стылямі дарог, павышанай кантрастнасцю і інш.
 	\n\t* Карэкцыя геоіду EGM96 для паказанняў вышыні GPS
     </string>
-    <string name="tip_recent_changes_0_8_4_t">Змены ў 0.8.4:
-	\n\t* Выпраўленне памылак
-	\n\t* Карта не губляе блакавання пазіцыі пасля перапыненняў
-	\n\t* Уключае рэжым сну падчас навігацыі
-    </string>
+    <string name="tip_recent_changes_0_8_4_t">"Змены ў 0.8.4:
+\n\t* Выпраўленне памылак
+\n\t* Карта не губляе блакавання пазіцыі пасля перапыненняў
+\n\t* Уключае фонавы рэжым падчас навігацыі "</string>
     <string name="osmand_srtm_long_description_1000_chars">Гэты модуль паказвае ізалініі вышынь на картах OsmAnd. Глабальныя дадзеныя (паміж 70 градусамі на поўначы і 70 градусамі на поўдні) грунтуюцца на вымярэннях SRTM (Shuttle Radar Topography Mission) і ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), дадзеных інструмента візуалізацыі Terra, флагманскага спадарожніка сістэмы назірання Зямлі ад NASA. ASTER - гэта вынік сумеснай працы NASA, міністэрства эканомікі Японіі, міністэрства гандлю і прамысловасці Японіі (METI), агенцтва касмічных сістэм Японіі (J-spacesystems).</string>
-    <string name="srtm_plugin_description">Модуль дазваляе загружаць дадзеныя ізаліній вышынь (\'Налады\' → \'Кіраваньне файламі мапаў\' → \'Спампаваць\' → Выберыце пажаданы тып карты).</string>
+    <string name="srtm_plugin_description">Модуль дазваляе cьцягваць дадзеныя ізаліній вышынь (\'Налады\' → \'Кіраваньне файламі мапаў\' → \'Сьцягнуць\' → Выберыце пажаданы тып мапы).</string>
     <string name="osmodroid_plugin_description">Модуль OsMoDroid - пашырэньне для OsmAnd, што выкарыстоўвае праграму OsModroid для сеткавага адсочваньня. Інфармацыю аб сэрвісе можна знайсьці на сайце http://esya.ru.</string>
     <string name="tip_altitude_offset_t">Большасць GPS прылад паказваюць вышыню односна элліпсоіда WGS84, для вызначэння вышыні над узроўнем мора неабходна правесці карэкцыю, якая залежыць ад вашага месцазнаходжання. ↵ 
 → → \n\nКаб выправіць значеньне вышыні выкарыстоўваецца праекцыя EGM96. ↵ 
@@ -1628,11 +1628,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\t* Кнопка блакавання экрана ў службе абсочваньня↵ 
 		\n\t* Выпраўлена напісанне арабскаю, моваю каннада і мовамі, якія маюць пісьменнасць справа налева 
 	</string>
-	<string name="arrival_distance_descr">Як хутка вы хочаце чуць паведамленье пра прыбыцьцё?</string>
+	<string name="arrival_distance_descr">Як хутка вы хочаце чуць паведамленьне пра прыбыцьцё?</string>
     <string name="tip_update_index_t">"Актуальныя картаграфічныя дадзеныя вельмі важныя для аўтаномнага прагляду мапы і адраснага пошуку. OsmAnd мае ўбудаваны мэнэджэр файлаў мапаў, які можа правяраць наяўнасць абнаўленьняў для лакальных мапаў.
-\n\nКаб выканаць загрузку мапаў абярыце пункт меню \'Налады\' → \'Кіраваньне файламі мапаў\' → \'Загрузка\'. ↵
-\n\nПасля таго як сьпіс рэгіёнаў будзе загружаны зь Інтэрнэту, націсьніце на любы пункт для загрузкі або абнаўленьня файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для загрузкі (карты, слаі рэльефу і г.д.) ↵
-\n\nВы можаце паказаць толькі дадзеныя прысутныя на прыстасаваньні \'Налады\' → \'Загружаныя\', каб пабачыць абнаўленьні толькі для дадзеных, загружаных на прыстасаваньне. ↵
+\n\nКаб cьцягнуць мапы абярыце пункт меню \'Налады\' → \'Кіраваньне файламі мапаў\' → \'Сьцягнуць\'. ↵
+\n\nПасля таго як сьпіс рэгіёнаў будзе cьцягнуты зь Інтэрнэту, націсьніце на любы пункт для cьцягваньня або абнаўленьня файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для cьцягванья (мапы, слаі рэльефу і г.д.) ↵
+\n\nВы можаце паказаць толькі дадзеныя прысутныя на прыстасаваньні \'Налады\' → \'Сьцягнутыя\', каб пабачыць абнаўленьні толькі для дадзеных, загружаных на прыстасаваньне. ↵
 \n\n\t* \'Зялёным\' паказваюцца дадзеныя, якія не патрабуюць абнаўленьня ↵
 \n\t* \'Блакітным\' - наяўныя абнаўленьні ↵
 \n\t* Элементы паказаныя курсівам - дэактываваныя дадзеныя на прыстасаваньні "</string>
@@ -1651,21 +1651,20 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="tip_map_switch_t_v2">"Карты і слаі можна мяняць праз \'Меню\' → \'Налада мапы\'. ↵
 \n\nУ пункце \'Крыніцы карт...\' можна выбраць прадусталяваныя вектарныя карты (звычайна патрэбныя для аўтаномнай навігацыі), або папярэдне указаныя (сеткавыя або кэшаваныя) крыніцы растравых карт (для выкарыстання неабходна ўключыць модуль \'Сеткавыя карты\') або самастойна створаныя карты (напрыклад, з дапамогай OsmAndMapCreator для ПК). ↵
 \n\nOsmAnd таксама падтрымлівае адвольныя крыніцы карыстальніка. ↵ "</string>
-	<string name="tip_recent_changes_0_6_7_t">Змены ў 0.6.7: ↵
-		\n\t- Менеджэр лакальных дадзеных (сцягванне, выдаленне, актывацыя і дэактывацыя дадзеных непасрэдна ў OsmAnd) ↵
-		\n\t- Закладкі і групы (катэгарызацыя, выдаленне, кіраванне закладкамі) ↵
-		\n\t- Агляд GPX у праграме (прагляд інфармацыі пра сьлед, адлегласць, сярэдняя хуткасць, вышыня, г.д.) ↵
-		\n\t- Навігацыя па GPX (больш параметраў, працяг навігацыі пасля збою, падтрымка руху па крузе ) ↵
-		\n\t- Магчымасць захавання маршруту як следу GPX для лакальнага выкарыстання ↵
-		\n\t- Палепшаны GPX-маніторынг (адкіданьне недакладнага становішча і захаванне дакладнасці/вышыні/хуткасці) ↵
-		\n\t- Загрузка GPX для выкарыстання супольнасцю OSM (http://download.osmand.net/gpx/) ↵
-		\n\t- Паляпшэнне вектарнай адмалёўкі ↵
-		\n\t- Паляпшэнне рухавічка TTS (паведамленне дакладнай адлегласці, можна і ў мілях) ↵
-		\n\t- Выпраўленні памылак ↵
-	</string>
+	<string name="tip_recent_changes_0_6_7_t">"Змены ў 0.6.7: ↵
+\n\t- Менеджэр лакальных дадзеных (сьцягванне, выдаленне, актывацыя і дэактывацыя дадзеных непасрэдна ў OsmAnd) ↵
+\n\t- Закладкі і групы (катэгарызацыя, выдаленне, кіраванне закладкамі) ↵
+\n\t- Агляд GPX у праграме (прагляд інфармацыі пра сьлед, адлегласць, сярэдняя хуткасць, вышыня, г.д.) ↵
+\n\t- Навігацыя па GPX (больш параметраў, працяг навігацыі пасля збою, падтрымка руху па крузе ) ↵
+\n\t- Магчымасць захавання маршруту як следу GPX для лакальнага выкарыстання ↵
+\n\t- Палепшаны GPX-маніторынг (адкіданьне недакладнага становішча і захаванне дакладнасці/вышыні/хуткасці) ↵
+\n\t- Загрузка GPX для выкарыстання супольнасцю OSM (http://download.osmand.net/gpx/) ↵
+\n\t- Паляпшэнне вектарнай адмалёўкі ↵
+\n\t- Паляпшэнне рухавічка TTS (паведамленне дакладнай адлегласці, можна і ў мілях) ↵
+\n\t- Выпраўленні памылак ↵ "</string>
 	<string name="osmo_io_error">Праблема з падключэньнем OsMo: </string>
-    <string name="osmo_mode_on">Спыніць сесію OsMo</string>    
-    <string name="osmo_mode_off">Запусьціць сесію OSMo</string>
+    <string name="osmo_mode_on">Спыніць сэсыю OsMo</string>    
+    <string name="osmo_mode_off">Запусьціць сэсыю OSMo</string>
     
     <string name="share_fav">Падзяліцца</string>
 	<string name="share_fav_subject">Выбранае адаслана праз OsmAnd</string>
@@ -1680,17 +1679,17 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     </string>
     <string name="osmo_auto_send_locations_descr">Аўтаматычна пачынаць запіс сьледу і перадачу месцазнаходжаньня пасьля старту праграмы</string>
     <string name="osmo_auto_send_locations">Аўтаматычна пачынаць адсылку месцазнаходжаньня</string>
-    <string name="osmo_tracker_id">Персанальны ID трэкера</string>
+    <string name="osmo_tracker_id">Пэрсанальны ID трэкера</string>
     <string name="osmo_tracker_id_descr">Націсніце, каб паглядзець ці падзяліцца ідэнтыфікатарам трэкера.          Выкарыстаньне ідэнтыфікатара трэкера звязанага з прыстасаваньнем дасць магчымасць кантраляваць усе перамяшчэньні гэтага прыстасаваньня! Для адключэньня выберыце опцыю перастварэньня.</string>
-    <string name="osmo_session_token">Токен сесіі: %1$s</string>
-    <string name="osmo_auth_pending">У чаканьні дазволу...</string>
+    <string name="osmo_session_token">Токен сэсыі: %1$s</string>
+    <string name="osmo_auth_pending">У чаканьні дазволу…</string>
     <string name="osmo_locations_sent">"Месцазнаходжаньне адаслана %1$d (у буферы %2$d) "</string>
     <string name="osmo_conn_successfull">Злучэньне ўстаноўлена: %1$s </string>
-    <string name="osmo_mode_restart">Пачаць OsMo сэсію паўторна</string>
+    <string name="osmo_mode_restart">Пачаць OsMo сэсыю паўторна</string>
     <string name="osmo_settings_debug">Адладачная інфармацыя</string>
     <string name="hours_ago">гадзін таму</string>
     <string name="minutes_ago">хвілін таму</string>
-    <string name="seconds_ago">секунд таму</string>
+    <string name="seconds_ago">сэкунд таму</string>
     <string name="osmo_connect_to_device_name">Імя карыстальніка</string>
     <string name="osmo_connect_to_device_tracker_id">ID трэкера</string>
     <string name="osmo_connect_to_device">Сувязь з прыстасаваньнем</string>
@@ -1702,9 +1701,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="osmo_group">Група OsMo</string>
     <string name="osmo_group_share">Каб падключыцца да групы %2$s, задайце ID групы (%1$s) або націсьніце %3$s.</string>
     <string name="osmo_share_connect_device">Дазволіць пастаянна адсочваць дадзенае прыстасаваньне</string>
-    <string name="osmo_share_current_session">Падзяліцца бягучай сесіяй у браўзэры</string>
-    <string name="osmo_share_session">Падзяліцца сэсіяй</string>
-    <string name="osmo_session_id_share">URL сесіі для адсочваньня прыстасаваньня (%1$s)</string>
+    <string name="osmo_share_current_session">Падзяліцца бягучай сэсыяй у браўзэры</string>
+    <string name="osmo_share_session">Падзяліцца сэсыяй</string>
+    <string name="osmo_session_id_share">URL сэсыі для адсочваньня прыстасаваньня (%1$s)</string>
     <string name="osmo_track_interval_descr">Выберыце часавы інтэрвал для адпраўкі месцазнаходжаньня</string>
     <string name="int_days">дзён</string>
     <string name="osmo_connect_menu">Падключыцца</string>
@@ -1724,7 +1723,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="osmo_track_interval">Інтэрвал адсылкі дадзеных</string>
 	<string name="osmo_expire_group">Тэрмін дзеяньня скончыцца праз</string>
     <string name="osmo_control">Хуткі доступ OsMo</string>
-    <string name="osmo_session_not_available">Сесія не даступная, калі ласка, пераканайцеся, што пункт \'Адсылаць месцазнаходжаньне\' уключаны.</string>
+    <string name="osmo_session_not_available">Сэсыя не даступная, калі ласка, пераканайцеся, што пункт \'Адсылаць месцазнаходжаньне\' уключаны.</string>
     <string name="osmo_tracker_id_share">Каб падключыцца да патрэбнага прыстасаваньня %2$s націсьніце на спасылку %3$s альбо задайце ідэнтыфікатар трэкеру (%1$s)</string>
     <string name="color_red">чырвоны</string>
 	<string name="color_pink">ружовы</string>
@@ -1738,7 +1737,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="osmo_edit_color">Выбар колеру</string>
     <string name="osmo_edit_device">Зьмяніць налады карыстальніка</string>
     <string name="osmo_sign_in">Увайсьці</string>
-    <string name="osmo_create_groups_confirm">Для таго каб стварыць групы вы павінны быць зарэгістраваным карыстальнікам OsMo.</string>
+    <string name="osmo_create_groups_confirm">Для стварэньня групы, вы павінны быць зарэгістраваным карыстальнікам OsMo.</string>
     <string name="osmo_credentials_not_valid">Уведзеныя зьвесткі не сапраўдныя.</string>
     <string name="osmo_regenerate_login_ids_confirm">Вы ўпэўненыя, што хочаце перастварыць асабістыя ідэнтыфікатары? Усе прыстасаваньні, падлучаныя да вас больш не змогуць адсочваць вас.</string>
     <string name="osmo_regenerate_login_ids">Перастварыць ідэнтыфікатар карыстальніка</string>
@@ -1747,8 +1746,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="osmo_user_name">Карыстальнік</string>
 	<string name="color_green">зялёны</string>
 	
-    <string name="osmo_set_moving_target">Усталяваць рухомай мішэньню</string>
-    <string name="osmo_cancel_moving_target">Скасаваць рухомую мішэнь</string>
+    <string name="osmo_set_moving_target">Усталяваць рухомай цэльлю</string>
+    <string name="osmo_cancel_moving_target">Скасаваць рухомую цэль</string>
     <string name="osmo_center_location">Цэнтраваць экран</string>
     <string name="osmo_follow">Суправаджаць</string>
     <string name="osmo_user_joined">Карыстальнік %1$s далучыўся да групы %2$s</string>
@@ -1767,11 +1766,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="gpx_info_start_time">Пачатак: %1$tF,  %1$tT </string>
 	<string name="gpx_info_end_time">Канец: %1$tF,  %1$tT </string>
 	<string name="gpx_info_average_speed">Сярэдняя хуткасьць: %1$s </string>
-	<string name="gpx_info_maximum_speed">Максімальная хуткасьць: %1$s </string>
+	<string name="gpx_info_maximum_speed">"Максымальная хуткасьць: %1$s "</string>
 	<string name="gpx_info_avg_altitude">Сярэдняя вышыня: %1$s</string>
 	<string name="gpx_timespan">Прамежак часу: %1$s</string>
 	<string name="gpx_timemoving">Час руху: %1$s</string>
-    <string name="gpx_selection_segment_title">Сегмент</string>
+    <string name="gpx_selection_segment_title">Адрэзак</string>
     <string name="gpx_selection_number_of_points">" %1$s пунктаў"</string>
     <string name="gpx_selection_point">Пункт %1$s</string>
     <string name="gpx_selection_current_track">запіс</string>
@@ -1783,7 +1782,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="gpx_split_interval">Інтэрвал нарэзкі</string>
     <string name="selected">выбрана</string>
     <string name="gpx_info_asc_altitude">Пад’ём/спад: %1$s</string>
-    <string name="loading_smth">Загрузка %1$s…</string>
+    <string name="loading_smth">Чытаньне %1$s…</string>
     <string name="map_widget_plain_time">Бягучы час</string>
     <string name="gpx_wpt">Пункт шляху</string>
     <string name="selected_gpx_info_show">\n\nНацісьніце і ўтрымлівайце, каб убачыць на мапе</string>
@@ -1802,11 +1801,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="local_index_select_gpx_file">Выбраць для паказу</string>
     <string name="no_index_file_to_download">Няма чаго сьцягваць, калі-ласка, праверце ваша Інтэрнэт-злучэньне.</string>
     <string name="osmo_not_signed_in">Не ўдалося ўвайсьці ў OsMo</string>
-    <string name="osmo_gpx_points_downloaded">Загружана %1$s кропак OsMo.</string>
+    <string name="osmo_gpx_points_downloaded">Сьцягнута %1$s кропак OsMo.</string>
     <string name="osmo_auto_connect_descr">Аўтаматычнае падключэньне да службы пасьля запуску праграмы</string>
     <string name="osmo_auto_connect">Аўтаматычнае падключэньне</string>
     <string name="osmo_start_service">Служба OsMo</string>
-    <string name="osmo_gpx_track_downloaded">Загружаны %1$s сьлед OsMo.</string>
+    <string name="osmo_gpx_track_downloaded">Сьцягнуты %1$s сьлед OsMo.</string>
     <string name="osmo_group_by_invite">Уваход па запрашэньнi</string>
     <string name="osmo_group_information">Калі ласка, прачытайце перад стварэньнем групы!</string>
     <string name="osmo_group_information_desc">" - Усе створаныя групы з\'яўляюцца агульнымі! Калі вы хочаце заставацца ананімным, падключайце прыладу наўпрост праз Tracker-ідэнтыфікатар.
@@ -1819,7 +1818,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="rendering_attr_hideBuildings_name">Схаваць будынкі</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">Схаваць не аўтамабільныя дарогі</string>
     <string name="rendering_attr_hideText_name">Схаваць тэкст</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Схаваць лясы і хмызнякі</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Схаваць лясы і хмызьнякі</string>
     <string name="rendering_attr_buildings15zoom_name">Будынкі на маштабе 15</string>
     <string name="rendering_attr_moreDetailed_name">Больш падрабязна</string>
     <string name="rendering_attr_lessDetailed_name">Менш падрабязна</string>
@@ -1829,14 +1828,14 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="rendering_attr_showSurfaces_name">Адлюстроўваць тып пакрыцьця</string>
     <string name="rendering_attr_showCycleRoutes_name">Паказаць веламаршруты</string>
     <string name="stop_navigation_service">Прыпыніць</string>
-	<string name="enable_sleep_mode">Уключыць рэжым сну GPS</string>
+	<string name="enable_sleep_mode">Уключыць фонавы рэжым GPS</string>
 	<string name="gps_wake_up_timer">Iнтэрвал абуджэньня GPS</string>
 	<string name="lang_sw">суахілі</string>
     <string name="lang_he">іўрыт</string>
     <string name="gpx_monitoring_start">Пачаць запіс GPX</string>
 	<string name="gpx_start_new_segment">Пачаць новы адрэзак</string>
     <string name="lang_fa">пэрсійдзкая</string>
-	<string name="sleep_mode_stop_dialog">Прыпыніць рэжым сну GPS?</string>
+	<string name="sleep_mode_stop_dialog">Прыпыніць фонавы рэжым GPS?</string>
 	<string name="map_preferred_locale_descr">Пажаданая мова надпісаў на мапе (калі не даступна, то будуць выкарыстны ангельскія ці мясцовыя назвы)</string>
     <string name="map_preferred_locale">Пажаданая мова мапы</string>
     <string name="local_map_names">Мясцовыя назвы</string>
@@ -1847,7 +1846,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="live_monitoring_start">Пачаць адсочваньне праз Інтэрнэт</string>
 	<string name="live_monitoring_stop">Спыніць адсочваньне праз Інтэрнэт</string>
 	<string name="live_monitoring_m">Адсочваньне праз Інтэрнэт (патрабуецца GPX)</string>
-    <string name="live_monitoring_m_descr">Адсылаць месцазнаходжаньне на пазначаны вэб сэрвіс пры ўключаным запісе GPX.</string>
+    <string name="live_monitoring_m_descr">Адсылаць месцазнаходжаньне на пазначаны вэб-сэрвіс пры ўключаным запісе GPX.</string>
 	<string name="lang_al">альбанская</string>
 	<string name="lang_ar">арабская</string>
 	<string name="lang_sr">сэрбская</string>
@@ -1878,8 +1877,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="rendering_value_car_name">Аўтамабіль</string>
     <string name="rendering_value_bicycle_name">Ровар</string>
     <string name="rendering_value_pedestrian_name">Пешаход</string>
-    <string name="download_additional_maps">Спампаваць мапы, што адсутнічаюць, %1$s (%2$d МБ)?</string>
-    <string name="more">Больш...</string>
+    <string name="download_additional_maps">Сьцягнуць мапы, што адсутнічаюць, %1$s (%2$d МБ)?</string>
+    <string name="more">Больш…</string>
     <string name="flat_list_waypoitns">Усе</string>
     <string name="waypoints">Кропкі шляху</string>
     <string name="way_alarms">Дарожныя папярэджаньні</string>
@@ -1898,8 +1897,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="save_track_interval_globally">Інтэрвал запісу</string>
 	<string name="save_track_to_gpx_globally_descr">Агульны запіс месцазнаходжаньня ў GPX файл можа быць уключаны або выключаны з дапамогай кнопкі запісу GPX на экране з мапай</string>
 	<string name="confirm_every_run">Пытацца заўсёды</string>
-	<string name="save_global_track_interval_descr">Выберыце інтэрвал рэгістраваньня для запісвання агульнага шляху (уключаецца віджэтам запісу GPX на мапе)</string>
-	<string name="save_global_track_interval">Агульны інтэрвал запісваньня</string>
+	<string name="save_global_track_interval_descr">Абярыце інтэрвал запісу сьледу (уключаецца віджэтам запісу GPX на мапе)</string>
+	<string name="save_global_track_interval">Агульны інтэрвал запісу</string>
 	<string name="traffic_warning_speed_limit">Абмежаваньне хуткасьці</string>
     <string name="traffic_warning_border_control">Памежны кантроль</string>
     <string name="traffic_warning_payment">Платны праезд</string>
@@ -1941,7 +1940,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="rendering_attr_busRoutes_name">Аўтобусныя маршруты</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Маршрутныя таксі</string>
     <string name="rendering_attr_tramTrainRoutes_name">Маршруты трамваяў і цягнікоў</string>
-    <string name="select_impassable_road">Выбраць на мапе</string>
+    <string name="select_impassable_road">Выбраць на мапе…</string>
     <string name="impassable_road">Пазьбягаць дарогі…</string>
     <string name="rendering_category_hide">Схаваць</string>
     <string name="wake_on_voice">Уключыць экран</string>
@@ -1962,8 +1961,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="use_opengl_render_descr">Выкарыстоўваць апаратнае паскарэньне OpenGL (можа не працаваць на некаторых прыстасаваньнях)</string>
     <string name="everything_up_to_date">Усе файлы ў актуальным стане</string>
     <string name="dismiss">Скасаваць</string>
-    <string name="no_internet_connection">Немагчыма спампаваць. Калі ласка, праверце ваша Інтэрнэт-злучэньне.</string>
-    <string name="download_tab_downloads">Усе загрузкі</string>
+    <string name="no_internet_connection">Немагчыма cьцягнуць. Калі ласка, праверце ваша Інтэрнэт-злучэньне.</string>
+    <string name="download_tab_downloads">Усе cьцягваньні</string>
     <string name="download_tab_updates">Абнаўленьні</string>
     <string name="download_tab_local">Лякальны</string>
 	<string name="navigate_point_zone">Зона</string>
@@ -1971,15 +1970,15 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="navigate_point_easting">На ўсход</string>
     <string name="map_locale">Мова мапы</string>
     <string name="rendering_attr_transportStops_name">Прыпынкі транспарту</string>
-    <string name="dash_download_msg_none">Вы хочаце спампаваць якія-небудзь мапы?</string>
-    <string name="dash_download_msg">Вы зладавалі %1$s мапы</string>
-    <string name="dash_download_new_one">Спампаваць новую мапу</string>
+    <string name="dash_download_msg_none">Вы хочаце cьцягнуць якія-небудзь мапы?</string>
+    <string name="dash_download_msg">Вы cьцягнулі %1$s мапы</string>
+    <string name="dash_download_new_one">Сьцягнуць новую мапу</string>
     <string name="dash_download_manage">Кіраваць</string>
     <string name="voices">Галасавыя падказкі</string>
 	<string name="rendering_value_orange_name">Аранжавы</string>
     <string name="rendering_value_germanRoadAtlas_name">Нямецкі атлас аўтадарог</string>
-    <string name="rendering_value_americanRoadAtlas_name">Амерыканскі атлас аўтадарог</string>
-    <string name="routing_attr_no_new_routing_name">Без правілаў маршрутызацыі v1.9</string>
+    <string name="rendering_value_americanRoadAtlas_name">Амэрыканскі атлас аўтадарог</string>
+    <string name="routing_attr_no_new_routing_name">Бяз правілаў маршрутызацыі v1.9</string>
     <string name="routing_attr_no_new_routing_description">Не выкарыстоўваць правілы маршрутызацыі ўведзеныя ў v1.9</string>
     <string name="rendering_value_default_name">Па змоўчаньні</string>
     <string name="rendering_attr_roadStyle_name">Стыль аўтадарог</string>
@@ -1988,4 +1987,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="traffic_warning_railways">Чыгуначны пераезд</string>
 	<string name="show_railway_warnings">Паказваць чыгуначныя пераезды</string>
 	<string name="speak_pedestrian">Папярэджваць пра пешаходныя пераходы</string>
-    </resources>
+    <string name="rendering_value__name">Па змоўчаньні</string>
+	</resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index e49c3828c4..bdd015ab63 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -66,7 +66,7 @@
 	<string name="poi_mountain_pass">Port de muntanya</string>
 	<string name="poi_city_wall">Muralla</string>
 	<string name="poi_vehicle_inspection">Inspecció de vehicles</string>
-	<string name="poi_military_nuclear_explosion_site">Centre d\'explosió nuclear</string>
+	<string name="poi_military_nuclear_explosion_site">Lloc d\'explosió nuclear</string>
 <string name="poi_military_range">Camp d\'instrucció</string>
 	<string name="poi_military_naval_base">Base naval militar</string>
 	<string name="poi_military">Zona militar</string>
@@ -113,4 +113,193 @@
 	<string name="poi_mine_historic">Mina històrica</string>
 	<string name="poi_gate">Porta</string>
 	<string name="poi_tobacco_shop">Venda de tabac</string>
+	<string name="poi_carpet_shop">Botiga de catifes</string>
+	<string name="poi_clothes_shop">Magatzem de roba</string>
+	<string name="poi_children_clothes_shop">Roba infantil</string>
+	<string name="poi_curtain_shop">Pelleteria</string>
+	<string name="poi_fabric_shop">Botiga de teixits</string>
+	<string name="poi_public_transport_platform">Parada de transport públic</string>
+	<string name="poi_bus_station">Estació d\'autobús (obsolet)</string>
+	<string name="poi_railway_station">Estació de tren (obsolet)</string>
+	<string name="poi_railway_platform">Andana de tren (obsolet)</string>
+	<string name="poi_railway_halt">Parada de tren (obsolet)</string>
+	<string name="poi_subway_entrance">Entrada de metro</string>
+	<string name="poi_subway_station">Estació de metro</string>
+	<string name="poi_taxi">Parada de taxis</string>
+
+	<string name="poi_airport">Aeroport</string>
+	<string name="poi_helipad">Heliport</string>
+	<string name="poi_runway">Pista d\'aterratge</string>
+	<string name="poi_aeroway_terminal">Terminal d\'aeroport</string>
+	<string name="poi_lighthouse">Far</string>
+
+	<string name="poi_bicycle_rental">Lloguer de bicicletes</string>
+	<string name="poi_bicycle_parking">Aparcament per bicicletes</string>
+
+	<string name="poi_houseware_shop">Complements per la llar</string>
+	<string name="poi_stationery_shop">Papereria</string>
+	<string name="poi_tableware_shop">Botiga de vaixelles</string>
+	<string name="poi_toys_shop">Botiga de joguines</string>
+	<string name="poi_trade_shop">Materials de construcció</string>
+	<string name="poi_variety_store">Botiga de descompte</string>
+	<string name="poi_video_shop">Videoclub</string>
+	<string name="poi_window_blind_shop">Botiga de persianes</string>
+	<string name="poi_ferry_terminal">Terminal de ferri</string>
+	<string name="poi_aerialway_cable_car">Telefèric</string>
+	<string name="poi_aerialway_station">Estació de remuntador</string>
+	<string name="poi_aerialway_gondola">Telecabina</string>
+	<string name="poi_aerialway_chair_lift">Telecadira</string>
+	<string name="poi_aerialway_t_bar">Teleesquí</string>
+	<string name="poi_tunnel">Túnel</string>
+	<string name="poi_bridge">Pont</string>
+
+	<string name="poi_vacuum_cleaner_shop">Aspiradores i aparells de neteja</string>
+	<string name="poi_motorway_junction">Sortida d\'autopista</string>
+
+	<string name="poi_water_well">Pou d\'aigua</string>
+	<string name="poi_boatyard">Drassana</string>
+	<string name="poi_wastewater_plant">Planta de tractament d\'aigües residuals</string>
+	<string name="poi_water_tower">Torre d\'aigua</string>
+	<string name="poi_lock_gate">Resclosa</string>
+	<string name="poi_weir">Abocador d\'aigua</string>
+	<string name="poi_dam">Presa d\'aigua</string>
+	<string name="poi_water_mill">Molí hidràulic</string>
+
+	<string name="poi_power_substation">Subestació elèctrica</string>
+	<string name="poi_power_transformer">Transformador elèctric</string>
+	<string name="poi_power_plant">Central energètica</string>
+	<string name="poi_power_generator">Generador d\'energia</string>
+
+	<string name="poi_post_office">Oficina de correus</string>
+	<string name="poi_post_box">Bústia de correus</string>
+	<string name="poi_telephone">Telèfon públic</string>
+	<string name="poi_communication_tower">Torre de comunicacions</string>
+	<string name="poi_telephone_exchange">Central telefònica</string>
+
+	<string name="poi_recycling">Reciclatge</string>
+	<string name="poi_landfill">Abocador d\'escombraries</string>
+	<string name="poi_waste_disposal">Contenidor d\'escombraries</string>
+	<string name="poi_waste_basket">Paperera</string>
+
+	<string name="poi_pier">Moll</string>
+	<string name="poi_surveillance">Equip de vigilància</string>
+	<string name="poi_observatory">Observatori</string>
+	<string name="poi_astronomical_observatory">Observatori astronòmic</string>
+	<string name="poi_tower">Torre</string>
+	<string name="poi_construction">En construcció</string>
+	<string name="poi_works">Fàbrica</string>
+	<string name="poi_quarry">Pedrera</string>
+	<string name="poi_vineyard">Vinya</string>
+	<string name="poi_orchard">Plantació de fruiters</string>
+	<string name="poi_salt_pond">Salina</string>
+	<string name="poi_cricket_nets">Xarxes de criquet</string>
+
+	<string name="poi_driving_school">Autoescola</string>
+	<string name="poi_school">Escola</string>
+	<string name="poi_kindergarten">Llar d\'infants</string>
+	<string name="poi_college">Institut</string>
+	<string name="poi_university">Universitat</string>
+
+	<string name="poi_social_facility">Serveis socials</string>
+	<string name="poi_courthouse">Palau de justícia</string>
+	<string name="poi_prison">Presó</string>
+	<string name="poi_register_office">Oficina de registre civil</string>
+	<string name="poi_embassy">Ambaixada</string>
+	<string name="poi_government">Oficina governamental</string>
+	<string name="poi_prosecutor">Fiscal</string>
+	<string name="poi_bailiff">Batlle</string>
+	<string name="poi_pension_fund">Fons de pensions</string>
+	<string name="poi_migration">Migració</string>
+	<string name="poi_tax_inspection">Recaptació d\'impostos</string>
+	<string name="poi_customs">Duana</string>
+	<string name="poi_city">Ciutat</string>
+	<string name="poi_town">Vila</string>
+	<string name="poi_village">Poble</string>
+	<string name="poi_hamlet">Llogaret</string>
+	<string name="poi_isolated_dwelling">Assentament aïllat</string>
+	<string name="poi_suburb">Barri</string>
+	<string name="poi_place_allotments">Horts familiars</string>
+	<string name="poi_place_farm">Granja</string>
+
+	<string name="poi_pharmacy">Farmàcia</string>
+	<string name="poi_hospital">Hospital</string>
+	<string name="poi_doctors">Centre mèdic</string>
+	<string name="poi_clinic">Clínica</string>
+	<string name="poi_first_aid">Primers auxilis</string>
+	<string name="poi_survey_point">Vèrtex geodèsic</string>
+	<string name="poi_windmill">Molí de vent</string>
+	<string name="poi_veterinary">Veterinari</string>
+	<string name="poi_healthcare_alternative">Medicina alternativa</string>
+	<string name="poi_audiologist">Audiologia</string>
+	<string name="poi_blood_bank">Banc de sang</string>
+	<string name="poi_healthcare_centre">Centre mèdic</string>
+	<string name="poi_midwife">Infermeria obstètrico-ginecològica</string>
+	<string name="poi_occupational_therapist">Teràpia ocupacional</string>
+	<string name="poi_optometrist">Optometria</string>
+	<string name="poi_physiotherapist">Fisioteràpia</string>
+	<string name="poi_podiatrist">Podologia</string>
+	<string name="poi_psychotherapist">Psicoteràpia</string>
+	<string name="poi_healthcare_rehabilitation">Rehabilitació</string>
+	<string name="poi_speech_therapist">Logopèdia</string>
+	<string name="poi_healthcare_yes">Serveis mèdics</string>
+
+	<string name="poi_company">Empresa</string>
+	<string name="poi_insurance">Agència d\'assegurances</string>
+	<string name="poi_estate_agent">Immobiliària</string>
+	<string name="poi_lawyer">Gabinet d\'advocats</string>
+	<string name="poi_telecommunication_office">Empresa de telecomunicacions</string>
+	<string name="poi_ngo">ONG</string>
+	<string name="poi_town_hall">Ajuntament</string>
+	<string name="poi_employment_agency">Oficina d\'ocupació</string>
+	<string name="poi_research_office">Oficina de recerca i desenvolupament</string>
+	<string name="poi_it_office">Consultoria en TIC</string>
+	<string name="poi_architect_office">Gabinet d\'arquitectura</string>
+	<string name="poi_advertising_agency">Agència de publicitat</string>
+	<string name="poi_studio">Estudi de gravació, ràdio o TV</string>
+	<string name="poi_bookmaker">Casa d\'apostes</string>
+
+	<string name="poi_stadium">Estadi</string>
+	<string name="poi_sports_centre">Poliesportiu</string>
+	<string name="poi_golf_course">Camp de golf</string>
+	<string name="poi_ice_rink">Pista de gel</string>
+	<string name="poi_pitch">Camp d\'esports</string>
+	<string name="poi_leisure_track">Pista esportiva</string>
+	<string name="poi_running_track">Pista d\'atletisme</string>
+	<string name="poi_bicycle_track">Pista de ciclisme</string>
+	<string name="poi_horse_track">Pista d\'equitació</string>
+	<string name="poi_raceway">Circuit de carreres</string>
+	<string name="poi_10pin">Bitlles americanes</string>
+	<string name="poi_archery">Tir amb arc</string>
+	<string name="poi_athletics">Atletisme</string>
+	<string name="poi_american_football">Futbol americà</string>
+	<string name="poi_australian_football">Futbol australià</string>
+	<string name="poi_base">Salt BASE</string>
+	<string name="poi_baseball">Beisbol</string>
+	<string name="poi_basketball">Basquetbol</string>
+	<string name="poi_beachvolleyball">Voleibol de platja</string>
+	<string name="poi_bmx_sport">Bicicròs</string>
+	<string name="poi_boules">Joc de botxes</string>
+	<string name="poi_canadian_football">Futbol canadenc</string>
+	<string name="poi_chess">Escacs</string>
+	<string name="poi_climbing">Escalada</string>
+	<string name="poi_cricket">Criquet</string>
+	<string name="poi_croquet">Croquet</string>
+	<string name="poi_cycling">Ciclisme</string>
+	<string name="poi_diving">Salts</string>
+	<string name="poi_scuba_diving">Submarinisme</string>
+	<string name="poi_dog_racing">Curses de gossos</string>
+	<string name="poi_equestrian">Hípica</string>
+	<string name="poi_golf">Golf</string>
+	<string name="poi_gymnastics">Gimnàstica</string>
+	<string name="poi_handball">Handbol</string>
+	<string name="poi_hockey">Hoquei</string>
+	<string name="poi_horse_racing">Curses de cavalls</string>
+	<string name="poi_ice_skating">Patinatge sobre gel</string>
+	<string name="poi_ice_stock">Icestock</string>
+	<string name="poi_korfbal">Corfbol</string>
+	<string name="poi_motor_sport">Esport de motor</string>
+	<string name="poi_orienteering">Cursa d\'orientació</string>
+	<string name="poi_paddle_tennis">Pàdel</string>
+	<string name="poi_paragliding">Parapent</string>
+	<string name="poi_pelota">Joc de pilota</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index d02c177aaf..a5ba0bba70 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -75,7 +75,7 @@
 <string name="navigate_point_format">Format:</string>
 <string name="navpoint_search_desc">Coordenades</string>
 <string name="address_search_desc">Cerca d\'adreces</string>
-<string name="transport_search_desc">Cerca de transports</string>
+<string name="transport_search_desc">Cerca de transport públic</string>
 <string name="favourites_search_desc">Cerca de preferits</string>
 <string name="history_search_desc">Cerca a l\'historial</string>
 <string name="left_side_navigation">Conducció per l\'esquerra</string>
@@ -293,7 +293,7 @@
 <string name="user_password_descr">És necessària per a les trameses a openstreetmap.org</string>
 <string name="old_poi_file_should_be_deleted">El fitxer de dades de PDI «%1$s» és redundant i serà suprimit.</string>
 <string name="search_position_favorites">Preferits…</string>
-<string name="search_position_map_view">Darrera visualització del mapa</string>
+<string name="search_position_map_view">Centre del mapa actual</string>
 <string name="select_search_position">Cerca prop de:</string>
 <string name="menu_save_directions">Desa les indicacions</string>
 <string name="local_index_upload_gpx_description">Pengeu els fitxers GPX a la comunitat d\'OSM. Es faran servir per millorar els mapes.</string>
@@ -318,7 +318,7 @@
 <string name="local_index_download">Baixa</string>
 <string name="local_index_poi_data">Dades dels PDI</string>
 <string name="local_index_address_data">Dades d\'adreces</string>
-<string name="local_index_transport_data">Dades de transports</string>
+<string name="local_index_transport_data">Dades de transports públics</string>
 <string name="local_index_map_data">Dades de mapes</string>
 <string name="local_indexes_cat_backup">Desactivat</string>
 <string name="local_indexes_cat_tts">Dades de veu (TTS)</string>
@@ -364,11 +364,11 @@
 <string name="amenity_type_sport">Esports</string>
 <string name="amenity_type_sustenance">Alimentació i beguda</string>
 <string name="amenity_type_tourism">Turisme</string>
-<string name="amenity_type_transportation">Transports</string>
+<string name="amenity_type_transportation">Transport</string>
 <string name="indexing_address">S\'estan indexant les adreces-…</string>
 <string name="indexing_map">Indexant el mapa…</string>
 <string name="indexing_poi">S\'estan indexant els PDI …</string>
-<string name="indexing_transport">Indexant els transports…</string>
+<string name="indexing_transport">S\'estan indexant els transports…</string>
 <string name="poi_filter_custom_filter">Filtre personalitzat</string>
 <string name="poi_filter_for_tourists">Per a turistes</string>
 <string name="poi_filter_fuel">Carburants</string>
@@ -410,8 +410,8 @@
 <string name="reading_cached_tiles">Llegint les tessel·les emmagatzemades…</string>
 <string name="specified_dir_doesnt_exist">No s\'ha trobat la carpeta especificada.</string>
 <string name="application_dir">Carpeta d\'emmagatzematge de dades</string>
-<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes vectorials i de mosaic, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa al dispositiu d\'emmagatzemament els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades - Limitacions d\'aquesta versió gratuïta de OsmAnd: - Limitació en el nombre de mapes baixats - No té accés als PDIs fora de línia de Viquipèdia L\'OsmAnd està en desenvolupament actiu i el nostre projecte i el seu futur progrés depenen de les donacions per ajudar al desenvolupament i proves de noves funcions. Si us plau, considereu la possibilitat de comprar l\'OsmAnd+ o bé fer una donació per impulsar una nova característica, o fer una donació de manera general a la pàgina osmand.net. "</string>
-<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes de tessel·les i de vectors, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. L\'OsmAnd+ és la versió de pagament. Comprant-la estareu donant suport al projecte, ajudareu al desenvolupament de noves funcions i rebreu les darreres actualitzacions. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa en el dispositiu d\'emmagatzemament  els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Disponibilitat fora de línia dels PDI baixats prèviament de Viquipèdia, és genial per fer turisme - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades "</string>
+<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes vectorials i de mosaic, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa al dispositiu d\'emmagatzemament els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, parades de transport públic, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades - Limitacions d\'aquesta versió gratuïta de OsmAnd: - Limitació en el nombre de mapes baixats - No té accés als PDIs fora de línia de Viquipèdia L\'OsmAnd està en desenvolupament actiu i el nostre projecte i el seu futur progrés depenen de les donacions per ajudar al desenvolupament i proves de noves funcions. Si us plau, considereu la possibilitat de comprar l\'OsmAnd+ o bé fer una donació per impulsar una nova característica, o fer una donació de manera general a la pàgina osmand.net. "</string>
+<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes de tessel·les i de vectors, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. L\'OsmAnd+ és la versió de pagament. Comprant-la estareu donant suport al projecte, ajudareu al desenvolupament de noves funcions i rebreu les darreres actualitzacions. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa en el dispositiu d\'emmagatzemament  els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Disponibilitat fora de línia dels PDI baixats prèviament de Viquipèdia, és genial per fer turisme - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, parades de transport públic, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades "</string>
 <string name="tip_recent_changes_0_8_1_t">"Canvis a la versió 0.8.1:
 \n\t* Rutes més precises (una mica més lent)
 \n\t* Torna a calcular rutes de manera intel·ligent i de pressa
@@ -523,7 +523,7 @@
 <string name="yard">iardes</string>
 <string name="mile_per_hour">mph</string>
 <string name="mile">milles</string>
-<string name="poi_filter_closest_poi">PDI més proper</string>
+<string name="poi_filter_closest_poi">PDI més propers</string>
 <string name="poi_context_menu_website">Mostra el lloc web del PDI</string>
 <string name="phone">Telèfon</string>
 <string name="download_type_to_filter">Tipus de filtre</string>
@@ -547,7 +547,7 @@
 <string name="unzipping_file">Descomprimint el fitxer…</string>
 <string name="first_time_download">Baixar regions</string>
 <string name="map_screen_orientation">Orientació de pantalla</string>
-<string name="transport_search_before">Ruta previa</string>
+<string name="transport_search_before">Itinerari anterior</string>
 <string name="context_menu_item_update_poi">Actualitzar PDI</string>
 <string name="searching_address">Cercant l\'adreça…</string>
 <string name="search_offline_address">Fora de línia</string>
@@ -631,7 +631,7 @@
 <string name="map_underlay_descr">Escolliu el mapa de fons</string>
 <string name="map_overlay_descr">Escolliu el mapa superposat</string>
 <string name="tip_location_sharing">Comparteix una ubicació</string>
-<string name="preferred_locale_descr">Selecciona la llengua a mostrar</string>
+<string name="preferred_locale_descr">Seleccioneu la llengua (reinicieu OsmAnd després de modificar-la)</string>
 <string name="tip_app_mode_t_v2">L\'OsmAnd suporta diferents (i personalitzables) perfils d\'aplicació per a diferents usos.
 \n\nPodeu canviar de perfil amb el boto a la cantonada inferior esquerra de la pantalla del mapa(icona de cotxe,bici o vianant), o quan creeu una ruta.
 	</string>
@@ -869,7 +869,7 @@
 	
 	<string name="create_poi_link_to_osm_doc">LLegenda del mapa <u>OSM en línia</u> amb imatges</string><string name="osmand_routing_experimental">La navegació fora de línia de l\'OsmAnd és una característica experimental i no funciona per distàncies superiors als 20Km.\n\nEl servei de navegació s\'ha desviat temporalment cap a CloudMade en línia.</string>
 	<string name="renderer_load_exception">S\'ha produït una excepció: el renderitzador no s\'ha carregat</string>
-	<string name="context_menu_item_search_transport">Cerca de transport</string>
+	<string name="context_menu_item_search_transport">Cerca de transports públics</string>
 	<string name="transport_search_again">Reinicia la cerca de transport</string>
 	<string name="no_vector_map_loaded">Els mapes de vectors no s\'han carregat</string>
 	<string name="gpx_files_not_found">No s\'ha trobat cap fitxer GPX a la carpeta de traces</string>
@@ -885,12 +885,12 @@
 	<string name="route_tshl">Gireu fortamanent a l\'esquerra i continueu</string>
 	<string name="route_tsll">Gireu lleugerament a l\'esquerra i continueu</string>
 	<string name="route_tu">Feu un gir en forma d\'U i continueu</string>
-	<string name="search_near_map">Cerca la darrera localització propera al mapa</string>
+	<string name="search_near_map">Cerca propera a la posició actual al mapa</string>
 	<string name="transport_Stop">Parada</string>
-	<string name="transport_search_after">Ruta subsegüent</string>	
+	<string name="transport_search_after">Itinerari subsegüent</string>	
 	<string name="transport_finish_search">Finalitza la cerca</string>
 	<string name="transport_to_go_before">distància subsegüent</string>
-	<string name="transport_route_distance">Distància de la ruta</string>
+	<string name="transport_route_distance">Longitud del itinerari</string>
 	<string name="show_transport_over_map_description">Mostra les parades del transport públic al mapa</string>
 	<string name="search_history_int_streets">Intersecció: {0} x {1} a {2}</string>
 	<string name="favorite">Preferit</string>
@@ -1166,7 +1166,7 @@
     <string name="distance_measurement_save_gpx">Desa com a GPX</string>
     <string name="distance_measurement_load_gpx">Obre un fitxer GPX existent</string>
     <string name="wait_current_task_finished">Espereu fins que finalitzi la tasca actual</string>
-    <string name="use_kalman_filter_compass_descr">Utilitzeu el filtre Kalman per evitar interferències a la brúixola</string>
+    <string name="use_kalman_filter_compass_descr">Allisat de la brúixola per estabilitzar lectures afegint inèrcia</string>
     <string name="use_kalman_filter_compass">Usa el filtre Kalman</string>
     <string name="access_mark_final_location_first">Mode d\'accessibilitat: seleccioneu primer la destinació</string> 
     <string name="use_magnetic_sensor_descr">Podeu usar el sensor magnètic per determinar el valor la brúixola en comptes del sensor d\'orientació</string>
@@ -1349,8 +1349,8 @@
 \n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir arxius entre l\'OsmAnd i l\'OsmAnd+."</string>
     <string name="application_dir_change_warning2">Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació? Indiqueu «No» i l\'OsmAnd crearà i utilitzarà una carpeta nova.</string>
     <string name="copying_osmand_one_file_descr">S\'està copiant el fitxer (%s) a la nova destinació…</string>
-    <string name="copying_osmand_files_descr">S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)</string>
-    <string name="copying_osmand_files">S\'estan copiant fitxers de dades de l\'OsmAnd</string>
+    <string name="copying_osmand_files_descr">S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)…</string>
+    <string name="copying_osmand_files">S\'estan copiant fitxers de dades de l\'OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Calcula una ruta fora de línia amb l\'OsmAnd</string>
     <string name="app_mode_truck">Camió</string>
     <string name="tip_map_styles_t">"OsmAnd pot representar els mapes vectorials en diferents estils per tal d\'adaptar-se millor al que necessiteu:
@@ -1813,7 +1813,7 @@
     <string name="rendering_attr_trolleybusRoutes_name">Rutes de troleibús</string>
     <string name="rendering_attr_busRoutes_name">Rutes de bus</string>
     <string name="rendering_attr_tramTrainRoutes_name">Rutes de tramvia i tren</string>
-    <string name="select_impassable_road">Selecciona en el mapa</string>
+    <string name="select_impassable_road">Selecciona en el mapa…</string>
     <string name="impassable_road">Evita carreteres…</string>
     <string name="rendering_category_hide">Amaga</string>
     <string name="wake_on_voice">Activa la pantalla</string>
@@ -1860,4 +1860,5 @@
     <string name="routing_attr_no_new_routing_name">Sense preferències de navegació v1.9</string>
     <string name="routing_attr_no_new_routing_description">No feu ús de les preferències de navegació introduïdes a la v1.9</string>
     <string name="speak_pedestrian">Anuncia els passos de zebra</string>
-    </resources>
+    <string name="rendering_value__name">Renderització per defecte</string>
+	</resources>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index c5c87eb4f1..c5d1a15325 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -221,10 +221,10 @@
   <string name="search_position_address">Adresy…</string>
   <string name="search_position_favorites">Oblíbených…</string>
   <string name="search_position_undefined">Nedefinováno</string>
-  <string name="search_position_fixed">Souřadnic</string>
+  <string name="search_position_fixed">Opraveno</string>
   <string name="search_position_current_location">Momentální polohy…</string>
   <string name="search_position_map_view">Posledního místa na mapě</string>
-  <string name="select_search_position">Hledat v okolí :</string>
+  <string name="select_search_position">Počáteční bod:</string>
   <string name="context_menu_item_search">Hledat</string>
   <string name="tip_recent_changes_0_6_7_t">"Poslední změny ve verzi 0.6.7 :
 \n\t- Správce offline dat (stáhnout, smazat, zálohovat přímo z OsmAndu)
@@ -275,7 +275,7 @@
   
   <string name="local_index_poi_data">Data POI</string>
   <string name="local_index_address_data">Addresy</string>
-  <string name="local_index_transport_data">Doprava</string>
+  <string name="local_index_transport_data">Údaje veřejné dopravy</string>
   <string name="local_index_map_data">Mapová data</string>
   
   <string name="local_indexes_cat_backup">Záloha</string>
@@ -336,7 +336,7 @@
   <string name="contribution_activity">Speciální aktivita pro vývojovou verzi</string>
   <string name="tip_update_index">Aktualizace offline map</string>
   <string name="tip_update_index_t">"Mít k dispozici aktuální mapová data je důležité. OsmAnd obsahuje správce stahování map, kde můžete snadno ověřit, zda jsou k dispozici novější mapy.
-\n\t Pro zkontrolování aktualizací \'Hlavní Menu\'-&gt;\'Nastavení\'-&gt;\'Spravovat mapové soubory\'-&gt;\'Stáhnout\'. Po aktualizaci seznamu z internetu vyberte z kontextového menu \'Zobrazit jen aktualizace\'.
+\n\t Pro zkontrolování aktualizací \'Hlavní Menu\'-&gt;\'Nastavení\'-&gt;\'Spravovat mapové soubory\'-&gt;\'Stáhnout\'. Po aktualizaci seznamu z Internetu vyberte z kontextového menu \'Zobrazit jen aktualizace\'.
 \n\t Teď se zobrazí jen indexy, které už máte stažené. Navíc jsou zvýrazněné následovně:
 \n\t Zelená - označuje aktuální mapy a data
 \n\t Modrá - označuje mapy a data, u kterých lze stáhnout novější verzi\n\t Tmavě zelená/Modrá - označuje vypnuté datové spojení "</string>
@@ -391,7 +391,7 @@
   <string name="map_overlay_descr">Vyberte překryvnou mapu</string>
   <string name="tile_source_already_installed">Mapa je již nainstalovaná, aktualizuji nastavení</string>
   <string name="select_tile_source_to_install">Vyberte mapy k instalaci nebo aktualizaci</string>
-  <string name="internet_not_available">Internetové připojení není dostupné</string>
+  <string name="internet_not_available">Pro tuto akci je potřebné internetové připojení, ale není dostupné</string>
   <string name="install_more">Instalovat další…</string>
   <string name="level_to_switch_vector_raster_descr">Zobrazovat vektorové mapy od minimálního zvětšení</string>
   <string name="level_to_switch_vector_raster">Zvětšení vektorové mapy</string>
@@ -480,7 +480,7 @@
   <string name="use_high_res_maps_descr">Použít mapu s vysokým rozlišením pro jemné displeje</string>
   <string name="unknown_location">Pozice ještě není známa</string>
   <string name="download_files">Stáhnout</string>
-  <string name="context_menu_item_search_transport">Hledat dopravu</string>
+  <string name="context_menu_item_search_transport">Hledat veřejnou dopravu</string>
   <string name="transport_searching_transport">Hledání dopravy (žádný cíl):</string>
   <string name="transport_searching_route">Hledání dopravy (cíl vzdálen {0}):</string>
   <string name="transport_search_none">nic</string>
@@ -515,7 +515,7 @@
   <string name="none_region_found">Na SD kartě nejsou žádná offline data pro oblasti. Zkuste nějaké stáhnout z internetu.</string>
   <string name="poi_namefinder_query_empty">Zadejte dotaz na POI</string>
   <string name="any_poi">Jakýkoli</string>
-  <string name="layer_transport_route">Dopravní komunikace</string>
+  <string name="layer_transport_route">Trasa hromadné dopravy</string>
   <string name="thanks_yandex_traffic">Děkujeme Yandexu za dopravní informace.</string>
   <string name="layer_yandex_traffic">Yandex doprava</string>
   <string name="layer_route">Cesta</string>
@@ -584,14 +584,14 @@
   <string name="transport_Routes">Cesty</string>
   <string name="transport_Stop">Zastávka</string>
   <string name="transport_stops">zastávky</string>
-  <string name="transport_search_after">Hledat spojení dál</string>
-  <string name="transport_search_before">Hledat spojení před</string>
+  <string name="transport_search_after">Následné pokyny</string>
+  <string name="transport_search_before">Předchozí pokyny</string>
   <string name="transport_finish_search">Ukončit hledání</string>
   <string name="transport_stop_to_go_out">Vyberte zastávku kde vystoupíte</string>
   <string name="transport_to_go_after">pěší vzdálenost poté</string>
   <string name="transport_to_go_before">pěší vzdálenost před</string>
   <string name="transport_stops_to_pass">počet zastávek</string>
-  <string name="transport_route_distance">Délka cesty</string>
+  <string name="transport_route_distance">Vzdálenost trasy</string>
   <string name="transport">Doprava</string>
   <string name="default_buttons_ok">OK</string>
   <string name="show_transport_over_map_description">Zobrazit v mapě zastávky veřejné dopravy</string>
@@ -867,7 +867,7 @@
   <string name="poi_search_desc">Hledat body zájmu (POI)</string>
   <string name="address_search_desc">Hledat adresu</string>
   <string name="navpoint_search_desc">Souřadnice</string>
-  <string name="transport_search_desc">Hledat dopravu</string>
+  <string name="transport_search_desc">Hledat veřejnou dopravu</string>
   <string name="favourites_search_desc">Hledat oblíbené místo</string>
   <string name="history_search_desc">Historie hledání</string>
   <string name="rendering_attr_noPolygons_description">Zobrazit všechny typy půdy průhledně</string>
@@ -1360,11 +1360,11 @@ s často kladenými otázkami.</string>
     <string name="app_modes_choose">Profily aplikace</string>
 	<string name="amenity_type_seamark">Mořská značka</string>
     <string name="keep_and_add_destination_point">Přidat jako cíl</string>
-    <string name="select_gpx">Vybrat GPX …</string>
+    <string name="select_gpx">Vybrat GPX…</string>
     <string name="use_displayed_track_for_navigation">Chcete použít zobrazenou trasu pro navigaci?</string>
     <string name="route_descr_select_destination">Vybrat cíl</string>
-    <string name="route_descr_select_on_map">Vybrat na mapě …</string>
-    <string name="route_descr_favorite">Oblíbené …</string>
+    <string name="route_descr_select_on_map">Vybrat na mapě…</string>
+    <string name="route_descr_favorite">Oblíbené…</string>
     <string name="route_preferences">Předvolby trasy</string>
     <string name="route_info">Informace o trase</string>
     <string name="routing_attr_prefer_motorway_name">Upřednostňovat dálnice</string>
@@ -1384,9 +1384,9 @@ s často kladenými otázkami.</string>
     <string name="android_19_location_disabled">Od verze Androidu 4.4 (KitKat) není možné stahovat a aktualizovat mapy v předchozím úložišti (%s). Chcete ho změnit na vhodné nové úložiště a zkopírovat do něj všechny soubory?\n Poznámka 1: Původní soubory zůstanou nedotčeny a mohou být smazány ručně.
 \n Poznámka 2: V novém úložišti nebude možné sdílet soubory mezi OsmAnd a OsmAnd+.</string>
     <string name="application_dir_change_warning2">Chcete aby OsmAnd také zkopíroval své datové soubory do nového cíle? Vybráním \'Ne\' OsmAnd pouze vytvoří a použije nový adresář.</string>
-    <string name="copying_osmand_one_file_descr">Kopírování souboru (%s) do nového umístění...</string>
-    <string name="copying_osmand_files_descr">Kopírování datových souborů OsmAnd do nového umístění (%s)</string>
-    <string name="copying_osmand_files">Kopírování datových souborů OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Kopírování souboru (%s) do nového umístění…</string>
+    <string name="copying_osmand_files_descr">Kopírování datových souborů OsmAnd do nového umístění (%s)…</string>
+    <string name="copying_osmand_files">Kopírování datových souborů OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Vypočítat OsmAnd offline trasu</string>
     <string name="app_mode_truck">Kamion</string>
     <string name="guidance_preferences_descr">Nastavení navigace</string>
@@ -1410,7 +1410,7 @@ s často kladenými otázkami.</string>
     <string name="osmodroid_refresh">Obnovit kanály</string>
     <string name="osmodroid_seek">Sledovat objekt</string>
     <string name="osmodroid_unseek">Nesledovat objekt</string>
-    <string name="calculate_osmand_route_without_internet">Vypočítat OsmAnd trasu bez připojení na internet</string>
+    <string name="calculate_osmand_route_without_internet">Vypočítat OsmAnd trasu bez připojení na Internet</string>
     <string name="gpx_option_calculate_first_last_segment">Vypočítat OsmAnd trasu pro první a poslední úsek</string>
     <string name="tip_map_styles_t">"OsmAnd umožňuje zobrazení vektorových map v různých stylech podle vašich potřeb:
 \n\nMimo vyváženého stylu default můžete v Menu → Nastavení mapy → Vektorový vykreslovač vybrat například:
@@ -1539,7 +1539,7 @@ s často kladenými otázkami.</string>
     <string name="osmo_tracker_id_descr">Klikněte pro zobrazení nebo sdílení ID sledovaného zařízení.
         Pomocí ID budou připojená zařízení schopná sledovat všechny pohyby tohoto zařízení! Pro odpojení použijte možnost "Regenerovat uživatelské ID".</string>
     <string name="osmo_session_token">Token relace: %1$s</string>
-    <string name="osmo_auth_pending">Čekání na autorizaci...</string>
+    <string name="osmo_auth_pending">Čekání na autorizaci…</string>
     <string name="osmo_locations_sent">Odeslané polohy %1$d (v zásobníku %2$d) </string>
     <string name="osmo_conn_successfull">Vytvořená spojení: %1$s </string>
     <string name="osmo_io_error">Problém s připojením OsMo: </string>
@@ -1583,7 +1583,7 @@ s často kladenými otázkami.</string>
     <string name="osmo_cancel_moving_target">Zrušit pohyblivý cíl</string>
     <string name="osmo_center_location">Zarovnat na střed obrazovky</string>
     <string name="osmo_set_moving_target">Nastavit jako pohyblivý cíl</string>
-    <string name="loading_smth">Načítá se %1$s …</string>
+    <string name="loading_smth">Načítá se %1$s…</string>
     <string name="map_widget_plain_time">Aktuální čas</string>
     <string name="delay_navigation_start">Spustit navigaci automaticky</string>
     <string name="selected">vybrané</string>
@@ -1627,7 +1627,7 @@ s často kladenými otázkami.</string>
     <string name="osmo_auto_connect">Automatické připojení</string>
     <string name="osmo_start_service">OsMo služba</string>
     <string name="osmo_gpx_track_downloaded">OsMo trasa %1$s stažena.</string>
-    <string name="no_index_file_to_download">Není nic ke stažení, prosím zkontrolujte připojení k Internetu.</string>
+    <string name="no_index_file_to_download">Není nic ke stažení, prosím zkontrolujte vaše připojení k Internetu.</string>
     <string name="none_selected_gpx">Nebyl vybrán žádný GPX soubor. Podržením vyberte z dostupných tras.</string>
     <string name="rendering_attr_hideBuildings_name">Skrýt budovy</string>
     <string name="rendering_attr_hideText_name">Skrýt text</string>
@@ -1668,7 +1668,7 @@ s často kladenými otázkami.</string>
     <string name="rendering_attr_subwayMode_name">Trasy metra</string>
  	<string name="pause_navigation">Pozastavit navigaci</string>
 	<string name="continue_navigation">Pokračování v navigaci</string>
-    <string name="osmo_invite">Pozvat...</string>
+    <string name="osmo_invite">Pozvat…</string>
     <string name="osmo_leave_confirmation_msg">Chcete opustit skupinu %1$s?</string>
     <string name="osmo_specify_tracker_id">Prosím určete id</string>
     <string name="rendering_attr_coloredBuildings_name">Barvy budov podle typu</string>
@@ -1694,7 +1694,7 @@ s často kladenými otázkami.</string>
 	<string name="av_camera_pic_size_descr">Vyberte velikost obrázku interního fotoaparátu</string>
     <string name="hide_all_waypoints">Odstranit všechny</string>
     <string name="announce_nearby_favorites">Oznamovat oblíbená místa v blízkosti</string>
-<string name="more">Více...</string>
+<string name="more">Více…</string>
     <string name="rendering_value_browse_map_name">Standardní</string>  
     <string name="rendering_value_car_name">Automobil</string>
     <string name="rendering_value_bicycle_name">Jízdní kolo</string>
@@ -1765,9 +1765,9 @@ s často kladenými otázkami.</string>
     <string name="impassable_road">Vyhnout se cestám…</string>
     <string name="rendering_category_hide">Skrýt</string>
     <string name="wake_on_voice">Zapnout obrazovku</string>
-    <string name="wake_on_voice_descr">Zapnout obrazovku když se blíží odbočka</string>
-    <string name="osmand_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí (nedostupné ve verzi zdarma) - Neomezené stahování, přímo z aplikace (ve verzi zdarma je limit 10 mapových souborů) - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "</string>
-	<string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). OsmAnd+ je placená verze aplikace. Její zakoupením podpoříte projekt, nové funkce a získáte nejnovější aktualizace map. Aplikaci si můžete před zakoupením vyzkoušet nainstalováním verze zdarma nazvané OsmAnd. Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí - Neomezené stahování, přímo z aplikace - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "</string>
+    <string name="wake_on_voice_descr">Zapnout obrazovku zařízení když se blíží odbočka</string>
+    <string name="osmand_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k Internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí (nedostupné ve verzi zdarma) - Neomezené stahování, přímo z aplikace (ve verzi zdarma je limit 10 mapových souborů) - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "</string>
+	<string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k Internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). OsmAnd+ je placená verze aplikace. Její zakoupením podpoříte projekt, nové funkce a získáte nejnovější aktualizace map. Aplikaci si můžete před zakoupením vyzkoušet nainstalováním verze zdarma nazvané OsmAnd. Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí - Neomezené stahování, přímo z aplikace - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "</string>
 	<string name="lock_screen_request_explanation">%1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie.</string>
     <string name="wake_on_voice_never">Nikdy</string>
     <string name="advanced_settings">Pokročilé</string>
@@ -1775,16 +1775,16 @@ s často kladenými otázkami.</string>
     <string name="show_map">ZOBRAZIT MAPU</string>
 	<string name="osmo_use_https_descr">Použít zabezpečené spojení se serverem</string>
     <string name="osmo_use_https">Použít HTTPS</string>
-	<string name="map_update">Máte %1$s aktualizací map</string>
+	<string name="map_update">K dispozici aktualizace pro %1$s map</string>
 	<string name="search_for">Hledat</string>
 	<string name="show_all">ZOBRAZIT VŠE</string>
 	<string name="coordinates">Souřadnice</string>
 	<string name="dismiss">Zavřít</string>
-    <string name="everything_up_to_date">Vše je aktuální</string>
+    <string name="everything_up_to_date">Všechny soubory jsou aktuální</string>
     <string name="use_opengl_render">Použít OpenGL</string>
     <string name="use_opengl_render_descr">Použít hardwarově akcelerované renderování pomocí OpenGL (nemusí fungovat na všech zařízeních)</string>
-    <string name="error_avoid_specific_road">Nebyla nalezena nejbližší silnice</string>
-    <string name="no_internet_connection">Není možné stáhnout. Prosím připojte se na Wi-Fi, aby bylo možné pokračovat.</string>
+    <string name="error_avoid_specific_road">Žádná objížďka nenalezena</string>
+    <string name="no_internet_connection">Stahování není možné. Prosím zkontrolujte internetové připojení.</string>
     <string name="map_locale">Jazyk map</string>
     <string name="rendering_attr_transportStops_name">Zastávky veřejné dopravy</string>
     <string name="navigate_point_zone">Zóna</string>
@@ -1796,17 +1796,18 @@ s často kladenými otázkami.</string>
     <string name="dash_download_msg">Máte staženo %1$s map</string>
     <string name="dash_download_new_one">Stáhnout novou mapu</string>
     <string name="dash_download_manage">Spravovat</string>
-    <string name="dash_download_msg_none">Chcete stáhnout nějakou offline mapu?</string>
+    <string name="dash_download_msg_none">Chcete stáhnout offline mapy?</string>
     <string name="voices">Hlasové pokyny</string>
 	<string name="rendering_attr_roadStyle_name">Styl cesty</string>
     <string name="rendering_value_default_name">Výchozí</string>
     <string name="rendering_value_orange_name">Oranžová</string>
-    <string name="rendering_value_germanRoadAtlas_name">Německý atlas cest</string>
-	<string name="traffic_warning_railways">Železnice</string>
-	<string name="traffic_warning_pedestrian">Chodec</string>
-	<string name="show_railway_warnings">Zobrazovat varování železnice</string>
-	<string name="show_pedestrian_warnings">Zobrazovat varování chodců</string>
-    <string name="rendering_value_americanRoadAtlas_name">Americký atlas cest</string>
-    <string name="routing_attr_no_new_routing_name">Nepoužívat v1.9 routování</string>
-    <string name="routing_attr_no_new_routing_description">Nepoužívat výpočet trasy verze 1.9</string>
+    <string name="rendering_value_germanRoadAtlas_name">Německý Atlas cest</string>
+	<string name="traffic_warning_railways">Železniční přejezd</string>
+	<string name="traffic_warning_pedestrian">Přechod pro chodce</string>
+	<string name="show_railway_warnings">Zobrazovat železniční přejezdy</string>
+	<string name="show_pedestrian_warnings">Zobrazovat přechody pro chodce</string>
+    <string name="rendering_value_americanRoadAtlas_name">Americký Atlas cest</string>
+    <string name="routing_attr_no_new_routing_name">Nepoužívat routovací pravidla v1.9</string>
+    <string name="routing_attr_no_new_routing_description">Nepoužívat pravidla výpočtu trasy zavedené ve verzi 1.9</string>
+    <string name="speak_pedestrian">Oznamovat přechody pro chodce</string>
     </resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 14e1be0f8b..40aa813985 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -65,7 +65,7 @@
         <string name="poi_newsagent_shop">Nyhedsbureau</string>
         <string name="poi_optician_shop">Optiker</string>
         <string name="poi_organic_shop">Økologiske fødevarer</string>
-        <string name="poi_outdoor_shop">Fritidsbeklædning</string>
+        <string name="poi_outdoor_shop">Friluftsudstyr</string>
         <string name="poi_paint_shop">Malerværksted</string>
         <string name="poi_pet_shop">Dyrehandel</string>
         <string name="poi_radiotechnics_shop">Radiodele</string>
@@ -659,4 +659,8 @@
 	<string name="poi_attraction_train">Tog (attraktion)</string>
 	<string name="poi_water_slide">Vandrutsjebane</string>
 
+	<string name="poi_tower">Tårn</string>
+	<string name="poi_aquarium">Akvarie</string>
+	<string name="poi_mast">Mast</string>
+	<string name="poi_radar">Radar</string>
 	</resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 0acc5535eb..95bd8de84f 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -179,7 +179,7 @@
 	<string name="tip_update_index">Opdatering af offlinekort</string>
 	<string name="filterpoi_activity">Opret interessepunkt-filter</string>
 	<string name="recalculate_route_to_your_location">Transportform:</string>
-	<string name="select_navigation_mode">Vælg transportmetode</string>
+	<string name="select_navigation_mode">Vælg transportform</string>
 	
 	<string name="day_night_info_description">Solopgang: %1$s
 \nSolnedgang: %2$s</string>
@@ -333,7 +333,7 @@
 	<string name="poi_search_desc">Søgning efter interessepunkt (IP)</string>
 	<string name="address_search_desc">Adressesøgning</string>
 	<string name="navpoint_search_desc">Koordinater</string>
-	<string name="transport_search_desc">Transportsøgning</string>
+	<string name="transport_search_desc">Kollektivtrafiksøgning</string>
 	<string name="favourites_search_desc">Favoritsøgning</string>
 	<string name="history_search_desc">Søgehistorik</string>
 	<string name="offline_navigation_not_available">OsmAnd offline navigation er midlertidig utilgængelig.</string>
@@ -345,7 +345,7 @@
 	<string name="unknown_location">Position endnu ikke kendt</string>
 	<string name="modify_transparency">Ændre gennemsigtighed (0 - gennemsigtig, 255 - ugennemsigtig)</string>
 	<string name="confirm_interrupt_download">Afbryd hentning af fil?</string>
-	<string name="first_time_msg">Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde offentlig transport.</string>    
+	<string name="first_time_msg">Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde kolllektivtrafik.</string>    
 	<string name="basemap_was_selected_to_download">Basiskort er nødvendige for korrekt programfunktion og blev automatisk valgt.</string>
 	<string name="select_index_file_to_download">Fandt intet. Hvis man ikke kan finde sin region kan man lave den selv (se http://osmand.net).</string>
 	<string name="local_indexes_cat_tile">Online- og delkort</string>
@@ -553,7 +553,7 @@
 	<string name="search_position_undefined">Ikke defineret</string>
 	<string name="search_position_fixed">" "</string>
 	<string name="search_position_current_location">Aktuel position…</string>
-	<string name="search_position_map_view">Seneste kortvisning</string>
+	<string name="search_position_map_view">Nuværende kortcenter</string>
 	<string name="select_search_position">Udgangspunkt:</string>
 	<string name="context_menu_item_search">Søg i nærheden</string>
 	<string name="save_route_dialog_title">Gem rute som GPX-spor</string>
@@ -692,7 +692,7 @@
 	<string name="local_index_download">Hent</string>
 	
 	<string name="local_index_address_data">Adressedata</string>
-	<string name="local_index_transport_data">Transportdata</string>
+	<string name="local_index_transport_data">Kollektivtrafikdata</string>
 	<string name="local_index_map_data">Kortdata</string>
 	<string name="local_indexes_cat_backup">Deaktiveret</string>
 	<string name="local_indexes_cat_tts">Stemmedata (TTS)</string>
@@ -816,7 +816,7 @@
 	<string name="km_h">km/t</string>
 	<string name="m">m</string>
 	<string name="old_map_index_is_not_supported">Forældet kortdataformat \'{0}\' er ikke understøttet</string>
-	<string name="poi_filter_closest_poi">Nærmeste interessepunkt</string>
+	<string name="poi_filter_closest_poi">Nærmeste interessepunkter</string>
 	<string name="poi_filter_custom_filter">Brugerdefineret filter</string>
 	<string name="poi_filter_namefinder">Online navne-søger</string>
 	<string name="reading_cached_tiles">Læser cachelagrede delkort…</string>
@@ -885,7 +885,7 @@
 	<string name="use_high_res_maps">Højopløseligt visning</string>
 	<string name="use_high_res_maps_descr">Stræk (og slør) ikke delkort på skærme med stor opløsning</string>
 	<string name="download_files">Hent</string>
-	<string name="context_menu_item_search_transport">Søg transport</string>
+	<string name="context_menu_item_search_transport">Søg kollektivtrafik</string>
 	<string name="transport_searching_transport">Transportresultater (ingen destination):</string>
 	<string name="transport_searching_route">Transportresultater ({0} til destination):</string>
 	<string name="transport_search_none">ingen</string>
@@ -898,7 +898,7 @@
 	<string name="layer_gpx_layer">GPX-spor…</string>
 	<string name="error_reading_gpx">Fejl under læsning af GPX-data</string>
 	<string name="vector_data">Offline vektorkort</string>
-	<string name="transport_context_menu">Søg transport ved stoppested</string>
+	<string name="transport_context_menu">Søg efter transport ved stoppested</string>
 	<string name="point_on_map">Placering:
 \n Lat %1$.5f
 \n Long %2$.5f</string>
@@ -1005,7 +1005,7 @@
 	<string name="first_time_continue">Senere</string>
 	<string name="first_time_download">Hent regioner</string>
 	<string name="search_poi_location">Søger efter signal…</string>
-	<string name="search_near_map">Søg tæt på sidste kortplacering</string>
+	<string name="search_near_map">Søg i nærheden af nuværende kortcenter</string>
 	<string name="search_nearby">Søg i nærheden</string>
 	<string name="map_orientation_default">Samme som enhed</string>
 	<string name="map_orientation_portrait">Stående</string>
@@ -1014,12 +1014,12 @@
 	<string name="map_screen_orientation_descr">Stående, liggende eller som enhed</string>
 	<string name="add_new_rule">Tilføj ny regel</string>
 	<string name="transport_Routes">Ruter</string>
-	<string name="transport_search_after">Efterfølgende rute</string>	
-	<string name="transport_search_before">Forudgående rute</string>
+	<string name="transport_search_after">Efterfølgende ruteplan</string>	
+	<string name="transport_search_before">Forudgående ruteplan</string>
 	<string name="transport_finish_search">Afslut søgning</string>
 	<string name="transport_to_go_after">tidligere afstand</string>
 	<string name="transport_to_go_before">efterfølgende afstand</string>
-	<string name="transport_route_distance">Rutelængde</string>
+	<string name="transport_route_distance">Ruteplan længde</string>
 	<string name="transport">Transport</string>
 	<string name="default_buttons_no">Nej</string>
 	<string name="default_buttons_yes">Ja</string>
@@ -1057,7 +1057,7 @@
 	<string name="opening_hours_not_supported">Åbningstider format understøtter ikke redigering</string>
 	<string name="transport_stop_to_go_out">Vælg stoppestedet for afstigning</string>
 	<string name="transport_stops_to_pass">stoppesteder der skal passeres</string>
-	<string name="show_transport_over_map_description">Vis stoppesteder for kollektivtransport på kortet</string>
+	<string name="show_transport_over_map_description">Vis stoppesteder for kollektivtrafik på kortet</string>
 	<string name="show_transport_over_map">Vis stoppesteder</string>
 	<string name="hello">Navigationsprogram OsmAnd</string>
 	<string name="update_poi_success">Interessepunkt-data blev opdateret ({0} blev indlæst)</string>
@@ -1087,9 +1087,8 @@
 	<string name="tip_map_switch_t_v2">"Kortkilden og lag der vises kan ændres via \'Menu\' → \'Konfigurer kort\'.
 \n\nUnder \'Kortkilde...\' vælges de forhåndsindlæste vektorkort, forhåndsdefinerede (online) delkortkilder (aktiver \'Online og delkort\' udvidelsen) eller kort der er manuelt oprettet f.eks. ved hjælp af OsmAndMapCreator på en PC.
 \n\nOsmAnd understøtter også brugerdefinerede kilder. "</string>
-	<string name="tip_app_mode_t_v2">OsmAnd understøtter forskellige profiler (kan konfigureres) til forskellige brugstilfælde.
-\n\nSkift profil via profilknappen i nederste venstre hjørne af skærmen (bil, cykel eller fodgænger) eller når en rute oprettes (\'Transportform\').
-	</string>
+	<string name="tip_app_mode_t_v2">"OsmAnd understøtter forskellige profiler (kan konfigureres) til forskellige brugstilfælde.
+\n\nSkift profil via profilknappen i nederste venstre hjørne af skærmen (bil, cykel eller fodgænger) eller når en rute oprettes (\'transportform\'). "</string>
 	<string name="tip_search_t">"Søg efter steder direkte på kortet via \'Brug placeringer\' → \'Søg i nærheden , eller ved at bruge søgeskærmen via \'Menu\' → \'Søg\'.
 \n\nSøgeskærmen indeholder skabeloner for søgning
 \n * efter adresse
@@ -1280,7 +1279,7 @@
     <string name="use_magnetic_sensor">Magnetisk sensor</string>
     <string name="local_indexes_cat_srtm">Højdekurvedata</string>
     <string name="use_magnetic_sensor_descr">Brug magnetisksensor i stedet for retningssensor til at bestemme kompasværdi</string>
-    <string name="use_kalman_filter_compass_descr">Brug Kalman-filter for at undgå kompasmisvisning</string>
+    <string name="use_kalman_filter_compass_descr">Reducerer støj i kompasaflæsninger, men tilføjer inerti</string>
     <string name="use_kalman_filter_compass">Kalman filter</string>
     <string name="access_mark_final_location_first">Tilgængelighedstilstand: Vælg destination først</string> 
     <string name="wait_current_task_finished">Vent - mens aktuel opgave bliver færdig</string>
@@ -1452,9 +1451,9 @@
     <string name="app_mode_truck">Lastbil</string>
     <string name="calculate_osmand_route_gpx">Beregn OsmAnd offline rute</string>
     <string name="application_dir_change_warning2">"Skal OsmAnd også kopiere datafiler til den nye placering? Vælg \'Nej\' hvis OsmAnd kun skal oprette og bruge den nye  mappe."</string>
-    <string name="copying_osmand_one_file_descr">Kopierer fil (%s) til den ny placering...</string>
-    <string name="copying_osmand_files_descr">Kopierer OsmAnd datafiler til ny destination (%s)</string>
-    <string name="copying_osmand_files">Kopierer OsmAnd datafiler</string>
+    <string name="copying_osmand_one_file_descr">Kopierer fil (%s) til den ny placering…</string>
+    <string name="copying_osmand_files_descr">Kopierer OsmAnd datafiler til ny destination (%s)…</string>
+    <string name="copying_osmand_files">Kopierer OsmAnd datafiler…</string>
     <string name="android_19_location_disabled">"Siden Android version 4.4  (KitKat) kan man ikke hente og opdatere kort i den tidligere lagerplacering (%s). Ønsker du at skifte til den tilladte placering og kopiere alle OsmAnd  datafiler dertil?         
 \n Note 1: De gamle datafiler forbliver urørt. (men kan slettes manuelt).        
 \n Note 2: I den nye placering vil det ikke være muligt at dele filer mellem OsmAnd og OsmAnd+."</string>
@@ -1586,7 +1585,7 @@
     <string name="osmo_tracker_id">Personligt sporings-id</string>
     <string name="osmo_tracker_id_descr">Klik for at se eller dele sporings-id. Med sporings-id vil tilsluttede enheder være i stand til at overvåge alle bevægelser af enheden! For at afbryde, vælg \'Forny personlig id\' mulighed.</string>
     <string name="osmo_session_token">Sessiontoken: %1$s</string>
-    <string name="osmo_auth_pending">Venter på autorisation...</string>
+    <string name="osmo_auth_pending">Venter på autorisation…</string>
     <string name="osmo_locations_sent">Placeringer sendt %1$d (i buffer %2$d) </string>
     <string name="osmo_conn_successfull">Forbindelse oprettet: %1$s </string>
     <string name="osmo_mode_restart">Genstart OsMo session</string>
@@ -1830,7 +1829,7 @@
     <string name="rendering_attr_trolleybusRoutes_name">Trolleybusruter</string>
     <string name="rendering_attr_busRoutes_name">Busruter</string>
     <string name="rendering_attr_tramTrainRoutes_name">Tog- og sporvognsruter</string>
-    <string name="select_impassable_road">Vælg på kort</string>
+    <string name="select_impassable_road">Vælg på kort…</string>
     <string name="impassable_road">Undgå veje…</string>
     <string name="rendering_category_hide">Skjul</string>
     <string name="wake_on_voice">Tænd for skærmen</string>
@@ -1877,4 +1876,5 @@
 	<string name="show_railway_warnings">Jernbaneoverskæringer</string>
 	<string name="show_pedestrian_warnings">Fodgængerovergange</string>
     <string name="speak_pedestrian">Fodgængerovergange</string>
-    </resources>
+    <string name="rendering_value__name">Standard</string>
+	</resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index a85ec5e951..5feadca1f5 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -607,4 +607,8 @@
 	<string name="poi_swing_carousel">Schaukel-Karussell</string>
 	<string name="poi_attraction_train">Eisenbahn (Attraktion)</string>
 	<string name="poi_water_slide">Wasserrutsche</string>
+	<string name="poi_tower">Sendeturm</string>
+	<string name="poi_mast">Mast</string>
+	<string name="poi_radar">Radar</string>
+	<string name="poi_aquarium">Aquarium</string>
   </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index e9f07cffcf..f83c7c9506 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -612,9 +612,8 @@
 	<string name="search_position_address">Adresse…</string>
 	<string name="search_position_favorites">Favorit…</string>
 	<string name="search_position_undefined">Undefiniert</string>
-	<string name="search_position_fixed"></string>
 	<string name="search_position_current_location">Aktueller Standort…</string>
-	<string name="search_position_map_view">Letzte Kartenposition</string>
+	<string name="search_position_map_view">Aktueller Kartenmittelpunkt</string>
 	<string name="select_search_position">Ausgangspunkt:</string>
 	<string name="context_menu_item_search">In der Nähe suchen</string>
 	<string name="save_route_dialog_title">Route als GPX-Track speichern</string>
@@ -702,7 +701,7 @@
 	<string name="map_overlay_descr">Wähle Overlay-Karte</string>
 	<string name="tile_source_already_installed">Karte schon installiert, Einstellungen werden aktualisiert</string>
 	<string name="select_tile_source_to_install">Kartenauswahl (Installation oder Aktualisierung)</string>
-	<string name="internet_not_available">Internet Verbindung erforderlich aber nicht verfügbar!</string>
+	<string name="internet_not_available">Internet Verbindung erforderlich, aber nicht verfügbar!</string>
 	<string name="install_more">Weitere installieren…</string>
 	<string name="tip_update_index">Offline-Karten</string>
 	<string name="tip_update_index_t">Aktuelles Kartenmaterial ist wichtig für die Offline-Kartenansicht, die POI und Adresssuche, und die Offline-Navigation. OsmAnd hat einen Karten-Manager für das Herunterladen oder Aktualisieren von Offline-Karten.
@@ -730,7 +729,7 @@
 	<string name="search_offline_geo_error">Konnte geointent nicht verarbeiten: \'%s\'</string>
 	<string name="search_osm_offline">Adresssuche mit Offline-Daten</string>
 	<string name="system_locale">Systemeinstellung</string>
-	<string name="preferred_locale_descr">Anzeigesprache wählen</string>
+	<string name="preferred_locale_descr">Anzeigesprache wählen (OsmAnd nach Änderungen neu starten)</string>
 	<string name="preferred_locale">Anzeigesprache</string>
 	<string name="tip_map_switch">Kartenquelle auswählen</string>
 	<string name="tip_map_switch_t_v2">Die Kartenquelle und die angezeigten Ebenen können in der Kartenansicht über \'Menü\' → \'Karte konfigurieren\' gewählt werden.
@@ -1416,7 +1415,7 @@
 	<string name="install_paid">Vollversion</string>
 	<string name="cancel_navigation">Navigation stoppen</string>
 	<string name="cancel_route">Route verwerfen</string>
-	<string name="use_kalman_filter_compass_descr">Kalman-Filter verwenden, um Kompass-Ungenauigkeiten auszublenden</string>
+	<string name="use_kalman_filter_compass_descr">Kompass-Rauschreduzierung, erhöht die Kompassträgheit etwas</string>
 	<string name="use_kalman_filter_compass">Kalman-Filter verwenden</string>
 	<string name="access_mark_final_location_first">Eingabehilfen-Modus: Bitte zuerst Ziel auswählen</string>
 	<string name="use_magnetic_sensor_descr">Magnetsensor statt Lagesensor zur Kompassermittlung verwenden</string>
@@ -1539,10 +1538,10 @@
 \n Hinweis 1: Die ursprünglichen Dateien bleiben hiervon unberührt, können aber nachfolgend manuell gelöscht werden.
 \n Hinweis 2: Die Dateien können dann nicht mehr von OsmAnd und OsmAnd+ gemeinsam genutzt werden."</string>
 	<string name="application_dir_change_warning2">Soll OsmAnd auch die Dateien an den neuen Speicherort verschieben? Mit \'Nein\' wird OsmAnd den neuen Speicherort nur anlegen und als Standard verwenden.</string>
-	<string name="copying_osmand_one_file_descr">Kopieren der Datei (%s) an den neuen Speicherort…</string>
-	<string name="copying_osmand_files_descr">Kopieren der OsmAnd-Dateien zum neuen Speicherort (%s)</string>
-	<string name="copying_osmand_files">Kopiere OsmAnd-Dateien</string>
-	<string name="calculate_osmand_route_gpx">Berechne OsmAnd-Offline-Route</string>
+	<string name="copying_osmand_one_file_descr">Datei (%s) wird an den neuen Speicherort kopiert&#8230;</string>
+	<string name="copying_osmand_files_descr">OsmAnd-Dateien werden zum neuen Speicherort (%s) kopiert&#8230;</string>
+	<string name="copying_osmand_files">OsmAnd-Dateien werden kopiert&#8230;</string>
+	<string name="calculate_osmand_route_gpx">OsmAnd-Offline-Route berechnen</string>
 	<string name="app_mode_truck">LKW</string>
 	<string name="guidance_preferences_descr">Navigations-Einstellungen</string>
 	<string name="routing_preferences_descr">Einstellungen für Routenberechnung</string>
@@ -1564,7 +1563,7 @@
 	<string name="always_center_position_on_map">Position immer in Bildschirmmitte anzeigen</string>
 	<string name="voice_pref_title">Stimme</string>
 	<string name="misc_pref_title">Verschiedene</string>
-	<string name="share_route_as_gpx">Teilen der Route als GPX-Datei</string>
+	<string name="share_route_as_gpx">Route als GPX-Datei teilen</string>
 	<string name="share_route_subject">Route über OsmAnd teilen</string>
 	<string name="localization_pref_title">Ländereinstellungen</string>
 	<string name="interrupt_music">Musikwiedergabe unterbrechen</string>
@@ -1574,7 +1573,7 @@
 	<string name="use_points_as_intermediates">Route zwischen Punkten berechnen</string>
 	<string name="keep_informing_never">Niemals</string>
 	<string name="keep_informing_descr">Navigationsanweisungen in regelmäßigen Abständen wiederholen</string>
-	<string name="keep_informing">Wiederholen von Navigationsanweisungen</string>
+	<string name="keep_informing">Navigationsanweisungen wiederholen</string>
 	<string name="arrival_distance">Zielankündigung</string>
 	<string name="arrival_distance_descr">Wann soll die Ankunft am Ziel angekündigt werden?</string>
 	<string name="int_days">Tage</string>
@@ -1839,7 +1838,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 
 	<string name="osmo_settings_uuid">Geräte-ID</string>
 	<string name="osmo_settings_descr">Konfigurieren der Überwachungs-Einstellungen und des persönlichen Überwachungs-Kanals</string>
-	<string name="osmo_plugin_description">"Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi ... Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff. "</string>
+	<string name="osmo_plugin_description">"Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi … Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff."</string>
 	<string name="osmo_plugin_name">OsMo (Erweiterte Live-Überwachung)</string>
 	<string name="osmo_settings">OsMo OpenStreetMap-Überwachung</string>
 	<string name="osmo_io_error">OsMo Verbindungsproblem: </string>
@@ -1955,7 +1954,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="gpx_saved_sucessfully">GPX-Datei erfolgreich gespeichert unter {0}</string>
 	<string name="gpx_option_calculate_first_last_segment">Berechnen des ersten und letzten Abschnitts der OsmAnd-Route</string>
 <string name="download_additional_maps">Fehlende Karten herunterladen: %1$s (%2$d MB)?</string>
-    <string name="more">Mehr...</string>
+    <string name="more">Mehr…</string>
     <string name="osmo_specify_tracker_id">Bitte ID eingeben</string>
     <string name="home">Ausgangsposition</string>
     <string name="rendering_attr_publicTransportMode_name">Bus-, Trolleybus-, Sammeltaxi-Linien</string>
@@ -2000,7 +1999,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="wake_on_voice">Bildschirm aktivieren</string>
     <string name="wake_on_voice_descr">Bildschirm bei Navigationsanweisung aktivieren</string>
     <string name="wake_on_voice_never">Niemals</string>
-    <string name="select_impassable_road">Auswählen auf der Karte</string>
+    <string name="select_impassable_road">Auf Karte auswählen&#8230;</string>
     <string name="impassable_road">Straße blockieren…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Straßen- und Eisenbahnlinien</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Stadtbahnlinien</string>
@@ -2030,8 +2029,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="map_locale">Beschriftungssprache</string>
     <string name="rendering_attr_transportStops_name">ÖPNV-Haltestellen</string>
     <string name="navigate_point_zone">Zone</string>
-    <string name="navigate_point_northing">Nordwert</string>
-    <string name="navigate_point_easting">Ostwert</string>
+    <string name="navigate_point_northing">Nord-/Hochwert</string>
+    <string name="navigate_point_easting">Ost-/Rechtswert</string>
     <string name="dash_download_msg_none">Möchten Sie Offline-Karten herunterladen?</string>
     <string name="dash_download_msg">%1$s heruntergeladene Karten</string>
     <string name="dash_download_new_one">Neue Karte herunterladen</string>
@@ -2041,11 +2040,11 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="rendering_value_orange_name">Orange</string>
     <string name="rendering_value_germanRoadAtlas_name">Deutscher Straßenatlas</string>
     <string name="traffic_warning_railways">Bahnübergang</string>
-    <string name="traffic_warning_pedestrian">Fußgänger</string>
-    <string name="show_railway_warnings">Eisenbahn-Übergänge anzeigen</string>
-    <string name="show_pedestrian_warnings">Fußgänger-Übergänge anzeigen</string>
+    <string name="traffic_warning_pedestrian">Fußgängerübergang</string>
+    <string name="show_railway_warnings">Eisenbahnübergänge anzeigen</string>
+    <string name="show_pedestrian_warnings">Fußgängerübergänge anzeigen</string>
     <string name="rendering_value_americanRoadAtlas_name">Amerikanischer Straßenatlas</string>
     <string name="routing_attr_no_new_routing_name">Routing v1.9 nicht verwenden</string>
     <string name="routing_attr_no_new_routing_description">Neuen Routenalgorithmus nicht verwenden</string>
-    <string name="speak_pedestrian">Fußgänger-Übergänge ankündigen</string>
+    <string name="speak_pedestrian">Fußgängerübergänge ankündigen</string>
     </resources>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 405bbba34b..890291e5c8 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -3,7 +3,7 @@
     <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
     <string name="poi_filter_parking">Στάθμευση</string>
     <string name="poi_filter_emergency">Επείγοντα</string>
-    <string name="poi_filter_public_transport">Δημόσιες Μεταφορές</string>
+    <string name="poi_filter_public_transport">Δημόσιες μεταφορές</string>
     <string name="poi_filter_entertainment">Διασκέδαση</string>
     <string name="poi_filter_accomodation">Διαμονή</string>
     <string name="poi_filter_restaurants">Εστιατόρια</string>
@@ -452,10 +452,10 @@
 	<string name="search_position_address">Διεύθυνση…</string>
 	<string name="search_position_favorites">Αγαπημένα…</string>
 	<string name="search_position_undefined">Ακαθόριστο</string>
-	<string name="search_position_fixed">Βρέθηκε</string>
+	<string name="search_position_fixed"/>
 	<string name="search_position_current_location">Τρέχουσα θέση…</string>
-	<string name="search_position_map_view">Τελευταία οπτική χάρτη</string>
-	<string name="select_search_position">Αναζήτηση κοντά:</string>
+	<string name="search_position_map_view">Τρέχον κέντρο χάρτη</string>
+	<string name="select_search_position">Πηγή:</string>
 	<string name="context_menu_item_search">Αναζήτηση εδώ κοντά</string>
 	<string name="tip_recent_changes_0_6_7_t">"Πρόσφατες αλλαγές στην 0.6.7 :
 \n\t- Offline data manager (download, διαγραφή, activate / deactivate offline data directly in OsmAnd)
@@ -509,7 +509,7 @@
 	
 	<string name="local_index_poi_data">Δεδομένα ΣΕ</string>
 	<string name="local_index_address_data">Δεδομένα διευθύνσεων</string>
-	<string name="local_index_transport_data">Δεδομένα μεταφορών</string>
+	<string name="local_index_transport_data">Δεδομένα δημόσιων μεταφορών</string>
 	<string name="local_index_map_data">Δεδομένα χάρτη</string>
 	<string name="local_indexes_cat_backup">Απενεργοποιημένο</string>
 	<string name="local_indexes_cat_tts">Δεδομένα Φωνής (TTS)</string>
@@ -657,7 +657,7 @@
 	<string name="km_h">χλμ/ω</string>
 	<string name="m">μ</string>
 	<string name="old_map_index_is_not_supported">Παρωχημένη μορφή δεδομένων χάρτη \'\'{0}\'\' δεν υποστηρίζεται</string>
-	<string name="poi_filter_closest_poi">Πλησιέστερο ΣΕ</string>
+	<string name="poi_filter_closest_poi">Πλησιέστερα ΣΕ</string>
 	<string name="poi_filter_custom_filter">Προσαρμοσμένο φίλτρο</string>
 	<string name="poi_filter_namefinder">Online NameFinder</string>
 	<string name="reading_cached_tiles">Ανάγνωση αποθηκευμένων πλακιδίων…</string>
@@ -805,7 +805,7 @@
 	<string name="first_time_continue">Αργότερα</string>
 	<string name="first_time_download">Λήψη περιοχών</string>
 	<string name="search_poi_location">Αναζήτηση σήματος…</string>
-	<string name="search_near_map">Αναζήτηση κοντά στην τελευταία τοποθεσία του χάρτη</string>
+	<string name="search_near_map">Αναζήτηση κοντά στο τρέχον κέντρο του χάρτη</string>
 	<string name="search_nearby">Αναζήτηση στη γύρω περιοχή</string>
 	<string name="map_orientation_default">Το ίδιο με τη συσκευή</string>
 	<string name="map_orientation_portrait">Πορτραίτο</string>
@@ -1233,7 +1233,7 @@
     <string name="install_paid">Πλήρης έκδοση</string>
     <string name="use_magnetic_sensor">Χρήση του μαγνητικού αισθητήρα</string>
     <string name="use_magnetic_sensor_descr">Χρήση του μαγνητικού αισθητήρα για τον προσδιορισμό της ένδειξης της πυξίδας, αντί του αισθητήρα προσανατολισμού</string>
-    <string name="use_kalman_filter_compass_descr">Χρήση φίλτρου Kalman για αποφυγή απόκλισης της πυξίδας</string>
+    <string name="use_kalman_filter_compass_descr">Μειώνει τον θόρυβο στην ανάγνωση της πυξίδας αλλά προσθέτει αδράνεια</string>
     <string name="use_kalman_filter_compass">Χρήση φίλτρου Kalman</string>
     <string name="access_mark_final_location_first">Λειτουργία προσβασιμότητας: παρακαλώ επιλέξτε πρώτα προορισμό</string> 
     <string name="wait_current_task_finished">Παρακαλώ περιμένετε μέχρι να τελειώσει η τρέχουσα διεργασία</string>
@@ -1452,7 +1452,7 @@
     <string name="osmo_activity">Παρακολούθηση OpenStreetMap</string>
     <string name="osmo_connected_devices">Συνδεδεμένες συσκευές</string>
     <string name="osmo_groups">Ομάδες/συσκευές OsMo</string>
-    <string name="osmo_auth_pending">Αναμονή εξουσιοδότησης...</string>
+    <string name="osmo_auth_pending">Αναμονή εξουσιοδότησης…</string>
     <string name="osmo_settings_uuid">Μοναδικό αναγνωριστικό συσκευής</string>
     <string name="use_points_as_intermediates">Υπολογισμός διαδρομής μεταξύ σημείων</string>
     <string name="always_center_position_on_map">Εμφάνιση της θέσης πάντα στο κέντρο</string>
@@ -1528,9 +1528,9 @@
 	<string name="routing_attr_avoid_motorway_description">Αποφυγή αυτοκινητόδρομων</string>
 	<string name="routing_attr_weight_name">Όριο βάρους</string>
 	<string name="routing_attr_weight_description">Καθορίσετε το βάρος του οχήματος που θα είναι επιτρεπτό στις διαδρομές</string>
-    <string name="copying_osmand_one_file_descr">Αντιγραφή αρχείου (%s) στο νέο προορισμό...</string>
-    <string name="copying_osmand_files_descr">Αντιγραφή αρχείων δεδομένων OsmAnd στο νέο προορισμό (%s)</string>
-    <string name="copying_osmand_files">Αντιγραφή αρχείων δεδομένων OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Αντιγραφή αρχείου (%s) στο νέο προορισμό…</string>
+    <string name="copying_osmand_files_descr">Αντιγραφή αρχείων δεδομένων OsmAnd στο νέο προορισμό (%s)…</string>
+    <string name="copying_osmand_files">Αντιγραφή αρχείων δεδομένων OsmAnd…</string>
     <string name="app_mode_truck">Φορτηγό</string>
     <string name="guidance_preferences_descr">Προτιμήσεις πλοήγησης</string>
     <string name="routing_preferences_descr">Προτιμήσεις δρομολόγησης</string>
@@ -1631,7 +1631,7 @@
     <string name="anonymous_user">Ανώνυμος χρήστης</string>
     <string name="logged_as">Συνδεδεμένος ως %1$s</string>
 	<string name="wake_on_voice_never">Ποτέ</string>
-    <string name="select_impassable_road">Επιλογή στον χάρτη</string>
+    <string name="select_impassable_road">Επιλογή στον χάρτη…</string>
     <string name="impassable_road">Αποφυγή δρόμων…</string>
     <string name="rendering_category_hide">Απόκρυψη</string>
     <string name="rendering_category_routes">Δρομολόγια</string>
@@ -1671,4 +1671,29 @@
     <string name="dismiss">Απόρριψη</string>
     <string name="show_map">ΕΜΦ ΧΑΡΤΗ</string>
 	<string name="show_all">ΕΜΦ ΌΛΩΝ</string>
+	<string name="speak_pedestrian">Ανακοίνωση διαβάσεων πεζών</string>
+    <string name="traffic_warning_pedestrian">Διάβαση πεζών</string>
+	<string name="routing_attr_no_new_routing_name">Κανόνες δρομολόγησης v1.9</string>
+    <string name="routing_attr_no_new_routing_description">Να μην χρησιμοποιηθούν οι κανόνες δρομολόγησης που εισήχθησαν στην έκδοση 1.9</string>
+    <string name="dash_download_msg_none">Θέλετε να κατεβάσετε χάρτες για χρήση εκτός σύνδεσης;</string>
+    <string name="dash_download_manage">Διαχείριση</string>
+    <string name="application_dir_change_warning2">Θέλετε ο OsmAnd να αντιγράψει επίσης τα δεδομένα του στη νέα τοποθεσία; Επιλέξτε \'Όχι\' ώστε ο OsmAnd απλά να δημιουργήσει και να χρησιμοποιήσει τον νέο φάκελο.</string>
+    <string name="navigate_point_zone">Ζώνη</string>
+    <string name="error_avoid_specific_road">Δεν βρέθηκε παράκαμψη</string>
+    <string name="osmo_use_https_descr">Χρήση ασφαλούς σύνδεσης με τον διακομιστή</string>
+    <string name="advanced_settings">Προηγμένες</string>
+	<string name="wake_on_voice">Άναμμα της οθόνης</string>
+    <string name="map_widget_appearance_rem">Εναπομείναντα στοιχεία</string>
+    <string name="speed_limit_exceed_message">Επιλέξτε το περιθώριο του ορίου ταχύτητας, πάνω από το οποίο θα ακούτε ηχητική προειδοποίηση.</string>
+	<string name="fav_point_dublicate_message">Αλλάχτηκε το όνομα του αγαπημένου σημείου σε %1$s για να αποφευχθούν διπλά ονόματα.</string>
+    <string name="rendering_value_germanRoadAtlas_name">Γερμανικός άτλαντας δρόμων</string>
+	<string name="rendering_value_americanRoadAtlas_name">Αμερικάνικος άτλαντας δρόμων</string>
+    <string name="use_opengl_render">Χρήση αποτύπωσης OpenGL</string>
+    <string name="use_opengl_render_descr">Χρήση αποτύπωσης με επιτάχυνση υλικού OpenGL (μπορεί να μη λειτουργεί σε ορισμένες συσκευές)</string>
+    <string name="wake_on_voice_descr">Άναμμα της οθόνης όταν πλησιάζετε μια στροφή</string>
+    <string name="traffic_warning">Προειδοποίηση κυκλοφοριακού</string>
+	<string name="save_global_track_interval">Γενικό διάστημα καταγραφής</string>
+	<string name="use_displayed_track_for_navigation">Θέλετε να χρησιμοποιήσετε το εμφανιζόμενο ίχνος για πλοήγηση;</string>
+    <string name="route_descr_destination">Προορισμός</string>
+    <string name="voices">Φωνητικές οδηγίες</string>
 	</resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 63519a0778..b4719b2447 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -151,7 +151,7 @@
   <string name="search_position_undefined">Indefinido</string>
   <string name="search_position_fixed">Corregido</string>
   <string name="search_position_current_location">Posición actual…</string>
-  <string name="search_position_map_view">Última vista del mapa</string>
+  <string name="search_position_map_view">Centro del mapa actual</string>
   <string name="select_search_position">Origen:</string>
   <string name="context_menu_item_search">Busca cerca de aquí</string>
   <string name="tip_recent_changes_0_6_7_t">"Cambios en 0.6.7 : \n\t- Gestor de datos descargados (descargar, borrar, activar/desactivar datos descargados directamente en OsmAnd) \n\t- Puntos y grupos favoritos (categorizar, borrar, gestionar favoritos) \n\t- Explorador de GPX en la aplicación (ver detalle del trayecto, distancia, velocidad media, elevación, etc.) \n\t- Navegación GPX (más opciones, continuar la navegación tras un fallo de aplicación, soportar rotondas) \n\t- Función para guardar la ruta como traza GPX para uso sin conexión \n\t- Mejora de la monitorización GPX (filtra alguna posición incorrecta y guarda precisión/elevación/velocidad) \n\t- Envía GPX a la comunidad OSM (http://download.osmand.net/gpx/) \n\t- Mejora del dibujo vectorial \n\t- Mejora del motor TTS (anuncia la distancia exacta, permite millas) \n\t- Arreglo de fallos "</string>
@@ -196,7 +196,7 @@
   
   <string name="local_index_poi_data">Datos de PDI</string>
   <string name="local_index_address_data">Datos de direcciones</string>
-  <string name="local_index_transport_data">Datos de transporte</string>
+  <string name="local_index_transport_data">Datos de transporte público</string>
   <string name="local_index_map_data">Datos de mapa</string>
   <string name="local_indexes_cat_backup">Desactivado</string>
   <string name="local_indexes_cat_tts">Datos de voz (sintetizado)</string>
@@ -350,7 +350,7 @@
   <string name="m">m</string>
   <string name="old_map_index_is_not_supported">No se soporta el formato \'\'{0}\'\' de datos obsoletos</string>
   <string name="poi_filter_car_aid">Asistencia de automóvil</string>
-  <string name="poi_filter_closest_poi">PDI más cercano</string>
+  <string name="poi_filter_closest_poi">PDIs más cercanos</string>
   <string name="poi_filter_custom_filter">Filtro propio</string>
   <string name="poi_filter_food_shop">Tienda de comida</string>
   <string name="poi_filter_for_tourists">Para turistas</string>
@@ -412,9 +412,9 @@
   <string name="use_high_res_maps_descr">No estira (ni hace borrosas) las teselas de mapa en pantallas de alta densidad</string>
   <string name="unknown_location">Posición aún desconocida</string>
   <string name="download_files">Descargar</string>
-  <string name="context_menu_item_search_transport">Buscar transporte</string>
-  <string name="transport_searching_transport">Resultados transporte (sin destino):</string>
-  <string name="transport_searching_route">Resultados transporte ({0} al destino):</string>
+  <string name="context_menu_item_search_transport">Buscar transporte público</string>
+  <string name="transport_searching_transport">Resultados de transporte (sin destino):</string>
+  <string name="transport_searching_route">Resultados de transporte ({0} al destino):</string>
   <string name="transport_search_none">ninguno</string>
   <string name="transport_search_again">Reiniciar búsqueda de transporte</string>
   <string name="map_index">Mapa</string>
@@ -425,7 +425,7 @@
   <string name="layer_gpx_layer">Traza GPX…</string>
   <string name="error_reading_gpx">Error leyendo datos GPX</string>
   <string name="vector_data">Mapas vectoriales descargados</string>
-  <string name="transport_context_menu">buscar transporte en parada</string>
+  <string name="transport_context_menu">Buscar transporte en parada</string>
   <string name="point_on_map">Localización:\n Lat %1$.5f\n Lon %2$.5f</string>
   <string name="osb_bug_name">Fallo</string>
   <string name="poi_context_menu_modify">Modificar PDI</string>
@@ -502,10 +502,9 @@
   <string name="route_head">Cabecera</string>
   <string name="first_time_continue">Después</string>
   <string name="first_time_download">Descargar regiones</string>
-  <string name="first_time_msg">Gracias por elegir OsmAnd.
-Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Después, podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
+  <string name="first_time_msg">Gracias por elegir OsmAnd. Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
   <string name="search_poi_location">Buscando señal…</string>
-  <string name="search_near_map">Buscar cerca de la última localización</string>
+  <string name="search_near_map">Buscar cerca del centro del mapa</string>
   <string name="search_nearby">Buscar cercanos</string>
   <string name="map_orientation_default">Según dispositivo</string>
   <string name="map_orientation_portrait">Vertical</string>
@@ -517,17 +516,17 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
   <string name="transport_Routes">Rutas</string>
   <string name="transport_Stop">Parada</string>
   <string name="transport_stops">paradas</string>
-  <string name="transport_search_after">Ruta subsiguiente</string>
-  <string name="transport_search_before">Ruta previa</string>
+  <string name="transport_search_after">Itinerario siguiente</string>
+  <string name="transport_search_before">Itinerario anterior</string>
   <string name="transport_finish_search">Finalizar búsqueda</string>
   <string name="transport_stop_to_go_out">Elige parada a la que ir</string>
   <string name="transport_to_go_after">distancia previa</string>
   <string name="transport_to_go_before">distancia siguiente</string>
   <string name="transport_stops_to_pass">paradas a pasar</string>
-  <string name="transport_route_distance">Distancia de ruta</string>
+  <string name="transport_route_distance">Distancia del itinerario</string>
   <string name="transport">Transporte</string>
   <string name="default_buttons_ok">Aceptar</string>
-  <string name="show_transport_over_map_description">Mostrar paradas de transporte público en el mapa</string>
+  <string name="show_transport_over_map_description">Muestra paradas de transporte público en el mapa</string>
   <string name="show_transport_over_map">Mostrar paradas de transporte</string>
   <string name="hello">Aplicación de navegación OsmAnd</string>
   <string name="update_poi_success">Datos de PDIs correctamente actualizados (se cargaron {0})</string>
@@ -867,7 +866,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
   <string name="poi_search_desc">Buscar PDI (Punto De Interes)</string>
   <string name="address_search_desc">Buscar dirección</string>
   <string name="navpoint_search_desc">Coordenadas</string>
-  <string name="transport_search_desc">Buscar transportes</string>
+  <string name="transport_search_desc">Búsqueda de transporte público</string>
   <string name="favourites_search_desc">Buscar favorito</string>
   <string name="history_search_desc">Historial de búsqueda</string>
   <string name="rendering_attr_noPolygons_description">Hacer todas las características del terreno transparentes en el mapa</string>
@@ -1026,7 +1025,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="btn_advanced_mode">Modo Avanzado…</string>
     <string name="poi_filter_parking">Aparcamiento</string>
     <string name="poi_filter_emergency">Emergencia</string>
-    <string name="poi_filter_public_transport">Transporte Público</string>
+    <string name="poi_filter_public_transport">Transporte público</string>
     <string name="poi_filter_entertainment">Entretenimiento</string>
     <string name="poi_filter_accomodation">Alojamiento</string>
     <string name="poi_filter_restaurants">Restaurantes</string>
@@ -1236,7 +1235,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="favourites_list_activity">Selecciona favorito</string>
     <string name="local_openstreetmap_act_title">Modificaciones OSM</string>
     <string name="default_buttons_other_actions">Otras acciones</string>
-    <string name="use_kalman_filter_compass_descr">Utiliza el filtro Kalman para evitar aberraciones de la brújula</string>
+    <string name="use_kalman_filter_compass_descr">Reduce el ruido en las lecturas de la brújula pero añade inercia</string>
     <string name="use_kalman_filter_compass">Usar filtro Kalman</string>
     <string name="access_mark_final_location_first">Modo Accesibilidad: seleccione el destino primero</string> 
     <string name="use_magnetic_sensor_descr">Utiliza el sensor magnético para determinar el valor de la brújula en vez del sensor de orientación</string>
@@ -1455,9 +1454,9 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="speech_rate_descr">Especifica la velocidad en el habla sintetizada (TTS)</string>
     <string name="speech_rate">Velocidad del habla sintetizada (TTS)</string>
     <string name="application_dir_change_warning2">¿Quieres que OsmAnd copie sus archivos de datos al nuevo destino? Selecciona \'No\' para que OsmAnd cree y use la nueva carpeta.</string>
-    <string name="copying_osmand_one_file_descr">Copiando archivo (%s) al nuevo destino...</string>
-    <string name="copying_osmand_files_descr">Copiando archivos de OsmAnd al nuevo destino (%s)</string>
-    <string name="copying_osmand_files">Copiando archivos de datos de OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Copiando archivo (%s) al nuevo destino…</string>
+    <string name="copying_osmand_files_descr">Copiando archivos de OsmAnd al nuevo destino (%s)…</string>
+    <string name="copying_osmand_files">Copiando archivos de datos de OsmAnd…</string>
     <string name="app_mode_truck">Camión</string>
     <string name="complex_route_calculation_failed">Falló el cálculo rápido de la ruta (%s), regresando a cálculo lento.</string>
     <string name="disable_complex_routing_descr">Deshabilitar la planificación de ruta de dos fases para la navegación con automóvil</string>
@@ -1483,10 +1482,10 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
 \n Nota 2: En la nueva ubicación de almacenamiento no será posible compartir archivos entre OsmAnd y OsmAnd+.</string>
     <string name="use_displayed_track_for_navigation">¿Desea usar la ruta mostrada para la navegación?</string>
     <string name="keep_and_add_destination_point">Añadir como punto de destino</string>
-    <string name="select_gpx">Seleccionar GPX …</string>
+    <string name="select_gpx">Seleccionar GPX…</string>
     <string name="route_descr_select_destination">Seleccionar destino</string>
-    <string name="route_descr_select_on_map">Seleccionar en el mapa …</string>
-    <string name="route_descr_favorite">Favorito …</string>
+    <string name="route_descr_select_on_map">Seleccionar en el mapa…</string>
+    <string name="route_descr_favorite">Favorito…</string>
     <string name="route_preferences">Preferencias de la ruta</string>
     <string name="route_info">Información de la ruta</string>
     <string name="tip_recent_changes_1_7_1_t">"Cambios en 1.7:
@@ -1583,7 +1582,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="osmo_connect_to_device_name">Nombre de usuario</string>
     
     <string name="osmo_connected_devices">Dispositivos conectados</string>
-    <string name="osmo_auth_pending">Esperando autorización...</string>
+    <string name="osmo_auth_pending">Esperando autorización…</string>
     <string name="osmo_locations_sent">Localizaciones enviadas %1$d (en buffer %2$d) </string>
     <string name="osmo_conn_successfull">Conexión establecida: %1$s </string>
     <string name="osmo_groups">Grupos/Dispositivos OsMo</string>
@@ -1673,7 +1672,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="gpx_file_is_empty">La traza GPX está vacía</string>
     <string name="selected_track">Pista seleccionada</string>
     <string name="my_tracks">Todas las pistas</string>
-    <string name="loading_smth">Cargando %1$s …</string>
+    <string name="loading_smth">Cargando %1$s…</string>
     <string name="selected_gpx_info_show">\n\nMantenga pulsado para ver el mapa</string>
     <string name="delay_navigation_start">Iniciar automáticamente la navegación giro a giro</string>
     <string name="selected">seleccionado</string>
@@ -1760,7 +1759,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="rendering_attr_osmcTraces_name">Superponer símbolo de senderismo</string>
     <string name="rendering_attr_osmcTraces_description">Dibujar caminos de acuerdo a las trazas de OSMC</string>
     
-	<string name="osmo_invite">Invitar...</string>
+	<string name="osmo_invite">Invitar…</string>
     <string name="osmo_leave_confirmation_msg">¿Quieres abandonar el grupo %1$s?</string>
     <string name="osmo_specify_tracker_id">Especifique el id</string>
     <string name="arrival_distance_factor_early">Pronto</string>
@@ -1776,7 +1775,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="rendering_value_car_name">Coche</string>
     <string name="rendering_value_bicycle_name">Bicicleta</string>
     <string name="rendering_value_pedestrian_name">Peatón</string>
-    <string name="more">Más...</string>
+    <string name="more">Más…</string>
     <string name="download_additional_maps">¿Descargar los mapas que faltan %1$s (%2$d MB)?</string>
     <string name="flat_list_waypoitns">Todos</string>
     <string name="waypoints">Puntos de ruta</string>
@@ -1860,7 +1859,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="error_avoid_specific_road">No se ha encontrado circunvalación</string>
     <string name="everything_up_to_date">Todos los archivos actualizados</string>
     <string name="dismiss">Descartar</string>
-    <string name="no_internet_connection">Imposible descargar, compruebe su conexión a Internet.</string>
+    <string name="no_internet_connection">Imposible descargar; por favor, comprueba tu conexión a Internet.</string>
     <string name="download_tab_downloads">Todas las descargas</string>
     <string name="download_tab_updates">Actualizaciones</string>
     <string name="download_tab_local">Local</string>
@@ -1886,4 +1885,5 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
     <string name="navigate_point_easting">Al este</string>
     <string name="navigate_point_northing">Al norte</string>
     <string name="speak_pedestrian">Anunciar pasos de peatones</string>
-    </resources>
+    <string name="rendering_value__name">Por defecto</string>
+	</resources>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 6537081065..f05caa5dab 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -631,4 +631,8 @@
 <string name="poi_carpet_layer">Couvreur de moquettes</string>
 	<string name="poi_parquet_layer">Couvreur de parquets</string>
 	<string name="poi_saddle">Selle</string>
+	<string name="poi_tower">Tour</string>
+	<string name="poi_mast">Mât</string>
+	<string name="poi_radar">Radar</string>
+	<string name="poi_aquarium">Aquarium</string>
 	</resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 18a464cbe3..8f7771a06e 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -148,7 +148,7 @@
   <string name="search_position_undefined">Non défini</string>
   <string name="search_position_fixed"/>
   <string name="search_position_current_location">Position actuelle…</string>
-  <string name="search_position_map_view">Dernière vue</string>
+  <string name="search_position_map_view">Centre de la carte</string>
   <string name="select_search_position">Origine :</string>
   <string name="context_menu_item_search">Rechercher autour de ce point</string>
   <string name="tip_recent_changes_0_6_7_t">Changement pour 0.6.7 :
@@ -200,7 +200,7 @@
   
   <string name="local_index_poi_data">Données PI</string>
   <string name="local_index_address_data">Données adresses</string>
-  <string name="local_index_transport_data">Données des transports</string>
+  <string name="local_index_transport_data">Données des transports publics</string>
   <string name="local_index_map_data">Cartes</string>
   
   <string name="local_indexes_cat_backup">Désactivé</string>
@@ -283,7 +283,7 @@
   <string name="search_offline_geo_error">Ne peut interpréter le geo intent:\'%s\'</string>
   <string name="search_osm_offline">Recherche d\'adresses dans les cartes hors-ligne</string>
   <string name="system_locale">Système</string>
-  <string name="preferred_locale_descr">Sélectionnez la langue pour l\'affichage</string>
+  <string name="preferred_locale_descr">Sélectionnez la langue d\'affichage (veuillez redémarrer OsmAnd après modification)</string>
   <string name="preferred_locale">Langue de l\'application</string>
   <string name="tip_map_switch">Sélectionner une source de carte</string>
   
@@ -359,7 +359,7 @@
   <string name="m">m</string>
   <string name="old_map_index_is_not_supported">Le format obsolète de la carte \'\'{0}\'\' n\'\'est pas supporté</string>
   <string name="poi_filter_car_aid">Pour conducteurs</string>
-  <string name="poi_filter_closest_poi">PI les plus proches</string>
+  <string name="poi_filter_closest_poi">Points d\'Intérêt les plus proches</string>
   <string name="poi_filter_custom_filter">Filtre personnalisé</string>
   <string name="poi_filter_food_shop">Alimentation</string>
   <string name="poi_filter_for_tourists">Pour voyageurs</string>
@@ -421,11 +421,11 @@
   <string name="use_high_res_maps_descr">Utilisez des cartes de haute résolution pour les appareils les mieux équipés</string>
   <string name="unknown_location">Position inconnue</string>
   <string name="download_files">Télécharger</string>
-  <string name="context_menu_item_search_transport">Chercher transport</string>
-  <string name="transport_searching_transport">Arrêts à proximité (aucune destination définie) :</string>
-  <string name="transport_searching_route">Arrêts à proximité ({0} de la destination) :</string>
+  <string name="context_menu_item_search_transport">Chercher un transport public</string>
+  <string name="transport_searching_transport">Transports possibles (aucune destination définie) :</string>
+  <string name="transport_searching_route">Transports possibles ({0} pour rejoindre la destination) :</string>
   <string name="transport_search_none">aucun</string>
-  <string name="transport_search_again">Réinitialiser la recherche</string>
+  <string name="transport_search_again">Réinitialiser la recherche de transport</string>
   <string name="map_index">Carte</string>
   <string name="voice">Voix enregistrée</string>
   <string name="no_vector_map_loaded">Aucune carte vectorielle n\'a été chargée</string>
@@ -434,7 +434,7 @@
   <string name="layer_gpx_layer">Trace GPX…</string>
   <string name="error_reading_gpx">Erreur de lecteur des données GPX</string>
   <string name="vector_data">Cartes vectorielles OSM</string>
-  <string name="transport_context_menu">Chercher transport à l\'arrivée</string>
+  <string name="transport_context_menu">Rechercher un transport à l\'arrivée</string>
   <string name="point_on_map">Position :\n Lat. %1$.5f\n Lon. %2$.5f</string>
   <string name="osb_bug_name">Bogue</string>
   <string name="poi_context_menu_modify">Modifier PI</string>
@@ -456,13 +456,13 @@
   <string name="none_region_found">Aucune région trouvée sur la carte SD. Essayez d\'en télécharger une d\'internet.</string>
   <string name="poi_namefinder_query_empty">Paramètres de recherche pour trouver le PI</string>
   <string name="any_poi">Tout</string>
-  <string name="layer_transport_route">Routes de transport</string>
+  <string name="layer_transport_route">Itinéraires de transports publics</string>
   <string name="thanks_yandex_traffic">Merci à Yandex de fournir des informations sur le trafic.</string>
   <string name="layer_yandex_traffic">Trafic Yandex</string>
   <string name="layer_route">Route</string>
   <string name="layer_favorites">Favoris</string>
   <string name="layer_osm_bugs">Bogues OSM</string>
-  <string name="layer_transport">Arrêts de transport</string>
+  <string name="layer_transport">Arrêts de transports publics</string>
   <string name="layer_poi">Points d\'intérêt…</string>
   <string name="layer_map">Source de la carte…</string>
   <string name="menu_layers">Couches</string>
@@ -513,9 +513,9 @@
   <string name="route_head">Avancez</string>
   <string name="first_time_continue">Continuer</string>
   <string name="first_time_download">Téléchargement des régions</string>
-  <string name="first_time_msg">Merci d\'avoir choisi OsmAnd. La plupart des fonctionnalités de l\'application nécessitent des données régionales, utilisables hors-ligne, que vous pouvez au préalable télécharger (\'Paramètres\' → \'Données hors-ligne\') ou préparer vous-même. Ces données permettront de visualiser les cartes et de rechercher une adresse, un point d\'intérêt (PI) ou un transport en commun.</string>
+  <string name="first_time_msg">Merci d\'avoir choisi OsmAnd. La plupart des fonctionnalités de l\'application nécessitent des données régionales, utilisables hors-ligne, que vous pouvez au préalable télécharger (\'Paramètres\' → \'Données hors-ligne\') ou préparer vous-même. Ces données permettront de visualiser les cartes et de rechercher une adresse, un point d\'intérêt (PI) ou un transport public.</string>
   <string name="search_poi_location">Recherche d\'un signal…</string>
-  <string name="search_near_map">Rechercher près de la dernière position</string>
+  <string name="search_near_map">Rechercher autour du centre de la carte</string>
   <string name="search_nearby">Rechercher à proximité</string>
   <string name="map_orientation_default">Automatique</string>
   <string name="map_orientation_portrait">Portrait</string>
@@ -534,11 +534,11 @@
   <string name="transport_to_go_after">parcourir ensuite</string>
   <string name="transport_to_go_before">parcourir au préalable</string>
   <string name="transport_stops_to_pass">nombre d\'arrêts :</string>
-  <string name="transport_route_distance">Distance du trajet :</string>
+  <string name="transport_route_distance">Distance de l\'itinéraire :</string>
   <string name="transport">Transport</string>
   <string name="default_buttons_ok">OK</string>
-  <string name="show_transport_over_map_description">Afficher les arrêts de transport en commun sur la carte</string>
-  <string name="show_transport_over_map">Afficher les arrêts de transport public</string>
+  <string name="show_transport_over_map_description">Afficher les arrêts de transport publics sur la carte</string>
+  <string name="show_transport_over_map">Afficher les arrêts de transports publics</string>
   <string name="hello">Application de navigation OsmAnd</string>
   <string name="update_poi_success">Mise à jour des données PI réussie ({0} ont été chargés)</string>
   <string name="update_poi_error_local">Erreur de mise à jour des index locaux</string>
@@ -877,7 +877,7 @@
   <string name="poi_search_desc">Recherche de points d\'intérêt (PI)</string>
   <string name="address_search_desc">Recherche par adresse</string>
   <string name="navpoint_search_desc">Coordonnées</string>
-  <string name="transport_search_desc">Recherche de transports en commun</string>
+  <string name="transport_search_desc">Recherche de transports publics</string>
   <string name="favourites_search_desc">Recherche parmi les favoris</string>
   <string name="history_search_desc">Historique des recherches</string>
   <string name="route_roundabout">Rond-point : prenez la %1$d sortie puis continuez</string>
@@ -1025,8 +1025,8 @@
 \n* Nombreuses corrections de bugs "</string>
 <string name="snap_to_road_descr">Coller à la route pendant la navigation</string>
 <string name="snap_to_road">Coller à la route</string>
-<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. "</string>
-<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse "</string>
+<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport public, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. "</string>
+<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport public, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse "</string>
 <string name="tip_map_switch_t_v2">"La source des cartes et des couches affichées est modifiable via \'Menu\' → \'Affichage de la carte\' → \'Source de la carte…\'.
 \n\tVous pouvez choisir entre les cartes vectorielles hors-ligne préchargées (choix par défaut, nécessaires pour la navigation hors-ligne), ou des sources prédéfinies de tuiles de carte en ligne ou en cache (activer le greffon \'Cartes en ligne\' pour cela), ou des cartes créées manuellement sur un PC grâce à OsmAndMapCreator.
 \n\tOsmAnd supporte également des sources personnalisées. "</string>
@@ -1053,7 +1053,7 @@
     <string name="btn_advanced_mode">Mode avancé…</string>
     <string name="poi_filter_parking">Parking</string>
     <string name="poi_filter_emergency">Urgences</string>
-    <string name="poi_filter_public_transport">Transports en commun</string>
+    <string name="poi_filter_public_transport">Transports publics</string>
     <string name="poi_filter_entertainment">Divertissements</string>
     <string name="poi_filter_restaurants">Restauration</string>
     <string name="poi_filter_sightseeing">Tourisme</string>
@@ -1303,7 +1303,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="use_magnetic_sensor_descr">Utiliser le magnétomètre pour déterminer l\'orientation de la boussole au lieu du capteur d\'orientation</string>
     <string name="use_magnetic_sensor">Utiliser le magnétomètre (boussole)</string>
     <string name="local_indexes_cat_srtm">Courbes de niveau</string>
-    <string name="use_kalman_filter_compass_descr">Utiliser un filtre de Kalman pour éviter les interférences de la boussole</string>
+    <string name="use_kalman_filter_compass_descr">Réduit le bruit sur les mesures de la boussole, mais ajoute de l\'inertie</string>
     <string name="use_kalman_filter_compass">Utiliser un filtre de Kalman</string>
     <string name="access_mark_final_location_first">Mode d\'accessibilité : veuillez d\'abord définir une destination</string> 
     <string name="distance_measurement_start_editing">Mesurer sur la carte</string>
@@ -1468,8 +1468,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 \n Note 1 : Les anciens fichiers seront conservés (mais vous pouvez les supprimer manuellement)\n Note 2 : En raison de ce nouveau dossier de stockage, il ne sera plus possible de partager des fichiers entre OsmAnd et OsmAnd+.</string>
     <string name="application_dir_change_warning2">Souhaitez-vous qu\'OsmAnd copie aussi ses données vers la nouvelle destination ? (choisissez \'Non\' pour qu\'OsmAnd crée et utilise un nouveau dossier vierge)</string>
     <string name="copying_osmand_one_file_descr">Copie du fichier (%s) vers le nouvel emplacement…</string>
-    <string name="copying_osmand_files_descr">Copie des fichiers de données OsmAnd vers la nouvelle destination (%s)</string>
-    <string name="copying_osmand_files">Copie des fichiers de données OsmAnd</string>
+    <string name="copying_osmand_files_descr">Copie des fichiers de données OsmAnd vers la nouvelle destination (%s)…</string>
+    <string name="copying_osmand_files">Copie des fichiers de données OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Calcul de la route OsmAnd hors-ligne</string>
     <string name="app_mode_truck">Camion</string>
     <string name="routing_attr_prefer_motorway_name">Privilégier les autoroutes</string>
@@ -1847,7 +1847,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="rendering_attr_tramRoutes_name">Voies de tramway</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Voies partagées pour les taxi</string>
     <string name="rendering_attr_tramTrainRoutes_name">Itinéraires de tramway et train</string>
-    <string name="select_impassable_road">Sélectionnez sur la carte</string>
+    <string name="select_impassable_road">Sélectionnez sur la carte…</string>
     <string name="impassable_road">Évitez les routes…</string>
     <string name="rendering_category_hide">Masquer</string>
     <string name="wake_on_voice">Allumer l\'écran</string>
@@ -1894,4 +1894,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="routing_attr_no_new_routing_description">Ne pas utiliser les nouvelles règles de routage de la version 1.9</string>
     <string name="routing_attr_no_new_routing_name">Ne pas utiliser la version 1.9 des calculs de route</string>
     <string name="speak_pedestrian">Annoncer les passages piéton</string>
-    </resources>
+    <string name="rendering_value__name">Par défaut</string>
+	</resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index de0a397034..e0d4a1f38d 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -183,8 +183,15 @@
   
   <string name="animate_route_off">Szimuláció leállítása</string>
   <string name="animate_route">Szimuláció indítása</string>
-  <string name="tip_recent_changes_0_6_8_t">A 0.6.8 verzió változásai: \n\t- Teljesen újratervezett kereső (POI, cím)! Az új kereső sokkal gyorsabb és lehetőséget ad különféle kiindulópontok szerinti kereséshez. \n\t- Név szerinti POI keresés nagy területekre (akár országnyi) \n\t- Javítva a képernyő villódzása tableteken (641-es hiba) \n\t- Útvonal automatikus követése beállítás (356-os hiba) \n\t- GPX navigáció áthelyezve az \'Útirány\' és az \'Útvonal mentése\' az \'Útvonal mutatása\' alá \n\t- POI adatok becsomagolva az .obf fájlba (tölts le 2011. 10. 01. utáni indexadatokat) \n\t- Hangutasítás javítások (a GPS pozícióval és a parancs első kimondásával kapcsolatban) \n\t- Apró fejlesztések
-	</string>
+  <string name="tip_recent_changes_0_6_8_t">"A 0.6.8 verzió változásai:
+\n\t- Teljesen újratervezett kereső (POI, cím)! Az új kereső sokkal gyorsabb és lehetőséget ad különféle kiindulópontok szerinti kereséshez.
+\n\t- Név szerinti POI keresés nagy területekre (akár országnyi)
+\n\t- Javítva a képernyő villódzása tableteken (641-es hiba)
+\n\t- Útvonal automatikus követése beállítás (356-os hiba)
+\n\t- GPX navigáció áthelyezve az „Útirány” és az „Útvonal mentése” az „Útvonal megjelenítése” alá
+\n\t- POI adatok becsomagolva az .obf fájlba (tölts le 2011. 10. 01. utáni indexadatokat)
+\n\t- Hangutasítás javítások (a GPS pozícióval és a parancs első kimondásával kapcsolatban)
+\n\t- Apró fejlesztések "</string>
   <string name="file_can_not_be_renamed">Fájl nem átnevezhető.</string>
   <string name="file_with_name_already_exists">Már létezik ilyen néven fájl.</string>
   <string name="gpx_navigation">GPX útvonal</string>
@@ -205,7 +212,7 @@
   <string name="search_position_undefined">Meghatározatlan</string>
   <string name="search_position_fixed"/>
   <string name="search_position_current_location">Jelenlegi pozíció…</string>
-  <string name="search_position_map_view">Utolsó térképnézet</string>
+  <string name="search_position_map_view">Jelenlegi térkép középpont</string>
   <string name="select_search_position">Eredet:</string>
   <string name="context_menu_item_search">Keresés itt</string>
   <string name="tip_recent_changes_0_6_7_t">0.6.7 verzió változásai: \n\t- Offline - kapcsolat nélküli - adat kezelés (letöltés, törlés, aktiválás/deaktiválás közvetlenül az OsmAndban) \n\t- Kedvenc pontok és csoportok (csoportosítás, törlés, kedvencek kezelése) \n\t- Beépített GPX böngésző (útvonalak megjelenítése, távolság, átlagsebesség, magasság, stb.) \n\t- GPX navigáció (hasznos opciók, összeomlás után útvonal folytatása, körforgalmak kezelése) \n\t- Útvonal mentése GPX útvonalként kapcsolat nélküli munkához \n\t- GPX adatok kibővítése (pontatlan adatok kiszűrése és pontosság/emelkedés/sebesség mentése) \n\t- GPX útvonal feltöltése az OSM közösséghez (http://download.osmand.net/gpx/) \n\t- Vektoros megjelenítés javítása \n\t- TTS javítások (pontos távolság kimondása, mérföld) \n\t- Hibajavítások
@@ -219,8 +226,8 @@
   <string name="local_index_upload_gpx_description">GPX fájl feltöltése OSM-be. A térkép kibővítésére használják majd.</string>
   <string name="local_index_items_uploaded">%2$d darabból %1$d sikeresen feltöltve.</string>
   <string name="local_index_mi_upload_gpx">OSM hozzájárulás</string>
-  <string name="show_more_map_detail">Több térképrészlet mutatása</string>
-  <string name="show_more_map_detail_descr">Több részlet megmutatása (pl. utak) vektoros térképen már alacsonyabb nagyítási szinten</string>
+  <string name="show_more_map_detail">Több térképrészlet megjelenítése</string>
+  <string name="show_more_map_detail_descr">Több részlet megjelenítése (utak, stb.) vektoros térképen már alacsonyabb nagyítási szinten</string>
   <string name="favourites_delete_multiple_succesful">Kedvenc pontok sikeresen törölve.</string>
   <string name="favorite_delete_multiple">%1$d kedvenc és %2$d kedvenc csoport törlése. Biztos?</string>
   <string name="favorite_home_category">Család</string>
@@ -251,7 +258,7 @@
   
   <string name="local_index_poi_data">POI adat</string>
   <string name="local_index_address_data">Cím adat</string>
-  <string name="local_index_transport_data">Közlekedési eszköz adat</string>
+  <string name="local_index_transport_data">Tömegközlekedési eszköz adatai</string>
   <string name="local_index_map_data">Térképadat</string>
   
   <string name="local_indexes_cat_backup">Deaktivált</string>
@@ -328,7 +335,7 @@
   <string name="search_offline_geo_error">Nem sikerült értelmezni a geo intent által küldött parancsot:\'%s\'</string>
   <string name="search_osm_offline">Cím keresése offline térképen</string>
   <string name="system_locale">Rendszer nyelve</string>
-  <string name="preferred_locale_descr">Megjelenített feliratok nyelve</string>
+  <string name="preferred_locale_descr">Megjelenítési nyelv kiválasztása (módosítás után indítsa újra az OsmAnd programot)</string>
   <string name="preferred_locale">Preferált nyelv</string>
   <string name="tip_map_switch">Térképforrás kiválasztása</string>
   
@@ -337,7 +344,7 @@
   <string name="tip_navigation">Navigáció</string>
   <string name="tip_navigation_t">"Ha egy adott helyre szeretnél navigálni, kattints hosszan a térképre, majd kattints az ott megjelenő buborékablakra. Keresésnél vagy Kedvencekben kattints egy elemre és válaszd a \'Navigáció ide\' menüpontot.
 \n\nA célpontot a térképen egy zászló jelzi, az irányát egy narancssárga háromszög, a jobb felső sarokban pedig a távolságot láthatod.
-\n\nA navigációt elindítva választhatod a \'Navigáció indítása\' módot, amikor az OsmAnd hangutasításokkal, figyelmeztetésekkel végigvezet a megtervezett útvonalon, vagy választhatod az \'Útvonal mutatása\' módot, ahol csak az útvonaltervet látod, vezetés és utasítások nélkül.
+\n\nA navigációt elindítva választhatod a \'Navigáció indítása\' módot, amikor az OsmAnd hangutasításokkal, figyelmeztetésekkel végigvezet a megtervezett útvonalon, vagy választhatod az \'Útvonal megjelenítése\' módot, ahol csak az útvonaltervet látod, vezetés és utasítások nélkül.
 \n\nHa nem a saját pozíciódról kiindulva szeretnél egy útvonalat megtervezni, válassz egy kiindulási pontot a térképen, és kattints a \'Navigáció innen\' gombra.
 \n\nHa a \'Navigáció innen\'-t együtt használod a \'Navigáció indítása\' móddal, az OsmAnd újratervezi az útvonalat, amint megtalálta a GPS pozíciódat. "</string>
   <string name="tip_search">Cím keresés</string>
@@ -407,7 +414,7 @@
   <string name="m">m</string>
   <string name="old_map_index_is_not_supported">Az elavult térkép formátum \'\'{0}\'\' nem támogatott</string>
   <string name="poi_filter_car_aid">Autós segítség</string>
-  <string name="poi_filter_closest_poi">Közeli POI</string>
+  <string name="poi_filter_closest_poi">Legközelebbi POI-k</string>
   <string name="poi_filter_custom_filter">Egyéni szűrő</string>
   <string name="poi_filter_food_shop">Élelmiszer üzlet</string>
   <string name="poi_filter_for_tourists">Turistáknak</string>
@@ -468,8 +475,8 @@
   <string name="use_high_res_maps_descr">Jobb megjelenítési minőség nagy felbontású eszközön</string>
   <string name="unknown_location">A jelenlegi helyzet nem ismert</string>
   <string name="download_files">Letöltés</string>
-  <string name="context_menu_item_search_transport">Közlekedés keresése</string>
-  <string name="transport_searching_transport">Közlekedés keresése (nincs kijelölt úti cél):</string>
+  <string name="context_menu_item_search_transport">Tömegközlekedés keresése</string>
+  <string name="transport_searching_transport">Közlekedés keresése (nincs úti cél):</string>
   <string name="transport_searching_route">Közlekedés keresése ({0} az úti célig):</string>
   <string name="transport_search_none">nincs</string>
   <string name="transport_search_again">Közlekedéskeresés újrakezdése</string>
@@ -509,7 +516,7 @@
   <string name="layer_route">Útvonal</string>
   <string name="layer_favorites">Kedvencek</string>
   <string name="layer_osm_bugs">OSM hibák</string>
-  <string name="layer_transport">Tömegközlekedési megállók</string>
+  <string name="layer_transport">Közlekedési megállók</string>
   <string name="layer_poi">POI…</string>
   <string name="layer_map">Térképforrás…</string>
   <string name="menu_layers">Térképrétegek</string>
@@ -560,7 +567,7 @@
   <string name="first_time_download">Térképadatok letöltése</string>
   <string name="first_time_msg">Köszönjük, hogy az OsmAndot használod! Hogy a program minden lehetőségét kihasználhasd, regionális offline adatokra lesz szükséged, amiket a \'Beállítások\' → \'Térképek kezelése\' menüben szerezhetsz be. Ezt követően tudsz majd térképet nézni, címre, POI-ra és tömegközlekedési eszközre keresni.</string>
   <string name="search_poi_location">Jel keresése…</string>
-  <string name="search_near_map">Keresés az utolsó térképpozíció közelében</string>
+  <string name="search_near_map">Keresés a jelenlegi térkép középpontja közelében</string>
   <string name="search_nearby">Keresés a közelben</string>
   <string name="map_orientation_default">Mint a készülék</string>
   <string name="map_orientation_portrait">Függőleges</string>
@@ -572,8 +579,8 @@
   <string name="transport_Routes">Útvonalak</string>
   <string name="transport_Stop">Megálló</string>
   <string name="transport_stops">megállók</string>
-  <string name="transport_search_after">Keresés utána</string>
-  <string name="transport_search_before">Keresés előtte</string>
+  <string name="transport_search_after">Következő útvonal</string>
+  <string name="transport_search_before">Előzetes útvonal</string>
   <string name="transport_finish_search">Keresés vége</string>
   <string name="transport_stop_to_go_out">Hol szeretnél leszállni?</string>
   <string name="transport_to_go_after">utána gyalog</string>
@@ -582,8 +589,8 @@
   <string name="transport_route_distance">Útvonal távolsága</string>
   <string name="transport">Közlekedés</string>
   <string name="default_buttons_ok">OK</string>
-  <string name="show_transport_over_map_description">Tömegközlekedési megállok mutatása a térképen</string>
-  <string name="show_transport_over_map">Tömegközlekedési megállok mutatása</string>
+  <string name="show_transport_over_map_description">Tömegközlekedési megállok megjelenítése a térképen</string>
+  <string name="show_transport_over_map">Tömegközlekedési megállok megjelenítése</string>
   <string name="hello">OsmAnd navigációs alkalmazás</string>
   <string name="update_poi_success">POI adatok sikeresen frissítve ({0} db betöltve)</string>
   <string name="update_poi_error_local">Hiba a helyi index állományok frissítésénél</string>
@@ -628,12 +635,12 @@
   <string name="fav_points_edited">Kedvenc pontok szerkesztése kész</string>
   <string name="fav_points_not_exist">Még nincsenek kedvenc pontok</string>
   <string name="update_existing">Csere</string>
-  <string name="only_show">Útvonal mutatása</string>
+  <string name="only_show">Útvonal megjelenítése</string>
   <string name="follow">Navigáció indítása</string>
   <string name="recalculate_route_to_your_location">Utazás módja:</string>
   <string name="mark_final_location_first">Először válaszd ki a célpontot</string>
   <string name="get_directions">Navigáció</string>
-  <string name="show_gps_status">GPS állapot mutatása</string>
+  <string name="show_gps_status">GPS állapot megjelenítése</string>
   <string name="opening_hours">Nyitvatartás</string>
   <string name="opening_changeset">Módosításcsomag megnyitása…</string>
   <string name="closing_changeset">Módosításcsomag lezárása…</string>
@@ -686,8 +693,8 @@
   <string name="update_tile">Térkép frissítés</string>
   <string name="reload_tile">Térképcsempe újraolvasása</string>
   <string name="mark_point">Célpont</string>
-  <string name="show_osm_bugs_descr">OpenStreetBugs mutatása a térképen</string>
-  <string name="show_osm_bugs">OpenStreetBugs megmutatása</string>
+  <string name="show_osm_bugs_descr">OpenStreetBugs megjelenítése a térképen</string>
+  <string name="show_osm_bugs">OpenStreetBugs megjelenítése</string>
   <string name="favourites_activity">Kedvencek</string>
   <string name="add_to_favourite">Hozzáadás a kedvencekhez</string>
   <string name="use_english_names_descr">Választás az eredeti és angol név között</string>
@@ -704,8 +711,8 @@
   <string name="show_view_angle">Látómező megjelenítése</string>
   <string name="map_view_3d_descr">A térkép 3D megjelenítésének engedélyezése</string>
   <string name="map_view_3d">3D térkép</string>
-  <string name="show_poi_over_map_description">POI mutatása a térképen (utoljára használt szűrő szerint)</string>
-  <string name="show_poi_over_map">POI mutatása</string>
+  <string name="show_poi_over_map_description">POI megjelenítése a térképen (utoljára használt szűrő szerint)</string>
+  <string name="show_poi_over_map">POI megjelenítése</string>
   <string name="map_tile_source_descr">Térképcsempék forrásának kiválasztása</string>
   <string name="map_tile_source">Térképcsempék forrása</string>
   <string name="map_source">Térkép forrása</string>
@@ -713,7 +720,7 @@
   <string name="show_location">Megjelenítés térképen</string>
   <string name="map_preferences">Térkép</string>
   <string name="settings_activity">Beállítások</string>
-  <string name="show_gps_coordinates_text">GPS koordináták mutatása a térképen</string>
+  <string name="show_gps_coordinates_text">GPS koordináták megjelenítése a térképen</string>
   <string name="use_internet_to_download_tile">Internet használata a hiányzó térképszeletek letöltésére</string>
   <string name="app_description">Navigációs alkalmazás</string>
   <string name="exit_Button">Kilép</string>
@@ -1193,7 +1200,7 @@
     <string name="favourites_list_activity">Kedvenc kiválasztása</string>
     <string name="local_openstreetmap_act_title">OSM módosítások</string>
     <string name="default_buttons_other_actions">Egyéb műveletek</string>
-    <string name="download_using_mobile_internet">Jelenleg nincs WiFi kapcsolat. Szeretnéd folytatni a letöltést a jelenlegi internetkapcsolattal?</string>
+    <string name="download_using_mobile_internet">Jelenleg nincs Wi-Fi kapcsolat. Szeretnéd a jelenlegi Internetkapcsolatot használni a letöltéshez?</string>
     <string name="cancel_route">Útvonal elvetése</string>
     <string name="cancel_navigation">Navigáció megállítása</string>
     <string name="clear_destination">Cél törlése</string>
@@ -1203,7 +1210,7 @@
     <string name="install_paid">Teljes verzió</string>
     <string name="use_magnetic_sensor_descr">A mágnesszenzor használata az iránytű értékének meghatározásához az tájolás szenzor helyett</string>
     <string name="use_magnetic_sensor">Mágnesszenzor (iránytű) használata</string>
-    <string name="use_kalman_filter_compass_descr">Kálmán-szűrő használata az iránytű stabilizálására</string>
+    <string name="use_kalman_filter_compass_descr">Csökkenti a zajt az iránytű olvasásakor, de hozzáadja a tehetetlenséget</string>
     <string name="use_kalman_filter_compass">Kálmán-szűrő használata</string>
     <string name="access_mark_final_location_first">Kisegítő mód: előbb válassz célpontot</string> 
     <string name="tip_recent_changes_1_3_t">"Az 1.3 kiadás újdonságai:
@@ -1368,7 +1375,7 @@
     <string name="select_gpx">GPX kiválasztása…</string>
     <string name="route_descr_select_destination">Válassz célpontot!</string>
     <string name="route_descr_select_on_map">Kiválasztás a térképen…</string>
-    <string name="route_descr_favorite">Kedvencek…</string>
+    <string name="route_descr_favorite">Kedvenc…</string>
     <string name="route_preferences">Útvonal beállítások</string>
     <string name="route_info">Útvonal információ</string>
     <string name="routing_attr_prefer_motorway_name">Autópályák preferálása</string>
@@ -1389,8 +1396,8 @@
 \n 2. megjegyzés: az új tárolóhelyen nem lehetséges az OsmAnd és OsmAnd+ között fájlokat megosztani.</string>
     <string name="application_dir_change_warning2">Szeretnéd, hogy az OsmAnd az adatokat az új helyre másolja? A „Nem” választásával az OsmAnd létrehozza az új mappát és azt használja.</string>
     <string name="copying_osmand_one_file_descr">%s fájl másolása az új helyre…</string>
-    <string name="copying_osmand_files_descr">OsmAnd adatainak másolása új helyre (%s)</string>
-    <string name="copying_osmand_files">OsmAnd adatok másolása</string>
+    <string name="copying_osmand_files_descr">OsmAnd adatainak másolása az új helyre (%s)…</string>
+    <string name="copying_osmand_files">OsmAnd adatfájlok másolása…</string>
     <string name="calculate_osmand_route_gpx">OsmAnd offline útvonal tervezése</string>
     <string name="app_mode_truck">Teherautó</string>
     <string name="guidance_preferences_descr">Navigációs beállítások</string>
@@ -1607,7 +1614,7 @@
     <string name="sort_by_distance">Rendezés távolság szerint</string>
     <string name="sort_by_name">Rendezés név szerint</string>
     <string name="visible_element">Megjelenítés térképen</string>
-    <string name="loading_smth">Betöltés %1$s …</string>
+    <string name="loading_smth">%1$s betöltése…</string>
     <string name="keep_navigation_service">Megtart</string>
 	<string name="stop_navigation_service">Leállítás</string>
 	<string name="enable_sleep_mode">GPS alvó mód engedélyezése</string>
@@ -1749,7 +1756,7 @@
     <string name="layers_category_show">Mutat</string>
 	<string name="configure_map">Térképi tartalom</string>
     <string name="search_radius_proximity">ennek a közelében</string>
-    <string name="select_impassable_road">Kiválasztás a térképen</string>
+    <string name="select_impassable_road">Kiválasztás a térképen…</string>
     <string name="impassable_road">Utak elkerülése…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Villamos- és vasútvonalak</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Vasútvonalak</string>
@@ -1761,7 +1768,7 @@
     <string name="wake_on_voice">Képernyő bekapcsolása</string>
     <string name="wake_on_voice_descr">Az eszköz képernyőjének bekapcsolása egy kanyarodáshoz közeledve</string>
     <string name="osmand_extended_description_4000_chars">" Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (internetkapcsolat nélkül) is.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (plugin telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán &amp; Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea,  Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság "</string>
-	<string name="osmand_plus_extended_description_4000_chars">" Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (internetkapcsolat nélkül) is.\n\nAz OsmAnd+ az alkalmazás fizetős változata. A megvételével támogatod a projektet, megalapozod új funkciók fejlesztését, és megkapod a legújabb frissítéseket. Ha vársárlás előtt kipróbálnád az alkalmazást, telepítsd az OsmAndot.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (plugin telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán &amp; Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea,  Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság "</string>
+	<string name="osmand_plus_extended_description_4000_chars">" Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (Internetkapcsolat nélkül) is.\n\nAz OsmAnd+ az alkalmazás fizetős változata. A megvételével támogatod a projektet, megalapozod új funkciók fejlesztését, és megkapod a legújabb frissítéseket. Ha vársárlás előtt kipróbálnád az alkalmazást, telepítsd az OsmAndot.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (bővítmény telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán &amp; Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea,  Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság "</string>
 	<string name="lock_screen_request_explanation">Az %1$s számára engedély szükséges a képernyő kikapcsolásához energiatakarékossági célból.</string>
     <string name="wake_on_voice_never">Soha</string>
     <string name="error_avoid_specific_road">Nem található kerülőút</string>
@@ -1803,4 +1810,6 @@
     <string name="rendering_value_americanRoadAtlas_name">Amerikai autós atlasz</string>
     <string name="routing_attr_no_new_routing_name">Nincsenek v1.9-es útvonalszabályok</string>
     <string name="routing_attr_no_new_routing_description">Ne használja az 1.9-es verzióban bevezetett útvonalszabályokat</string>
-    </resources>
+    <string name="speak_pedestrian">Gyalogátkelőhelyek bejelentése</string>
+    <string name="rendering_value__name">Alapértelmezett</string>
+	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index aa00332615..0edd93b05d 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -141,8 +141,8 @@
   <string name="search_position_undefined">Non definito</string>
   <string name="search_position_fixed">Fissato</string>
   <string name="search_position_current_location">Posizione corrente…</string>
-  <string name="search_position_map_view">Ultima vista mappa</string>
-  <string name="select_search_position">Cerca vicino a:</string>
+  <string name="search_position_map_view">Attuale centro della mappa</string>
+  <string name="select_search_position">Origine:</string>
   <string name="context_menu_item_search">Cerca nelle vicinanze</string>
   <string name="tip_recent_changes_0_6_7_t">Novità nella versione 0.6.7:
 		\n\t- Manager dati offline (scaricare, eliminare e backup di dati offline direttamente da OsmAnd)
@@ -223,7 +223,7 @@
   <string name="voice_not_use">Non usare</string>
   <string name="voice_not_specified">Nessuna</string>
   <string name="installing_new_resources">Scompattazione nuovi dati…</string>
-  <string name="internet_connection_required_for_online_route">E\' selezionato un servizio di navigazione online ma la connessione a internet non è disponibile.</string>
+  <string name="internet_connection_required_for_online_route">È stato selezionato un servizio di navigazione online, ma la connessione a Internet non è disponibile.</string>
   <string name="tts_language_not_supported_title">Lingua non supportata</string>
   <string name="tts_language_not_supported">La lingua selezionata non è supportata nel motore TTS (text-to-speech) Android installato. Vuoi vedere in Market un altro motore TTS? Altrimenti verrà utilizzata la lingua TTS preimpostata.</string>
   <string name="tts_missing_language_data_title">Dati mancanti</string>
@@ -342,7 +342,7 @@
   <string name="amenity_type_sport">Sport</string>
   <string name="amenity_type_sustenance">Alimentari</string>
   <string name="amenity_type_tourism">Turismo</string>
-  <string name="amenity_type_transportation">Trasporto</string>
+  <string name="amenity_type_transportation">Trasporti pubblici</string>
   <string name="indexing_address">Indicizzazione indirizzi…</string>
   <string name="indexing_map">Indicizzazione mappa…</string>
   <string name="indexing_poi">Indicizzazione PDI…</string>
@@ -509,7 +509,7 @@
   <string name="first_time_download">Scarica le regioni</string>
   <string name="first_time_msg">Grazie di utilizzare OsmAnd. Per molte delle caratteristiche dell\'applicazione, hai bisogno dei dati offline locali, che possono essere scaricati da \'Impostazioni\'→\'Gestisci i file mappe\'. Sarà poi possibile visualizzare mappe, cercare indirizzi, PDI, e trovare trasporti pubblici.</string>
   <string name="search_poi_location">Ricerca segnale GPS…</string>
-  <string name="search_near_map">Ricerca vicino all\'ultima posizione sulla mappa</string>
+  <string name="search_near_map">Ricerca vicino all\'attuale centro della mappa</string>
   <string name="search_nearby">Ricerca vicino</string>
   <string name="map_orientation_default">Orientamento predefinito</string>
   <string name="map_orientation_portrait">Verticale</string>
@@ -521,14 +521,14 @@
   <string name="transport_Routes">Percorsi</string>
   <string name="transport_Stop">Fermata</string>
   <string name="transport_stops">fermate</string>
-  <string name="transport_search_after">Percorso successivo</string>
-  <string name="transport_search_before">Percorso precedente</string>
+  <string name="transport_search_after">Itinerario successivo</string>
+  <string name="transport_search_before">Itinerario precedente</string>
   <string name="transport_finish_search">Completa la ricerca</string>
   <string name="transport_stop_to_go_out">Scegli ferma per uscire</string>
   <string name="transport_to_go_after">distanza precedente</string>
   <string name="transport_to_go_before">distanza successiva</string>
   <string name="transport_stops_to_pass">fermate da passare</string>
-  <string name="transport_route_distance">Distanza percorso</string>
+  <string name="transport_route_distance">Distanza itinerario</string>
   <string name="transport">Trasporto pubblico</string>
   <string name="default_buttons_ok">OK</string>
   <string name="show_transport_over_map_description">Visualizza le fermate di trasporto pubblico sulla mappa</string>
@@ -1038,14 +1038,13 @@
 		\n\t* \'Nella direzione del movimento\' - La mappa sarà sempre allineata alla vostra direzione
 		\n\t* \'Con la bussola\' - La mappa sarà sempre allineata alla lettura della bussola del dispositivo
 	</string>
-<string name="tip_day_night_mode_t_v2">L\'aspetto della mappa può, per alcune mappe vettoriali, essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e meno fastidiosi per la guida di notte.
-		\n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configurazione schermo…\' → \'Mappa giorno/notte\'.
-		\n\nLe opzioni sono:
-		\n\t* \'Alba/Tramonto\': automatico, in base alla posizione del sole (preimpostato)
-		\n\t* \'Giorno\': usa sempre il modo diurno
-		\n\t* \'Notte\': usa sempre il modo notturno
-		\n\t* \'Sensore di luminosità\': l\'aspetto della mappa è controllato dal sensore di luminosità del dispositivo (solo se presente)
-	</string>
+<string name="tip_day_night_mode_t_v2">"Per le mappe vettoriali l\'aspetto della mappa può essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e meno fastidiosi per la guida di notte.
+\n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configura la mappa\' → \'Mappa giorno/notte\'.
+\n\nLe opzioni sono:
+\n\t* \'Alba/Tramonto\': automatico, in base alla posizione del sole (preimpostato)
+\n\t* \'Giorno\': usa sempre il modo diurno
+\n\t* \'Notte\': usa sempre il modo notturno
+\n\t* \'Sensore luce\': l\'aspetto della mappa è controllato dal sensore di luminosità del dispositivo (solo se presente) "</string>
 <string name="tip_map_switch_t_v2">"La sorgente della mappa e i livelli visualizzati sono cambiati attraverso \'Menu\'-&gt;\'Configura la mappa\'.
 \n\nSotto \'Sorgente mappa…\' puoi scegliere di usare le mappe vettoriali offline precaricate (predefinito, sono necessarie anche per la navigazione offline), le sorgenti di tasselli predefinite -online o caricate in cache offline- (attiva il plugin \'Mappe online\' in \'Impostazioni\' → \'Gestore plugin\' per averle), o mappe create manualmente usando per esempio OsmAndMapCreator sul PC.
 \n\nOsmAnd supporta anche sorgenti personalizzate. "</string>
@@ -1445,7 +1444,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="use_magnetic_sensor_descr">Utilizza il sensore magnetico per determinare il valore della bussola invece del sensore di orientamento</string>
     <string name="use_magnetic_sensor">Utilizza il sensore magnetico (bussola)</string>
     <string name="local_indexes_cat_srtm">Dati isocline</string>
-    <string name="use_kalman_filter_compass_descr">Usare il filtro di Kalman per evitare aberrazioni della bussola</string>
+    <string name="use_kalman_filter_compass_descr">Riduce il rumore delle letture della bussola ma introduce dell\'inerzia</string>
     <string name="use_kalman_filter_compass">Uso del filtro di Kalman</string>
     <string name="access_mark_final_location_first">Modalità di accesso facilitato: selezionare prima la destinazione</string> 
     <string name="wait_current_task_finished">Prego attendere il termine dell\'operazione</string>
@@ -1619,9 +1618,9 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 \n Nota: i file precedenti non verranno modificati.
 \n Nota: non sarà possibile condividere i files fra OsmAnd and OsmAnd+.</string>
     <string name="application_dir_change_warning2">Vuoi che OsmAnd sposti anche i propri dati nella nuova destinazione? Scegli \'No\' perché OsmAnd crei e utilizzi una nuova cartella.</string>
-    <string name="copying_osmand_one_file_descr">Copia in corso del file (%s) nella nuova destinazione...</string>
-    <string name="copying_osmand_files_descr">Copia in corso dei file OsmAnd nella nuova destinazione (%s)</string>
-    <string name="copying_osmand_files">Copia dei file di dati di OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Copia in corso del file (%s) nella nuova destinazione…</string>
+    <string name="copying_osmand_files_descr">Copia in corso dei file OsmAnd nella nuova destinazione (%s)…</string>
+    <string name="copying_osmand_files">Copia dei file di dati di OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Calcola percorso OsmAnd offline</string>
     <string name="routing_attr_prefer_motorway_name">Preferisci le autostrade</string>
 	<string name="routing_attr_prefer_motorway_description">Preferisci le autostrade</string>
@@ -1656,7 +1655,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	\n\t* Molte piccole migliorie dell\'interfaccia utente &amp; correzioni usabilità
 	\n\t* Impostazioni della velocità della vocalizzazione
     </string>
-    <string name="calculate_osmand_route_without_internet">Calcola un tratto di percorso OsmAnd senza l\'utilizzo di internet</string>
+    <string name="calculate_osmand_route_without_internet">Calcola un tratto di percorso OsmAnd senza l\'utilizzo di Internet</string>
     <string name="gpx_option_calculate_first_last_segment">Calcola una percorso OsmAnd per il primo e l\'ultimo tratto del percorso</string>
     <string name="osmodroid_unseek">Oggetto non trovato</string>
     <string name="lang_en">Inglese</string>
@@ -1743,7 +1742,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="osmo_tracker_id_descr">Clicca per visualizzare o condividere l\'id della tracciabilità.
  Usando l\'id della tracciabilità i dispositivi connessi saranno in grado di seguire tutti i movimenti di questo dispositivo! Per disconnettersi seleziona Opzione rigenera.</string>
     <string name="osmo_session_token">Token della sessione: %1$s</string>
-    <string name="osmo_auth_pending">In attesa di autorizzazione...</string>
+    <string name="osmo_auth_pending">In attesa di autorizzazione…</string>
     <string name="osmo_locations_sent">Localizzazioni inviate %1$d (nel buffer %2$d) </string>
     <string name="osmo_conn_successfull">Connessione stabilita: %1$s </string>
     <string name="osmo_mode_restart">Riavvia la sessione OsMo</string>
@@ -1843,7 +1842,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="gpx_available_current_track">Traccia attualmente in registrazione</string>
     <string name="selected">selezionato</string>
     <string name="gpx_split_interval">Intervallo suddivisione</string>
-    <string name="loading_smth">Caricamento di %1$s …</string>
+    <string name="loading_smth">Caricamento di %1$s…</string>
     <string name="gpx_wpt">Tappa</string>
     <string name="selected_gpx_info_show">\n\nTieni premuto per vederlo sulla mappa</string>
     <string name="delay_navigation_start">Avvia la navigazione passo per passo automaticamente</string>
@@ -1860,7 +1859,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="local_index_unselect_gpx_file">Deseleziona</string>
     <string name="local_index_select_gpx_file">Seleziona per visualizzarlo</string>
     <string name="route_descr_destination">Destinazione</string>
-    <string name="no_index_file_to_download">Niente da scaricare, per favore controllare la connessione internet.</string>
+    <string name="no_index_file_to_download">Non è stato trovato niente da scaricare, per favore controllare la connessione internet.</string>
     <string name="osmo_gpx_points_downloaded">Scaricati %1$s punti OsMo.</string>
     <string name="osmo_auto_connect_descr">Connettiti al servizio automaticamente dopo l\'accensione</string>
     <string name="osmo_auto_connect">Connesione automatica</string>
@@ -1911,7 +1910,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="lang_zh_CN">Cinese semplificato</string>
 	<string name="lang_zh_TW">Cinese tradizionale</string>
 	<string name="rendering_attr_subwayMode_name">Percorsi metró</string>
- 	<string name="osmo_invite">Invita ...</string>
+ 	<string name="osmo_invite">Invita…</string>
     <string name="osmo_leave_confirmation_msg">Vuoi abbandonare il gruppo %1$s?</string>
     <string name="osmo_specify_tracker_id">Per favore specifica l\'id</string>
     <string name="continue_navigation">Prosegui la navigazione</string>
@@ -1934,7 +1933,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="rendering_value_car_name">Automobile</string>
     <string name="rendering_value_bicycle_name">Bicicletta</string>
     <string name="rendering_value_pedestrian_name">Pedone</string>
-    <string name="more">Altro...</string>
+    <string name="more">Altro…</string>
     <string name="download_additional_maps">Scaricare le mappe mancanti %1$s (%2$d MB)?</string>
     <string name="flat_list_waypoitns">Tutti</string>
     <string name="waypoints">Punti intermedi</string>
@@ -1997,7 +1996,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="rendering_attr_trolleybusRoutes_name">Percorsi in filobus</string>
     <string name="rendering_attr_busRoutes_name">Percorsi in bus</string>
     <string name="rendering_attr_tramTrainRoutes_name">Percorsi tram e treno</string>
-    <string name="select_impassable_road">Seleziona nella mappa</string>
+    <string name="select_impassable_road">Seleziona nella mappa…</string>
     <string name="impassable_road">Evita strade …</string>
     <string name="rendering_category_hide">Nascondi</string>
     <string name="wake_on_voice">Accendi lo schermo</string>
@@ -2010,7 +2009,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="show_all">MOSTRA TUTTO</string>
 	<string name="coordinates">Coordinate</string>
 	<string name="home_button">Schermata iniziale</string>
-    <string name="map_update">Ci sono %1$s aggiornamenti per le mappe</string>
+    <string name="map_update">Ci sono aggiornamenti per %1$s mappe</string>
 	<string name="search_for">Cerca</string>
 	<string name="show_map">MOSTRA LA MAPPA</string>
 	<string name="error_avoid_specific_road">Nessuna alternativa trovata</string>
@@ -2037,11 +2036,12 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="rendering_value_orange_name">Arancione</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlante strade tedesche</string>
     <string name="rendering_value_americanRoadAtlas_name">Atlante strade americane</string>
-    <string name="routing_attr_no_new_routing_name">Non usare il calcolo del percorso v1.9</string>
-    <string name="routing_attr_no_new_routing_description">Non usare il calcolo del percorso v1.9</string>
-    <string name="traffic_warning_railways">Ferrovie</string>
-	<string name="traffic_warning_pedestrian">Pedonale</string>
+    <string name="routing_attr_no_new_routing_name">Ignora le regole di calcolo del percorso v1.9</string>
+    <string name="routing_attr_no_new_routing_description">Non usare le regole di calcolo del percorso introdotte nella v1.9</string>
+    <string name="traffic_warning_railways">Passaggio a livello</string>
+	<string name="traffic_warning_pedestrian">Attraversamento pedonale</string>
 	<string name="show_railway_warnings">Mostra i passaggi a livello</string>
 	<string name="show_pedestrian_warnings">Mostra gli attraversamenti pedonali</string>
     <string name="speak_pedestrian">Annuncia gli attraversamenti pedonali</string>
-    </resources>
+    <string name="rendering_value__name">Preimpostato</string>
+	</resources>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index cd9dc16a17..262475f372 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -174,7 +174,7 @@
 	<string name="poi_bridge">다리</string>
 
 	<string name="poi_speed_camera">속도 경고 카메라</string>
-	<string name="poi_turning_circle">터 닝 서클</string>
+	<string name="poi_turning_circle">터닝 서클</string>
 	<string name="poi_motorway_junction">고속도로 분기점</string>
 
 	<string name="poi_boatyard">보트야드</string>
@@ -641,4 +641,8 @@
 	<string name="poi_attraction_train">기차 (명소)</string>
 	<string name="poi_water_slide">워터 슬라이드</string>
 
+	<string name="poi_tower">타워</string>
+	<string name="poi_aquarium">아쿠아리움</string>
+	<string name="poi_mast">돛대</string>
+	<string name="poi_radar">레이더</string>
 	</resources>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 226f9f4a41..ff1922dfe5 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -79,7 +79,7 @@
 	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs 가 업로드되었습니다</string>
 	<string name="local_openstreetmap_uploadall">모두 업로드하기</string>
 	
-	<string name="local_openstreetmap_show">지도에서 보기</string>
+	<string name="local_openstreetmap_show">지도에 표시</string>
 	<string name="local_openstreetmap_upload">대량수정을 OSM에 업로드</string>
 	<string name="local_openstreetmap_delete">대량수정 삭제</string>
 	<string name="local_openstreetmap_descr_title">비동기 OSM 편집 :</string>
@@ -101,7 +101,7 @@
 	</string>    
 	<string name="free_version_message">무료 OsmAnd 버전은 다운로드를 %1$s 번으로 제한되고 오프라인 위키피디아 기사를 제공하지 않습니다.</string>
 	<string name="free_version_title">무료 버전</string>
-	<string name="poi_context_menu_showdescription">POI 설명 보여주기</string>
+	<string name="poi_context_menu_showdescription">POI 설명 표시</string>
 
 	<string name="index_name_north_america">북아메리카</string>
 	<string name="index_name_us">북아메리카 - 미국</string>
@@ -124,11 +124,11 @@
 	<string name="fav_export_confirmation">이전에 익스포트한 즐겨찾기에 대한 파일이 이미 존재합니다. 이 파일을 대체하시겠습니까?</string>
 <string name="profile_settings">특정 설정 프로필</string>
 	<string name="settings_preset">기본 프로필</string>
-	<string name="settings_preset_descr">각 프로필마다 맵뷰어 와 라우팅 설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
+	<string name="settings_preset_descr">각 프로필마다 맵뷰어 와 운행 설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
 	
 	
 	<string name="routing_settings">운행</string>
-	<string name="routing_settings_descr">라우팅을 위한 옵션을 설정합니다</string>
+	<string name="routing_settings_descr">운행을 위한 옵션을 설정합니다</string>
 	<string name="global_settings">일반 설정</string>
 	<string name="index_settings">지도 관리</string>
 	<string name="index_settings_descr">기기에 저장된 오프라인 지도를 다운로드하고 관리합니다</string>
@@ -203,16 +203,15 @@
 	<string name="animate_route_off">모의주행 정지</string>
 	<string name="animate_route">모의주행 시작</string>
 	
-	<string name="tip_recent_changes_0_6_8_t">0.6.8 버전에 대한 변경사항들 :
+	<string name="tip_recent_changes_0_6_8_t">"0.6.8 버전에 대한 변경사항들 :
 \n\t- 완전히 재설계한 검색 (POI, 주소)! 주소 검색을 훨씬 빠르게 응답하도록 함. 여러가지 많은 옵션을 가진 단일 검색 인터페이스 생성.
-\n\t- 넓은 지역 (나라)의 POI 이름 검색 구현  
+\n\t- 넓은 지역 (나라)의 POI 이름 검색 구현
 \n\t- 태블릿에 대한 깜박이는 맵 화면 수정 (이슈 641번)
 \n\t- 자동-중심 맵 보기 옵션 (이슈 356번)
-\n\t- GPX 네비겨이션이 \'방향\' 으로 이동 및 \'방향 저장\' 이  \'About route\' 로 이동
-\n\t- POI 데이터가 .obf 파일에 포함됨 (01/10/11 이후 모든 다운로드 인덱스) 
-\n\t- 음성 안내 픽스 (GPS 위치 픽스, 첫번째 명령 생략) 
-\n\t- 몇몇 개선점들
-	</string>
+\n\t- GPX 내비게이션이 \'방향\' 으로 이동 및 \'방향 저장\' 이 \'About route\' 로 이동
+\n\t- POI 데이터가 .obf 파일에 포함됨 (01/10/11 이후 모든 다운로드 인덱스)
+\n\t- 음성 안내 픽스 (GPS 위치 픽스, 첫번째 명령 생략)
+\n\t- 몇몇 개선점들 "</string>
 	<string name="file_can_not_be_renamed">파일 이름을 바꿀 수 없습니다.</string>
 	<string name="file_with_name_already_exists">같은 이름을 가진 파일이 이미 존재합니다.</string>
 	<string name="gpx_navigation">GPX 경로</string>
@@ -226,7 +225,7 @@
 	<string name="map_version_changed_info">서버가 현재 앱 버전과 호환되지 않는 지도 파일을 가지고 있습니다. 그것들을 다운로드하고 사용하기 위해, 앱을 새로운 버전으로 업그레이드 하세요.</string>
 	
 	<string name="local_index_mi_rename">이름 바꾸기</string>
-	<string name="show_gpx_route">지도에서 보기</string>
+	<string name="show_gpx_route">지도에 표시</string>
 	<string name="poi_filter_nominatim">온라인 지명</string>
 	<string name="search_position_current_location_search">위치 검색중…</string>
 	<string name="search_position_current_location_found">위치(발견)</string>
@@ -235,9 +234,9 @@
 	<string name="search_position_undefined">정의되지 않음</string>
 	<string name="search_position_fixed">고정</string>
 	<string name="search_position_current_location">현재 위치…</string>
-	<string name="search_position_map_view">마지막 지도 보기</string>
+	<string name="search_position_map_view">현재 지도 센터링</string>
 	
-	<string name="select_search_position">기원 :</string>
+	<string name="select_search_position">원점 :</string>
 	<string name="context_menu_item_search">가까운 주변 검색</string>
 	<string name="tip_recent_changes_0_6_7_t">"0.6.7 버전에 대한 변경사항들 :
 \n\t- 오프라인 데이터 관리 (OsmAnd 에서 직접 오프라인 데이터 다운로드, 삭제, 활성화 / 비활성화)
@@ -250,7 +249,7 @@
 \n\t- 벡터 렌더링 개선
 \n\t- TTS 엔진 개선 (정확한 거리 안내, 마일 활성화)
 \n\t- 버그 수정 "</string>
-	<string name="save_route_dialog_title">루트를 변환하여 GPX파일로 저장</string>
+	<string name="save_route_dialog_title">경로를 GPX파일로 저장</string>
 	<string name="route_successfully_saved_at">경로가 \'%1$s\'로 성공적으로 저장되었습니다.</string>
 	<string name="filename_input">파일 이름 : </string>
 	<string name="file_with_name_already_exist">같은 이름의 파일이 이미 존재합니다.</string>
@@ -296,7 +295,7 @@
 	
 	<string name="local_index_poi_data">POI 데이터</string>
 	<string name="local_index_address_data">주소 데이터</string>
-	<string name="local_index_transport_data">운송 데이터</string>
+	<string name="local_index_transport_data">대중 교통 데이터</string>
 	<string name="local_index_map_data">지도 데이터</string>
 	
 	<string name="local_indexes_cat_backup">비활성화</string>
@@ -316,30 +315,30 @@
 	<string name="tip_recent_changes">최근 변경사항들</string>
 	<string name="tip_recent_changes_0_6_6_t">"0.6.6 버전에 대한 변경사항들 :
 \n\t- 음성 안내를 위한 Text To Speech 엔진
-\n\t- 지도 렌더러를 더욱 세밀하게 만듦
+\n\t- 지도 렌더링를 더욱 세밀하게 만듦
 \n\t- 앱과 함께 패키지된 전세계 기본맵
-\n\t- 오프라인 길안내 조정 (실험적)
-\n\t- GPX 길안내 옵션들
+\n\t- 오프라인 운행 조정 (실험적)
+\n\t- GPX 운행 옵션들
 \n\t- UI 개선 및 큰 버그 수정 "</string>
 	<string name="voice_not_use">사용하지 않음</string>
 	<string name="installing_new_resources">새로운 데이터 풀기(Unpacking)…</string>
-	<string name="internet_connection_required_for_online_route">온라인 라우팅 서비스가 선택되었지만 인터넷이 연결되지 않았습니다.</string>
+	<string name="internet_connection_required_for_online_route">온라인 운행 서비스를 선택하였지만 인터넷 연결이 되지 않습니다.</string>
 	<string name="tts_language_not_supported_title">지원되지 않은 언어</string>
 	<string name="tts_language_not_supported">선택한 언어는  설치된 안드로이드 TTS (text-to-speech) 엔진이 지원되지 않습니다. 다른 TTS 엔진을 찾기 위해 구글마켓으로 가시겠습니까? 아니면 미리설정된 TTS 언어가 사용될 것입니다.</string>
 	<string name="tts_missing_language_data_title">누락된 데이터</string>
 	<string name="tts_missing_language_data">선택한 언어에 대한 데이터가 설치되지 않았습니다. 설치하기 위해 구글마켓으로 가시겠습니까?</string>
 
 	<string name="gpx_option_reverse_route">GPX 길안내 반대로 가기</string>
-	<string name="gpx_option_destination_point">현재 목적지 사용</string>
+	<string name="gpx_option_destination_point">현재 도착지 사용</string>
 	<string name="gpx_option_from_start_point">전체 경로를 따라 이동</string>
 
 	<string name="switch_to_vector_map_to_see">이 위치에 대해 존재하는 오프라인 벡터 맵.
 \n\t\n\t사용하려면 [메뉴-&gt;계층 지도-&gt;맵 소스…-&gt;\'오프라인 벡터 맵] 을 활성화합니다.</string>
 	<string name="choose_audio_stream">음성 안내 출력</string>
 	<string name="choose_audio_stream_descr">음성 안내를 재생할 채널을 선택합니다 (시스템 의존)</string>
-	<string name="voice_stream_voice_call">음성 호출 오디오</string>
-	<string name="voice_stream_notification">오디오 알림</string>
-	<string name="voice_stream_music">미디어/음악 오디오</string>
+	<string name="voice_stream_voice_call">음성 호출 스트림(통화음)</string>
+	<string name="voice_stream_notification">소리 알림</string>
+	<string name="voice_stream_music">미디어/음악 스트림(통화음)</string>
 	<string name="warning_tile_layer_not_downloadable">OsmAnd 앱이 계층 지도 %1$s 를 다운로드할 수 없으니, 재설치 하세요.</string>
 	<string name="overlay_transparency_descr">오버레이 맵 투명도를 수정합니다</string>
 	<string name="overlay_transparency">오버레이 투명도</string>
@@ -371,21 +370,15 @@
 	<string name="level_to_switch_vector_raster">최소 벡터 줌 레벨</string>
 
 	<string name="tip_location_sharing">위치 공유</string>
-	<string name="tip_location_sharing_t">You can share the location of interesting places on your trip with family or friends via the \'Use location\' context menu → \'Share location\'.
-
-\t여행 도중 관심 지점의 위치를 가족 또는 친구와 공유할 수 있습니다.
-	\n\t원하는 위치를 공유하기 위해:
-	\n\t\'맵 컨텍스트 메뉴\' -&gt; \'위치 공유\' 메뉴를 사용합니다.
-
-		\n\nThen chose a way to share your location. The choices are: E-Mail, SMS(text), or just copy the location coordinates to the device clipboard.
-
-	\n\t그런 다음 위치를 공유할 방법을 선택합니다. 선택사항에 따라: E-Mail, SMS(문자), 또는  클립보드로 위치 좌표를 복사합니다.
-	</string>
+	<string name="tip_location_sharing_t">"여행 도중 관심 지점의 위치를 가족 또는 친구와 공유할 수 있습니다.
+\n\t원하는 위치를 공유하기 위해:
+\n\t\'맵 컨텍스트 메뉴\' -&gt; \'위치 공유\' 메뉴를 사용합니다.
+\n\t그런 다음 위치를 공유할 방법을 선택합니다. 선택사항에 따라: E-Mail, SMS(문자), 또는 클립보드로 위치 좌표를 복사합니다. "</string>
 
 	<string name="tip_favorites">즐겨찾기 포인트</string>
 	<string name="tip_favorites_t">"자주 사용되는 포인트는 아래처럼 즐겨 찾기에 저장할 수 있습니다. ↵
 \n\n포인트를 즐겨 찾기에 저장하려면 맵 컨텍스트 메뉴로 이동하여 \'즐겨 찾기에 추가\'옵션을 선택하고 이름을 붙여주세요.
-\n\n즐겨 찾기 저장 후 \'메인 메뉴\'-&gt; \'장소\'를 통해 사용할 수 있습니다.  \'즐겨 찾기\'메뉴에서 즐겨 찾기를 길게 누르면 탐색 할 옵션이 나타나고, 편집 및 삭제할 수 있습니다. ↵
+\n\n즐겨 찾기 저장 후 \'메인 메뉴\'-&gt; \'저장소\'를 통해 사용할 수 있습니다.  \'즐겨 찾기\'메뉴에서 즐겨 찾기를 길게 누르면 탐색 할 옵션이 나타나고, 편집 및 삭제할 수 있습니다. ↵
 \n\n지도에 직접 모든 즐겨 찾기 지점을 표시하려면 \'맵 컨텍스트 메뉴\'-&gt; \'지도 구성\'의 \'즐겨 찾기\'레이어를 활성화하십시오. "</string>
 
 	<string name="create_poi_link_to_osm_doc">이미지와 함께 <u>온라인 OSM</u> 맵 분류</string>
@@ -417,7 +410,7 @@
 \n\nA marker box can be hidden again by long-clicking on it. "</string>
 
 	<string name="tip_initial">도움말</string>
-	<string name="tip_initial_t">"OsmAnd는 많은 기능을 가진 네비게이션 앱입니다.\n기본적인 소개로서, 몇 가지 유용한 도움말을 [메뉴-도움말]에서 찾을 수 있습니다. "</string>
+	<string name="tip_initial_t">"OsmAnd는 많은 기능을 가진 내비게이션 앱입니다.\n기본적인 소개로서, 몇 가지 유용한 도움말을 지도화면에서  [메뉴-도움말]에서 찾을 수 있습니다. "</string>
 	<string name="next_button">다음</string>
 	<string name="previous_button">이전</string>
 
@@ -434,8 +427,8 @@
 	<string name="send_location_email_pattern">위치를 보기 위해 웹 브라우저 링크  %1$s 또는 안드로이드 인텐트 링크 %2$s 를 따라갑니다</string>
 	<string name="send_location">위치 전송</string>
 	<string name="context_menu_item_share_location">위치 공유</string>
-	<string name="add_waypoint_dialog_added">GPX 포인트 \'\'{0}\'\' 가 성공적으로 추가되었습니다</string>
-	<string name="add_waypoint_dialog_title">기록된 GPX 경로에 포인트 추가</string>
+	<string name="add_waypoint_dialog_added">GPX 경유지 \'\'{0}\'\' 가 성공적으로 추가되었습니다</string>
+	<string name="add_waypoint_dialog_title">기록된 GPX 경로에 경유지 추가</string>
 	<string name="context_menu_item_add_waypoint">GPX 경유지 추가</string>
 	<string name="amenity_type_administrative">관리</string>
 	<string name="amenity_type_barrier">배리어(Barrier)</string>
@@ -468,7 +461,7 @@
 	<string name="m">m</string>
 	<string name="old_map_index_is_not_supported">사용되지 않은 지도 데이터 형식 \'\'{0}\'\' 은 지원되지 않습니다</string>
 	<string name="poi_filter_car_aid">주유소</string>
-	<string name="poi_filter_closest_poi">가장 가까운 POI</string>
+	<string name="poi_filter_closest_poi">가까운 POI</string>
 	<string name="poi_filter_custom_filter">사용자 필터</string>
 	<string name="poi_filter_food_shop">식품가게</string>
 	<string name="poi_filter_for_tourists">여행자</string>
@@ -528,8 +521,8 @@
 	<string name="renderers">벡터 렌더러</string>
 	<string name="renderers_descr">렌더링 스타일을 선택합니다</string>
 	
-	<string name="poi_context_menu_website">POI 웹사이트 보기</string>
-	<string name="poi_context_menu_call">POI 전화 보기</string>
+	<string name="poi_context_menu_website">POI 웹사이트 표시</string>
+	<string name="poi_context_menu_call">POI 전화번호 표시</string>
 	<string name="website">웹사이트</string>
 	<string name="phone">전화</string>
 	<string name="download_type_to_filter">필터 종류</string>
@@ -538,10 +531,10 @@
 	<string name="unknown_location">위치는 아직 알 수 없음</string>
 	<string name="download_files">다운로드</string>
 	<string name="context_menu_item_search_transport">대중교통 검색</string>
-	<string name="transport_searching_transport">대중교통 검색결과 (목적지 없음):</string>
-	<string name="transport_searching_route">대중교통 검색결과 (목적지에 {0}):</string>
+	<string name="transport_searching_transport">대중교통 검색결과 (도착지 없음):</string>
+	<string name="transport_searching_route">대중교통 검색결과 (도착지에 {0}):</string>
 	<string name="transport_search_none">없음</string>
-	<string name="transport_search_again">대중교통 검색 재설정</string>
+	<string name="transport_search_again">대중교통 재검색</string>
 
 	<string name="map_index">지도</string>
 	<string name="voice">녹음된 음성</string>
@@ -595,7 +588,7 @@
 	<string name="background_service_wait_int">최대 대기시간</string>
 	<string name="service_stop_background_service">OsmAnd 절전 모드 운행 서비스 정지</string>
 	<string name="where_am_i">GPS 위치</string>
-	<string name="process_navigation_service">OsmAnd 네비게이션 서비스</string>
+	<string name="process_navigation_service">OsmAnd 내비게이션 서비스</string>
 	<string name="network_provider">네트워크</string>
 	<string name="gps_provider">GPS</string>
 	<string name="int_seconds">초</string>
@@ -606,7 +599,7 @@
 	<string name="background_service_provider">위치 제공자</string>
 	<string name="background_router_service_descr">오랫동안 위치를 추적하기 위해 백그라운드 서비스를 활성화합니다</string>
 	<string name="background_router_service">절전 모드에서 실행</string>
-	<string name="off_router_service_no_gps_available">백그라운드 길안내 서비스를 위해 GPS가 켜져 있어야 합니다.</string>
+	<string name="off_router_service_no_gps_available">절전모드 운행 서비스를 위해 GPS가 켜져 있어야 합니다.</string>
 	<string name="hide_poi_filter">필터 숨김</string>
 	<string name="show_poi_filter">필터 보이기</string>
 	<string name="search_poi_filter">필터</string>
@@ -635,7 +628,7 @@
 	<string name="first_time_msg">"OsmAnd 를 선택해 주셔서 감사합니다. 앱의 모든 기능을 사용하려면, 인덱스 파일을 (설정-&gt;지도 관리)  다운로드 하여 준비하세요.
 \n그런 다음, 지도를 보거나 주소, POI, 공공장소 등등을 찾을 수 있습니다."</string>
 	<string name="search_poi_location">신호 위치 찾는 중…</string>
-	<string name="search_near_map">지난번 지도 위치 검색</string>
+	<string name="search_near_map">현재 지도 센터링 검색</string>
 	<string name="search_nearby">근처 검색</string>
 	<string name="map_orientation_default">장치와 같음</string>
 	<string name="map_orientation_portrait">세로</string>
@@ -644,23 +637,23 @@
 	<string name="map_screen_orientation_descr">세로, 가로, 자동</string>
 	<string name="opening_hours_not_supported">오프닝 시간 형식은 편집을 지원하지 않습니다</string>
 	<string name="add_new_rule">새로운 규칙 추가</string>
-	<string name="transport_Routes">노선</string>
+	<string name="transport_Routes">경로</string>
 	<string name="transport_Stop">정류소</string>
 	<string name="transport_stops">정류소들</string>
 	
-	<string name="transport_search_after">다음 경로</string>	
-	<string name="transport_search_before">이전 경로</string>
+	<string name="transport_search_after">다음 교차로</string>	
+	<string name="transport_search_before">이전 교차로</string>
 	<string name="transport_finish_search">검색 종료</string>
 	<string name="transport_stop_to_go_out">하차할 정류소 선택</string>
 	<string name="transport_to_go_after">이전 거리</string>
 	<string name="transport_to_go_before">이후 거리</string>
 	<string name="transport_stops_to_pass">경유할 정류소들</string>
-	<string name="transport_route_distance">경로 거리</string>
+	<string name="transport_route_distance">교처로까지 거리</string>
 	<string name="transport">대중교통</string>
 	<string name="default_buttons_ok">OK</string>
-	<string name="show_transport_over_map_description">대중교통 정류소를 지도에 표시합니다</string>
+	<string name="show_transport_over_map_description">대중교통 정류소를 지도에 표시</string>
 	<string name="show_transport_over_map">대중교통 정류소 표시</string>
-	<string name="hello">네비게이션 앱 OsmAnd</string>
+	<string name="hello">내비게이션 앱 OsmAnd</string>
 	<string name="update_poi_success">POI 데이터가 성공적으로 업데이트되었습니다 ({0} 이 로드되었습니다)</string>
 	<string name="update_poi_error_local">지역 POI 목록을 업데이트하는 도중 오류가 발생하였습니다</string>
 	<string name="update_poi_error_loading">서버로부터 데이터를 로드하는 도중 오류가 발생하였습니다</string>
@@ -688,7 +681,7 @@
 	<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
 	<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
 	<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
-	<string name="router_service">라우터 선택</string>
+	<string name="router_service">운행 서비스</string>
 	<string name="sd_dir_not_accessible">SD 카드에 있는 데이터 저장 폴더에 접근할 수 없습니다!</string>
 	<string name="download_question">{0} - {1} 을 다운로드할까요?</string>
 	<string name="download_question_exist">{0} 에 대한 오프라인 데이터가 이미 존재합니다({1}). 업데이트할까요({2}) ?</string>
@@ -700,16 +693,16 @@
 	<string name="downloading_list_indexes">사용 가능한 지역 목록을 다운로드하는 중…</string>
 	<string name="list_index_files_was_not_loaded">지역 목록을 osmand.googlecode.com 로부터 가져올 수 없습니다.</string>
     <string name="select_index_file_to_download">원하는 지역의 지도를 찾을 수 없으면, 직접 지도를 만들 수도 있습니다. http://osmand.net 를 참고하세요.</string>
-	<string name="show_poi_on_map">지도에서 보기</string>
+	<string name="show_poi_on_map">지도에 표시</string>
 	<string name="fav_points_edited">즐겨찾기 포인트가 수정되었습니다</string>
 	<string name="fav_points_not_exist">즐겨찾기 포인트가 하나도 존재하지 않습니다</string>
 	<string name="update_existing">대체</string>
 	<string name="only_show">경로 표시</string>
 	<string name="follow">운행 시작</string>
 	<string name="recalculate_route_to_your_location">전송 모드 :</string>
-	<string name="mark_final_location_first">먼저 목적지를 선택하세요</string>
+	<string name="mark_final_location_first">먼저 도착지를 선택하세요</string>
 	<string name="get_directions">운행시작</string>
-    <string name="show_gps_status">GPS 정보</string>
+    <string name="show_gps_status">GPS Status 표시</string>
 	<string name="opening_hours">오프닝 시간</string>
 	<string name="opening_changeset">변경사항 여는중…</string>
 	<string name="closing_changeset">변경사항 닫는중…</string>
@@ -725,11 +718,11 @@
 	
 	<string name="poi">POI</string>
 	<string name="error_occurred_saving_gpx">GPX를 저장하는 도중 오류가 발생하였습니다</string>
-	<string name="error_calculating_route">경로를 찾는 도중 오류</string>
+	<string name="error_calculating_route">경로 탐색 도중 오류</string>
 	<string name="error_calculating_route_occured">경로를 찾는 도중 오류가 발생하였습니다</string>
 	<string name="empty_route_calculated">경로를 찾지 못하였습니다</string>									
 	<string name="new_route_calculated_dist">새로운 경로를 찾았습니다, 거리</string>
-	<string name="arrived_at_destination">목적지에 도착하였습니다</string>
+	<string name="arrived_at_destination">도착지에 도착하였습니다</string>
 	<string name="invalid_locations">좌표가 유효하지 않습니다!</string>
 	<string name="go_back_to_osmand">OsmAnd 맵으로 되돌아감</string>
 	<string name="close">닫기</string>
@@ -755,14 +748,14 @@
     <string name="settings">설정</string>
     <string name="save_current_track_descr">현재 트랙을 SD 카드에 저장합니다</string>
     <string name="save_current_track">현재 트랙을 GPX 파일로 저장</string>
-    <string name="save_track_interval_descr">운행하는 동안 트랙 레코딩을 저장하는 로깅 간격을 선택합니다</string>
+    <string name="save_track_interval_descr">운행하는 동안 트랙 레코딩을 위한 로깅 간격을 선택합니다</string>
     <string name="save_track_interval">운행중 로깅 간격</string>
     <string name="save_track_to_gpx_descrp">운행하는 동안 트랙을 GPX파일로 저장합니다</string>
     <string name="save_track_to_gpx">운행하는 동안 트랙을 GPX파일로 기록</string>
     <string name="update_tile">맵 업데이트</string>
     <string name="reload_tile">타일 재로드</string>
     <string name="mark_point">목적지</string>
-    <string name="show_osm_bugs_descr">맵에 OpenStreetBugs 표시</string>
+    <string name="show_osm_bugs_descr">"OpenStreetBugs를 지도에  표시"</string>
     <string name="show_osm_bugs">OpenStreetBugs 표시</string>
     <string name="favourites_activity">즐겨찾기</string>
     <string name="add_to_favourite">즐겨찾기에 추가</string>
@@ -781,7 +774,7 @@
     <string name="map_view_3d_descr">맵의 3D 뷰 활성화</string>
     <string name="map_view_3d">맵 3D 뷰</string>
     
-    <string name="show_poi_over_map_description">POI를 맵에 표시합니다 (최근에 선택된 필터 사용)</string>
+    <string name="show_poi_over_map_description">POI를 지도에 표시합니다 (최근에 선택된 필터 사용)</string>
     <string name="show_poi_over_map">POI 표시</string>
     <string name="map_tile_source_descr">온라인소스 또는 캐시된 맵 타일 소스를 선택합니다</string>
     <string name="map_tile_source">타일 맵 소스</string>
@@ -797,7 +790,7 @@
 <string name="exit_Button">종료</string>
 <string name="map_Button">지도</string>
 <string name="settings_Button">설정</string>
-<string name="favorites_Button">장소</string>
+<string name="favorites_Button">저장소</string>
 <string name="search_button">검색</string>
 <string name="search_activity">검색</string>
 
@@ -808,8 +801,8 @@
 <string name="incremental_search_building">빌딩 검색</string>
 <string name="choose_available_region">목록에서 지역을 선택합니다</string>
 <string name="choose_intersected_street">교차로를 선택합니다</string>
-<string name="Closest_Amenities">가장 가까운 시설들</string>
-<string name="app_mode_default">지도 보기</string>
+<string name="Closest_Amenities">근접한 시설들</string>
+<string name="app_mode_default">지도 찾아보기</string>
 <string name="app_mode_car">자동차</string>
 <string name="app_mode_bicycle">자전거</string>
 <string name="app_mode_pedestrian">보행자</string>
@@ -821,7 +814,7 @@
 <string name="navigate_point_format_D">DDD.DD</string>
 <string name="navigate_point_format_DM">DDD MM.MMM</string>
 <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-<string name="search_shown_on_map">맵에 표시</string>
+<string name="search_shown_on_map">지도에 보이기</string>
 <string name="navigate_point_cancel">취소</string>
 <string name="search_address_top_text">주소를 선택하세요</string>
 <string name="search_address_region">지역</string>
@@ -942,9 +935,9 @@
     <string name="calculate_osmand_route_without_internet">인터넷 연결없이 OsmAnd 경로 구간 계산</string>
     <string name="gpx_option_calculate_first_last_segment">첫번째와 마지막 경로 구간 계산</string>
     <string name="use_displayed_track_for_navigation">운행을 위해 맵뷰어에 표시된 경로를 사용하시겠습니까?</string>
-    <string name="keep_and_add_destination_point">목적지로 추가</string>
+    <string name="keep_and_add_destination_point">도착지로 추가</string>
     <string name="select_gpx">GPX 선택…</string>
-    <string name="route_descr_select_destination">목적지 선택</string>
+    <string name="route_descr_select_destination">도착지 선택</string>
     <string name="route_descr_select_on_map">지도에서 선택…</string>
     <string name="route_descr_favorite">즐겨찾기…</string>
     <string name="route_info">경로 정보</string>
@@ -961,15 +954,15 @@
 	<string name="routing_attr_avoid_motorway_name">전용도로 회피</string>
 	<string name="routing_attr_avoid_motorway_description">전용도로 회피하기</string>
 	<string name="routing_attr_weight_name">중량 제한</string>
-	<string name="routing_attr_weight_description">도로에 허가된 차량중량 지정하기</string>
+	<string name="routing_attr_weight_description">도로에 통행가능한 차량중량을 지정</string>
     <string name="android_19_location_disabled">킷캣(KitKat) 버전 이후로 이전에 저장한 폴더 (%s)에 지도를 다운로드하고 업데이트 할 수 없습니다.
 \n저장 위치를 변경하고 모든 파일을 그곳에 복사하는 것을 허락하겠습니까?
 \n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다.</string>
-    <string name="application_dir_change_warning2">OsmAnd에 새 목적지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요.</string>
+    <string name="application_dir_change_warning2">OsmAnd에 새 도착지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요.</string>
     <string name="copying_osmand_one_file_descr">새 도착지에 파일(%s)을 복사중…</string>
-    <string name="copying_osmand_files_descr">새로운 도착지에 OsmAnd 데이터 파일을 복사중 (%s)</string>
-    <string name="copying_osmand_files">OsmAnd 데이터 파일을 복사중</string>
-    <string name="calculate_osmand_route_gpx">OsmAnd 오프라인 경로 계산하기</string>
+    <string name="copying_osmand_files_descr">새로운 도착지(%s)에 OsmAnd 데이터 파일을 복사중…</string>
+    <string name="copying_osmand_files">OsmAnd 데이터 파일을 복사중…</string>
+    <string name="calculate_osmand_route_gpx">OsmAnd 오프라인 경로를 계산</string>
     <string name="app_mode_truck">트럭</string>
     <string name="routing_preferences_descr">라우팅 환경설정</string>
     <string name="speech_rate_descr">TTS에 대한 음성속도를 지정합니다</string>
@@ -987,7 +980,7 @@
     <string name="tip_faq">자주 묻는 질문 (FAQ)</string>
     <string name="local_osm_changes_delete_all">모두 삭제하기</string>
     <string name="animate_routing_route_not_calculated">먼저 경로를 계산하세요</string>
-    <string name="animate_routing_route">"탬색된 경로를 이용하여 모의주행하기 "</string>
+    <string name="animate_routing_route">"탐색한 경로를 이용하여 모의주행 "</string>
     <string name="animate_routing_gpx">GPX경로를 이용하여 모의주행하기</string>
     <string name="remember_choice">내 선택을 기억하기</string>
     <string name="gps_status_eclipsim">GPS status</string>
@@ -1044,12 +1037,12 @@
 	<string name="lang_cy">웨일스어</string>
 	<string name="route_preferences">경로 환경설정</string>
     <string name="guidance_preferences_descr">운행 환경설정</string>
-    <string name="disable_complex_routing_descr">자동차용 라우팅의 복잡한 출발지/도착지 2단계 라우팅 사용불가</string>
+    <string name="disable_complex_routing_descr">자동차 운행의 복잡한 출발지/도착지 2단계 라우팅 사용불가</string>
     <string name="app_modes_choose_descr">앱에서 볼 수있는 사용자 프로필를 선택합니다</string>
     <string name="map_widget_appearance">나머지 요소 :</string>
 	<string name="local_osm_changes_delete_all_confirm">%1$d OSM 변경 사항을 삭제하려고 합니다.  확실합니까?</string>
     <string name="route_is_too_long">OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있습니다. (가끔 작동 되지 않을 수 있습니다) 당신은 더 나은 성능을 위해 경유지를 추가할 수 있습니다.</string>
-	<string name="auto_zoom_close">가까운 거리에</string>
+	<string name="auto_zoom_close">좀 더 가깝게</string>
 	<string name="auto_zoom_far">중간 거리에</string>
 	<string name="auto_zoom_farthest">긴 거리에</string>
 	<string name="edit_tilesource_elliptic_tile">타원 메르카토르</string>
@@ -1060,8 +1053,8 @@
     <string name="clear_intermediate_points">경유지 지우기</string>
     <string name="keep_intermediate_points">경유지 유지</string>
     <string name="new_directions_point_dialog">이미 경유자를 설정했습니다.</string>
-    <string name="context_menu_item_directions_to">도착지 설정</string>
-    <string name="context_menu_item_directions_from">출발지 설정</string>
+    <string name="context_menu_item_directions_to">~까지 운행</string>
+    <string name="context_menu_item_directions_from">~부터 운행</string>
     <string name="route_descr_map_location">지도 : </string>
     <string name="route_descr_lat_lon">위도 %1$.3f, 경도 %2$.3f</string>
     <string name="route_descr_current_location">현재 위치</string>
@@ -1070,8 +1063,8 @@
     <string name="route_from">~부터 :</string>
 	
 	
-	<string name="destination_point">목적지 %1$s</string>
-    <string name="context_menu_item_destination_point">목적지로 설정</string>
+	<string name="destination_point">도착지 %1$s</string>
+    <string name="context_menu_item_destination_point">도착지로 설정</string>
     <string name="please_select_address">먼저 도시나 거리를 선택</string>
     <string name="tip_recent_changes_1_4_t">"Changes in 1.4:
 \n\t* 모든 곳을 방문하기 위한 최적화된 방식으로 포인트 순서
@@ -1082,7 +1075,7 @@
 \n\t* SRTM 파일 삭제
 \n\t* OSM 노트 지원 "</string>
     <string name="search_street_in_neighborhood_cities">인근 도시에서 거리 검색</string>
-    <string name="intermediate_items_sort_return">경유지는 목적지까지 가는 길에 경유지의 순서를 최적화하기 위해 재 정렬.</string>
+    <string name="intermediate_items_sort_return">경유지는 도착지까지 가는 길에 경유지의 순서를 최적화하기 위해 재 정렬.</string>
     <string name="intermediate_items_sort_by_distance">정렬 (도어 투 도어)</string>
     <string name="local_osm_changes_backup_successful">OSM 변경 파일이 성공적으로 생성되었습니다 %1$s</string>
     <string name="local_osm_changes_backup_failed">백업 OSM 변경 실패</string>
@@ -1095,7 +1088,7 @@
     <string name="plugin_distance_point">포인트</string>
     <string name="gpx_file_name">GPX 파일 이름</string>
     <string name="gpx_saved_sucessfully">GPX 파일이 성공적으로 {0} 에 저장</string>
-    <string name="osmand_distance_planning_plugin_description">포인트 사이의 거리를 측정하기 위해 경로(또는 기존 GPX 파일을 수정/사용)를 생성합니다. GPX로 저장하여, GPX 경로를 이용할 수 있습니다.</string>
+    <string name="osmand_distance_planning_plugin_description">지점 사이의 거리를 측정하기 위해 경로(또는 기존 GPX 파일을 수정/사용)를 생성합니다. GPX로 저장하여, GPX 경로를 이용할 수 있습니다.</string>
     <string name="osmand_distance_planning_plugin_name">거리 계산 및 플래닝 도구</string>
     <string name="default_buttons_do_not_show_again">다시 표시하지 않음</string>
     <string name="distance_measurement_start_editing">편집 시작</string>
@@ -1107,7 +1100,7 @@
     <string name="wait_current_task_finished">현재 작업이 완료 될 때까지 기다리십시오</string>
     <string name="use_kalman_filter_compass_descr">나침반 흔들림을 방지하기 위해 칼만 필터를 사용</string>
     <string name="use_kalman_filter_compass">칼만 필터 사용</string>
-    <string name="access_mark_final_location_first">접근성 모드 : 먼저 목적지를 선택하세요</string> 
+    <string name="access_mark_final_location_first">접근성 모드 : 먼저 도착지를 선택하세요</string> 
     <string name="use_magnetic_sensor_descr">방위센서(GPS) 대신 나침반 값을 결정하는 지자기센서를 사용</string>
     <string name="use_magnetic_sensor">지자기센서를 사용</string>
     <string name="other_location">기타</string>
@@ -1115,7 +1108,7 @@
     <string name="install_paid">정식 버전</string>
     <string name="cancel_route">경로 해제</string>
     <string name="cancel_navigation">운행 중지</string>
-    <string name="clear_destination">목적지 지우기</string>
+    <string name="clear_destination">도착지 지우기</string>
     <string name="download_using_mobile_internet">현재 와이파이(WiFi)가 연결되어 있지 않습니다. 현재의 인터넷 연결(3G)을 통해서 계속 다운로드 하시겠습니까?</string>
     <string name="street_name">거리</string>
 	<string name="hno">주택 수</string>
@@ -1125,11 +1118,11 @@
          \n\t* 나침반을 안정화하기 위해 추가 설정
          \n\t* 지도 화면에서 좌상단 버튼는  메뉴버튼을 대체
     </string>
-    <string name="monitoring_settings">트랙 레코딩</string>
-    <string name="monitoring_settings_descr">트랙을 기록하는 방법을 구성합니다</string>
+    <string name="monitoring_settings">경로 레코딩</string>
+    <string name="monitoring_settings_descr">경로를 기록하는 방법을 구성합니다</string>
     <string name="osmand_monitoring_plugin_description">절전모드(스크린 끄기)에서 트래킹 및 경로탐색 활성화, 주기적으로 GPS 장치가 작동중일 때 . 표시 설정은 로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 트랙을 기록하는 설비 가능.</string>
     <string name="osmand_monitoring_plugin_name">로깅 서비스</string>
-    <string name="osmand_background_plugin_description">주기적으로 GPS 장치를 On 시켜 절전모드(스크린 끄기)에서 트래킹 및 라우팅을 가능하게 합니다.</string>
+    <string name="osmand_background_plugin_description">주기적으로 GPS 장치를 On 시켜 절전모드(스크린 끄기)에서 트래킹 및 운행을 가능하게 합니다.</string>
     <string name="choose_osmand_theme_descr">앱 테마(색상)를 선택</string>
     <string name="choose_osmand_theme">앱 테마</string>
     <string name="accessibility_options">접근성(내게 필요한) 옵션</string>
@@ -1153,42 +1146,42 @@
     <string name="dist_control_start">시작</string>
     
     <string name="local_indexes_cat_srtm">등고선 데이터</string>
-    <string name="local_indexes_cat_av">오디오/비디오 데이터</string>
+    <string name="local_indexes_cat_av">소리/영상 데이터</string>
     <string name="stop_routing_confirm">운행을 중지하시겠습니까 ?</string>
-    <string name="clear_dest_confirm">목적지( 및 경유지)를지우겠습니까?</string>
-    <string name="precise_routing_mode_descr">고장없이 정확한 경로를 계산(라우팅) 할 수 있습니다. 현 단계에서는 거리가 한정되어있어 게다가 느립니다.</string>
+    <string name="clear_dest_confirm">도착지 (및 경유지) 를지우겠습니까?</string>
+    <string name="precise_routing_mode_descr">고장없이 정확한 경로를 계산(라우팅) 할 수 있습니다. 현 단계에서는 거리가 한정되어있고 게다가 느립니다.</string>
     <string name="precise_routing_mode">정확한 라우팅 모드</string>
     <string name="recording_context_menu_show">표시</string>
     <string name="recording_photo_description">사진 %1$s of %2$s</string>
     <string name="av_def_action_picture">사진 찍기</string>
     <string name="recording_context_menu_precord">사진 찍기</string>
-    <string name="dropbox_plugin_description">Dropbox 플러그인은 Dropbox 계정으로 GPX경로와 오디오/비디오 노트를 동기화 할 수 있습니다 .</string>
+    <string name="dropbox_plugin_description">Dropbox 플러그인은 Dropbox 계정으로 GPX경로와 소리/영상 노트를 동기화 할 수 있습니다 .</string>
     <string name="dropbox_plugin_name">드롭박스 플러그인</string>
     <string name="intermediate_points_change_order">순서 변경</string>
     <string name="srtm_paid_version_msg">등고선 추가 개발을 지원하기 위해 구글플레이에서 플러그인을 구입하시기 바랍니다 .</string>
     <string name="srtm_paid_version_title">등고선 플러그인</string>
     <string name="av_def_action_choose">요청에 대한 선택</string>
-    <string name="av_def_action_video">비디오 녹화</string>
-    <string name="av_def_action_audio">오디오 녹음</string>
+    <string name="av_def_action_video">영상 녹화</string>
+    <string name="av_def_action_audio">소리 녹음</string>
     <string name="av_widget_action_descr">기본 위젯의 동작을 선택합니다</string>
     <string name="av_widget_action">기본 위젯 작업</string>
-    <string name="av_video_format_descr">비디오 출력 형식 선택</string>
-    <string name="av_video_format">비디오 출력 형식</string>
-    <string name="av_use_external_recorder_descr">비디오에 시스템 레코더를 사용</string>
+    <string name="av_video_format_descr">영상 출력 형식 선택</string>
+    <string name="av_video_format">영상 출력 형식</string>
+    <string name="av_use_external_recorder_descr">영상 촬영시 시스템 레코더를 사용</string>
     <string name="av_use_external_recorder">시스템 레코더 사용</string>
     <string name="av_use_external_camera_descr">사진에 대한 시스템 앱을 사용</string>
     <string name="av_use_external_camera">카메라 앱을 사용</string>
-    <string name="av_settings_descr">오디오 및 비디오 설정을 구성합니다</string>
-    <string name="av_settings">오디오/비디오 설정 </string>
+    <string name="av_settings_descr">소리 및 영상 설정을 구성합니다</string>
+    <string name="av_settings">"소리/영상 설정 "</string>
     <string name="recording_error">"기록하는 동안 오류가 발생했습니다 "</string>
     <string name="recording_camera_not_available">카메라는 사용할 수 없습니다</string>
-    <string name="recording_is_recorded">오디오/비디오는 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다.</string>
-    <string name="recording_playing">지정된 녹음기에서 오디오가 재생되고 있습니다.\n%1$s</string>
+    <string name="recording_is_recorded">소리/영상은 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다.</string>
+    <string name="recording_playing">지정된 녹음기에서 소리가 재생되고 있습니다.\n%1$s</string>
     <string name="recording_open_external_player">외부 플레이어 열기</string>
     <string name="recording_delete_confirm">이 기록을 삭제하시겠습니까 ?</string>
     <string name="recording_unavailable">사용 불가능</string>
-    <string name="recording_context_menu_arecord">오디오 녹음</string>
-    <string name="recording_context_menu_vrecord">비디오 녹화</string>
+    <string name="recording_context_menu_arecord">소리 녹음</string>
+    <string name="recording_context_menu_vrecord">영상 녹화</string>
     <string name="layer_recordings">레코딩 레이어</string>
     <string name="recording_can_not_be_played">레코딩을 재생할 수 없습니다</string>
     <string name="recording_context_menu_delete">레코딩 삭제</string>
@@ -1197,13 +1190,13 @@
     <string name="recording_default_name">레코딩</string>
     <string name="av_control_stop">정지</string>
     <string name="av_control_start">A/V 찍기</string>
-    <string name="map_widget_av_notes">오디오/비디오 노트</string>
+    <string name="map_widget_av_notes">소리/영상 노트</string>
     <string name="osmand_srtm_short_description_80_chars">오프라인 등고선에 대한 OsmAnd 플러그인</string>
     <string name="map_widget_distancemeasurement">거리 측정</string>
     <string name="monitoring_control_stop">정지</string>
-    <string name="map_widget_audionotes">오디오 노트</string>
-    <string name="audionotes_plugin_description">여행하는 동안 오디오/비디오 노트 기록하기</string>
-    <string name="audionotes_plugin_name">오디오/비디오 노트</string>
+    <string name="map_widget_audionotes">소리 노트</string>
+    <string name="audionotes_plugin_description">여행하는 동안 소리/영상 노트 기록하기</string>
+    <string name="audionotes_plugin_name">소리/영상 노트</string>
     <string name="index_srtm_parts">부분</string>
     <string name="index_srtm_ele">등고선</string>
     <string name="srtm_plugin_description">오프라인 등고선 과 음영은 다운로드를 용이하게 한다. (설정→지도 관리→다운로드→ 원하는 지도 유형 선택)</string>
@@ -1234,13 +1227,13 @@
 \n\t* 향상된 라우팅(길찾기) : 더 빨리, 더 정확히, 최대 거리 250km
 \n\t* 도로 전용 지도 소개
 \n\t* 지도는 중단 후 위치 잠금을 잃지 않는다
-\n\t* 길안내하는 동안 절전 모드 서비스를 활성화 "</string>
-    <string name="tip_recent_changes_0_8_4_t">"버전 0.8.4 의 변경 사항 : →\n\t* 일부 버그 수정 →\n\t* 지도는 중단 후 위치 잠금을 잃지 않는다 →\n\t* 길안내하는 동안 절전 모드 서비스를 활성화 "</string>
+\n\t* 운행하는 동안 절전 모드 서비스를 활성화 "</string>
+    <string name="tip_recent_changes_0_8_4_t">"버전 0.8.4 의 변경 사항 : →\n\t* 일부 버그 수정 →\n\t* 지도는 중단 후 위치 잠금을 잃지 않는다 →\n\t* 운행하는 동안 절전 모드 서비스를 활성화 "</string>
     <string name="close_changeset">변경세트 닫기</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing 바코드 스캐너 앱이 설치되어 있지 않습니다 .  구글시장에서 검색할까요 ?</string>
 	<string name="rendering_attr_roadColors_description">도로 색상을 선택합니다:</string>
 	<string name="rendering_attr_roadColors_name">도로 색상</string>
-    <string name="map_widget_show_destination_arrow">목적지 방향 표시</string>
+    <string name="map_widget_show_destination_arrow">도착지 방향 표시</string>
     <string name="enable_plugin_monitoring_services">트랙로깅 서비스(GPX 기록, 온라인 트래킹)를 사용하여 트래킹 플러그인을 활성화</string>
     <string name="non_optimal_route_calculation">장거리를 가능하게 하는 비-최적 경로 계산</string>
 	<string name="gps_not_available">설정에서 GPS를 활성화하십시오</string>
@@ -1254,10 +1247,10 @@
     <string name="add_as_last_destination_point">마지막 경유지로 추가</string>
     <string name="add_as_first_destination_point">첫번째 경유지로 추가</string>
 
-    <string name="replace_destination_point">목적지 대체</string>
-    <string name="new_destination_point_dialog">이미 목적지가 설정되었습니다.</string>
+    <string name="replace_destination_point">도착지로 대체</string>
+    <string name="new_destination_point_dialog">이미 도착지가 설정되었습니다.</string>
     <string name="target_points">경유지</string>
-    <string name="intermediate_point_too_far">도로에서 너무 멀리 떨어진 포인트 %1$s .</string>
+    <string name="intermediate_point_too_far">도로에서 너무 멀리 떨어진 경유지 %1$s .</string>
     <string name="arrived_at_intermediate_point">경유지에 도착했습니다</string>
     <string name="context_menu_item_intermediate_point">경유지로 추가</string>
     <string name="map_widget_intermediate_distance">경유지</string>
@@ -1271,15 +1264,15 @@
     <string name="poi_filter_accomodation">숙소</string>
     <string name="poi_filter_restaurants">레스토랑</string>
     <string name="poi_filter_sightseeing">관광</string>
-    <string name="show_warnings_title">알람 보기…</string>
+    <string name="show_warnings_title">알람 표시…</string>
 	<string name="show_warnings_descr">트래픽 경고(속도 제한, 강제 정지, 속도 범프), 속도 카메라 경고 및 차선 정보를 구성합니다</string>
 	<string name="use_compass_navigation_descr">GPS로 진행방향이 탐지되지 않을 때 나침반을 사용</string>
 	<string name="use_compass_navigation">나침반 사용</string>
 	<string name="avoid_motorway">전용도로 회피</string>
-	<string name="snap_to_road_descr">길안내할 동안 차량을 도로에 밀착시킴</string>
+	<string name="snap_to_road_descr">운행하는 동안 차량을 도로에 밀착시킴</string>
 	<string name="snap_to_road">도로에 밀착</string>
-	<string name="osmand_play_title_30_chars">OsmAnd 지도 및 네비게이션</string>
-	<string name="osmand_short_description_80_chars">글로벌 모바일 맵 뷰어 및 오프라인 및 온라인 OSM 지도를 위한 라우팅</string>
+	<string name="osmand_play_title_30_chars">OsmAnd 지도 및 내비게이션</string>
+	<string name="osmand_short_description_80_chars">글로벌 모바일 맵 뷰어 및 오프라인 및 온라인 OSM 지도를 위한 운행</string>
 	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM 자동 라우팅 및 길안내 시스템) OsmAnd 글로벌 OpenStreetMap의 다양한 데이터에 접근할 수 있는 오픈 소스 라우팅 응용 프로그램입니다.
 \n모든 지도 데이터(벡터 맵 또는 타일 맵 ) 는 오프라인 사용을 위하여 휴대 전화 메모리 카드에 저장할 수 있습니다.
 \nOsmAnd는 또한 턴-바이-턴 음성 안내 등의 오프라인 및 온라인 라우팅(길찾기) 기능을 제공합니다.
@@ -1301,8 +1294,8 @@
 \n- 위키 백과 또는 오프라인 관심 장소에 액세스할 수 없음.
 \n\nOsmAnd 는 적극적으로 개발하고 우리의 프로젝트와 프로젝트의 추가 진행은 개발 자금을 재정 지원에 의존하고 새로운 기능을 testdriving 하고있다.
 \nOsmAnd+ 를 구입, 또는 특정 새로운 기능에 자금을 지원하거나 osmand.net 에 일반 후원을 부탁드립니다. "</string>
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ 지도 및 네비게이션</string>
-	<string name="osmand_plus_short_description_80_chars">글로벌 모바일 지도보기 및 오프라인 및 온라인 OSM 지도를 위한 라우팅</string>
+	<string name="osmand_plus_play_title_30_chars">OsmAnd+ 지도 및 내비게이션</string>
+	<string name="osmand_plus_short_description_80_chars">글로벌 모바일 지도보기 및 오프라인 및 온라인 OSM 지도를 위한 운행</string>
 	<string name="osmand_plus_long_description_1000_chars">" OsmAnd + (OSM 자동 안내 및 안내 ) OsmAnd + 글로벌 OpenStreetMap의 다양한 (OSM) 데이터에 접근할 수 있는 오픈 소스 운행 응용 프로그램입니다. 모든 지도 데이터 (벡터 또는 타일 맵 ) 오프라인 사용에 대한 휴대 전화 메모리 카드에 저장할 수 있습니다. OsmAnd 또한 턴-바이-턴 안내 등의 오프라인 및 온라인 라우팅 기능을 제공합니다. OsmAnd+는 프로젝트를 지원하는 새로운 기능의 개발을 투자하고, 최신 업데이트를 받을 수 있도록 구입하여 사용할 수 있는 유료 응용 프로그램 버전입니다.
 \n\n핵심 기능 중 일부 :
 \n- 전체 오프라인 기능 (선택 폴더 에 저장 다운로드 벡터 또는 타일 지도 )
@@ -1393,12 +1386,12 @@
 	
 	
 	<string name="layer_map_appearance">맵 뷰어</string>
-	<string name="show_lanes">레인 표시</string>
+	<string name="show_lanes">차선 표시</string>
 	<string name="avoid_unpaved">비포장 도로 회피</string>
 	<string name="avoid_ferries">뱃길 회피</string>
 	<string name="avoid_in_routing_title">회피하기…</string>
 	<string name="avoid_in_routing_descr">유료도로, 비포장, 뱃길 회피하기</string>
-	<string name="map_widget_fluorescent">형광색상 노선</string>
+	<string name="map_widget_fluorescent">깜박이는 경로</string>
 	<string name="map_widget_show_ruler">축척(Ruler)</string>
 	<string name="map_widget_view_direction">방향 보기</string>
 	<string name="map_widget_transparent">투명 스킨</string>
@@ -1421,7 +1414,7 @@
 	<string name="map_widget_parking">주차</string>
 	<string name="map_widget_monitoring">GPX 레코딩</string>
 	<string name="map_widget_speed">속도</string>
-	<string name="map_widget_distance">목적지</string>
+	<string name="map_widget_distance">도착지</string>
 	<string name="map_widget_altitude">고도</string>
 	<string name="map_widget_time">가야할 시간</string>
 	<string name="map_widget_next_turn">다음 턴</string>
@@ -1433,10 +1426,10 @@
 	<string name="bg_service_screen_lock_toast">화면이 잠김</string>
 	<string name="bg_service_interval">알람(wake-up) 간격을 설정 :</string>
 	<string name="show_cameras">속도 카메라 표시</string>
-	<string name="show_traffic_warnings">트래픽 경고 표시</string>
+	<string name="show_traffic_warnings">교통 경고 표시</string>
 	<string name="avoid_toll_roads">유료 도로 회피</string>
-	<string name="continue_follow_previous_route_auto">이전 길안내는 아직 끝나지 안났습니다. 계속 길안내를 받으시겠습니까? (%1$s 초)</string>
-	<string name="route_updated_loc_found">위치가 확정되면 경로를 찾을 것입니다</string>
+	<string name="continue_follow_previous_route_auto">이전 운행은 아직 끝나지 안났습니다. 계속 운행을 하시겠습니까? (%1$s 초)</string>
+	<string name="route_updated_loc_found">위치가 확정되면 경로를 탐색합니다</string>
 	<string name="osmand_parking_hours">시간</string>
 	<string name="osmand_parking_minutes">분</string>
 	<string name="osmand_parking_position_description_add_time">자동차를 ~에 주차했습니다 :</string>
@@ -1491,18 +1484,18 @@
 	<string name="rendering_attr_appMode_name">렌더링 모드</string>
 	<string name="rendering_attr_appMode_description">~에 대한 지도를 최적화</string>
 	<string name="rendering_attr_contourLines_description">줌 레벨에서 보여주기(등고선 데이터가 필요합니다):</string>
-	<string name="rendering_attr_contourLines_name">등고선 보이기</string>
-	<string name="rendering_attr_hmRendered_description">지도 세부사항 보이기 증가</string>
-	<string name="rendering_attr_hmRendered_name">지도 세부사항 보기</string>
+	<string name="rendering_attr_contourLines_name">등고선 표시</string>
+	<string name="rendering_attr_hmRendered_description">지도 세부사항 표시 증가</string>
+	<string name="rendering_attr_hmRendered_name">지도 세부사항 표시</string>
 	<string name="local_index_routing_data">데이터로 길찾기</string>
 	<string name="navigate_point_format">형식 :</string>
 	<string name="poi_search_desc">POI(관심지점) 검색</string>
 	<string name="address_search_desc">주소 검색</string>
 	<string name="navpoint_search_desc">좌표</string>
-	<string name="transport_search_desc">교통 검색</string>
+	<string name="transport_search_desc">대중 교통 검색</string>
 	<string name="favourites_search_desc">즐겨 찾기 검색</string>
 	<string name="history_search_desc">검색한 기록</string>
-	<string name="offline_navigation_not_available">OsmAnd 오프라인 라우팅은 일시적으로 사용할 수 없습니다.</string>
+	<string name="offline_navigation_not_available">OsmAnd 오프라인 라우팅을 일시적으로 사용할 수 없습니다.</string>
 	<string name="left_side_navigation">왼쪽좌석 운전</string>
 	<string name="left_side_navigation_descr">왼쪽좌석 운전 국가를 선택합니다</string>
 	<string name="download_link_and_local_description">오프라인 데이터를 다운로드 하거나 업데이트 하려면 여기를 클릭하십시오. 세부정보를 보려면 기존 아이템을 클릭하세요, 비활성화 하거나 삭제하려면 길게 누르세요. 기기에 남아있는 현재 데이터는 (%1$s free):</string>
@@ -1518,9 +1511,9 @@
 	<string name="map_settings_descr">지도 표시를 구성합니다</string>
 	<string name="osmand_accessibility_description">접근성(내게 필요한) 기능에 대한 설정을 표시하기.</string>
 	<string name="extra_settings">고급 설정</string>
-	<string name="osmand_monitoring_description">로컬 GPX 파일이나 온라인 웹 서비스를 사용하는 온라인을 기록하기 위해 설정기능을 표시합니다.</string>
+	<string name="osmand_monitoring_description">로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 경로를 기록하기 위한 설정 기능을 표시합니다.</string>
 	<string name="osmand_extra_settings_description">고급 지도 구성(지도 상세보기) 및 일부 장치 특성에 대한 설정을 표시합니다.</string>
-	<string name="osmand_development_plugin_description">경로 시뮬레이션 이나 렌더링 성능 표시와 같은 개발 및 디버깅 기능에 대한 설정을 표시합니다.</string>
+	<string name="osmand_development_plugin_description">모의 주행이나 렌더링 성능 표시와 같은 개발 및 디버깅 기능에 대한 설정을 표시합니다.</string>
 	<string name="plugins_screen">플러그인</string>
 	<string name="select_plugin_to_activate">활성화 또는 비활성화 하기위해 플러그인을 터치합니다.(OsmAnd는 재시작해야 합니다)</string>
 	<string name="prefs_plugins_descr">플러그인은 고급설정 및 추가기능을 활성화합니다</string>
@@ -1613,8 +1606,8 @@
 \n→ * 다른 사소한 수정 ↵
 \n↵
 \n* 1.2의 변경 사항 : ↵
-\n→ * 버그 수정 (라우팅 조정, 검색, AV 레코딩, 음성 지시, 일부 디스플레이 개선) ↵
-\n→ * 좀 더 쉽게 음영 기복도 오버레이 구성 (등고선 플러그인 필요) ↵
+\n→ * 버그 수정 (라우팅 조정, 검색, AV 레코딩, 음성 안내, 일부 디스플레이 개선) ↵
+\n→ * 좀 더 쉽게 음영 오버레이 구성 (등고선 플러그인 필요) ↵
 \n→ * maps.google.com의 위치 링크 허용 ↵
 \n→ * 새로운 위젯 (GPS 정보) ↵
 \n→ * 최근 삼성 장치 등의 멀티 윈도우를 지원 ↵
@@ -1624,20 +1617,20 @@
 \n\t* UI 재디자인
 \n\t* 버그 수정 "</string>
     <string name="tip_recent_changes_1_1_2_t">"Changes in 1.1.2:
-\n\t* 오디오/비디오 플러그인 개선사항
+\n\t* 소리/영상 플러그인 개선사항
 \n\t* 사용성 고정 및 등고선 플러그인 재 구성
 \n\t* 등고선 플러그인을 위한 음영 팩키지
 \n\t* 버그 수정 "</string>
     <string name="tip_recent_changes_1_1_0_t">"Changes in 1.1.0:
 \n\t* 거리 계산 플러그인
-\n\t* 오디오/비디오 메모 플러그인
+\n\t* 소리/영상 노트 플러그인
 \n\t* 등고선 플러그인
 \n\t* 버그 수정
 \n\t* 지도 세부정보아 함께 지도 스타일 옵션, 새 도로 스타일,
 \n\t* EGM96 geoid 오프셋 보정, GPS 고도 읽기 "</string>
     <string name="audionotes_location_not_defined">노트와 연결할 위치는 아직 정의되지 않았습니다. 지정된 위치에 노트를 할당하려면 \"위치 사용…\"</string>
     <string name="tip_recent_changes_0_8_3_t">"Changes in 0.8.3:
-\n\t* 포인트
+\n\t* 경유지
 \n\t* 향상된 경로 안내
 \n\t* 경로를 생성하는 동안 전용도로를 회피하는 것을 허락하는 설정을 추가
 \n\t* 지도에 자전거 도로의 유형을 추가
@@ -1762,15 +1755,14 @@
 \n\t* \'Light sensor\': map appearance is controlled by the device\'s light sensor (only if equipped) "</string>	
 	<string name="tip_map_switch_t_v2">"표시된 맵 소스와 계층 지도는 [메뉴]-&gt;[계층 지도]에서 변경할 수 있다.\n[맵 소스] 아래에.. 미리 로드된 오프라인 벡터 지도를 사용하여 선택할 수 있다. OsmAnd 는 또한 사용자 지도를 지원합니다. "</string>
 	<string name="tip_app_mode_t_v2">"OsmAnd 는 다른 사용 사례에 대해 서로 다른 (사용자 정의) 앱 프로필을 지원합니다. 지도 화면 (아이콘 자동차, 자전거 또는 보행자 )의 왼쪽 하단 모서리에 있는 프로필 버튼을 통해 프로필을 변경하거나 경로(\'전송 모드\')을 만들 때 할 수 있습니다. "</string>
-	<string name="tip_search_t">[위치사용-&gt;가까운 장소 검색] 메뉴를 통해서 지도에서 장소를 직접 검색할 수 있습니다. 또는 [메뉴-&gt;검색]을 통해서 화면에서 검색할 수 도 있습니다.
-		\n\n검색화면은 검색을 위한 템플릿을 제공합니다
-		\n\t* 주소로
-		\n\t* 좌표로
-		\n\t* POI로 (by type or by name)
-		\n\t* 기록된 검색으로
-		\n\t* 즐겨찾기로 검색할 수 있습니다.
-		\n\n컨텍스트 메뉴를 이용하거나 또는 액션 바는 [길안내 또는 지도에서 보기] 등을 제공합니다.
-	</string>
+	<string name="tip_search_t">"[위치사용-&gt;주변 장소 검색] 메뉴를 통해서 지도에서 장소를 직접 검색할 수 있습니다. 또는 [메뉴-&gt;검색]을 통해서 화면에서 검색할 수 도 있습니다.
+\n\n검색화면은 검색을 위한 템플릿을 제공합니다
+\n\t* 주소로
+\n\t* 좌표로
+\n\t* POI로 (by type or by name)
+\n\t* 기록된 검색으로
+\n\t* 즐겨찾기로 검색할 수 있습니다.
+\n\n컨텍스트 메뉴를 이용하거나 또는 액션 바는 [길안내 또는 지도에서 보기] 등을 제공합니다. "</string>
 	<string name="osmo_settings_uuid">고유 장치 id</string>
     <string name="osmo_settings_descr">모니터링 설정을 구성하고 개인 모니터링 채널을 설정</string>
     <string name="osmo_plugin_description">"OpenStreetMap 고급 실시간 모니터링. 이에 대해서는 http://osmo.mobi를 참조 하십시오. 다른 장치를 추적하고 추적받는 가능성을 제공 합니다. 익명 그룹을 만들고, 서로의 위치를 공유하고 소통한다. 세션 트래킹 또는 영구 트래킹에 대한 다양한 설정을 합니다. 익명그룹는 수많은 날에 제한되며  일부 기능 즉, 원격 제어 및 그룹 관리자는 제한된다. 완벽하게 기능적인 그룹은 웹사이트에 생성하고 그들에게 등록된 사용자만 액세스할 수 있습니다. "</string>
@@ -1781,8 +1773,8 @@
 	<string name="arrival_distance">도착 알림</string>
     <string name="arrival_distance_descr">도착 알림을 원하세요 ?</string>
     <string name="keep_informing_never">결코</string>
-    <string name="keep_informing_descr">정기적인 간격으로 라우팅 명령을 재실행</string>
-    <string name="keep_informing">라우팅 명령을 반복</string>
+    <string name="keep_informing_descr">정기적인 간격으로 운행 명령을 다시 알리기</string>
+    <string name="keep_informing">운행 명령을 반복</string>
 	<string name="navigation_intent_invalid">잘못된 포맷 : %s</string>
 
     <string name="osmo_io_error">"OsMo 연결 문제 : "</string>
@@ -1809,12 +1801,12 @@
     <string name="osmo_locations_sent">위치 전송 %1$d (in buffer %2$d) </string>
     <string name="osmo_conn_successfull">설정된 연결 : %1$s </string>
     <string name="tip_recent_changes_1_8_alpha">"1.8의 변경 사항 :
-\n\n* GPX 트랙의 루트 지점 간의 경로를 계산
+\n\n* GPX 트랙의 지점 간 경로를 계산
 \n* 국가 별 다운로드 레이아웃 변경 (로컬 이름 검색을 지원)
 \n* GPX / KML 가져 오기를 지원 (KML에서 GPX로 변환)
 \n* GPX 트랙 \"내 데이터\"로 이동
 \n* GPX 트랙을 분할하고 고도차 / 속도를 확인 할 수 있습니다
-\n* 지연이후  자동으로 운행 시작 "</string>
+\n* 일정시간 지연이후  자동으로 운행 시작 "</string>
     <string name="use_points_as_intermediates">포인트 사이의 경로를 계산</string>
     <string name="osmo_mode_restart">OsMo 세션 재시작</string>
     <string name="osmo_settings_debug">디버그 정보</string>
@@ -1826,7 +1818,7 @@
     <string name="osmo_session_not_available">세션을 사용할 수 없습니다 , \'위치 전송하기\' 가 켜져 있는지 확인하시기 바랍니다</string>
     <string name="osmo_share_session">세션 공유</string>
     <string name="osmo_session_id_share">장치를 추적하기 위한 세션 URL(%1$s)</string>
-    <string name="osmo_tracker_id_share">%2$s 목적지 장치를 연결하려면, %3$s 링크를 클릭하거나 tracker id(%1$s)를 지정하세요</string>
+    <string name="osmo_tracker_id_share">%2$s 대상 장치를 연결하려면, %3$s 링크를 클릭하거나 tracker id(%1$s)를 지정하세요</string>
     <string name="osmo_track_interval">로깅 간격</string>
 	<string name="osmo_track_interval_descr">위치를 전송하도록 시간 간격을 선택</string>
     <string name="int_days">하루</string>
@@ -1873,14 +1865,14 @@
 	
     <string name="osmo_user_joined">사용자 %1$s이(가) 그룹 %2$s에 합류합니다</string>
     <string name="osmo_user_left">"사용자 %1$s가  그룹 %2$s에 남습니다"</string>
-    <string name="osmo_show_group_notifications">그룹 알림 보기</string>
+    <string name="osmo_show_group_notifications">그룹 알림 표시</string>
     <string name="osmo_show_group_notifications_descr">사용자가 그룹에 참여 또는 해체 할때 토스트 메시지를 표시</string>
     <string name="gpx_file_is_empty">GPX 경로가 비어있습니다</string>
     <string name="selected_track">선택된 경로</string>
-    <string name="my_tracks">내 GPX경로</string>
-    <string name="my_favorites">내 즐겨찾기</string>
-    <string name="my_data_Button">장소</string>
-    <string name="my_data_activity">장소</string>
+    <string name="my_tracks">모든 경로</string>
+    <string name="my_favorites">모든 즐겨찾기</string>
+    <string name="my_data_Button">저장소</string>
+    <string name="my_data_activity">저장소</string>
     <string name="gpx_info_subtracks">"하위 경로 : %1$s "</string>
 	<string name="gpx_info_distance">거리: %1$s (%2$s points) </string>
 	<string name="gpx_info_start_time">시작 시간: %1$tF,  %1$tR </string>
@@ -1894,9 +1886,9 @@
     <string name="gpx_selection_segment_title">구간</string>
     <string name="gpx_selection_number_of_points"> %1$s 포인트</string>
     <string name="gpx_selection_point">포인트 %1$s</string>
-    <string name="gpx_selection_current_track">트랙 레코딩</string>
+    <string name="gpx_selection_current_track">레코딩</string>
     <string name="gpx_selection_route_points">%1$s
-\n 루트 포인트 %2$s</string>
+\n 경로 포인트 %2$s</string>
     <string name="gpx_selection_points">%1$s\n 포인트</string>
     <string name="gpx_selection_track">%1$s\n GPX경로 %2$s</string>
     <string name="gpx_available_current_track">현재 기록중인 트랙</string>
@@ -1912,15 +1904,15 @@
     <string name="save_as_favorites_points">즐겨찾기 그룹으로 저장</string>
     <string name="select_destination_and_intermediate_points">경유지 선택</string>
     <string name="layer_amenity_label">포인트 이름</string>
-    <string name="show_zoom_buttons_navigation_descr">운행중 줌 버튼 보기</string>
-    <string name="show_zoom_buttons_navigation">줌 버튼 보이기</string>
+    <string name="show_zoom_buttons_navigation_descr">운행하는 동안 줌 버튼 표시</string>
+    <string name="show_zoom_buttons_navigation">줌 버튼 표시</string>
     <string name="none_selected_gpx">선택한 GPX 파일 없음. 이용 가능한 GPX 파일을 선택하려면 누르고 있어요.</string>
     <string name="local_index_unselect_gpx_file">선택을 취소합니다.</string>
-    <string name="local_index_select_gpx_file">보이기위해 선택</string>
+    <string name="local_index_select_gpx_file">선택하여 표시</string>
     <string name="sort_by_distance">거리로 정렬</string>
     <string name="sort_by_name">이름으로 정렬</string>
-    <string name="visible_element">지도에서 보기</string>
-    <string name="route_descr_destination">목적지</string>
+    <string name="visible_element">지도에 표시</string>
+    <string name="route_descr_destination">도착지</string>
     <string name="no_index_file_to_download">다운로드 되지 않았습니다, 인터넷 연결을 체크하세요.</string>
     <string name="osmo_auth_error_short">인증 실패</string>
     <string name="osmo_auth_error">OsMo 인증 오류가 발생 했습니다: %1$s.\n임시로 서비스가 다운되었거나 또는 등록 만료가 되었습니다.\n신규 등록을 진행 하시겠습니까?</string>
@@ -1942,10 +1934,10 @@
     <string name="rendering_attr_moreDetailed_name">상세 접보</string>
     <string name="rendering_attr_lessDetailed_name">덜 상세</string>
     <string name="rendering_attr_hideAccess_name">접근 제한 숨기기</string>
-    <string name="rendering_attr_showAccess_name">접근 제한 보이기</string>
+    <string name="rendering_attr_showAccess_name">접근 제한 표시</string>
     <string name="rendering_attr_showSurfaceGrade_name">도로 등급 표시</string>
     <string name="rendering_attr_showSurfaces_name">도로 표면 표시</string>
-    <string name="rendering_attr_showCycleRoutes_name">자전거 노선 보이기</string>
+    <string name="rendering_attr_showCycleRoutes_name">자전거 경로 표시</string>
     <string name="keep_navigation_service">계속</string>
 	<string name="stop_navigation_service">중지</string>
 	<string name="enable_sleep_mode">GPS 절전 모드 활성화</string>
@@ -1992,14 +1984,14 @@
 <string name="av_camera_pic_size">카메라 사진 크기</string>
 	<string name="av_camera_pic_size_descr">내부 카메라 사진 크기 선택</string>
     <string name="announce_nearby_favorites">가까운 즐겨찾기 알리기</string>
-<string name="rendering_value_browse_map_name">지도 보기</string>  
+<string name="rendering_value_browse_map_name">지도 찾아보기</string>  
     <string name="rendering_value_car_name">자동차</string>
     <string name="rendering_value_bicycle_name">자전거</string>
     <string name="rendering_value_pedestrian_name">보행자</string>
     <string name="more">더 보기…</string>
     <string name="download_additional_maps">누락된 지도 %1$s (%2$d MB) 를 다운로드 할까요?</string>
-    <string name="record_plugin_description">지도 화면에 하나의 버튼 터치로 경로를 저장 합니다. 로컬 GPX 파일 또는 웹 서비스를 사용하여 온라인에 여행을 기록하기 위해 설정을 보여줍니다.</string>
-    <string name="record_plugin_name">트랙 기록</string>
+    <string name="record_plugin_description">지도 화면에 하나의 버튼 터치로 경로를 저장 합니다. 로컬 GPX 파일 또는 웹 서비스를 사용하여 온라인에 경로를 기록하기 위해 설정을 보여줍니다.</string>
+    <string name="record_plugin_name">경로 기록</string>
     <string name="int_hour">h</string>
     <string name="duration">경과시간</string>
     <string name="distance">거리</string>
@@ -2008,8 +2000,8 @@
     <string name="waypoints">경유지</string>
     <string name="targets">도착지</string>
     <string name="way_alarms">교통 경고</string>
-    <string name="speak_favorites">가까운 즐겨찾기 알리기</string>
-    <string name="speak_poi">가까운 POI 알리기</string>
+    <string name="speak_favorites">주변의 즐겨찾기 알리기</string>
+    <string name="speak_poi">주변의 POI 알리기</string>
     <string name="rendering_attr_publicTransportMode_name">버스, 무궤도전차, 셔틀 노선</string>
 	<string name="save_track_to_gpx_globally">트랙을 GPX파일로 저장</string>
 	<string name="save_track_to_gpx_globally_descr">GPX 파일에 기록하는 일반적인 위치는 지도 화면에 GPX 기록 위젯을 사용하여 켜거나 끌 수 있습니다</string>
@@ -2060,15 +2052,15 @@
 \n* 지도에 텍스트 크기에 대한 별도의 줌 지원\n* 경로 이탈한 경우에 특별한 오디오 알림 지원
 \n* OsMo 로그인 기능
 \n* OsMo 버전 비 호환성 수정 "</string>
-    <string name="rendering_category_routes">노선 (Routes)</string>
+    <string name="rendering_category_routes">경로 (Routes)</string>
     <string name="rendering_attr_trainLightrailRoutes_name">기차 노선</string>
-    <string name="rendering_attr_tramRoutes_name">트램 노선</string>
+    <string name="rendering_attr_tramRoutes_name">전차 노선</string>
     <string name="rendering_attr_shareTaxiRoutes_name">택시 노선 공유</string>
     <string name="rendering_attr_trolleybusRoutes_name">무궤도 전차 노선</string>
     <string name="rendering_attr_busRoutes_name">버스 노선</string>
     <string name="select_impassable_road">지도에서 선택</string>
     <string name="impassable_road">도로 회피…</string>
-    <string name="rendering_attr_tramTrainRoutes_name">트램과 기차 노선</string>
+    <string name="rendering_attr_tramTrainRoutes_name">전차 및 기차 노선</string>
     <string name="rendering_category_hide">숨기기</string>
     <string name="wake_on_voice">화면 켜기</string>
     <string name="wake_on_voice_descr">교차로에 접근할 때 전화 화면 켜기</string>
@@ -2114,4 +2106,5 @@
 	<string name="show_railway_warnings">철도 교차로 표시</string>
 	<string name="show_pedestrian_warnings">보행자 횡단보도 표시</string>
     <string name="speak_pedestrian">보행자 횡단보도 알리기</string>
-    </resources>
+    <string name="rendering_value__name">기본값</string>
+	</resources>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 98b6dbb75e..3969db3592 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -52,7 +52,7 @@
   <string name="poi_search_desc">LV (Lankytinos vietos) paieška</string>
   <string name="address_search_desc">Adreso paieška</string>
   <string name="navpoint_search_desc">Koordinatės</string>
-  <string name="transport_search_desc">Transporto paieška</string>
+  <string name="transport_search_desc">Viešojo transporto paieška</string>
   <string name="favourites_search_desc">Išsaugotų vietų paieška</string>
   <string name="history_search_desc">Paieškos istorija</string>
   <string name="offline_navigation_not_available">Vidinė (be interneto) OsmAnd navigacija laikinai neprieinama.</string>
@@ -340,8 +340,8 @@
   <string name="search_position_undefined">Nenurodyta</string>
   <string name="search_position_fixed"/>
   <string name="search_position_current_location">Esama vieta…</string>
-  <string name="search_position_map_view">Paskutinė žiūrėta žemėlapio vieta</string>
-  <string name="select_search_position">Kilmė:</string>
+  <string name="search_position_map_view">Esamo žemėlapio centras</string>
+  <string name="select_search_position">Pradžia:</string>
   <string name="context_menu_item_search">Ieškoti netoliese nuo čia</string>
   <string name="tip_recent_changes_0_6_7_t">Pakeitimai 0.6.7 versijoje : 
 		\n\t- Parsiųstų duomenų valdymas (parsiųsti, ištrinti, aktyvuoti / deaktyvuoti parsiųstus duomenis tiesiogiai OsmAnd programoje) 
@@ -396,7 +396,7 @@
   
   <string name="local_index_poi_data">LV duomenys</string>
   <string name="local_index_address_data">Adresų duomenys</string>
-  <string name="local_index_transport_data">Transporto duomenys</string>
+  <string name="local_index_transport_data">Viešojo transporto duomenys</string>
   <string name="local_index_map_data">Žemėlapio duomenys</string>
   
   <string name="local_indexes_cat_backup">Deaktyvuota</string>
@@ -616,9 +616,9 @@
   <string name="use_high_res_maps">Didelės raiškos ekranas</string>
   <string name="use_high_res_maps_descr">Neištempti (ir nesulieti) žemėlapio lakštų didelės raiškos ekranuose</string>
   <string name="download_files">Parsiųsti</string>
-  <string name="context_menu_item_search_transport">Ieškoti transporto</string>
-  <string name="transport_searching_transport">Transporto rezultatai (ne iki tikslo):</string>
-  <string name="transport_searching_route">Transporto rezultatai ({0} iki tikslo):</string>
+  <string name="context_menu_item_search_transport">Ieškoti viešojo transporto</string>
+  <string name="transport_searching_transport">Transporto paieškos rezultatai (tikslas nerastas):</string>
+  <string name="transport_searching_route">Transporto paieškos rezultatai ({0} iki tikslo):</string>
   <string name="transport_search_none">nėra</string>
   <string name="transport_search_again">Pradėti transporto paiešką iš pradžių</string>
   <string name="map_index">Žemėlapis</string>
@@ -707,7 +707,7 @@
   <string name="first_time_continue">Vėliau</string>
   <string name="first_time_download">Parsisiųsti regionus</string>
   <string name="search_poi_location">Ieškoma signalo…</string>
-  <string name="search_near_map">Ieškoti šalia paskutinės vietos žemėlapyje</string>
+  <string name="search_near_map">Ieškoti šalia dabartinio centro žemėlapyje</string>
   <string name="search_nearby">Ieškoti šalia</string>
   <string name="map_orientation_default">Kaip ir įrenginys</string>
   <string name="map_orientation_portrait">Stačias</string>
@@ -729,8 +729,8 @@
   <string name="transport_route_distance">Maršruto ilgis</string>
   <string name="transport">Transportas</string>
   <string name="default_buttons_ok">Gerai</string>
-  <string name="show_transport_over_map_description">Rodyti viešo transporto stoteles žemėlapyje</string>
-  <string name="show_transport_over_map">Rodyti viešo transporto stoteles</string>
+  <string name="show_transport_over_map_description">Rodyti viešojo transporto stoteles žemėlapyje</string>
+  <string name="show_transport_over_map">Rodyti viešojo transporto stoteles</string>
   <string name="hello">Navigacijos programa OsmAnd</string>
   <string name="update_poi_success">LV duomenys buvo sėkmingai atnaujinti ({0} įkelta)</string>
   <string name="update_poi_error_local">Įvyko klaida atnaujinant vietinį LV sąrašą</string>
@@ -1286,7 +1286,7 @@
     <string name="download_using_mobile_internet">Šiuo metu Wi-Fi neprijungta. Ar norite tęsti siuntimąsį dabartiniu interneto ryšiu?</string>
     <string name="use_magnetic_sensor_descr">Maudoti magnetinį sensorių naudoti vietoje pokrypio sensoriaus kompaso reikšmei nustatyti</string>
     <string name="use_magnetic_sensor">Naudoti magnetinį sensorių (kompasą)</string>
-    <string name="use_kalman_filter_compass_descr">Naudoti Kalmano fltrą kompaso parodymų išlyginimui</string>
+    <string name="use_kalman_filter_compass_descr">Sumažina kompaso triukšmą, tačiau prideda inertiškumo</string>
     <string name="use_kalman_filter_compass">Naudoti Kalmano filtrą</string>
     <string name="access_mark_final_location_first">Prieigos režimas: pirmiausia pasirinkite kelionės tikslą</string> 
     <string name="local_indexes_cat_srtm">Kontūrinių linijų duomenys</string>
@@ -1473,8 +1473,8 @@
 \n Pastaba: dalintis tais pačiais failais tarp OsmAnd ir OsmAnd+ nebus galima.</string>
     <string name="application_dir_change_warning2">Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą? Pasirinkite \"Ne\", jei norite, kad OsmAnd tik sukurtų ir naudotų naują folderį.</string>
     <string name="copying_osmand_one_file_descr">Kopijuojami failai (%/s) į naują saugojimo vietą…</string>
-    <string name="copying_osmand_files_descr">OsmAnd failai kopijuojami į naują vietą (%/s)</string>
-    <string name="copying_osmand_files">Kopijuojami OsmAnd failai</string>
+    <string name="copying_osmand_files_descr">OsmAnd failai kopijuojami į naują vietą (%/s)…</string>
+    <string name="copying_osmand_files">Kopijuojami OsmAnd failai…</string>
     <string name="keep_and_add_destination_point">Įtraukti kaip kelionės tikslą</string>
     <string name="select_gpx">Pasirinkti GPX…</string>
     <string name="route_descr_select_destination">Pasirinkti kelionės tikslą</string>
@@ -1832,7 +1832,7 @@
     <string name="rendering_attr_trolleybusRoutes_name">Troleibusų maršrutai</string>
     <string name="rendering_attr_tramRoutes_name">Tramvajų maršrutai</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Traukinių maršrutai</string>
-    <string name="select_impassable_road">Pasirinkite žemėlapį</string>
+    <string name="select_impassable_road">Pasirinkite žemėlapyje…</string>
     <string name="impassable_road">Vengti kelių…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Tramvajų ir traukinių maršrutai</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Maršrutinis taksi</string>
@@ -1882,4 +1882,5 @@
 	<string name="show_pedestrian_warnings">Rodyti pėsčiųjų perėjas</string>
     <string name="speak_pedestrian">Pranešti apie perėjas</string>
     <string name="traffic_warning_pedestrian">Pėčiųjų perėja</string>
+	<string name="rendering_value__name">Numatytasis</string>
 	</resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 100dc45eca..36e8fdaf6a 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -101,7 +101,7 @@
 	<string name="poi_search_desc">Interessepunktsøk</string>
 	<string name="address_search_desc">Adressesøk</string>
 	<string name="navpoint_search_desc">Koordinater</string>
-	<string name="transport_search_desc">Transportsøk</string>
+	<string name="transport_search_desc">Kollektivtrafikksøk</string>
 	<string name="favourites_search_desc">Favorittsøk</string>
 	<string name="history_search_desc">Søkehistorikk</string>
 	<string name="offline_navigation_not_available">OsmAnd offline navigering er midlertidig ikke tilgjengelig.</string>
@@ -268,7 +268,7 @@
 	<string name="search_position_fixed">Fast</string>
 	<string name="search_position_current_location">Gjeldende posisjon…</string>
 	<string name="search_position_map_view">Siste kartvisning</string>
-	<string name="select_search_position">Søk nær:</string>
+	<string name="select_search_position">Utgangspunkt:</string>
 	<string name="context_menu_item_search">Søk nær her</string>
 	<string name="save_route_dialog_title">Lagre rute som GPX-spor</string>
 	<string name="route_successfully_saved_at">Rute vellykket lagret som \'%1$s\'.</string>
@@ -297,7 +297,7 @@
 	
 	<string name="local_index_poi_data">Interessepunkt-data</string>
 	<string name="local_index_address_data">Adressedata</string>
-	<string name="local_index_transport_data">Transportdata</string>
+	<string name="local_index_transport_data">Kollektivtrafikkdata</string>
 	<string name="local_index_map_data">Kartdata</string>
 	<string name="local_indexes_cat_backup">Deaktivert</string>
 	<string name="local_indexes_cat_tts">Taledata (TTS)</string>
@@ -415,7 +415,7 @@
 	<string name="renderers_descr">Velg utseende på opptegningen</string>
 	<string name="website">Nettsted</string>
 	<string name="phone">Telefon</string>
-	<string name="context_menu_item_search_transport">Søk transport</string>
+	<string name="context_menu_item_search_transport">Søk offentlig transport</string>
 	<string name="transport_searching_transport">Transportresultater (ingen mål):</string>
 	<string name="transport_searching_route">Transportresultater ({0} til mål):</string>
 	<string name="transport_search_none">ingen</string>
@@ -472,7 +472,7 @@
 	<string name="map_screen_orientation_descr">Portrett, landskap eller enhet</string>
 	<string name="add_new_rule">Legg til ny regel</string>
 	<string name="transport_Routes">Ruter</string>
-	<string name="transport_route_distance">Rutedistanse</string>
+	<string name="transport_route_distance">Reiserutedistanse</string>
 	<string name="transport">Transport</string>
 	<string name="default_buttons_ok">OK</string>
 	<string name="show_transport_over_map_description">Vis stoppesteder for offentlig transport på kart</string>
@@ -858,7 +858,7 @@
     <string name="distance">Avstand</string>
     <string name="index_tours">Turer</string>
     <string name="flat_list_waypoints">Alle</string>
-    <string name="more">Mer...</string>
+    <string name="more">Mer…</string>
     <string name="rendering_value_browse_map_name">Se gjennom kart</string>  
     <string name="rendering_attr_coloredBuildings_name">Fargekod bygninger etter type</string>
     <string name="rendering_attr_buildings15zoom_name">Bygninger på zoom 15</string>
@@ -892,7 +892,7 @@
 	<string name="routing_attr_avoid_motorway_description">Unngå motorveier</string>
 	<string name="routing_attr_weight_name">Vektgrense</string>
 	<string name="routing_attr_weight_description">Angi kjøretøyets vekt som er tillatt på ruter</string>
-    <string name="copying_osmand_files_descr">Kopierer OsmAnd-datafiler til nytt sted (%s)</string>
+    <string name="copying_osmand_files_descr">Kopierer OsmAnd-datafiler til det nye stedet (%s)…</string>
     <string name="distance_measurement_clear_route">Slett alle punkter</string>
     <string name="use_kalman_filter_compass_descr">Bruk Kalmanfilter for å unngå kompassavvik</string>
     <string name="use_kalman_filter_compass">Bruk Kalmanfilter</string>
@@ -983,7 +983,7 @@
 	<string name="lang_zh_CN">Forenklet kinesisk</string>
 	<string name="lang_zh_TW">Tradisjonell kinesisk</string>
 	<string name="keep_and_add_destination_point">Legg til som målpunkt</string>
-    <string name="select_gpx">Velg GPX …</string>
+    <string name="select_gpx">Velg GPX…</string>
     <string name="route_descr_select_on_map">Velg på kart…</string>
     <string name="route_descr_favorite">Favoritt…</string>
     <string name="route_preferences">Ruteinnstillinger</string>
@@ -1109,7 +1109,7 @@
     <string name="local_index_unselect_gpx_file">Fravelg</string>
     <string name="local_index_select_gpx_file">Velg for å vise</string>
     <string name="save_as_favorites_points">Lagre som gruppe av favoritter</string>
-    <string name="loading_smth">Laster %1$s …</string>
+    <string name="loading_smth">Laster %1$s…</string>
     <string name="gpx_info_distance">"Avstand: %1$s (%2$s punkter) "</string>
 	<string name="gpx_info_start_time">"Starttid: %1$tF, %1$tT "</string>
 	<string name="gpx_info_end_time">"Sluttid: %1$tF, %1$tT "</string>
@@ -1126,8 +1126,8 @@
     <string name="hours_ago">timer siden</string>
     <string name="minutes_ago">minutter siden</string>
     <string name="seconds_ago">sekunder siden</string>
-    <string name="copying_osmand_one_file_descr">Kopierer fil (%s) til det nye stedet...</string>
-    <string name="copying_osmand_files">Kopierer OsmAnd-datafiler</string>
+    <string name="copying_osmand_one_file_descr">Kopierer fil (%s) til det nye stedet…</string>
+    <string name="copying_osmand_files">Kopierer OsmAnd-datafiler…</string>
     <string name="route_descr_destination">Reisemål</string>
     <string name="gpx_file_name">GPX-filnavn</string>
     <string name="osmand_distance_planning_plugin_name">Distansekalkulator &amp; Planleggingsverktøy</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 5432afc36a..5bcac409f8 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -235,8 +235,8 @@
   <string name="show_gpx_route">Toon op kaart</string>
   <string name="poi_filter_nominatim">Online (Nominatim)</string>
   <string name="search_position_current_location">Huidige positie…</string>
-  <string name="search_position_map_view">Laatste kaartweergave</string>
-  <string name="select_search_position">Zoek in de buurt van:</string>
+  <string name="search_position_map_view">Midden van kaart</string>
+  <string name="select_search_position">Startpunt:</string>
   <string name="context_menu_item_search">Zoek hier dichtbij</string>
   <string name="tip_recent_changes_0_6_7_t">Recent wijzigingen for 0.6.7:
 		\n\t- Offline gegevensmanager (download, verwijder, activeer / deactiveer offline gegevens direct vanuit OsmAnd)
@@ -451,7 +451,7 @@
   <string name="m">m</string>
   <string name="old_map_index_is_not_supported">Verouderd kaartformaat \'\'{0}\'\' wordt niet ondersteund</string>
   <string name="poi_filter_car_aid">Auto hulp</string>
-  <string name="poi_filter_closest_poi">Interessepunten dichtbij</string>
+  <string name="poi_filter_closest_poi">POI in de omgeving</string>
   <string name="poi_filter_custom_filter">Eigen filter</string>
   <string name="poi_filter_food_shop">Eten en drinken (winkel)</string>
   <string name="poi_filter_for_tourists">Voor toeristen</string>
@@ -514,7 +514,7 @@
   <string name="download_files">Download</string>
   <string name="context_menu_item_search_transport">Zoek openbaar vervoer</string>
   <string name="transport_searching_transport">Openbaar vervoer-resultaten (geen bestemming):</string>
-  <string name="transport_searching_route">Vervoer resultaten ({0} naar bestemming):</string>
+  <string name="transport_searching_route">Openbaar vervoer-resultaten ({0} naar bestemming):</string>
   <string name="transport_search_none">geen</string>
   <string name="transport_search_again">Opnieuw OV zoeken</string>
   <string name="map_index">Kaart</string>
@@ -602,9 +602,9 @@
   <string name="route_head">Koers</string>
   <string name="first_time_continue">Ga door</string>
   <string name="first_time_download">Download regio\'s</string>
-  <string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
+  <string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of deze zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
   <string name="search_poi_location">Naar signaal zoeken…</string>
-  <string name="search_near_map">Zoek dichtbij de laatste kaartlocatie</string>
+  <string name="search_near_map">Zoek bij het midden van de kaart</string>
   <string name="search_nearby">Zoek dichtbij</string>
   <string name="map_orientation_default">Zelfde als apparaat-instelling</string>
   <string name="map_orientation_portrait">Portret</string>
@@ -616,14 +616,14 @@
   <string name="transport_Routes">Routes</string>
   <string name="transport_Stop">Halte</string>
   <string name="transport_stops">Haltes</string>
-  <string name="transport_search_after">Voorbij de route</string>
-  <string name="transport_search_before">Voorafgaand aan route</string>
+  <string name="transport_search_after">Aansluitende route</string>
+  <string name="transport_search_before">Voorafgaande route</string>
   <string name="transport_finish_search">Zoeken</string>
   <string name="transport_stop_to_go_out">Kies uitstaphalte</string>
   <string name="transport_to_go_after">Nog te volgen afstand</string>
   <string name="transport_to_go_before">Voorafgaande afstand</string>
   <string name="transport_stops_to_pass">Aantal haltes te gaan</string>
-  <string name="transport_route_distance">Lengte route</string>
+  <string name="transport_route_distance">Lengte van route</string>
   <string name="transport">Openbaar vervoer</string>
   <string name="default_buttons_ok">OK</string>
   <string name="show_transport_over_map_description">Toon haltes openbaar vervoer op kaart</string>
@@ -1444,7 +1444,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="clear_destination">Wis bestemming</string>
     <string name="use_magnetic_sensor_descr">Gebruik magnetische sensor in plaats van oriëntatiesensor voor het kompas</string>
     <string name="use_magnetic_sensor">Gebruik magnetische sensor</string>
-    <string name="use_kalman_filter_compass_descr">Gebruik Kalman-filter om kompasafwijkingen te vermijden</string>
+    <string name="use_kalman_filter_compass_descr">Verminder storingen in het kompas (maakt de kompasweergave langzamer)</string>
     <string name="use_kalman_filter_compass">Gebruik Kalman-filter</string>
     <string name="access_mark_final_location_first">Toegankelijkheidsmodus: kies eerst een bestemming</string> 
     <string name="local_indexes_cat_srtm">Gegevens voor hoogtelijnen</string>
@@ -1612,9 +1612,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="app_mode_truck">Vrachtauto</string>
     <string name="android_19_location_disabled">Vanaf Android 4.4 (KitKat) kunnen kaarten niet meer worden opgeslagen in de bestaande map(%s). Wil je een nieuwe map maken op de toegestane locatie en de OsmAnd-bestanden daar naartoe kopiëren?\n Let op: oude bestanden blijven bestaan. U kunt ze zelf verwijderen.\n Let op: het is niet meer mogelijk bestanden te delen tussen OsmAnd en Osmand+.</string>
     <string name="application_dir_change_warning2">Wil je dat OsmAnd de bestanden naar de nieuwe map verplaatst? Als je \'Nee\' kiest, gebruikt Osmand een nieuwe, lege map.</string>
-    <string name="copying_osmand_one_file_descr">Bestand (%s) wordt gekopieerd naar de nieuwe locatie...</string>
-    <string name="copying_osmand_files_descr">OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)</string>
-    <string name="copying_osmand_files">Kopieer OsmAnd-bestanden</string>
+    <string name="copying_osmand_one_file_descr">Kopieer bestand (%s) naar de nieuwe locatie…</string>
+    <string name="copying_osmand_files_descr">OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)…</string>
+    <string name="copying_osmand_files">Kopieer OsmAnd-bestanden…</string>
     <string name="calculate_osmand_route_gpx">Bereken de route offline met OsmAnd</string>
     <string name="routing_attr_prefer_motorway_name">Bij voorkeur autowegen</string>
 	<string name="routing_attr_prefer_motorway_description">Gebruik bij voorkeur autowegen</string>
@@ -1630,7 +1630,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="routing_attr_avoid_motorway_description">Vermijd autowegen</string>
 	<string name="routing_attr_weight_description">Geef het gewicht van het voertuig voor de routeplanning</string>
     <string name="routing_attr_weight_name">Gewicht voertuig</string>
-	<string name="select_gpx">GPX-bestand kiezen …</string>
+	<string name="select_gpx">GPX-bestand kiezen…</string>
     <string name="route_descr_select_destination">Bestemming kiezen</string>
     <string name="route_descr_select_on_map">Kies op de kaart…</string>
     <string name="route_descr_favorite">Favoriet…</string>
@@ -1840,7 +1840,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="gpx_selection_track">%1$s \nTrack %2$s</string>
     <string name="gpx_available_current_track">Huidige geregistreerde track</string>
     <string name="save_as_favorites_points">Bewaar als groep van favorieten</string>
-    <string name="loading_smth">Laad %1$s …</string>
+    <string name="loading_smth">Laad %1$s…</string>
     <string name="map_widget_plain_time">Huidige tijd</string>
     <string name="select_destination_and_intermediate_points">Routepunten kiezen</string>
     <string name="layer_amenity_label">Namen van interessepunten</string>
@@ -2037,7 +2037,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="rendering_value_germanRoadAtlas_name">Duitse wegenkaart</string>
     <string name="rendering_value_americanRoadAtlas_name">Amerikaanse wegenkaart</string>
     <string name="routing_attr_no_new_routing_name">Gebruik routeberekening v1.9 niet</string>
-    <string name="routing_attr_no_new_routing_description">Gebruik routeberekening v1.9 niet</string>
+    <string name="routing_attr_no_new_routing_description">Gebruik de routeregels van vóór versie 1.9</string>
     <string name="traffic_warning_railways">Spoorweg overgang</string>
 	<string name="traffic_warning_pedestrian">Voetgangers oversteekplaats</string>
 	<string name="show_railway_warnings">Toon spoorwegovergangen</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index ae83426d29..9856ff8ec7 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -176,7 +176,7 @@
 	<string name="poi_bridge">Most</string>
 
 	<string name="poi_speed_camera">Fotoradar</string>
-	<string name="poi_emergency_access_point">Pogotowie</string>
+	<string name="poi_emergency_access_point">Ambulatoryjne świadczenia zdrowotne</string>
 
 	<string name="poi_railway_halt">Dworzec kolejowy (nieaktualne)</string>
 	<string name="poi_turning_circle">Miejsce do zawracania</string>
@@ -198,4 +198,53 @@
 	<string name="poi_telephone">Telefon</string>
 	<string name="poi_waste_basket">Kosz na śmieci</string>
 
+	<string name="poi_mine_historic">Zabytkowa kopalnia</string>
+	<string name="poi_waterway_turning_point">Żeglugowy punkt zwrotny</string>
+	<string name="poi_weir">Grobla</string>
+	<string name="poi_power_plant">Elektrownia</string>
+	<string name="poi_power_generator">Generator prądu</string>
+
+	<string name="poi_communication_tower">Wieża komunikacyjna</string>
+	<string name="poi_telephone_exchange">Centrala telefoniczna</string>
+
+	<string name="poi_landfill">Składowisko odpadów</string>
+	<string name="poi_waste_disposal">Złomowisko</string>
+	<string name="poi_pier">Molo</string>
+	<string name="poi_surveillance">Centrum nadzoru</string>
+	<string name="poi_observatory">Obserwatorium</string>
+	<string name="poi_astronomical_observatory">Obserwatorium astronomiczne</string>
+	<string name="poi_tower">Wieża</string>
+	<string name="poi_mast">Maszt</string>
+	<string name="poi_radar">Radar</string>
+	<string name="poi_construction">Budowa</string>
+	<string name="poi_works">Fabryka</string>
+	<string name="poi_mineshaft">Szyb</string>
+	<string name="poi_adit">Sztolnia</string>
+	<string name="poi_petroleum_well">Szyb ropy naftowej</string>
+	<string name="poi_windmill">Wiatrak</string>
+	<string name="poi_quarry">Kamieniołom</string>
+	<string name="poi_vineyard">Winnica</string>
+	<string name="poi_orchard">Sad</string>
+	<string name="poi_driving_school">Szkoła nauki jazdy</string>
+	<string name="poi_school">Szkoła</string>
+	<string name="poi_kindergarten">Przedszkole</string>
+	<string name="poi_college">Uczelnia</string>
+	<string name="poi_university">Uniwersytet</string>
+
+	<string name="poi_social_facility">Placówka społeczna</string>
+	<string name="poi_courthouse">Sąd</string>
+	<string name="poi_prison">Więzienie</string>
+	<string name="poi_register_office">Urząd stanu cywilnego</string>
+	<string name="poi_embassy">Ambasada</string>
+	<string name="poi_government">Rząd</string>
+	<string name="poi_bailiff">Komornik</string>
+	<string name="poi_prosecutor">Prokurator</string>
+	<string name="poi_pension_fund">Fundusz emerytalny</string>
+	<string name="poi_tax_inspection">Urząd podatkowy</string>
+	<string name="poi_administrative_office">Urząd</string>
+	<string name="poi_customs">Urząd celny</string>
+	<string name="poi_city">Miasto</string>
+	<string name="poi_town">Miasto</string>
+	<string name="poi_village">Wieś</string>
+	<string name="poi_hamlet">Wioska</string>
 	</resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index b15effc1e0..d6a088f8aa 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -52,7 +52,7 @@
   <string name="search_position_undefined">Niezdefiniowane</string>
   <string name="search_position_fixed">Ustalono</string>
   <string name="search_position_current_location">Obecna pozycja…</string>
-  <string name="search_position_map_view">Ostatni widok mapy</string>
+  <string name="search_position_map_view">Aktualny środek mapy</string>
   <string name="select_search_position">Szukaj w pobliżu:</string>
   <string name="context_menu_item_search">Szukaj w pobliżu</string>
   <string name="tip_recent_changes_0_6_7_t">"Zmiany dla wersji 0.6.7: \n\t- możliwość pobrania map bezpośrednio z poziomu aplikacji (pobierz, usuń, zrób kopię zapasową danych bezpośrednio w OsmAnd) \n\t- ulubione punkty i grupy (kategoryzuj, usuń, zarządzaj ulubionymi) \n\t- GPX Explorer w aplikacji (see tracks, distance, average speed, elevation, etc.) \n\t- nawigacja w oparciu o track GPX (useful options, continue navigation after crash, supports roundabouts) \n\t- możliwość zapisania trasy jako ślad GPX do wykorzystania w trybie offline \n\t- poprawiono monitorowanie GPX (filtruje niektóre nieprecyzyjne położenia i zapisuje precyzję/wysokość/prędkość) \n\t- możliwość wysłania śladu GPX dla społeczności OSM (http://download.osmand.net/gpx/) \n\t- usprawnienie rendera wektorowego \n\t- usprawnienie mechanizmu TTS (dokładny dystans) \n\t- poprawki różnych błędów "</string>
@@ -324,9 +324,9 @@
   <string name="use_high_res_maps_descr">Nie rozciągaj i rozmazuj kafelków mapy na ekranach o dużej rozdzielczości</string>
   <string name="unknown_location">Pozycja nie jest jeszcze znana</string>
   <string name="download_files">Pobierz</string>
-  <string name="context_menu_item_search_transport">Wyszukaj komunikację</string>
-  <string name="transport_searching_transport">Rezultat wyszukiwania komunikacji (brak celu):</string>
-  <string name="transport_searching_route">Rezultat wyszukiwania komunikacji ({0} do celu):</string>
+  <string name="context_menu_item_search_transport">Wyszukaj transport publiczny</string>
+  <string name="transport_searching_transport">Rezultat wyszukiwania transportu (brak celu):</string>
+  <string name="transport_searching_route">Rezultat wyszukiwania transportu ({0} do celu):</string>
   <string name="transport_search_none">Żaden</string>
   <string name="transport_search_again">Resetuj wyszukiwanie transportu</string>
   <string name="map_index">Mapa</string>
@@ -416,9 +416,9 @@
   <string name="route_head">Prosto</string>
   <string name="first_time_continue">Kontynuuj</string>
   <string name="first_time_download">Pobierz region</string>
-  <string name="first_time_msg">Dziękujemy za korzystanie z OsmAnd. Do wykorzystania większości funkcji aplikacji potrzebujesz danych o wybranym regionie, które pobierzesz w \'Ustawienia\' → \'Zarządzaniu plikami map\'. Dzięki nim będziesz mógł przeglądać mapy, wyszukiwać adresy, POI i inne obiekty.</string>
+  <string name="first_time_msg">Dziękujemy za korzystanie z OsmAnd. Do wykorzystania większości funkcji aplikacji potrzebujesz danych o wybranym regionie, które pobierzesz w \'Ustawienia\' → \'Zarządzaniu plikami map\'. Dzięki nim będziesz mógł przeglądać mapy, wyszukiwać adresy, POI i transport publiczny.</string>
   <string name="search_poi_location">Wyszukiwanie sygnału…</string>
-  <string name="search_near_map">Szukaj w pobliżu ostatniej pozycji</string>
+  <string name="search_near_map">Szukaj w pobliżu aktualnego środka mapy</string>
   <string name="search_nearby">Szukaj w pobliżu</string>
   <string name="map_orientation_default">Jak w urządzeniu</string>
   <string name="map_orientation_portrait">Pionowo</string>
@@ -855,10 +855,10 @@
 <u>Online OSM</u> map classification with images"</string>
   <string name="local_index_routing_data">Dane trasowania</string>
   <string name="navigate_point_format">Format:</string>
-  <string name="poi_search_desc">Wyszukaj POI</string>
+  <string name="poi_search_desc">Wyszukiwanie POI</string>
   <string name="address_search_desc">Wyszukiwanie adresu</string>
   <string name="navpoint_search_desc">Współrzędne</string>
-  <string name="transport_search_desc">Wyszukaj transport</string>
+  <string name="transport_search_desc">Wyszukiwanie transportu publicznego</string>
   <string name="favourites_search_desc">Wyszukaj w ulubionych</string>
   <string name="history_search_desc">Historia wyszukiwania</string>
   <string name="rendering_attr_noPolygons_description">"Ukryj wszystkie elementy mapy będące terenami ziemnymi"</string>
@@ -980,7 +980,7 @@
 		\n\t* \'Względem kompasu\' - Mapa będzie ciągle ustawiana zgodnie z kierunkiem wskazywanym przez kompas.
 	</string>
 <string name="osmand_short_description_80_chars">OsmAnd to aplikacja nawigacyjna open source  wspierająca mapy kafelkowe oraz wektorowe</string>
-<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automatyczne Nawigowanie Do celu) OsmAnd jest programem open source do nawigacji z dostępem do szerokiej gamy globalnych map OpenStreetMap (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu w użycia offline. OsmAnd oferuje również funkcjonalność routingu w trybie offline i online zawierającą zapowiedzi głosowe. Niektóre z podstawowych funkcji: - Funkcjonalnowanie w trybie offline (przechowuje pobrane mapy wektorowych lub kafelkowe w pamięci urządzenia) - Dostępne kompaktowe mapy w trybie offlinie dla całego świata - Pobieranie map kraju lub regionu bezpośrednio z aplikacji - Możliwość nakładania kilku warstw map, takich jak GPX lub tras nawigacji, ciekawe miejsc, ulubionych, linii konturu, przystanków komunikacji miejskiej, dodatkowe mapy z konfigurowalną przejrzystością - Wyszukiwanie Offline adresów i miejsc (POI) - Wyznaczanie w trybie Offline tras na krótkich dystansach (eksperymentalne) - Tryby samochodowy, rowerowy i pieszy z: - opcjonalnym automatycznym przełączaniem widoku dzień/noc - opcjonalnie skalowanie map w zależności od prędkości - opcjonalne wyrównanie map według kompasu lub kierunku ruchu - opcjonalne wyświetlanie wskazywanie pasów, ograniczeń prędkości, głosy nagrane i głowy TTS w bezpłatnej wersji OsmAnd: - limitowana liczba pobrań mapy - Brak dostępu do Wikipedii dla POI w trybie offline jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd + lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na osmand.net. "</string>
+<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automatyczne Nawigowanie Do celu) OsmAnd jest programem open source do nawigacji z dostępem do szerokiej gamy globalnych map OpenStreetMap (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu w użycia offline. OsmAnd oferuje również nawigację w trybie offline i online zawierającą zapowiedzi głosowe. Niektóre z podstawowych funkcji: - Funkcjonowanie w trybie offline (przechowuje pobrane mapy wektorowych lub kafelkowe w pamięci urządzenia) - Dostępne kompaktowe mapy w trybie offlinie dla całego świata - Pobieranie map kraju lub regionu bezpośrednio z aplikacji - Możliwość nakładania kilku warstw map, takich jak GPX lub tras nawigacji, ciekawe miejsc, ulubionych, linii konturu, przystanków komunikacji miejskiej, dodatkowe mapy z konfigurowalną przejrzystością - Wyszukiwanie Offline adresów i miejsc (POI) - Wyznaczanie w trybie Offline tras na krótkich dystansach (eksperymentalne) - Tryby samochodowy, rowerowy i pieszy z: - opcjonalnym automatycznym przełączaniem widoku dzień/noc - opcjonalnie skalowanie map w zależności od prędkości - opcjonalne wyrównanie map według kompasu lub kierunku ruchu - opcjonalne wyświetlanie wskazywanie pasów, ograniczeń prędkości, głosy nagrane i głowy TTS w bezpłatnej wersji OsmAnd: - limitowana liczba pobrań mapy - Brak dostępu do Wikipedii dla POI w trybie offline jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd + lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na osmand.net. "</string>
 <string name="osmand_plus_short_description_80_chars">OsmAnd to aplikacja open source do nawigacji obsługująca mapy offline i online</string>
 <string name="avoid_motorway">Autostrad</string>
 <string name="snap_to_road_descr">Przyciągaj pozycję do drogi podczas nawigacji</string>
@@ -1236,7 +1236,7 @@
     <string name="use_magnetic_sensor_descr">Użyj czujnika pola magnetycznego, aby określić kierunek kompasu</string>
     <string name="use_magnetic_sensor">Użyj czujnika magnetycznego (kompas)</string>
     <string name="local_indexes_cat_srtm">Dane poziomic</string>
-    <string name="use_kalman_filter_compass_descr">Użyj filtru Kalmana, aby uniknąć odchyleń kompasu</string>
+    <string name="use_kalman_filter_compass_descr">Redukuje szumy w odczytach kompasu, ale zwiększa bezwładność</string>
     <string name="use_kalman_filter_compass">Użyj filtru Kalmana</string>
     <string name="access_mark_final_location_first">Tryb ułatwień dostępu: wybierz najpierw punkt docelowy</string> 
     <string name="wait_current_task_finished">Zaczekaj aż bieżące zadanie zostanie zakończone</string>
@@ -1553,9 +1553,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="guidance_preferences_descr">Ustawienia nawigacji</string>
     <string name="routing_preferences_descr">Ustawienia obliczania trasy</string>
     <string name="app_mode_truck">Ciężarówka</string>
-    <string name="copying_osmand_one_file_descr">Kopiowanie pliku (%s) do nowej lokalizacji...</string>
-    <string name="copying_osmand_files_descr">Kopiowanie plików OsmAnd do nowej lokalizacji (%s)</string>
-    <string name="copying_osmand_files">Kopiowanie plików OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Kopiowanie pliku (%s) do nowej lokalizacji…</string>
+    <string name="copying_osmand_files_descr">Kopiowanie plików OsmAnd do nowej lokalizacji (%s)…</string>
+    <string name="copying_osmand_files">Kopiowanie plików OsmAnd…</string>
     <string name="application_dir_change_warning2">Czy chcesz, aby OsmAnd skopiował też swoje dane do nowej lokalizacji? Wybierz \'Nie\', aby OsmAnd utworzył tylko nowy folder.</string>
     <string name="android_19_location_disabled">Od wersji 4.4 KitKat nie można pobierać ani aktualizować map w poprzedniej lokalizacji (%s). Czy chcesz ją zmienić na lokalizację dozwoloną i skopiować do niej wszystkie pliki?
 \n Uwaga 1: Twoje stare pliki zostaną nienaruszone (mogą być usunięte manualnie).
@@ -1574,10 +1574,10 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="routing_attr_avoid_motorway_description">Unikaj autostrad</string>
 	<string name="routing_attr_weight_name">Limit wagi</string>
 	<string name="routing_attr_weight_description">Określ ograniczenie masy pojazdu dozwolone na drodze</string>
-    <string name="select_gpx">Wybierz GPX …</string>
+    <string name="select_gpx">Wybierz GPX…</string>
     <string name="route_descr_select_destination">Wybierz cel podróży</string>
-    <string name="route_descr_select_on_map">Wybierz na mapie …</string>
-    <string name="route_descr_favorite">Ulubione …</string>
+    <string name="route_descr_select_on_map">Wybierz na mapie…</string>
+    <string name="route_descr_favorite">Ulubione…</string>
     <string name="route_preferences">Ustawienia trasy</string>
     <string name="route_info">Informacje o trasie</string>
     <string name="calculate_osmand_route_gpx">Przelicz trasę offline w OsmAnd</string>
@@ -1685,7 +1685,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="osmo_auto_send_locations">Automatycznie uruchom sesję trackera</string>
     <string name="osmo_tracker_id">Osobisty identyfikator trackera</string>
     <string name="osmo_session_token">Token sesji: %1$s</string>
-    <string name="osmo_auth_pending">Oczekiwanie na autoryzację...</string>
+    <string name="osmo_auth_pending">Oczekiwanie na autoryzację…</string>
     <string name="osmo_conn_successfull">Ustanowiono połączenie: %1$s </string>
     <string name="osmo_mode_restart">Uruchom ponownie sesję OsMo</string>
     <string name="osmo_settings_debug">Informacje debugowania</string>
@@ -1789,7 +1789,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="delay_navigation_start">Rozpocznij nawigację automatycznie</string>
     <string name="selected">wybrano</string>
     <string name="gpx_split_interval">Interwał podziału</string>
-    <string name="loading_smth">Ładowanie %1$s …</string>
+    <string name="loading_smth">Wczytywanie %1$s…</string>
     <string name="map_widget_plain_time">Aktualny czas</string>
     <string name="gpx_wpt">Punkt trasy</string>
     <string name="save_as_favorites_points">Zapisz jako grupę ulubionych</string>
@@ -1855,13 +1855,13 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="lang_zh_TW">Chiński tradycyjny</string>
 	<string name="rendering_attr_subwayMode_name">Trasy metra</string>
  	<string name="download_additional_maps">Pobrać brakujące mapy %1$s (%2$d MB)?</string>
-    <string name="more">Więcej...</string>
+    <string name="more">Więcej…</string>
     <string name="rendering_value_browse_map_name">Przeglądaj mapę</string>  
     <string name="rendering_value_car_name">Samochód</string>
     <string name="rendering_value_bicycle_name">Rower</string>
     <string name="rendering_value_pedestrian_name">Pieszy</string>
     <string name="rendering_attr_coloredBuildings_name">Kolorowy kod typów budynków</string>
-    <string name="osmo_invite">Zaproś...</string>
+    <string name="osmo_invite">Zaproś…</string>
     <string name="osmo_leave_confirmation_msg">Czy chcesz opuścić grupę %1$s?</string>
     <string name="osmo_specify_tracker_id">Określ id</string>
     <string name="continue_navigation">Kontynuuj nawigację</string>
@@ -1934,7 +1934,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="search_radius_proximity">W odległości</string>
     <string name="wake_on_voice">Włącz ekran</string>
     <string name="wake_on_voice_descr">Włącz ekran urządzenia podczas zbliżania się do skrętu</string>
-    <string name="select_impassable_road">Zaznacz na mapie</string>
+    <string name="select_impassable_road">Zaznacz na mapie…</string>
     <string name="impassable_road">Unikaj dróg…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Trasy tramwajowe i kolejowe</string>
     <string name="tip_recent_changes_1_9_t">"Zmiany w 1.9: * Aktualizacja stylów mapy z renderowaniem warstw nawierzchni drogi, transportu i symboli turystycznych * Wyszukiwanie punktów POI wzdłuż trasy * Zaznaczanie nieprzejezdnej drogi dla danego przejazdu * Ułatwienia pobrania i aktualizacji mapy * Otrzymywanie powiadomień wizualnych i audio podczas zbliżania się do punktu * Drukuj informacje o trasie i manewrach * Wsparcie dla asystenta pasa ruchu * Wsparcie Android Wear * Dużo zmian UI * Oddzielne powiększenie rozmiaru dla tekstu na mapie * Specjalne powiadomienia dźwiękowe w przypadku zjechania z trasy * Funkcjonalności logowania do Osmo * Poprawienie niezgodności wersji OsMo "</string>
@@ -1949,7 +1949,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="osmo_use_https_descr">Użyj bezpiecznego połączenia z serwerem</string>
     <string name="osmo_use_https">Użyj HTTPS</string>
 	<string name="advanced_settings">Zaawansowane</string>
-	<string name="home_button">Strona startowa</string>
+	<string name="home_button">Dom</string>
     <string name="map_update">Dostępne aktualizacje dla %1$s map</string>
 	<string name="search_for">Wyszukaj</string>
 	<string name="show_map">POKAŻ MAPĘ</string>
@@ -1986,4 +1986,5 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="show_railway_warnings">Pokazuj przejazdy kolejowe</string>
 	<string name="show_pedestrian_warnings">Pokazuj przejścia dla pieszych</string>
     <string name="speak_pedestrian">Informuj o przejściach dla pieszych</string>
-    </resources>
+    <string name="rendering_value__name">Domyślne</string>
+	</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 36ca52dacb..856093b89d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -554,28 +554,28 @@
 	<string name="poi_seamark_anchorage">Якорная стоянка</string>
 	<string name="poi_seamark_anchor_berth">Якорный причал</string>
 	<string name="poi_seamark_beacon">Бакен</string>
-	<string name="poi_seamark_beacon_cardinal"/>
-	<string name="poi_seamark_beacon_lateral"/>
-	<string name="poi_seamark_beacon_safe_water"/>
+	<string name="poi_seamark_beacon_cardinal">Кардинальный бакен</string>
+	<string name="poi_seamark_beacon_lateral">Латеральный бакен</string>
+	<string name="poi_seamark_beacon_safe_water">Бакен безопасности</string>
 	<string name="poi_seamark_beacon_special_purpose">Бакен специального назначения</string>
 	<string name="poi_seamark_berth">Причал</string>
-	<string name="poi_seamark_building"/>
-	<string name="poi_seamark_bridge"/>
-	<string name="poi_seamark_buoy_cardinal"/>
+	<string name="poi_seamark_building">Здание</string>
+	<string name="poi_seamark_bridge">Мост</string>
+	<string name="poi_seamark_buoy_cardinal">Кардинальный буй</string>
 	<string name="poi_seamark_buoy_installation">Знак изолированной опасности</string>
-	<string name="poi_seamark_buoy_isolated_danger"/>
-	<string name="poi_seamark_buoy_lateral"/>
+	<string name="poi_seamark_buoy_isolated_danger">Буй (изолированная опасность)</string>
+	<string name="poi_seamark_buoy_lateral">Латеральный буй</string>
 	<string name="poi_seamark_buoy_safe_water"/>
 	<string name="poi_seamark_buoy_special_purpose">Специальный буй</string>
-	<string name="poi_seamark_daymark"/>
-	<string name="poi_seamark_distance_mark"/>
-	<string name="poi_seamark_dry_dock"/>
+	<string name="poi_seamark_daymark">Дневной маяк</string>
+	<string name="poi_seamark_distance_mark">Отметка расстояния</string>
+	<string name="poi_seamark_dry_dock">Сухой док</string>
 	<string name="poi_seamark_dyke"/>
-	<string name="poi_seamark_floating_dock"/>
+	<string name="poi_seamark_floating_dock">Плавучий док</string>
 	<string name="poi_seamark_fog_signal">Сигнал при тумане</string>
 	<string name="poi_seamark_harbour_basin"/>
 	<string name="poi_seamark_harbour">Гавань</string>
-	<string name="poi_seamark_landmark"/>
+	<string name="poi_seamark_landmark">Ориентир</string>
 	<string name="poi_seamark_light"/>
 	<string name="poi_seamark_light_major"/>
 	<string name="poi_seamark_light_minor"/>
@@ -586,11 +586,11 @@
 	<string name="poi_seamark_pile"/>
 	<string name="poi_seamark_radar_transponder"/>
 	<string name="poi_seamark_radio_station">Радиостанция</string>
-	<string name="poi_seamark_signal_station_traffic"/>
+	<string name="poi_seamark_signal_station_traffic">Сигнальная станция</string>
 	<string name="poi_seamark_signal_station_warning">Сигнал опасности</string>
-	<string name="poi_seamark_small_craft_facility"/>
+	<string name="poi_seamark_small_craft_facility">Лодочная станция</string>
 	<string name="poi_seamark_topmark"/>
-	<string name="poi_seamark_rock"/>
+	<string name="poi_seamark_rock">Скала</string>
 	<string name="poi_seamark_wreck">Кораблекрушение</string>
 
 	<string name="poi_military_airfield">Военный аэродром</string>
@@ -637,4 +637,15 @@
 	<string name="poi_attraction_train">Поезд (аттракцион)</string>
 	<string name="poi_water_slide">Водные горки</string>
 
+	<string name="poi_radar">Радар</string>
+	<string name="poi_aquarium">Аквариум</string>
+	<string name="poi_motorway_junction">Съезд</string>
+
+	<string name="poi_tower">Башня</string>
+	<string name="poi_mast">Мачта</string>
+	<string name="poi_attraction_animal">Животное (аттракцион)</string>
+	<string name="poi_slide">Горка</string>
+	<string name="poi_summer_toboggan">Летние санки</string>
+	<string name="poi_dock">Док</string>
+	<string name="poi_roller_coaster">Американские горки</string>
 	</resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index a468c9558f..895e7917da 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -111,7 +111,7 @@
   <string name="unknown_location">Определяем местоположение</string>
   <string name="modify_transparency">Изменить прозрачность (0 - прозрачный, 255 - непрозрачный)</string>
   <string name="confirm_interrupt_download">Прервать загрузку файла?</string>
-  <string name="first_time_msg">Для работы большинства основных возможностей приложения требуются детальные карты регионов, которые можно загрузить из Интернета с помощью пункта меню \"Настройки\" → \"Управление файлами карт\". После загрузки Вы сможете просматривать карты, осуществлять поиск адресов, POI и остановок общественного транспорта.</string>
+  <string name="first_time_msg">Для работы большинства основных возможностей приложения требуются детальные карты регионов, которые можно загрузить из Интернета с помощью пункта меню \"Настройки\" → \"Управление файлами карт\". После загрузки Вы сможете просматривать карты, осуществлять поиск адресов, POI и общественного транспорта.</string>
   <string name="basemap_was_selected_to_download">Базовая карта необходима для корректной работы приложения и автоматически была выбрана для загрузки.</string>
   <string name="select_index_file_to_download">Ничего не было найдено. Вы можете создать карту самостоятельно (смотрите на osmand.net).</string>
   <string name="local_indexes_cat_tile">Онлайн карты (растровые)</string>
@@ -276,8 +276,8 @@
   <string name="search_position_undefined">Неопределенно</string>
   <string name="search_position_fixed">Точка</string>
   <string name="search_position_current_location">Текущее местоположение…</string>
-  <string name="search_position_map_view">Вид карты</string>
-  <string name="select_search_position">Искать рядом:</string>
+  <string name="search_position_map_view">Текущий центр карты</string>
+  <string name="select_search_position">Начало:</string>
   <string name="context_menu_item_search">Искать рядом</string>
   <string name="tip_recent_changes_0_6_7_t">Изменения в 0.6.7:
 		\n\t- Менеджер локальных данных (просмотр, удаление, создание архива данных прямо в OsmAnd)
@@ -330,7 +330,7 @@
   
   <string name="local_index_poi_data">POI</string>
   <string name="local_index_address_data">Адрес</string>
-  <string name="local_index_transport_data">Транспорт</string>
+  <string name="local_index_transport_data">Данные публичного транспорта</string>
   <string name="local_index_map_data">Карта</string>
   
   <string name="local_indexes_cat_backup">Архивировано</string>
@@ -397,7 +397,7 @@
   <string name="search_offline_geo_error">Невозможно разобрать запрос: \"%s\"</string>
   <string name="search_osm_offline">Поиск по адресу в локальных картах</string>
   <string name="system_locale">Системная</string>
-  <string name="preferred_locale_descr">Изменить язык программы</string>
+  <string name="preferred_locale_descr">Выбор языка программы (перезапустите OsmAnd после изменения)</string>
   <string name="preferred_locale">Локализация</string>
   <string name="tip_map_switch">Источник карты</string>
   
@@ -531,10 +531,10 @@
   <string name="use_high_res_maps">Дисплей высокого разрешения</string>
   <string name="use_high_res_maps_descr">Не растягивать (с размытием) растровые карты на дисплеях высокого разрешения</string>
   <string name="download_files">Загрузить</string>
-  <string name="context_menu_item_search_transport">Искать транспорт</string>
+  <string name="context_menu_item_search_transport">Искать общественный транспорт</string>
   <string name="transport_context_menu">Искать транспорт на остановке</string>
-  <string name="transport_searching_transport">Искать транспорт (нет цели):</string>
-  <string name="transport_searching_route">Искать транспорт (до цели {0}):</string>
+  <string name="transport_searching_transport">Результат поиска транспорта (нет цели):</string>
+  <string name="transport_searching_route">Результ поиска транспорта (до цели {0}):</string>
   <string name="transport_search_again">Искать транспорт заново</string>
   <string name="map_index">Карта</string>
   <string name="voice">Голосовые данные (запись)</string>
@@ -624,7 +624,7 @@
   <string name="first_time_continue">Продолжить</string>
   <string name="first_time_download">Загрузить детальные карты регионов</string>
   <string name="search_poi_location">Поиск сигнала…</string>
-  <string name="search_near_map">Искать вокруг выбранного центра карты</string>
+  <string name="search_near_map">Искать вокруг текущего центра карты</string>
   <string name="search_nearby">Искать рядом</string>
   <string name="map_orientation_default">По умолчанию</string>
   <string name="map_orientation_portrait">Портрет</string>
@@ -637,8 +637,8 @@
   <string name="transport_Stop">Остановка</string>
   <string name="transport_stops">остановок</string>
   <string name="transport_search_none">нет</string>
-  <string name="transport_search_after">Маршрут после</string>
-  <string name="transport_search_before">Маршрут до</string>
+  <string name="transport_search_after">Последующий маршрут</string>
+  <string name="transport_search_before">Предыдущий маршрут</string>
   <string name="transport_finish_search">Закончить поиск</string>
   <string name="transport_stop_to_go_out">Выберите остановку</string>
   <string name="transport_to_go_after">идти после</string>
@@ -647,8 +647,8 @@
   <string name="transport_route_distance">Длина пути</string>
   <string name="transport">Транспорт</string>
   <string name="default_buttons_ok">OK</string>
-  <string name="show_transport_over_map_description">Показать остановки транспорта на карте</string>
-  <string name="show_transport_over_map">Показать транспорт</string>
+  <string name="show_transport_over_map_description">Показывать остановки общественного транспорта на карте</string>
+  <string name="show_transport_over_map">Показать остановки транспорта</string>
   <string name="hello">Навигационное приложение OsmAnd</string>
   <string name="update_poi_success">Данные POI были успешно обновлены ({0} объектов загружено)</string>
   <string name="update_poi_error_local">Ошибка сохранения локальной POI</string>
@@ -981,7 +981,7 @@
   <string name="poi_search_desc">Поиск POI</string>
   <string name="address_search_desc">Поиск по адресу</string>
   <string name="navpoint_search_desc">Координаты</string>
-  <string name="transport_search_desc">Поиск транспорта</string>
+  <string name="transport_search_desc">Поиск общественного транспорта</string>
   <string name="favourites_search_desc">Поиск в избранном</string>
   <string name="history_search_desc">История поиска</string>
   <string name="rendering_attr_noPolygons_description">Отображать только границы многоугольников, без заливки</string>
@@ -1247,7 +1247,7 @@
     <string name="av_def_action_choose">Выберите по запросу</string>
     <string name="osmand_play_title_30_chars">OsmAnd карты и навигация</string>
 	<string name="osmand_plus_play_title_30_chars">OsmAnd+ карты и навигация</string>
-	<string name="use_kalman_filter_compass_descr">Использовать фильтр Калмана для избежания отклонений компаса</string>
+	<string name="use_kalman_filter_compass_descr">Уменьшает \"шум\" компаса, но добавляет инерцию</string>
     <string name="use_kalman_filter_compass">Использовать фильтр Калмана</string>
     <string name="cancel_navigation">Прекратить навигацию</string>
     <string name="use_magnetic_sensor">Использовать датчик магнитного поля</string>
@@ -1414,7 +1414,7 @@
     <string name="routing_preferences_descr">Настройки маршрутизации</string>
     <string name="app_mode_truck">Грузовик</string>
     <string name="calculate_osmand_route_gpx">Рассчитать оффлайновый маршрут OsmAnd</string>
-    <string name="copying_osmand_files">Копирование файлов данных OsmAnd</string>
+    <string name="copying_osmand_files">Копирование файлов данных OsmAnd…</string>
     <string name="speech_rate">Скорость произношения</string>
     <string name="app_modes_choose_descr">Выберите профили, видимые в приложении</string>
     <string name="app_modes_choose">Профили приложения</string>
@@ -1425,7 +1425,7 @@
 \n Примечание 2: При переносе файлов в новое хранилище совместное использование файлов OsmAnd и OsmAnd+ не возможно.</string>
     <string name="application_dir_change_warning2">Хотите ли Вы, чтобы OsmAnd скопировал файлы данных на новое место? Выберите \"Нет\", чтобы OsmAnd только создал и использовал новую директорию.</string>
     <string name="copying_osmand_one_file_descr">Копирование файла (%s) на новое место…</string>
-    <string name="copying_osmand_files_descr">Копирование файлов данных OsmAnd на новое место (%s)</string>
+    <string name="copying_osmand_files_descr">Копирование файлов данных OsmAnd на новое место (%s)…</string>
     <string name="tip_recent_changes_1_6_t">Изменения в 1.6:
 	\n\t* Поддержка устройств с разрешением Full HD;
 	\n\t* Поддержка прозрачного фона карты;
@@ -1805,7 +1805,7 @@
     <string name="rendering_attr_busRoutes_name">Маршруты автобусов</string>
     <string name="rendering_attr_tramTrainRoutes_name">Маршруты трамваев и поездов</string>
     <string name="rendering_category_hide">Скрыть</string>
-    <string name="select_impassable_road">Выбрать на карте</string>
+    <string name="select_impassable_road">Выбрать на карте…</string>
     <string name="impassable_road">Избегать дороги…</string>
     <string name="wake_on_voice_never">Никогда</string>
     <string name="lock_screen_request_explanation">%1$s необходимо это разрешение, чтобы выключить экран для экономии энергии.</string>
@@ -1849,4 +1849,5 @@
     <string name="traffic_warning_railways">Железнодорожный переезд</string>
 	<string name="traffic_warning_pedestrian">Пешеходный переход</string>
 	<string name="speak_pedestrian">Сообщать о пешеходных переходах</string>
-    </resources>
+    <string name="rendering_value__name">По умолчанию</string>
+	</resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index ebc892d375..2b7b7ea64a 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -60,8 +60,8 @@
     <string name="keep_and_add_destination_point">Annànghe unu puntu de destinatzione</string>
     <string name="select_gpx">Issèbera GPX…</string>
     <string name="route_descr_select_destination">Issèbera sa destinatzione</string>
-    <string name="route_descr_select_on_map">Issèbera in sa mapa…</string>
-    <string name="route_descr_favorite">Preferridu…</string>
+    <string name="route_descr_select_on_map">Ischerta in sa mapa…</string>
+    <string name="route_descr_favorite">Prefèrridu…</string>
     <string name="route_preferences">Preferèntzias pro s\'àndala</string>
     <string name="route_info">Informatziones de s\'àndalas</string>
     <string name="routing_attr_prefer_motorway_name">Preferre sas autostradas</string>
@@ -82,9 +82,9 @@
 \n Nota 1: sos datos antepostos tuos non at a èssere mudados (ma podent essere burrados manualmente).
 \n Nota 2: in sa cartella noa non at a èssere possìbile cumpartzire sos datos intra OsmAnd e OsmAnd+.</string>
     <string name="application_dir_change_warning2">Boles chi OsmAnd còpiet sos datos suos fintzas in sa destinatzione noa? Icherta \"Nono\" pro fàghere petzi creare ed impreare una cartella noa a OsmAnd.</string>
-    <string name="copying_osmand_one_file_descr">Copiande su documentu (%s) in sa destinatzione noa...</string>
-    <string name="copying_osmand_files_descr">Copiande sos datos de OsmAnd in (%s), sa destinatzione noa</string>
-    <string name="copying_osmand_files">Copiande sos datos de OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Copiande su documentu (%s) in sa destinatzione noa…</string>
+    <string name="copying_osmand_files_descr">Copiande sos datos de OsmAnd in (%s), sa destinatzione noa…</string>
+    <string name="copying_osmand_files">Copiande sos datos de OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Càlcula s\'àndala OsmAnd sena lìnia</string>
     <string name="app_mode_truck">Càmion</string>
     <string name="guidance_preferences_descr">Preferèntzias de nàvigu</string>
@@ -574,7 +574,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="save_as_favorites_points">Sarba comente grupu de prefèrridos</string>
     <string name="select_destination_and_intermediate_points">Issèbera sas tapas</string>
     <string name="layer_amenity_label">Etichetas de sos puntos</string>
-    <string name="loading_smth">Carrigamentu de %1$s …</string>
+    <string name="loading_smth">Carrigamentu de %1$s…</string>
     <string name="map_widget_plain_time">Oràriu atuale</string>
     <string name="gpx_wpt">Tapa</string>
     <string name="selected_gpx_info_show">\n\nTene carcau pro lu bìere in sa mapa</string>
@@ -675,7 +675,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="osmo_tracker_id">Id pessonale arrastamentu</string>
     <string name="osmo_tracker_id_descr">Carca pro visualizzare o cumpartzire s\'id de arrastamentu. Impreande s\'id de arrastamentu sos dispositivos connessos ant a èssere capatzes de sighire totu sos movimentos de custu dispositivu! Pro ti disconnèttere ischerta s\'optzione Reingendra.</string>
     <string name="osmo_session_token">Token de sa sessione: %1$s</string>
-    <string name="osmo_auth_pending">Isetande pro s\'autorizatzione...</string>
+    <string name="osmo_auth_pending">Isetande pro s\'autorizatzione…</string>
     <string name="osmo_locations_sent">"Localizatziones imbiadas %1$d (in su buffer %2$d) "</string>
     <string name="osmo_conn_successfull">"Connessione istabilida: %1$s "</string>
     <string name="tip_recent_changes_1_8_alpha">"Mudas in sa 1.8: * Càlcula s\'àndala intre duos puntos de una rasta GPX * Mudada s\'aspetu pro s\'isgarrigamentu de sos istados (suportu pro sa chirca cun nùmenes locales) * Suportu pro s\'importatzione GPX/KML (cunvertere dae KML a GPX) * Sas rastas GPX sunt istadas mòvidas in \'Datos meos\' * Como podes partzire sas rastas GPX pro distantzia e compidare sa diferèntzia de artària/ lestresa * Aviu automàticu de su nàvigu a pustis de un isetu curtzu "</string>
@@ -948,7 +948,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="default_buttons_save">Sarba</string>
 	<string name="menu_save_directions">Sarba diretziones</string>
 	<string name="rendering_attr_coloredBuildings_name">Edifìtzios colorados pro casta</string>
-    <string name="osmo_invite">Invita...</string>
+    <string name="osmo_invite">Invita…</string>
     <string name="osmo_leave_confirmation_msg">Boles essire dae su grupu %1$s?</string>
     <string name="osmo_specify_tracker_id">Pro piaghere dislinda s\'id</string>
     <string name="continue_navigation">Sighi cun su nàvigu</string>
@@ -1146,9 +1146,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="map_version_changed_info">In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s\'aplicu a s\'ùritma versione.</string>
 	<string name="local_index_mi_rename">Torra a numenare</string>
 	<string name="search_position_undefined">Non dessinidu</string>
-	<string name="search_position_fixed"></string>
+	<string name="search_position_fixed"/>
 	<string name="search_position_current_location">Positzione currente…</string>
-	<string name="search_position_map_view">Ùrtima bisura mapa</string>
+	<string name="search_position_map_view">Tzentru atuale de sa mapa</string>
 	<string name="local_index_mi_upload_gpx">Imbia ad OSM</string>
 	<string name="favourites_delete_multiple_succesful">Puntu/os prefèrridu/os burrados.</string>
 	<string name="favorite_delete_multiple">Ses burrande %1$d prefèrridu/os e %2$d grupu/os prefèrridos. Ses seguru?</string>
@@ -1175,7 +1175,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="local_index_mi_reload">Torra a carrigare dae s\'ischeda SD</string>
 	<string name="local_index_download">Iscàrriga</string>
 	<string name="local_index_address_data">Datos indiritzos</string>
-	<string name="local_index_transport_data">Datos trasportos</string>
+	<string name="local_index_transport_data">Datos trasportos pùblicos</string>
 	<string name="local_index_map_data">Datos mapa</string>
 	<string name="local_indexes_cat_backup">Deativadu</string>
 	<string name="local_indexes_cat_tts">Boghes (TTS)</string>
@@ -1357,7 +1357,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="error_occurred_loading_gpx">Errore durante su carrigamentu de su documentu GPX</string>
 	<string name="send_report">Imbia resumu</string>
 	<string name="any_poi">Totus</string>
-	<string name="layer_transport_route">Àndala de trsportu pùblicu</string>
+	<string name="layer_transport_route">Àndala de trasportu pùblicu</string>
 	<string name="thanks_yandex_traffic">Gràtzias a Yandex pro sas informatziones pro su tràficu.</string>
 	<string name="layer_yandex_traffic">Yandex (tràficu)</string>
 	<string name="layer_route">Àndala</string>
@@ -1382,7 +1382,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="menu_mute_off">S\'àudio est deativadu</string>
 	<string name="menu_mute_on">Àudio deativadu</string>
 	<string name="download_additional_maps">Iscarrigare sas mapas fartantes %1$s (%2$d MB)?</string>
-    <string name="more">Àteru...</string>
+    <string name="more">Àteru…</string>
     <string name="local_index_upload_gpx_description">Imbiu de sos documentos GPX a sa comunidade OSM. Los ant a impreare pro megiorare sas mapas.</string>
 	<string name="local_index_items_uploaded">Ogetu/os %1$d de %2$d carrigadu curretamente.</string>
 	<string name="tip_location_sharing_t">"Podes cumpartzire sa positzione de sos logos interesantes de sos biagios tuos cun familiares e amigos, tràmite su Menù cuntestuale \'Imprea sa positzione\' → \'Cumpartzi positzione\'.
@@ -1431,7 +1431,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="first_time_continue">A pustis</string>
 	<string name="first_time_download">Iscàrriga sas regiones</string>
 	<string name="search_poi_location">Chirca sinnale GPS…</string>
-	<string name="search_near_map">Chirca a curtzu de s\'ùrtima positzione in sa mapa</string>
+	<string name="search_near_map">Chirca a curtzu de su tzentru atuale de sa mapa</string>
 	<string name="search_nearby">Chirca a curtzu</string>
 	<string name="map_orientation_default">Orientamentu predefinidu</string>
 	<string name="map_orientation_portrait">Verticale</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 9451dd490a..fcc8f7fd29 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -323,7 +323,7 @@
   <string name="search_position_undefined">Neurčené</string>
   <string name="search_position_fixed"/>
   <string name="search_position_current_location">Aktuálne umiestnenie…</string>
-  <string name="search_position_map_view">Posledné mapové zobrazenie</string>
+  <string name="search_position_map_view">Terajší stred mapy</string>
   <string name="select_search_position">Východzí bod:</string>
   <string name="context_menu_item_search">Hľadať</string>
   <string name="tip_recent_changes_0_6_7_t">"Novinky vo verzii 0.6.7 :
@@ -376,7 +376,7 @@
   
   <string name="local_index_poi_data">POI údaje</string>
   <string name="local_index_address_data">Adresné údaje</string>
-  <string name="local_index_transport_data">Dopravné údaje</string>
+  <string name="local_index_transport_data">Údaje hromadnej dopravy</string>
   <string name="local_index_map_data">Mapové údaje</string>
   
   <string name="local_indexes_cat_backup">Záloha</string>
@@ -609,7 +609,7 @@
   <string name="use_high_res_maps_descr">Použitie mapy s vysokým rozlíšením pre zariadenia s vysokou hustotou bodov</string>
   <string name="unknown_location">Umiestnenie zatiaľ nenájdené</string>
   <string name="download_files">Stiahnuť</string>
-  <string name="context_menu_item_search_transport">Hľadať prepravu</string>
+  <string name="context_menu_item_search_transport">Hľadať hromadnú dopravu</string>
   <string name="transport_searching_transport">Hľadá sa preprava (bez cieľa):</string>
   <string name="transport_searching_route">Hľadá sa preprava ({0} ako cieľ):</string>
   <string name="transport_search_none">nič</string>
@@ -701,9 +701,9 @@
   <string name="route_head">Pokračujte rovno</string>
   <string name="first_time_continue">Neskôr</string>
   <string name="first_time_download">Stiahnuť oblasti</string>
-  <string name="first_time_msg">Ďakujeme, že ste si vybrali OsmAnd. Na použitie hlavných funkcií tejto aplikácie potrebujete nejaké regionálne offline údaje, ktoré si môžete stiahnuť (použite "Nastavenia" → "Mapové súbory"). Potom budete môcť zobrazovať mapy, vyhľadávať adresy, body záujmov (POI) a verejnú dopravu.</string>
+  <string name="first_time_msg">Ďakujeme, že ste si vybrali OsmAnd. Na použitie hlavných funkcií tejto aplikácie potrebujete nejaké regionálne offline údaje, ktoré si môžete stiahnuť (použite Nastavenia → Mapové súbory). Potom budete môcť zobrazovať mapy, vyhľadávať adresy, body záujmov (POI) a hromadnú dopravu.</string>
   <string name="search_poi_location">Hľadá sa signál…</string>
-  <string name="search_near_map">Hľadať v blízkosti poslednej pozície</string>
+  <string name="search_near_map">Hľadať v blízkosti terajšieho stredu mapy</string>
   <string name="search_nearby">Hľadať neďaleko Vás</string>
   <string name="map_orientation_default">Podľa zariadenia</string>
   <string name="map_orientation_portrait">Na výšku</string>
@@ -715,8 +715,8 @@
   <string name="transport_Routes">Linky</string>
   <string name="transport_Stop">Zastávka</string>
   <string name="transport_stops">zastávky</string>
-  <string name="transport_search_after">Nasledovná trasa</string>
-  <string name="transport_search_before">Prednostná trasa</string>
+  <string name="transport_search_after">Nasledovné pokyny</string>
+  <string name="transport_search_before">Predošlé pokyny</string>
   <string name="transport_finish_search">Dokončiť hľadanie</string>
   <string name="transport_stop_to_go_out">Vybrať zastávku na vystúpenie</string>
   <string name="transport_to_go_after">prednostná vzdialenosť</string>
@@ -725,7 +725,7 @@
   <string name="transport_route_distance">Vzdialenosť trasy</string>
   <string name="transport">Hromadná doprava</string>
   <string name="default_buttons_ok">OK</string>
-  <string name="show_transport_over_map_description">Zobrazenie zastávok verejnej dopravy na mape</string>
+  <string name="show_transport_over_map_description">Zobrazenie zastávok hromadnej dopravy na mape</string>
   <string name="show_transport_over_map">Zobraziť zastávky hrom.dopravy</string>
   <string name="hello">Navigačná aplikácia OsmAnd</string>
   <string name="update_poi_success">Údaje POI boli úspešne aktualizované ({0} bolo načítaných)</string>
@@ -1066,8 +1066,8 @@
 <string name="osmand_short_description_80_chars">OsmAnd je open source navigácia s offline aj online mapami</string>
 <string name="osmand_plus_short_description_80_chars">OsmAnd je open source navigácia s offline aj online mapami</string>
 <string name="rendering_attr_contourLines_description">Výber minimálneho priblíženia na zobrazenie na mape, ak sú dostupné. Môže byť vyžadovaný oddelený SRTM súbor:</string>
-  <string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automatizované navigačné pokyny) OsmAnd je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Stiahnutie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, dopravné spojenie verejnými dopravnými zastávky, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovania pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy Obmedzenia tejto voľnej verzie OsmAndu: - Počet stiahnutí máp je obmedzený - Žiadny prístup k POI offline Wikipédii OsmAnd je aktívne vyvíjaný a náš projekt a jeho ďalší pokrok závisí od finančných príspevkov na financovanie rozvoja a testovanie nových funkcii. Prosím, zvážte nákup OsmAnd+, alebo financovanie konkrétnych nových funkcií (bidforfix) alebo všeobecný dar. Viac na www.osmand.net. "</string>
-	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automatizované navigačné pokyny) OsmAnd+ je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. OsmAnd+ je platená verzia aplikácie. Jej zakúpením podporíte projekt, vývoj nových funkcií a získate najnovšie aktualizácie. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Neobmedzené sťahovanie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, dopravné spojenie verejnými dopravnými zastávky, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovanie pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy "</string>
+  <string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automatizované navigačné pokyny) OsmAnd je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Stiahnutie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, zastávky hromadnej dopravy, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovania pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy Obmedzenia tejto voľnej verzie OsmAndu: - Počet stiahnutí máp je obmedzený - Žiadny prístup k POI offline Wikipédii OsmAnd je aktívne vyvíjaný a náš projekt a jeho ďalší pokrok závisí od finančných príspevkov na financovanie rozvoja a testovanie nových funkcii. Prosím, zvážte nákup OsmAnd+, alebo financovanie konkrétnych nových funkcií (bidforfix) alebo všeobecný dar. Viac na www.osmand.net. "</string>
+	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automatizované navigačné pokyny) OsmAnd+ je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. OsmAnd+ je platená verzia aplikácie. Jej zakúpením podporíte projekt, vývoj nových funkcií a získate najnovšie aktualizácie. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Neobmedzené sťahovanie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, zastávky hromadnej dopravy, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovanie pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy "</string>
 	<string name="tip_rotation_switching_t_v2">Môžete prepínať, či a ako sa zobrazenie mapy otáča tým, že opakovane kliknete na ikonu kompasu v obrazovke mapy.
 
 		\n\nMožnosti sú:
@@ -1254,7 +1254,7 @@
     <string name="use_magnetic_sensor_descr">Použiť magnetický senzor namiesto orientačného na zistenie hodnôt kompasu</string>
     <string name="use_magnetic_sensor">Použiť magnetický senzor (kompas)</string>
     <string name="wait_current_task_finished">Prosím, čakajte, kým sa dokončí aktuálna úloha</string>
-    <string name="use_kalman_filter_compass_descr">Použiť Kalmanov filter na zabránenie odchýliek kompasu</string>
+    <string name="use_kalman_filter_compass_descr">Zníži šum v hodnotách z kompasu, ale spomalí zmeny smeru</string>
     <string name="use_kalman_filter_compass">Upožiť Kalmanov filter</string>
     <string name="access_mark_final_location_first">Režim zjednodušeného ovládania: prosím, najskôr vyberte cieľ</string> 
     <string name="delete_point">Odstrániť bod</string>
@@ -1593,9 +1593,9 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="guidance_preferences_descr">Nastavenia navigácie</string>
     <string name="routing_preferences_descr">Nastavenia určovania trasy</string>
     <string name="app_mode_truck">Kamión</string>
-    <string name="copying_osmand_files_descr">Kopírujem dátové súbory OsmAnd do nového cieľa (%s)</string>
-    <string name="copying_osmand_files">Kopírujem dátové súbory OsmAnd</string>
-    <string name="copying_osmand_one_file_descr">Kopírujem súbor (%s) do nového cieľa...</string>
+    <string name="copying_osmand_files_descr">Kopírujem dátové súbory OsmAnd do nového cieľa (%s)…</string>
+    <string name="copying_osmand_files">Kopírujem dátové súbory OsmAnd…</string>
+    <string name="copying_osmand_one_file_descr">Kopírujem súbor (%s) do nového cieľa…</string>
     <string name="application_dir_change_warning2">Chcete aby OsmAnd presunul údajové súbory do nového cieľa? Zvoľte \"Nie\" ak chcete, aby OsmAnd len vytvoril a použil nový prázdny priečinok.</string>
     <string name="calculate_osmand_route_gpx">Vypočítať OsmAnd offline trasu</string>
     <string name="android_19_location_disabled">Od Androidu verzie 4.4 (KitKat) nie je možné sťahovať a aktualizovať mapy v pôvodnom úložnom priečinku (%s). Chcete ho zmeniť na vhodné nové úložisko a skopírovať tam všetky súbory?
@@ -1614,10 +1614,10 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="routing_attr_avoid_motorway_description">Vyhnúť sa diaľniciam</string>
 	<string name="routing_attr_weight_name">Hmotnostný limit</string>
 	<string name="routing_attr_weight_description">Zadajte hmotnosť vozidla, ktorá musí byť povolená na cestách</string>
-    <string name="select_gpx">Vybrať GPX …</string>
+    <string name="select_gpx">Vybrať GPX…</string>
     <string name="route_descr_select_destination">Vybrať cieľ</string>
-    <string name="route_descr_select_on_map">Vybrať na mape …</string>
-    <string name="route_descr_favorite">Obľúbené …</string>
+    <string name="route_descr_select_on_map">Vybrať na mape…</string>
+    <string name="route_descr_favorite">Obľúbené…</string>
     <string name="route_preferences">Predvoľby trasy</string>
     <string name="route_info">Informácie trasy</string>
     <string name="keep_and_add_destination_point">Pridať ako cieľový bod</string>
@@ -1736,7 +1736,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="osmo_tracker_id_descr">Kliknite pre zobrazenia alebo zdieľanie ID sledovacieho zariadenia.
         Pomocou ID budú pripojené zariadenia schopné sledovať všetky pohyby tohto zariadenia! Pre odpojenie použite možnosť "Pregenerovať".</string>
     <string name="osmo_session_token">Token relácie: %1$s</string>
-    <string name="osmo_auth_pending">Čaká sa na autorizáciu...</string>
+    <string name="osmo_auth_pending">Čaká sa na autorizáciu…</string>
     <string name="osmo_locations_sent">Odoslané polohy %1$d (v zásobníku %2$d) </string>
     <string name="osmo_conn_successfull">Vytvorené spojenie: %1$s </string>
     <string name="osmo_mode_restart">Reštartovať reláciu OsMo</string>
@@ -1804,7 +1804,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="osmo_expire_group">Vyprší za</string>
     <string name="osmo_group_description">Popis</string>
     <string name="osmo_group_policy">Pravidlá</string>
-    <string name="loading_smth">Načítava sa %1$s …</string>
+    <string name="loading_smth">Načítava sa %1$s…</string>
     <string name="map_widget_plain_time">Aktuálny čas</string>
     <string name="gpx_wpt">Prechodný bod</string>
     <string name="selected_gpx_info_show">\n\nStlačte a podržte pre zobrazenie na mape</string>
@@ -1902,7 +1902,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_attr_osmcTraces_description">Kresliť chodníky podľa značenia OSMC</string>
     
 	<string name="rendering_attr_coloredBuildings_name">Vyfarbiť budovy podľa typu</string>
-    <string name="osmo_invite">Pozvať...</string>
+    <string name="osmo_invite">Pozvať…</string>
     <string name="osmo_leave_confirmation_msg">Chcete opustiť skupinu %1$s?</string>
     <string name="osmo_specify_tracker_id">Prosím zadajte ID</string>
     <string name="arrival_distance_factor_early">Skoro</string>
@@ -1918,7 +1918,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_value_bicycle_name">Bicykel</string>
     <string name="rendering_value_pedestrian_name">Chodec</string>
     <string name="download_additional_maps">Stiahnuť chýbajúce mapy %1$s (%2$d MB)?</string>
-    <string name="more">Viac...</string>
+    <string name="more">Viac…</string>
     <string name="flat_list_waypoitns">Všetky</string>
     <string name="waypoints">Prechodné body</string>
     <string name="targets">Ciele</string>
@@ -1981,7 +1981,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_attr_busRoutes_name">Autobusové linky</string>
     <string name="wake_on_voice">Rozsvietiť obrazovku</string>
     <string name="wake_on_voice_descr">Rozsvietiť obrazovku keď sa blíži odbočenie</string>
-    <string name="select_impassable_road">Vybrať na mape</string>
+    <string name="select_impassable_road">Vybrať na mape…</string>
     <string name="impassable_road">Vyhnúť sa cestám…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Linky električiek a vlakov</string>
     <string name="rendering_category_hide">Skryť</string>
@@ -2001,7 +2001,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="everything_up_to_date">Všetky súbory sú aktuálne</string>
     <string name="use_opengl_render">Použiť vykresľovanie OpenGL</string>
     <string name="use_opengl_render_descr">Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať)</string>
-    <string name="no_internet_connection">Sťahovanie nie je možné, prosím pripojte sa na WiFi, aby bolo možné pokračovať.</string>
+    <string name="no_internet_connection">Sťahovanie nie je možné, prosím skontrolujte pripojenie na Internet.</string>
     <string name="navigate_point_zone">Zóna</string>
     <string name="download_tab_downloads">Všetky sťahovania</string>
     <string name="download_tab_updates">Aktualizácie</string>
@@ -2027,4 +2027,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="routing_attr_no_new_routing_name">Bez smerovacích pravidiel verzie 1.9</string>
     <string name="routing_attr_no_new_routing_description">Nepoužívať pravidlá výpočtu trasy zavedené vo verzii 1.9</string>
     <string name="speak_pedestrian">Oznamovať priechody pre chodcov</string>
-    </resources>
+    <string name="rendering_value__name">Predvolené</string>
+	</resources>
diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
new file mode 100644
index 0000000000..85dad97cae
--- /dev/null
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="poi_bakery">Pekarna</string>
+	<string name="poi_mall">Veleblagovnica</string>
+	</resources>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 103a574333..ebd53fc3d0 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -880,7 +880,7 @@
 	<string name="download_type_to_filter">tipkajte za filtriranje</string>
 	<string name="use_high_res_maps">Zaslon z visoko ločljivostjo</string>
 	<string name="use_high_res_maps_descr">Ne raztegni (in zamegli) ploščic zemljevida na zaslonih z visoko gostoto</string>
-	<string name="context_menu_item_search_transport">Iskanje prevoza</string>
+	<string name="context_menu_item_search_transport">Iskanje javnega prevoza</string>
 	<string name="transport_searching_transport">Rezultati prevoza (brez cilja):</string>
 	<string name="transport_searching_route">Rezultati prevoza ({0} do cilja):</string>
 	<string name="transport_search_none">brez</string>
@@ -898,8 +898,8 @@
 	<string name="show_route">Podrobnosti poti</string>
 	<string name="fav_imported_sucessfully">Priljubljene točke so bile uspešno uvožene</string>
 	<string name="fav_file_to_load_not_found">Datoteke GPX, ki vsebuje priljubljene, ni bilo mogoče najti na {0}</string>
-	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: * nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom * nastavljivo povečavo zemljevida glede na hitrost gibanja * nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja * nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS). Brezplačna različica programa OsmAnd ima naslednje omejitve: - omejeno je število prenosov zemljevidov - brez povezave ni dostopa do točk iz Wikipedije. OsmAnd je v aktivnem razvoju. Napredek projekta je odvisen od finančnih prispevkov s katerimi se financira razvoj in testiranje novih funkcionalnosti. Prosimo, razmislite o nakupu aplikacije OsmAnd+, ali financiranju posamezne funkcionalnosti, ali nenamensko donacijo na spletni strani osmand.net. "</string>
-	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd+ omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). OsmAnd+ je plačljiva različica aplikacije. Z nakupom financirate nadaljnji razvoj in testiranje novih funkcionalnosti ter pridobite zadnje posodobitve. Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Neomejen prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Wikipedia brez povezave (prenos točk iz Wikipedie), odlično za oglede znamenitosti - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: * nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom * nastavljivo povečavo zemljevida glede na hitrost gibanja * nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja * nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS) "</string>
+	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: - nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom - nastavljivo povečavo zemljevida glede na hitrost gibanja - nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja - nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS). Brezplačna različica programa OsmAnd ima naslednje omejitve: - omejeno je število prenosov zemljevidov - brez povezave ni dostopa do točk iz Wikipedije. OsmAnd je v aktivnem razvoju. Napredek projekta je odvisen od finančnih prispevkov s katerimi se financira razvoj in testiranje novih funkcionalnosti. Prosimo, razmislite o nakupu aplikacije OsmAnd+, ali financiranju posamezne funkcionalnosti, ali nenamensko donacijo na spletni strani osmand.net. "</string>
+	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd+ omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). OsmAnd+ je plačljiva različica aplikacije. Z nakupom financirate nadaljnji razvoj in testiranje novih funkcionalnosti ter pridobite zadnje posodobitve. Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Neomejen prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Wikipedia brez povezave (prenos točk iz Wikipedie), odlično za oglede znamenitosti - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: - nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom - nastavljivo povečavo zemljevida glede na hitrost gibanja - nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja - nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS) "</string>
 	<string name="error_occurred_loading_gpx">Napaka pri nalaganju GPX-a</string>
 	<string name="send_report">Pošlji poročilo</string>
 	<string name="none_region_found">Na SD kartici ni podatkov območij za uporabo brez povezave. Prenesite želena območja iz interneta.</string>
@@ -912,7 +912,7 @@
 	<string name="layer_route">Pot</string>
 	<string name="layer_favorites">Priljubljeni</string>
 	<string name="layer_osm_bugs">OSM hrošči</string>
-	<string name="layer_transport">Postaje javnega prevoza</string>
+	<string name="layer_transport">Postaje prevoza</string>
 	<string name="layer_poi">POI …</string>
 	<string name="layer_map">Vir zemljevida …</string>
 	<string name="context_menu_item_search_poi">Iskanje POI</string>
@@ -944,7 +944,7 @@
 	<string name="first_time_continue">Kasneje</string>
 	<string name="first_time_download">Prenos območij</string>
 	<string name="search_poi_location">Iskanje znaka …</string>
-	<string name="search_near_map">Iskanje v bližini zadnje lokacije</string>
+	<string name="search_near_map">Iskanje v bližini zadnje lokacije na zemljevidu</string>
 	<string name="tip_map_switch_t_v2">"Vir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' → \'Nastavitve zemljevida\'.
 \n\nPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\' v \'Nastavitve\' → \'Upravljalnik vtičnikov\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku.
 \n\nOsmAnd podpira tudi vire po meri. "</string>
@@ -954,13 +954,13 @@
 	<string name="transport_Routes">Poti</string>
 	<string name="transport_Stop">Postaja</string>
 	<string name="transport_stops">postaje</string>
-	<string name="transport_search_after">Naslednja pot</string>	
+	<string name="transport_search_after">Naknadna pot</string>	
 	<string name="transport_search_before">Prejšnja pot</string>
 	<string name="transport_stop_to_go_out">Izberite izstopno postajo</string>
 	<string name="transport_to_go_after">prejšnja razdalja</string>
 	<string name="transport_to_go_before">naslednja razdalja</string>
 	<string name="transport_stops_to_pass">postaje do izstopa</string>
-	<string name="transport_route_distance">razdalja poti</string>
+	<string name="transport_route_distance">Razdalja poti</string>
 	<string name="default_buttons_ok">V redu</string>
 	<string name="show_transport_over_map_description">Prikaz postaj javnega prevoza na zemljevidu</string>
 	<string name="show_transport_over_map">Prikaz postaj prevoza</string>
@@ -1609,17 +1609,17 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="index_item_world_altitude_correction">Svetovni popravki nadmorske višine</string>
 	<string name="index_item_world_seamarks">Svetovne pomorske oznake</string>
 	<string name="keep_and_add_destination_point">Dodaj kot ciljno točko</string>
-    <string name="select_gpx">Izberite GPX…</string>
+    <string name="select_gpx">Izberite GPX …</string>
     <string name="route_descr_select_destination">Izberite cilj</string>
-    <string name="route_descr_select_on_map">Izberite na zemljevidu…</string>
-    <string name="route_descr_favorite">Priljubljene…</string>
+    <string name="route_descr_select_on_map">Izberite na zemljevidu …</string>
+    <string name="route_descr_favorite">Priljubljene …</string>
     <string name="android_19_location_disabled">Od Android verzije 4.4 (KitKat) naprej, prenos posodobitev zemljevidov ni mogoč na prejšnjo mesto hrambe (%s). Ali želite to spremeniti na takšno mesto, kjer bo to mogoče in skopirati vse OsmAnd podatke tja?
 \n Opomba 1: stare datoteke ne bodo spremenjene (vendar jih lahko ročno izbrišete).
 \n Opomba 2: v novem mestu shrambe si aplikaciji OsmAnd and OsmAnd+ ne bosta mogli deliti podatkov.</string>
     <string name="application_dir_change_warning2">OsmAnd lahko poskusi premakniti podatke na novo mesto hrambe. Ali si želite tega? Izberite \'Ne\' če želite, da OsmAnd ustvari in uporablja novo mapo.</string>
-    <string name="copying_osmand_one_file_descr">Kopiranje datoteke (%s) na novo mesto hrambe...</string>
-    <string name="copying_osmand_files_descr">Kopiranje datotek s podatki za OsmAnd na novo mesto hrambe (%s)</string>
-    <string name="copying_osmand_files">Kopiranje datotek s podatki programa OsmAnd</string>
+    <string name="copying_osmand_one_file_descr">Kopiranje datoteke (%s) na novo mesto hrambe …</string>
+    <string name="copying_osmand_files_descr">Kopiranje datotek s podatki za OsmAnd na novo mesto hrambe (%s) …</string>
+    <string name="copying_osmand_files">Kopiranje datotek s podatki programa OsmAnd …</string>
     <string name="always_center_position_on_map">Prikaz položaja vedno v središču</string>
     <string name="index_item_nation_addresses">Naslovi za celotno državo</string>
 	<string name="lang_mr">Maratščina</string>
@@ -1703,7 +1703,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="osmo_enable_tracker">Pošiljanje mojih lokacij</string>
     <string name="osmo_control">OsMo hiter dostop</string>
     <string name="osmo_connected_devices">Povezane naprave</string>
-    <string name="osmo_auth_pending">Čakanje na dovoljenje...</string>
+    <string name="osmo_auth_pending">Čakanje na dovoljenje …</string>
     <string name="osmo_regenerate_login_ids_confirm">Ali ste prepričani, da želite ustvariti nov ID uporabnika? Vse naprave, ki so povezane z vami, vam ne bodo mogle več slediti.</string>
     <string name="osmo_track_interval_descr">Izberite časovni interval za pošiljanje lokacije</string>
     <string name="osmo_connect_menu">Poveži</string>
@@ -1836,7 +1836,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="rendering_attr_subwayMode_name">Proge podzemne železnice</string>
  	<string name="continue_navigation">Nadaljuj navigacijo</string>
     <string name="rendering_attr_alpineHiking_name">Skala alpskega pohodništva (SAC)</string>
-    <string name="osmo_invite">Povabite...</string>
+    <string name="osmo_invite">Povabite …</string>
     <string name="osmo_specify_tracker_id">Prosim, določite ID</string>
     <string name="arrival_distance_factor_early">Zgodaj</string>
     <string name="arrival_distance_factor_normally">Običajno</string>
@@ -1849,7 +1849,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="av_camera_pic_size_descr">Izberite velikost posnetkov vgrajenega fotoaparata</string>
     <string name="announce_nearby_favorites">Najavi bližino priljubljenih krajev</string>
 <string name="download_additional_maps">Prenos manjkajočih zemljevidov %1$s (%2$d MB)?</string>
-    <string name="more">Več...</string>
+    <string name="more">Več …</string>
     <string name="rendering_value_car_name">Avtomobil</string>
     <string name="rendering_value_bicycle_name">Kolo</string>
     <string name="rendering_value_pedestrian_name">Pešec</string>
@@ -1967,4 +1967,5 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="navigate_point_zone">Območje</string>
     <string name="navigate_point_northing">y koordinata</string>
     <string name="navigate_point_easting">x koordinata</string>
-    </resources>
+    <string name="rendering_value__name">Privzeto</string>
+	</resources>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index cdc7f11259..8540b37a93 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -137,7 +137,7 @@
 <string name="rendering_attr_appMode_description">Optimera karta för</string>
 <string name="address_search_desc">Adressökning</string>
 <string name="navpoint_search_desc">Koordinater</string>
-<string name="transport_search_desc">Transportsökning</string>
+<string name="transport_search_desc">Kollektivtrafiksökning</string>
 <string name="offline_navigation_not_available">OsmAnd offlinenavigering är inte tillgänglig för tillfället.</string>
 <string name="left_side_navigation">Vänstertrafik</string>
 <string name="left_side_navigation_descr">Välj för länder med vänstertrafik</string>
@@ -426,12 +426,12 @@
 <string name="show_gpx_route">Visa på karta</string>
 <string name="search_position_current_location_search">Söker plats …</string>
 <string name="search_position_current_location_found">Plats (hittad)</string>
-<string name="search_position_address">Adress …</string>
+<string name="search_position_address">Adresser …</string>
 <string name="search_position_favorites">Favoriter …</string>
 <string name="search_position_undefined">Odefinierad</string>
 <string name="search_position_fixed"/>
 <string name="search_position_current_location">Nuvarande position …</string>
-<string name="search_position_map_view">Senaste kartvyn</string>
+<string name="search_position_map_view">Aktuell kartmitt</string>
 <string name="select_search_position">Ursprung:</string>
 <string name="context_menu_item_search">Sök i närheten</string>
 <string name="save_route_dialog_title">Spara rutt som GPX-spår</string>
@@ -470,15 +470,15 @@
 <string name="local_index_mi_reload">Ladda om från SD-kort</string>
 <string name="local_index_download">Ladda ner</string>
 
-<string name="local_index_poi_data">POI-data</string>
+<string name="local_index_poi_data">Intressepunktsdata</string>
 <string name="local_index_address_data">Adressdata</string>
-<string name="local_index_transport_data">Transportdata</string>
+<string name="local_index_transport_data">Kollektivtrafikdata</string>
 <string name="local_index_map_data">Kartdata</string>
 <string name="local_indexes_cat_backup">Inaktiverade</string>
 <string name="local_indexes_cat_tts">Röstdata (TTS)</string>
 <string name="local_indexes_cat_voice">Röstdata (inspelat)</string>
 <string name="local_indexes_cat_gpx">GPX-data</string>
-<string name="local_indexes_cat_poi">POI-data</string>
+<string name="local_indexes_cat_poi">Intressepunktsdata</string>
 <string name="ttsvoice">TTS-röst</string>
 <string name="search_offline_clear_search">Ny sökning</string>
 <string name="map_text_size_descr">Välj textstorlek för namn på kartan</string>
@@ -585,10 +585,10 @@
 <string name="amenity_type_sport">Sport</string>
 <string name="amenity_type_sustenance">Näring</string>
 <string name="amenity_type_tourism">Turism</string>
-<string name="amenity_type_transportation">Transport</string>
-<string name="indexing_address">Indexerar adress …</string>
+<string name="amenity_type_transportation">Transporter</string>
+<string name="indexing_address">Indexerar adresser …</string>
 <string name="indexing_map">Indexerar kartan …</string>
-<string name="indexing_poi">Indexerar POI …</string>
+<string name="indexing_poi">Indexerar Intressepunkter …</string>
 <string name="indexing_transport">Indexerar transport …</string>
 <string name="input_output_error">Ett I/O-fel har inträffat</string>
 <string name="km">km</string>
@@ -596,7 +596,7 @@
 <string name="m">m</string>
 <string name="old_map_index_is_not_supported">Det föråldrade kartdataformatet \"{0}\" stöds inte</string>
 <string name="poi_filter_car_aid">Bilhjälp</string>
-<string name="poi_filter_closest_poi">Närmaste POI</string>
+<string name="poi_filter_closest_poi">Närmaste intressepunkt</string>
 <string name="poi_filter_custom_filter">Anpassat filter</string>
 <string name="poi_filter_food_shop">Mataffär</string>
 <string name="poi_filter_for_tourists">För turister</string>
@@ -690,7 +690,7 @@
 	<string name="use_high_res_maps">Skärm med hög upplösning</string>
 	<string name="use_high_res_maps_descr">Sträck inte ut (och gör oskarpa) kartbitar på högupplösta skärmar</string>
 	<string name="download_files">Ladda ner</string>
-	<string name="context_menu_item_search_transport">Sök transport</string>
+	<string name="context_menu_item_search_transport">Sök kollektivtrafik</string>
 	<string name="transport_searching_transport">Transportresultat (ingen destination):</string>
 	<string name="transport_searching_route">Transportresultat ({0} till destinationen):</string>
 	<string name="transport_search_none">ingen</string>
@@ -705,7 +705,7 @@
 	<string name="vector_data">Offline vektorkartor</string>
 	<string name="transport_context_menu">Sök transport vid stopp</string>
 	<string name="point_on_map">Plats:\n Lat %1$.5f\n Long %2$.5f</string>
-	<string name="poi_context_menu_modify">Ändra POI</string>
+	<string name="poi_context_menu_modify">Ändra Intressepunkt</string>
 	<string name="poi_context_menu_delete">Ta bort POI</string>
 	<string name="rotate_map_compass_opt">Till kompass</string>
 	<string name="rotate_map_bearing_opt">I körriktningen</string>
@@ -731,10 +731,10 @@
 	<string name="layer_favorites">Favoriter</string>
 	<string name="layer_osm_bugs">OSM-buggar</string>
 	<string name="layer_transport">Hållplatser</string>
-	<string name="layer_poi">POI …</string>
+	<string name="layer_poi">Intressepunkt …</string>
 	<string name="layer_map">Kartkälla …</string>
 	<string name="menu_layers">Kartlager</string>
-	<string name="context_menu_item_search_poi">Sök POI</string>
+	<string name="context_menu_item_search_poi">Sök intressepunkt</string>
 	
 	<string name="use_trackball_descr">Använd styrkulan för att flytta kartan</string>
 	<string name="use_trackball">Använd styrkula</string>
@@ -785,7 +785,7 @@
 	<string name="first_time_continue">Senare</string>
 	<string name="first_time_download">Ladda ner regioner</string>
 	<string name="search_poi_location">Söker efter signal …</string>
-	<string name="search_near_map">Sök i närheten av förra platsen på kartan</string>
+	<string name="search_near_map">Sök i närheten av aktuell kartmitt</string>
 	<string name="search_nearby">Sök i närheten</string>
 	<string name="map_orientation_default">Samma som enheten</string>
 	<string name="map_orientation_portrait">Stående</string>
@@ -797,15 +797,15 @@
 	<string name="transport_Routes">Rutter</string>
 	<string name="transport_Stop">Hållplats</string>
 	<string name="transport_stops">hållplatser</string>
-	<string name="transport_search_after">Följande rutt</string>	
-	<string name="transport_search_before">Tidigare rutt</string>
+	<string name="transport_search_after">Följande resväg</string>	
+	<string name="transport_search_before">Tidigare resväg</string>
 	<string name="transport_finish_search">Avsluta sökningen</string>
 	<string name="transport_stop_to_go_out">Välj hållplats att kliva av vid</string>
 	<string name="transport_to_go_after">tidigare sträcka</string>
 	<string name="transport_to_go_before">följande sträcka</string>
 	<string name="transport_stops_to_pass">hållplatser att passera</string>
-	<string name="transport_route_distance">Ruttavstånd</string>
-	<string name="transport">Transport</string>
+	<string name="transport_route_distance">Resvägssträcka</string>
+	<string name="transport">Transporter</string>
 	<string name="default_buttons_ok">OK</string>
 	<string name="show_transport_over_map_description">Visa hållplatser för kollektivtrafik på kartan</string>
 	<string name="show_transport_over_map">Visa hållplatser</string>
@@ -815,7 +815,7 @@
 	<string name="update_poi_error_loading">Fel vid laddning av data från servern</string>
 	<string name="update_poi_no_offline_poi_index">Inga offline POI-data tillgängliga för detta område</string>
 	<string name="update_poi_is_not_available_for_zoom">Det går inte att uppdatera POI för små zoomnivåer</string>
-	<string name="context_menu_item_update_poi">Uppdatera POI</string>
+	<string name="context_menu_item_update_poi">Uppdatera intressepunkt</string>
 	<string name="context_menu_item_update_map_confirm">Uppdatera lokala data via Internet?</string>
 	<string name="search_history_city">Stad: {0}</string>
 	<string name="search_history_street">Gata: {0},{1}</string>
@@ -860,7 +860,7 @@
 	<string name="mark_final_location_first">Välj en destination först</string>
 	<string name="show_gps_status">Visa GPS-status</string>
 	<string name="opening_hours">Öppettider</string>
-	<string name="loading_poi_obj">Laddar POI …</string>
+	<string name="loading_poi_obj">Laddar intressepunkt …</string>
 	<string name="loading_streets_buildings">Laddar gator/byggnader …</string>
 	<string name="loading_postcodes">Laddar postnummer …</string>
 	<string name="loading_streets">Laddar gator …</string>
@@ -1060,7 +1060,7 @@
 	<string name="map_view_3d_descr">Aktivera 3D-vy på kartan</string>
 	<string name="map_view_3d">3D-vy på kartan</string>
 	<string name="show_poi_over_map_description">Visa POI över karta (använd det senast valda filtret)</string>
-	<string name="show_poi_over_map">Visa POI</string>
+	<string name="show_poi_over_map">Visa intressepunkt</string>
 	<string name="map_tile_source_descr">Välj källa för onlinekartor eller cachade kartbitar</string>
 	<string name="map_tile_source">Källa för kartbitar</string>
 	<string name="map_source">Kartkälla</string>
@@ -1076,7 +1076,7 @@
 	<string name="favorites_Button">Mina platser</string>
 	<string name="search_button">Sök</string>
 	<string name="search_activity">Sök</string>
-	<string name="searchpoi_activity">Välj POI</string>
+	<string name="searchpoi_activity">Välj intressepunkt</string>
 	<string name="search_POI_level_btn">Sök efter fler</string>
 	<string name="choose_available_region">Välj region från lista</string>
 	<string name="choose_intersected_street">Välj korsande gata</string>
@@ -1165,7 +1165,7 @@
      \n\t* Ytterligare inställningar för att stabilisera kompassen
      \n\t* Översta knappen till vänster på kartskärmen ersätter menyknappen
     </string>
-    <string name="use_kalman_filter_compass_descr">Använd Kalman-filter för att undvika kompassmissvisning</string>
+    <string name="use_kalman_filter_compass_descr">Minskar kompassmissvisningen men blir trögare</string>
     <string name="use_kalman_filter_compass">Använd Kalman-filter</string>
     <string name="choose_osmand_theme">App-tema</string>
     <string name="choose_osmand_theme_descr">Välj tema för applikationen</string>
@@ -1340,8 +1340,8 @@
 \n OBS: På den nya lagringsplatsen kommer det inte att vara möjligt att dela filer mellan OsmAnd och OsmAnd+.</string>
     <string name="application_dir_change_warning2">Vill du att OsmAnd också ska kopiera datafilerna till den nya platsen? Välj \'Nej\' om du vill att OsmAnd ska skapa och använda den nya mappen.</string>
     <string name="copying_osmand_one_file_descr">Kopierar filen (%s) till den nya platsen …</string>
-    <string name="copying_osmand_files_descr">Kopierar OsmAnd-datafiler till den nya platsen (%s)</string>
-    <string name="copying_osmand_files">Kopierar OsmAnd-datafiler</string>
+    <string name="copying_osmand_files_descr">Kopierar OsmAnd-datafiler till den nya platsen (%s) …</string>
+    <string name="copying_osmand_files">Kopierar OsmAnd-datafiler …</string>
     <string name="calculate_osmand_route_gpx">Beräkna OsmAnd offline-rutt</string>
     <string name="app_mode_truck">Lastbil</string>
     <string name="routing_attr_prefer_motorway_name">Föredra motorvägar</string>
@@ -1720,7 +1720,7 @@
     <string name="rendering_attr_trolleybusRoutes_name">Trådbusslinjer</string>
     <string name="rendering_attr_busRoutes_name">Busslinjer</string>
     <string name="rendering_attr_tramTrainRoutes_name">Spårvagns- och tåglinjer</string>
-    <string name="select_impassable_road">Välj på kartan</string>
+    <string name="select_impassable_road">Välj på kartan …</string>
     <string name="impassable_road">Undvik vägar …</string>
     <string name="rendering_category_hide">Dölj</string>
     <string name="wake_on_voice">Slå på skärmen</string>
@@ -1735,7 +1735,7 @@
 	<string name="show_map">VISA KARTAN</string>
 	<string name="show_all">VISA ALLA</string>
 	<string name="coordinates">Koordinater</string>
-	<string name="map_update">"Det finns  %1$s uppdatering(ar)"</string>
+	<string name="map_update">Det finns %1$s uppdatering(ar)</string>
 	<string name="error_avoid_specific_road">Hittar ingen förbifart</string>
     <string name="dismiss">Avvisa</string>
     <string name="everything_up_to_date">Alla filer är uppdaterade</string>
@@ -1768,4 +1768,5 @@
 	<string name="route_descr_destination">Destination</string>
     <string name="voices">Röstprompter</string>
 	<string name="speak_pedestrian">Meddela om övergångsställen</string>
-    </resources>
+    <string name="rendering_value__name">Standard</string>
+	</resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index df2b63cdee..a3f2f088ee 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -32,7 +32,7 @@
     <string name="btn_advanced_mode">進階模式…</string>
     <string name="poi_filter_parking">停車場</string>
     <string name="poi_filter_emergency">緊急救助</string>
-    <string name="poi_filter_public_transport">大眾運輸</string>
+    <string name="poi_filter_public_transport">公共交通</string>
     <string name="poi_filter_entertainment">娛樂</string>
     <string name="poi_filter_accomodation">住宿</string>
     <string name="poi_filter_restaurants">餐廳</string>
@@ -63,8 +63,8 @@
 \n\t* 登錄為\'藍色\'，表示伺服器有更新的版本
 \n\t* 登錄為斜體字，表示未在裝置上使用 "</string>
 	<string name="filterpoi_activity">建立興趣點篩選</string>
-	<string name="recalculate_route_to_your_location">運輸模式：</string>
-	<string name="select_navigation_mode">選擇運輸模式</string>
+	<string name="recalculate_route_to_your_location">交通模式：</string>
+	<string name="select_navigation_mode">選擇交通模式</string>
 	
 	<string name="day_night_info_description">日出：%1$s \n日落：%2$s</string>
 	<string name="day_night_info">日/夜資訊</string>
@@ -175,7 +175,7 @@
 	<string name="poi_search_desc">POI(興趣點)查尋</string>
 	<string name="address_search_desc">地址查尋</string>
 	<string name="navpoint_search_desc">座標查尋</string>
-	<string name="transport_search_desc">交通設施查尋</string>
+	<string name="transport_search_desc">公共交通查尋</string>
 	<string name="favourites_search_desc">我的最愛查尋</string>
 	<string name="history_search_desc">歷史記錄查尋</string>
 	<string name="offline_navigation_not_available">OsmAnd 離線導航，暫時不能使用。</string>
@@ -186,7 +186,7 @@
 	<string name="unknown_location">未知地理位置</string>
 	<string name="modify_transparency">調整透明度(0 - 透明, 255 - 不透明)</string>
 	<string name="confirm_interrupt_download">您要中斷下載中的檔案嗎？</string>
-	<string name="first_time_msg">感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些地區的離線資料，您可以透過\'設定\' -&gt; \'管理地圖檔案\'來下載。之後您可瀏覽地圖、位置的地址、查看興趣點以及找到大眾運輸設施。</string>    
+	<string name="first_time_msg">感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些地區的離線資料，您可以透過\'設定\' -&gt; \'管理地圖檔案\'來下載。之後您可瀏覽地圖、位置的地址、查看興趣點以及尋找公共交通。</string>    
 	<string name="basemap_was_selected_to_download">底圖為某些特別的應用功能必需使用的，並且預設為下載。</string>
 	<string name="select_index_file_to_download">找不到任何資料。如果您不能在您的區域找到，您可以自行製作(參考http://osmand.net)。</string>
 	<string name="local_indexes_cat_tile">線上地圖圖磚</string>
@@ -414,7 +414,7 @@
 	<string name="search_position_undefined">未定義</string>
 	<string name="search_position_fixed">" "</string>
 	<string name="search_position_current_location">目前位置…</string>
-	<string name="search_position_map_view">上次瀏覽的地圖</string>
+	<string name="search_position_map_view">目前的地圖中心</string>
 	<string name="select_search_position">起點：</string>
 	<string name="context_menu_item_search">查尋這附近</string>
 	<string name="save_route_dialog_title">儲存路線成 GPX 軌跡</string>
@@ -457,7 +457,7 @@
 	
 	<string name="local_index_poi_data">興趣點資料</string>
 	<string name="local_index_address_data">地址資料</string>
-	<string name="local_index_transport_data">交通設施資料</string>
+	<string name="local_index_transport_data">公共交通資料</string>
 	<string name="local_index_map_data">地圖資料</string>
 	<string name="local_indexes_cat_backup">已停用</string>
 	<string name="local_indexes_cat_tts">語音資料(TTS)</string>
@@ -526,9 +526,8 @@
 \n\n在\'地圖來源…\'之下，您可以選擇使用預先載入的離線向量圖（預設，離線導航所需），或預先定義（連線或離線快取）圖磚來源（在此啟動\'線上地圖\'外掛元件下的\'設定\' → \'外掛元件\'），或手動建立地圖，例如在 PC 上使用的 OsmAndMapCreator。
 \n\nOsmAnd 也支援自訂來源。 "</string>
 	<string name="tip_app_mode">使用設定檔</string>
-	<string name="tip_app_mode_t_v2">OsmAnd 在不同的使用情況下，支援不同的使用者設定檔 (可自行訂製) 。
-		\n\n您可透過地圖畫面左下角的設定檔按鈕(汽車、自行車、步行三種圖示)更改使用設定檔 ，或是作路線規劃。
-	</string>
+	<string name="tip_app_mode_t_v2">"OsmAnd 在不同的使用情況下，支援不同的使用者設定檔 (可自行訂製) 。
+\n\n您可透過地圖畫面左下角的設定檔按鈕(汽車、自行車、步行三種圖示)更改使用設定檔 ，或是作路線規劃(\'交通模式\')。 "</string>
 	<string name="tip_navigation">導航</string>
 	<string name="tip_navigation_t">"需要導引到一個地點，可以直接在地圖上選擇並長按該地點，(然後再點選快顯功能表單的\'導引到\')，或著選擇\'導引\'後，在查尋結果清單或是我的最愛清單點選進入。
 \n\n目的地標點以一目標旗標記在地圖上，同時 OsmAnd 會顯示達到目的地的距離與它的方位(橙色三角形)。
@@ -591,7 +590,7 @@
 	<string name="amenity_type_sport">運動</string>
 	<string name="amenity_type_sustenance">飲食</string>
 	<string name="amenity_type_tourism">旅遊、住宿</string>
-	<string name="amenity_type_transportation">交通設施</string>
+	<string name="amenity_type_transportation">交通工具</string>
 	<string name="indexing_address">地址索引…</string>
 	<string name="indexing_map">地圖索引…</string>
 	<string name="indexing_poi">興趣點索引…</string>
@@ -601,7 +600,7 @@
 	<string name="km_h">公里/小時</string>
 	<string name="m">公尺</string>
 	<string name="old_map_index_is_not_supported">舊地圖格式 \'\'{0}\'\' 已不支援</string>
-	<string name="poi_filter_closest_poi">最近興趣點</string>
+	<string name="poi_filter_closest_poi">最近的興趣點</string>
 	<string name="poi_filter_custom_filter">自訂篩選</string>
 	<string name="poi_filter_namefinder">線上名稱尋找</string>
 	<string name="reading_cached_tiles">正在取讀暫存地圖圖磚…</string>
@@ -658,11 +657,11 @@
 	<string name="use_high_res_maps">高解析顯示</string>
 	<string name="use_high_res_maps_descr">不要伸展（模糊）在高解析螢幕上的地圖圖磚</string>
 	<string name="download_files">下載</string>
-	<string name="context_menu_item_search_transport">查尋交通運輸</string>
-	<string name="transport_searching_transport">交通設施結果(無目的地)：</string>
-	<string name="transport_searching_route">交通設施(有{0}到目的地)：</string>
+	<string name="context_menu_item_search_transport">查尋公共交通</string>
+	<string name="transport_searching_transport">交通運輸結果(無目的地)：</string>
+	<string name="transport_searching_route">交通運輸結果(有{0}到目的地)：</string>
 	<string name="transport_search_none">無</string>
-	<string name="transport_search_again">重置交通運輸查尋</string>
+	<string name="transport_search_again">重置公車查尋</string>
 	<string name="map_index">地圖</string>
 	<string name="voice">真人語音</string>
 	<string name="no_vector_map_loaded">向量地圖未載入</string>
@@ -671,7 +670,7 @@
 	<string name="layer_gpx_layer">GPX 軌跡…</string>
 	<string name="error_reading_gpx">讀取 GPX 資料錯誤</string>
 	<string name="vector_data">離線向量地圖</string>
-	<string name="transport_context_menu">在終點查尋交通運輸</string>
+	<string name="transport_context_menu">查尋公車站牌</string>
 	<string name="point_on_map">位置：\n 緯度 %1$.5f\n 經度 %2$.5f</string>
 	<string name="osb_bug_name">程式臭蟲</string>
 	<string name="poi_context_menu_modify">修改興趣點</string>
@@ -693,13 +692,13 @@
 	<string name="none_region_found">在 SD 卡上沒有該地區離線資料。由網路下載資料。</string>
 	<string name="poi_namefinder_query_empty">輸入查尋條件以查尋興趣點</string>
 	<string name="any_poi">任何</string>
-	<string name="layer_transport_route">交通路線</string>
+	<string name="layer_transport_route">公車路線</string>
 	<string name="thanks_yandex_traffic">感謝 Yandex 提供的交通資訊。</string>
 	<string name="layer_yandex_traffic">Yandex 的交通資訊</string>
 	<string name="layer_route">導航路線</string>
 	<string name="layer_favorites">我的最愛</string>
 	<string name="layer_osm_bugs">OSM 錯誤(線上)</string>
-	<string name="layer_transport">車站、站牌</string>
+	<string name="layer_transport">公車站牌</string>
 	<string name="layer_poi">興趣點…</string>
 	<string name="layer_map">地圖來源…</string>
 	<string name="menu_layers">地圖圖層</string>
@@ -749,7 +748,7 @@
 	<string name="first_time_continue">接著</string>
 	<string name="first_time_download">下載地區</string>
 	<string name="search_poi_location">搜尋訊號中…</string>
-	<string name="search_near_map">查尋上次位置附近</string>
+	<string name="search_near_map">查尋目前地圖中心附近</string>
 	<string name="search_nearby">在附近查尋</string>
 	<string name="map_orientation_default">與裝置一樣</string>
 	<string name="map_orientation_portrait">直豎</string>
@@ -760,7 +759,7 @@
 	<string name="add_new_rule">新增新規則</string>
 	<string name="transport_Routes">導航路線</string>
 	<string name="transport_Stop">停止</string>
-	<string name="transport_stops">車站</string>
+	<string name="transport_stops">站牌</string>
 	<string name="transport_search_after">後續路線</string>	
 	<string name="transport_search_before">優先路線</string>
 	<string name="transport_finish_search">查尋完成</string>
@@ -1016,7 +1015,7 @@
     <string name="distance_measurement_save_gpx">另存為 GPX</string>
     <string name="distance_measurement_load_gpx">開啟現有的 GPX</string>
     <string name="wait_current_task_finished">請等待目前的作業結束</string>
-    <string name="use_kalman_filter_compass_descr">使用 Kalman 濾波器，以避免電子羅盤的偏差</string>
+    <string name="use_kalman_filter_compass_descr">降低電子羅盤讀值雜訊，但增加了慣性</string>
     <string name="use_kalman_filter_compass">使用 Kalman 濾波器</string>
     <string name="use_magnetic_sensor_descr">使用磁性感應器來判斷電子羅盤的值，而不是定位感應器</string>
     <string name="use_magnetic_sensor">使用磁性感應器</string>
@@ -1444,8 +1443,8 @@
     <string name="app_mode_truck">卡車</string>
     <string name="application_dir_change_warning2">您想要將 OsmAnd 資料複製到新的目的地嗎？選擇否，OsmAnd 只建立和使用新的資料夾。</string>
     <string name="copying_osmand_one_file_descr">複製檔案 (%s) 到新的目的地…</string>
-    <string name="copying_osmand_files_descr">複製 OsmAnd 資料檔到新的目的地 (%s)</string>
-    <string name="copying_osmand_files">複製 OsmAnd 資料檔案</string>
+    <string name="copying_osmand_files_descr">複製 OsmAnd 資料檔到新的目的地 (%s)…</string>
+    <string name="copying_osmand_files">複製 OsmAnd 資料檔案…</string>
     <string name="calculate_osmand_route_gpx">OsmAnd 預估離線路線</string>
     <string name="android_19_location_disabled">由於 Android 4.4 (KitKat) 版本，您無法下載和更新地圖於之前的存儲檔案夾 (%s)。您是否想變更到允許的存儲位置並複製所有的 OsmAnd 檔案到那裡？
 \n注意 1：您舊的檔案將保持不變（但可以手動刪除）。
@@ -1805,7 +1804,7 @@
     <string name="anonymous_user">匿名使用者</string>
     <string name="logged_as">已登入於 %1$s</string>
 	<string name="rendering_category_details">詳細資訊</string>
-    <string name="rendering_category_transport">運輸</string>
+    <string name="rendering_category_transport">交通工具</string>
     <string name="rendering_category_others">其它地圖屬性</string>
     <string name="map_widget_appearance_rem">剩餘元件</string>
     <string name="map_widget_top">狀態列</string>
@@ -1821,7 +1820,7 @@
     <string name="rendering_attr_shareTaxiRoutes_name">分享計程車路線</string>
     <string name="rendering_attr_trolleybusRoutes_name">無軌電車路線</string>
     <string name="rendering_attr_busRoutes_name">公車路線</string>
-    <string name="select_impassable_road">在地圖上選取</string>
+    <string name="select_impassable_road">在地圖上選取…</string>
     <string name="impassable_road">避開的道路…</string>
     <string name="rendering_attr_tramTrainRoutes_name">有軌電車和火車路線</string>
     <string name="rendering_category_hide">隱藏</string>
@@ -1843,7 +1842,7 @@
     <string name="use_opengl_render">使用 OpenGL 繪製</string>
     <string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作）</string>
     <string name="dismiss">排除</string>
-    <string name="no_internet_connection">不能下載。請檢查您的網路連線。</string>
+    <string name="no_internet_connection">不能下載，請檢查您的網路連線。</string>
     <string name="download_tab_downloads">全部下載</string>
     <string name="download_tab_updates">更新</string>
     <string name="download_tab_local">本機</string>
@@ -1851,7 +1850,7 @@
     <string name="navigate_point_easting">東距</string>
     <string name="navigate_point_zone">地區</string>
     <string name="map_locale">地圖上的語言</string>
-    <string name="rendering_attr_transportStops_name">候車亭</string>
+    <string name="rendering_attr_transportStops_name">公車站牌</string>
     <string name="voices">提示語音</string>
 	<string name="dash_download_msg_none">您想要下載離線地圖嗎？</string>
     <string name="dash_download_msg">您已下載了 %1$s 的地圖</string>
@@ -1869,4 +1868,5 @@
 	<string name="show_railway_warnings">顯示鐵路平交道</string>
 	<string name="show_pedestrian_warnings">顯示行人穿越道</string>
     <string name="speak_pedestrian">通報行人穿越道</string>
-    </resources>
+    <string name="rendering_value__name">預設</string>
+	</resources>
diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 93c8675391..1a05ffeebc 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -36,4 +36,6 @@
 	\n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
     </string>
     <string name="app_edition"></string>
+    <string name="preferred_locale_no_translate">Display language</string>
+    <string name="system_locale_no_translate">Device language</string>
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 1855bff523..831af18ba4 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -216,6 +216,9 @@
 	<string name="poi_surveillance">Surveillance</string>
 	<string name="poi_observatory">Observatory</string>
 	<string name="poi_astronomical_observatory">Astronomical observatory</string>
+	<string name="poi_tower">Tower</string>
+	<string name="poi_mast">Mast</string>
+	<string name="poi_radar">Radar</string>
 	<string name="poi_construction">Construction</string>
 	<string name="poi_works">Works</string>
 	<string name="poi_mineshaft">Mineshaft</string>
@@ -383,6 +386,7 @@
 	<string name="poi_mine_historic">Historic mine</string>
 	<string name="poi_monument">Monument</string>
 	<string name="poi_zoo">Zoo</string>
+	<string name="poi_aquarium">Aquarium</string>
 	<string name="poi_theme_park">Theme park</string>
 	
 	<string name="poi_attraction">Tourism attraction</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a36d860e4a..9756bd09b6 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          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_value__name">Default</string>
 	<string name="speak_pedestrian">Announce pedestrian crosswalks</string>
     <string name="rendering_attr_roadStyle_name">Road style</string>
     <string name="rendering_value_default_name">Default</string>
@@ -34,7 +35,7 @@
     <string name="download_tab_downloads">All&#160;Downloads</string>
     <string name="download_tab_updates">Updates</string>
     <string name="download_tab_local">Local</string>
-	<string name="no_internet_connection">Downloading not possible, please check your Internet connetion.</string>
+	<string name="no_internet_connection">Downloading not possible, please check your Internet connection.</string>
     <string name="dismiss">Dismiss</string>
     <string name="everything_up_to_date">All files up to date</string>
     <string name="use_opengl_render">Use OpenGL rendering</string>
@@ -56,7 +57,7 @@
     <string name="wake_on_voice">Turn on the screen</string>
     <string name="wake_on_voice_descr">Turn on the device screen when approaching a turn</string>
     <string name="wake_on_voice_never">Never</string>
-    <string name="select_impassable_road">Select on map</string>
+    <string name="select_impassable_road">Select on map&#8230;</string>
     <string name="impassable_road">Avoid roads&#8230;</string>
     <string name="tip_recent_changes_1_9_t">Changes in 1.9:
         * Updated maps styles with road surface rendering, transport layers and hiking symbols
@@ -455,8 +456,8 @@
         \n Note 1: Your old files will remain untouched (but can be deleted manually).
         \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
     <string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination&#8230;</string>
-    <string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)</string>
-    <string name="copying_osmand_files">Copying OsmAnd data files</string>
+    <string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)&#8230;</string>
+    <string name="copying_osmand_files">Copying OsmAnd data files&#8230;</string>
     <string name="calculate_osmand_route_gpx">Calculate OsmAnd offline route</string>
     <string name="app_mode_truck">Truck</string>
     <string name="guidance_preferences_descr">Navigation preferences</string>
@@ -624,7 +625,7 @@
     <string name="distance_measurement_save_gpx">Save as GPX</string>
     <string name="distance_measurement_load_gpx">Open existing GPX</string>
     <string name="wait_current_task_finished">Please wait until current task is finished</string>
-    <string name="use_kalman_filter_compass_descr">Use Kalman filter to avoid compass aberrations</string>
+    <string name="use_kalman_filter_compass_descr">Reduces noise in compass readings but adds inertia</string>
     <string name="use_kalman_filter_compass">Use Kalman filter</string>
     <string name="access_mark_final_location_first">Accessibility mode: please select destination first</string> 
     <string name="use_magnetic_sensor_descr">Use magnetic sensor to determine compass value instead of orientation sensor</string>
@@ -838,7 +839,7 @@
     <string name="btn_advanced_mode">Advanced Mode&#8230;</string>
     <string name="poi_filter_parking">Parking</string>
     <string name="poi_filter_emergency">Emergency</string>
-    <string name="poi_filter_public_transport">Public Transport</string>
+    <string name="poi_filter_public_transport">Public transport</string>
     <string name="poi_filter_entertainment">Entertainment</string>
     <string name="poi_filter_accomodation">Accommodation</string>
     <string name="poi_filter_restaurants">Restaurants</string>
@@ -876,7 +877,7 @@
 		- Complete offline functionality (store downloaded vector or tile maps in the device storage)
 		- Compact offline vector maps for the whole world available
 		- Download of country or region maps directly from the app 
-		- Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transportation stops, additional maps with customizable transparency
+		- Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transport stops, additional maps with customizable transparency
 		- Offline search for addresses and places (POIs)
 		- Offline routing for short distances (experimental)
 		- Car, bicycle, and pedestrian modes with:
@@ -976,7 +977,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 		- Compact offline vector maps for the whole world available
 		- Unlimited downloading of country or region maps directly from the app 
 		- Offline Wikipedia feature (download Wikipedia POIs), great for sightseeing
-		- Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transportation stops, additional maps with customizable transparency
+		- Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transport stops, additional maps with customizable transparency
 		- Offline search for addresses and places (POIs)
 		- Offline routing for short distances (experimental)
 		- Car, bicycle, and pedestrian modes with:
@@ -1181,7 +1182,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="poi_search_desc">POI (Point of interest) search</string>
 	<string name="address_search_desc">Address search</string>
 	<string name="navpoint_search_desc">Coordinates</string>
-	<string name="transport_search_desc">Transportation search</string>
+	<string name="transport_search_desc">Public transport search</string>
 	<string name="favourites_search_desc">Favorites search</string>
 	<string name="history_search_desc">Search history</string>
 	<string name="offline_navigation_not_available">OsmAnd offline navigation is temporarily not available.</string>
@@ -1192,7 +1193,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="unknown_location">Position not yet known</string>
 	<string name="modify_transparency">Modify transparency (0 - transparent, 255 - opaque)</string>
 	<string name="confirm_interrupt_download">Do you want to interrupt file downloading?</string>
-	<string name="first_time_msg">Thank you for using OsmAnd. For many features of this application you need some regional offline data which you can download via \'Settings\' →  \'Manage map files\'. Afterwards you will be able to view maps, locate addresses, look up POIs, and find public transportation.</string>    
+	<string name="first_time_msg">Thank you for using OsmAnd. For many features of this application you need some regional offline data which you can download via \'Settings\' →  \'Manage map files\'. Afterwards you will be able to view maps, locate addresses, look up POIs, and find public transport.</string>    
 	<string name="basemap_was_selected_to_download">Basemap is required for proper application functioning and was selected to download.</string>
 	<string name="local_indexes_cat_tile">Online and tile maps</string>
 	<string name="local_indexes_cat_map">Offline maps (vector)</string>
@@ -1474,9 +1475,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="search_position_address">Address&#8230;</string>
 	<string name="search_position_favorites">Favorites&#8230;</string>
 	<string name="search_position_undefined">Undefined</string>
-	<string name="search_position_fixed"></string>
 	<string name="search_position_current_location">Current position&#8230;</string>
-	<string name="search_position_map_view">Last map view</string>
+	<string name="search_position_map_view">Current map center</string>
 	<string name="select_search_position">Origin:</string>
 	<string name="context_menu_item_search">Search near here</string>
 	<string name="tip_recent_changes_0_6_7_t">Recent changes for 0.6.7:
@@ -1528,7 +1528,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="local_index_download">Download</string>
 	<string name="local_index_poi_data">POI data</string>
 	<string name="local_index_address_data">Address data</string>
-	<string name="local_index_transport_data">Transportation data</string>
+	<string name="local_index_transport_data">Public transport data</string>
 	<string name="local_index_map_data">Map data</string>
 	<string name="local_indexes_cat_backup">Deactivated</string>
 	<string name="local_indexes_cat_tts">Voice data (TTS)</string>
@@ -1600,7 +1600,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="search_offline_geo_error">Could not parse geo intent \'%s\'</string>
 	<string name="search_osm_offline">Search geo location</string>
 	<string name="system_locale">System</string>
-	<string name="preferred_locale_descr">Select display language</string>
+	<string name="preferred_locale_descr">Select display language (please restart OsmAnd after changing)</string>
 	<string name="preferred_locale">Display language</string>
 	<string name="incomplete_locale">incomplete</string>
 	<string name="tip_map_switch">Select a Map Source</string>
@@ -1656,17 +1656,17 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="amenity_type_sport">Sport</string>
 	<string name="amenity_type_sustenance">Sustenance</string>
 	<string name="amenity_type_tourism">Tourism</string>
-	<string name="amenity_type_transportation">Transportation</string>
+	<string name="amenity_type_transportation">Transport</string>
 	<string name="indexing_address">Indexing address&#8230;</string>
 	<string name="indexing_map">Indexing map&#8230;</string>
 	<string name="indexing_poi">Indexing POI&#8230;</string>
-	<string name="indexing_transport">Indexing transportation&#8230;</string>
+	<string name="indexing_transport">Indexing transport&#8230;</string>
 	<string name="input_output_error">I/O error occurred</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
 	<string name="old_map_index_is_not_supported">Deprecated map data format \'\'{0}\'\' is not supported</string>
-	<string name="poi_filter_closest_poi">Closest POI</string>
+	<string name="poi_filter_closest_poi">Nearest POIs</string>
 	<string name="poi_filter_custom_filter">Custom filter</string>
 	<string name="poi_filter_namefinder">Online NameFinder</string>
 	<string name="reading_cached_tiles">Reading cached tiles&#8230;</string>
@@ -1720,11 +1720,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="use_high_res_maps">High resolution display</string>
 	<string name="use_high_res_maps_descr">Do not stretch (and blur) map tiles on high density displays</string>
 	<string name="download_files">Download</string>
-	<string name="context_menu_item_search_transport">Search transportation</string>
-	<string name="transport_searching_transport">Transportation results (no destination):</string>
-	<string name="transport_searching_route">Transportation results ({0} to destination):</string>
+	<string name="context_menu_item_search_transport">Search public transport</string>
+	<string name="transport_searching_transport">Transport results (no destination):</string>
+	<string name="transport_searching_route">Transport results ({0} to destination):</string>
 	<string name="transport_search_none">none</string>
-	<string name="transport_search_again">Reset Transportation search</string>
+	<string name="transport_search_again">Reset transport search</string>
 	<string name="map_index">Map</string>
 	<string name="voice">Recorded voice</string>
 	<string name="voices">Voice prompts</string>
@@ -1734,7 +1734,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="layer_gpx_layer">GPX track&#8230;</string>
 	<string name="error_reading_gpx">Error reading GPX data</string>
 	<string name="vector_data">Offline vector maps</string>
-	<string name="transport_context_menu">Search transportation at stop</string>
+	<string name="transport_context_menu">Search transport at stop</string>
 	<string name="point_on_map">Location:\n Lat %1$.5f\n Lon %2$.5f</string>
 	<string name="osb_bug_name">Bug</string>
 	<string name="poi_context_menu_modify">Modify POI</string>
@@ -1760,13 +1760,13 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="none_region_found">No offline data for regions found on SD card. Download regions from the Internet.</string>
 	<string name="poi_namefinder_query_empty">Input search query to find POI</string>
 	<string name="any_poi">Any</string>
-	<string name="layer_transport_route">Transportation route</string>
+	<string name="layer_transport_route">Transport route</string>
 	<string name="thanks_yandex_traffic">Thanks to Yandex for traffic information.</string>
 	<string name="layer_yandex_traffic">Yandex traffic</string>
 	<string name="layer_route">Route</string>
 	<string name="layer_favorites">Favorites</string>
 	<string name="layer_osm_bugs">OSM bugs (online)</string>
-	<string name="layer_transport">Transportation stops</string>
+	<string name="layer_transport">Transport stops</string>
 	<string name="layer_poi">POI&#8230;</string>
 	<string name="layer_map">Map source&#8230;</string>
 	<string name="menu_layers">Map layers</string>
@@ -1811,7 +1811,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="first_time_continue">Later</string>
 	<string name="first_time_download">Download regions</string>
 	<string name="search_poi_location">Searching for signal&#8230;</string>
-	<string name="search_near_map">Search near last map location</string>
+	<string name="search_near_map">Search near current map center</string>
 	<string name="search_nearby">Search nearby</string>
 	<string name="map_orientation_default">Same as device</string>
 	<string name="map_orientation_portrait">Portrait</string>
@@ -1823,18 +1823,18 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="transport_Routes">Routes</string>
 	<string name="transport_Stop">Stop</string>
 	<string name="transport_stops">stops</string>
-	<string name="transport_search_after">Subsequent route</string>	
-	<string name="transport_search_before">Prior route</string>
+	<string name="transport_search_after">Subsequent itinerary</string>
+	<string name="transport_search_before">Prior itinerary</string>
 	<string name="transport_finish_search">Finish search</string>
 	<string name="transport_stop_to_go_out">Choose stop to get off</string>
 	<string name="transport_to_go_after">prior distance</string>
 	<string name="transport_to_go_before">subsequent distance</string>
 	<string name="transport_stops_to_pass">stops to pass</string>
-	<string name="transport_route_distance">Route distance</string>
-	<string name="transport">Transportation</string>
+	<string name="transport_route_distance">Itinerary distance</string>
+	<string name="transport">Transport</string>
 	<string name="default_buttons_ok">OK</string>
-	<string name="show_transport_over_map_description">Show public transportation stops on map</string>
-	<string name="show_transport_over_map">Show transportation stops</string>
+	<string name="show_transport_over_map_description">Show public transport stops on map</string>
+	<string name="show_transport_over_map">Show transport stops</string>
 	<string name="hello">Navigation application OsmAnd</string>
 	<string name="update_poi_success">POI data was updated successfully ({0} were loaded)</string>
 	<string name="update_poi_error_local">Error updating local POI list</string>
diff --git a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
index b974c14d61..99bd2b91f6 100644
--- a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
@@ -80,7 +80,7 @@ public class CurrentPositionHelper {
 					}
 				};
 				calculatingThread = app.getRoutingHelper().startTaskInRouteThreadIfPossible(run);
-			} else if (!calcThread.isAlive()) {
+			} else if (calcThread != null && !calcThread.isAlive()) {
 				calculatingThread = null;
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 8c3a467d4d..92b98c0f24 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -16,6 +16,7 @@ import java.util.regex.Pattern;
 
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
@@ -151,9 +152,6 @@ public class FavouritesDbHelper {
 		}
 		FavoriteGroup group = getOrCreateGroup(p, 0);
 
-		//making sure that dublicated names will not occur in favorites
-		checkDublicates(p);
-
 		if (!p.getName().equals("")) {
 			p.setVisible(group.visible);
 			p.setColor(group.color);
@@ -167,45 +165,45 @@ public class FavouritesDbHelper {
 		return true;
 	}
 	
-	private void checkDublicates(FavouritePoint p){
-		boolean fl = true;
+	public static AlertDialog.Builder checkDublicates(FavouritePoint p, FavouritesDbHelper fdb, Context uiContext) {
 		boolean emoticons = false;
 		String index = "";
 		int number = 0;
 		String name = checkEmoticons(p.getName());
 		String category = checkEmoticons(p.getCategory());
 		p.setCategory(category);
-		if (name.length() != p.getName().length()){
+		if (name.length() != p.getName().length()) {
 			emoticons = true;
 		}
-		while (fl){
+		boolean fl = true;
+		while (fl) {
 			fl = false;
-			for (FavouritePoint fp : cachedFavoritePoints){
-				if (fp.getName().equals(name)){
+			for (FavouritePoint fp : fdb.getFavouritePoints()) {
+				if (fp.getName().equals(name)) {
 					number++;
 					index = " (" + number + ")";
 					name = p.getName() + index;
-					fl=true;
+					fl = true;
 					break;
 				}
 			}
 		}
-		if ((index.length() > 0 || emoticons)&&
-				context.getMapActivity() != null){
-			AlertDialog.Builder builder = new AlertDialog.Builder(context.getMapActivity());
+		if ((index.length() > 0 || emoticons) ) {
+			AlertDialog.Builder builder = new AlertDialog.Builder(uiContext);
 			builder.setTitle(R.string.fav_point_dublicate);
-			if (emoticons){
-				builder.setMessage(context.getString(R.string.fav_point_emoticons_message, name));
+			if (emoticons) {
+				builder.setMessage(uiContext.getString(R.string.fav_point_emoticons_message, name));
 			} else {
-				builder.setMessage(context.getString(R.string.fav_point_dublicate_message, name));
+				builder.setMessage(uiContext.getString(R.string.fav_point_dublicate_message, name));
 			}
 			builder.setPositiveButton(R.string.default_buttons_ok, null);
 			p.setName(name);
-			builder.show();
+			return builder;
 		}
+		return null;
 	}
 
-	public String checkEmoticons(String name){
+	public static String checkEmoticons(String name){
 		char[] chars = name.toCharArray();
 		int index;
 		char ch1;
@@ -317,7 +315,7 @@ public class FavouritesDbHelper {
 		return false;
 	}
 
-	private File getExternalFile() {
+	public File getExternalFile() {
 		return new File(context.getAppPath(null), FILE_TO_SAVE);
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index e88d16604c..208d1d4bf3 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -88,6 +88,7 @@ public class GPXUtilities {
 		public double lon;
 		public String name = null;
 		public String link = null;
+		// previous undocumented feature 'category' ,now 'type'
 		public String category = null;
 		public String desc = null;
 		// by default
@@ -760,7 +761,7 @@ public class GPXUtilities {
 			serializer.attribute(null, "link", p.link);
 			serializer.endTag(null, "link");
 		}
-		writeNotNullText(serializer, "category", p.category);
+		writeNotNullText(serializer, "type", p.category);
 		if (!Double.isNaN(p.hdop)) {
 			writeNotNullText(serializer, "hdop", p.hdop + "");
 		}
@@ -925,6 +926,10 @@ public class GPXUtilities {
 								((WptPt) parse).link = parser.getAttributeValue("", "href");
 							} else if (tag.equals("category")) {
 								((WptPt) parse).category = readText(parser, "category");
+							} else if (tag.equals("type")) {
+								if(((WptPt) parse).category == null) {
+									((WptPt) parse).category = readText(parser, "type");
+								}
 							} else if (parser.getName().equals("ele")) {
 								String text = readText(parser, "ele");
 								if (text != null) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index ac9c2ce641..3629bd4d31 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -152,4 +152,10 @@ public class OsmAndAppCustomization {
 		return false;
 	}
 
+	public <T> void resumeActivity(Class<T> class1, T d) {
+	}
+	
+	public <T> void pauseActivity(Class<T> class1) {
+	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index dd3977a80b..2c38a712a5 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -117,9 +117,6 @@ public class OsmandApplication extends Application {
 
 	SQLiteAPI sqliteAPI;
 	BRouterServiceConnection bRouterServiceConnection;
-
-	MapActivity mapActivity;
-	DownloadActivity downloadActivity;
 	
 	// Typeface
 	
@@ -915,19 +912,5 @@ public class OsmandApplication extends Application {
 		}		
 	}
 
-	public MapActivity getMapActivity() {
-		return mapActivity;
-	}
 
-	public void setMapActivity(MapActivity mapActivity) {
-		this.mapActivity = mapActivity;
-	}
-	
-	public void setDownloadActivity(DownloadActivity downloadActivity) {
-		this.downloadActivity = downloadActivity;
-	}
-	
-	public DownloadActivity getDownloadActivity() {
-		return downloadActivity;
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java
index 43d0c921f7..7a7c266ec0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java
@@ -38,6 +38,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.v4.app.FragmentActivity;
 import android.text.Spannable;
@@ -524,9 +525,11 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
 					hideProgressBar();
 					final Intent sendIntent = new Intent();
 					sendIntent.setAction(Intent.ACTION_SEND);
-					sendIntent.putExtra(Intent.EXTRA_TEXT, GPXUtilities.asString(gpxFile, getMyApplication()));
+					sendIntent.putExtra(Intent.EXTRA_TEXT, "Favourites.gpx:\n\n\n"+GPXUtilities.asString(gpxFile, getMyApplication()));
 					sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject));
-					sendIntent.setType("application/gpx+xml");
+					sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(helper.getExternalFile()));
+//					sendIntent.setType("application/gpx+xml");
+					sendIntent.setType("text/plain");
 					startActivity(sendIntent);
 				}
 			};
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 1098466ada..6c1e318d5e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -14,7 +14,6 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.base.BasicProgressAsyncTask;
-import net.osmand.plus.dashboard.DashAudioVideoNotesFragment;
 import net.osmand.plus.dashboard.DashDownloadMapsFragment;
 import net.osmand.plus.dashboard.DashErrorFragment;
 import net.osmand.plus.dashboard.DashFavoritesFragment;
@@ -72,7 +71,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 	private static final int HELP_ID = 0;
 	private static final int SETTINGS_ID = 1;
 	private static final int EXIT_ID = 2;
-	private OsmAndLocationProvider lp;
 
 
 	@Override
@@ -101,7 +99,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 			return;
 		}
 		setContentView(R.layout.dashboard);
-		lp = getMyApplication().getLocationProvider();
 
 		String textVersion = Version.getFullVersion(getMyApplication());
 		if (textVersion.indexOf("#") != -1) {
@@ -194,7 +191,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 //		inst.setTime(new Date());
 //		final String textVersion = "\u00A9 OsmAnd " + inst.get(Calendar.YEAR);
 //		textVersionView.setText(textVersion);
-		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
+//		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 //		textVersionView.setOnClickListener(new OnClickListener(){
 //			int i = 0;
 //			@Override
@@ -494,9 +491,10 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 			if (f instanceof DashDownloadMapsFragment && !f.isDetached()) {
 				((DashDownloadMapsFragment) f).refreshData();
 			}
-
-			if (f instanceof DashAudioVideoNotesFragment && !f.isDetached()) {
-				((DashAudioVideoNotesFragment) f).setupNotes();
+			//Needed to reliably initialize DashFavoritesFragement on devices without compass
+			// [Victor]: This doesn't look as a proper place, then it highly depends on internet connection and download list 
+			if (f instanceof DashFavoritesFragment && !f.isDetached()) {
+				((DashFavoritesFragment) f).setupFavorites();
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 9b30725a63..1d24a5f819 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -369,7 +369,6 @@ public class MapActivity extends AccessibleActivity {
 		}
 
 		settings.MAP_ACTIVITY_ENABLED.set(true);
-		app.setMapActivity(this);
 		checkExternalStorage();
 		showAndHideMapPosition();
 
@@ -443,6 +442,7 @@ public class MapActivity extends AccessibleActivity {
 		if(atlasMapRendererView != null) {
 			atlasMapRendererView.handleOnResume();
 		}
+		getMyApplication().getAppCustomization().resumeActivity(MapActivity.class, this);
 	}
 
 
@@ -661,7 +661,7 @@ public class MapActivity extends AccessibleActivity {
 		
 		settings.setLastKnownMapZoom(mapView.getZoom());
 		settings.MAP_ACTIVITY_ENABLED.set(false);
-		app.setMapActivity(null);
+		getMyApplication().getAppCustomization().pauseActivity(MapActivity.class);
 		app.getResourceManager().interruptRendering();
 		app.getResourceManager().setBusyIndicator(null);
 		OsmandPlugin.onMapActivityPause(this);
diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
index 8bb0054eab..fe25eefd98 100644
--- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
@@ -55,30 +55,30 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 	private static final int SHOW_ON_MAP = 3;
 	private static final int ADD_TO_FAVORITE = 4;
 
-
 	private View view;
+	private LatLon location;
 
 	public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) {
 		view = inflater.inflate(R.layout.navigate_point, container, false);
 		setHasOptionsMenu(true);
-		
-		LatLon loc = null;
+
+		location = null;
 		OsmandApplication app = (OsmandApplication) getActivity().getApplication();
 		Intent intent = getSherlockActivity().getIntent();
 		if(intent != null){
 			double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
 			double lon = intent.getDoubleExtra(SEARCH_LON, 0);
 			if(lat != 0 || lon != 0){
-				loc = new LatLon(lat, lon);
+				location = new LatLon(lat, lon);
 			}
 		}
-		if (loc == null && getActivity() instanceof SearchActivity) {
-			loc = ((SearchActivity) getActivity()).getSearchPoint();
+		if (location == null && getActivity() instanceof SearchActivity) {
+			location = ((SearchActivity) getActivity()).getSearchPoint();
 		}
-		if (loc == null) {
-			loc = app.getSettings().getLastKnownMapLocation();
+		if (location == null) {
+			location = app.getSettings().getLastKnownMapLocation();
 		}
-		initUI(loc.getLatitude(), loc.getLongitude());
+		initUI(location.getLatitude(), location.getLongitude());
 		if(savedInstanceState != null && savedInstanceState.containsKey(SEARCH_LAT) && savedInstanceState.containsKey(SEARCH_LON) && 
 				currentFormat != UTM_FORMAT) {
 			String lat = savedInstanceState.getString(SEARCH_LAT);
@@ -166,21 +166,42 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 	@Override
 	public void onResume() {
 		super.onResume();
+
+		//Hardy: onResume() code is needed so that search origin is properly reflected in tab contents when origin has been changed on one tab, then tab is changed to another one.
+		location = null;
+		OsmandApplication app = (OsmandApplication) getActivity().getApplication();
+		//Intent intent = getSherlockActivity().getIntent();
+		//if (intent != null) {
+		//	if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) {
+		//		double lat = intent.getDoubleExtra(SearchActivity.SEARCH_LAT, 0);
+		//		double lon = intent.getDoubleExtra(SearchActivity.SEARCH_LON, 0);
+		//		if (lat != 0 || lon != 0) {
+		//			location = new LatLon(lat, lon);
+		//		}
+		//	}
+		//}
+		if (location == null && getActivity() instanceof SearchActivity) {
+			location = ((SearchActivity) getActivity()).getSearchPoint();
+		}
+		if (location == null) {
+			location = app.getSettings().getLastKnownMapLocation();
+		}
+		locationUpdate(location);
 	}
 	
-	
 	@Override
-	public void locationUpdate(LatLon loc) {
+	public void locationUpdate(LatLon l) {
+		//location = l;
 		if (view != null) {
-			if (loc != null) {
-				showCurrentFormat(loc);
+			if (l != null) {
+				showCurrentFormat(l);
 			} else {
 				showCurrentFormat(new LatLon(0, 0));
 			}
 		}
 	}
 	
-	protected void showCurrentFormat( LatLon loc) {
+	protected void showCurrentFormat(LatLon l) {
 		final EditText latEdit = ((EditText)view.findViewById(R.id.LatitudeEdit));
 		final EditText lonEdit = ((EditText)view.findViewById(R.id.LongitudeEdit));
 		boolean utm = currentFormat == UTM_FORMAT;
@@ -193,13 +214,13 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 			final EditText northingEdit = ((EditText)view.findViewById(R.id.NorthingEdit));
 			final EditText eastingEdit = ((EditText)view.findViewById(R.id.EastingEdit));
 			final EditText zoneEdit = ((EditText)view.findViewById(R.id.ZoneEdit));
-			UTMPoint pnt = new UTMPoint(new LatLonPoint(loc.getLatitude(), loc.getLongitude()));
+			UTMPoint pnt = new UTMPoint(new LatLonPoint(l.getLatitude(), l.getLongitude()));
 			zoneEdit.setText(pnt.zone_number + ""+pnt.zone_letter);
 			northingEdit.setText(((long)pnt.northing)+"");
 			eastingEdit.setText(((long)pnt.easting)+"");
 		} else {
-			latEdit.setText(convert(MapUtils.checkLatitude(loc.getLatitude()), currentFormat));
-			lonEdit.setText(convert(MapUtils.checkLongitude(loc.getLongitude()), currentFormat));
+			latEdit.setText(convert(MapUtils.checkLatitude(l.getLatitude()), currentFormat));
+			lonEdit.setText(convert(MapUtils.checkLongitude(l.getLongitude()), currentFormat));
 		}
 	}
 
@@ -346,9 +367,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 		latEdit.addTextChangedListener(textWatcher);
 		lonEdit.addTextChangedListener(textWatcher);
 	}
-	
 
-	
+
 	public void select(int mode){
 		try {
 			LatLon loc = parseLocation();
@@ -455,7 +475,6 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
             throw new IllegalArgumentException("coordinate=" + coordinate);
         }
     }
-	
 
 
 	public static String convert(double coordinate, int outputType) {
@@ -492,7 +511,5 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 		sb.append(df.format(coordinate));
 		return sb.toString();
 	}
-	
-	
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index cb8477f190..9eecd2b5c5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -153,6 +153,9 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		
 		// See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/
 		String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")";
+		// Add this in Latin also so it can be more easily identified if foreign language has been selected by mistake
+		String latinSystemDefaultSuffix = " (" + getString(R.string.system_locale_no_translate) + ")";
+
 		//getResources().getAssets().getLocales();
 		entrieValues = new String[] { "",
 				"en",
@@ -203,7 +206,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				"uk",
 				"vi",
 				"cy"};
-		entries = new String[] { getString(R.string.system_locale), 
+		entries = new String[] { getString(R.string.system_locale) + latinSystemDefaultSuffix,
 				getString(R.string.lang_en),
 				getString(R.string.lang_af),
 				getString(R.string.lang_al) + incompleteSuffix,
@@ -253,6 +256,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				getString(R.string.lang_vi) + incompleteSuffix,
 				getString(R.string.lang_cy) + incompleteSuffix,};
 		registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues);
+		// Display "Device language" in Latin for all non-en languages
+		if (!getResources().getString(R.string.preferred_locale).equals(getResources().getString(R.string.preferred_locale_no_translate))) {
+			((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(getString(R.string.preferred_locale) + " (" + getString(R.string.preferred_locale_no_translate) + ")");
+		}
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 8805abb714..05e68cafd6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -162,6 +162,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
 		
 		Intent intent = getIntent();
 		OsmandSettings settings = ((OsmandApplication) getApplication()).getSettings();
+		LatLon last = settings.getLastKnownMapLocation();
 		if (intent != null) {
 			double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
 			double lon = intent.getDoubleExtra(SEARCH_LON, 0);
@@ -169,15 +170,18 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
 				LatLon l = new LatLon(lat, lon);
 				if(!Algorithms.objectEquals(reqSearchPoint, l)){
 					reqSearchPoint = l;
-					updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true);
+					if ((Math.abs(lat - last.getLatitude()) < 0.00001) && (Math.abs(lon - last.getLongitude()) < 0.00001)) {
+						updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false);
+					} else {
+						updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true);
+					}
 				}
 			}
 		}
 		if(searchPoint == null){
-			LatLon last = settings.getLastKnownMapLocation();
 			if(!Algorithms.objectEquals(reqSearchPoint, last)){
 				reqSearchPoint = last;
-				updateSearchPoint(last, getString(R.string.select_search_position), true);
+				updateSearchPoint(last, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false);
 			}
 		}
     }
@@ -239,7 +243,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
 						searchAroundCurrentLocation = false;
 						endSearchCurrentLocation();
 						if (position == POSITION_LAST_MAP_VIEW) {
-							updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true);
+							updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false);
 						} else if (position == POSITION_FAVORITES) {
 							Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class);
 							intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -286,7 +290,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
 			if(name != null){
 				updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + name, false);
 			} else {
-				updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true);
+				updateSearchPoint(latLon, getString(R.string.select_search_position) + " ", true);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java
index 4cac70a352..3e9861965e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java
@@ -123,7 +123,7 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea
 			double lat = intent.getDoubleExtra(SearchActivity.SEARCH_LAT, 0);
 			double lon = intent.getDoubleExtra(SearchActivity.SEARCH_LON, 0);
 			if(lat != 0 || lon != 0){
-				location = new LatLon(lat, lon);
+				adapter.location = new LatLon(lat, lon);
 			}
 		}
 		if (location == null && getActivity() instanceof SearchActivity) {
@@ -132,13 +132,14 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea
 		if (location == null) {
 			location = settings.getLastKnownMapLocation();
 		}
+		locationUpdate(location);
 	}
 	
 	@Override
 	public void locationUpdate(LatLon l) {
 		location = l;
 		if(adapter != null){
-			adapter.notifyDataSetInvalidated();
+			adapter.updateLocation(l);
 		}
 	}
 
@@ -244,6 +245,12 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea
 	}
 	
 	class PlacesAdapter extends ArrayAdapter<Place> {
+		private LatLon location;
+
+		public void updateLocation(LatLon l) {
+			location = l;
+			notifyDataSetChanged();
+		}
 
 		public PlacesAdapter(List<Place> places) {
 			super(getActivity(), R.layout.search_address_online_list_item, places);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index d08a875ca3..d26a4f963f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -40,7 +40,6 @@ public class SearchHistoryFragment extends SherlockListFragment  implements Sear
 	public static final String SEARCH_LON = SearchActivity.SEARCH_LON;
 	private HistoryAdapter historyAdapter;
 
-	
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
@@ -74,13 +73,16 @@ public class SearchHistoryFragment extends SherlockListFragment  implements Sear
 	@Override
 	public void onResume() {
 		super.onResume();
+
+		//Hardy: onResume() code is needed so that search origin is properly reflected in tab contents when origin has been changed on one tab, then tab is changed to another one.
+		location = null;
 		FragmentActivity activity = getActivity();
 		Intent intent = activity.getIntent();
 		if (intent != null) {
 			double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
 			double lon = intent.getDoubleExtra(SEARCH_LON, 0);
 			if (lat != 0 || lon != 0) {
-				location = new LatLon(lat, lon);
+				historyAdapter.location = new LatLon(lat, lon);
 			}
 		}
 		if (location == null && activity instanceof SearchActivity) {
@@ -89,16 +91,16 @@ public class SearchHistoryFragment extends SherlockListFragment  implements Sear
 		if (location == null) {
 			location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation();
 		}
-
+		locationUpdate(location);
 		clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE);
 		
 	}
 
 	@Override
 	public void locationUpdate(LatLon l) {
-		location = l;
+		//location = l;
 		if(historyAdapter != null) {
-			historyAdapter.notifyDataSetChanged();
+			historyAdapter.updateLocation(l);
 		}
 	}
 
@@ -126,6 +128,12 @@ public class SearchHistoryFragment extends SherlockListFragment  implements Sear
 	}
 
 	class HistoryAdapter extends ArrayAdapter<HistoryEntry> {
+		private LatLon location;
+
+		public void updateLocation(LatLon l) {
+			location = l;
+			notifyDataSetChanged();
+		}
 
 		public HistoryAdapter(List<HistoryEntry> list) {
 			super(getActivity(), R.layout.search_history_list_item, list);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index f3fbdce6c8..5259806dea 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -43,6 +43,7 @@ import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.views.DirectionDrawable;
 import net.osmand.util.Algorithms;
+import net.osmand.util.MapUtils;
 import net.osmand.util.OpeningHoursParser;
 import net.osmand.util.OpeningHoursParser.OpeningHours;
 import android.app.AlertDialog;
@@ -50,6 +51,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Matrix;
@@ -107,6 +110,11 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 	private static final int SHOW_ON_MAP = 1;
 	private static final int FILTER = 2;
 
+	private static final int ORIENTATION_0 = 0;
+	private static final int ORIENTATION_90 = 3;
+	private static final int ORIENTATION_270 = 1;
+	private static final int ORIENTATION_180 = 2;
+
 	private PoiFilter filter;
 	private AmenityAdapter amenityAdapter;
 	private EditText searchFilter;
@@ -344,6 +352,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		} else if(isSearchByNameFilter() ){
 			searchFilterLayout.setVisibility(View.VISIBLE);
 		}
+		//Freeze the direction arrows (reference is constant north) when Accessibility mode = ON, so screen can be read aloud without continuous updates
 		if(!app.accessibilityEnabled()) {
 			app.getLocationProvider().addCompassListener(this);
 			app.getLocationProvider().registerOrUnregisterCompassListener(true);
@@ -506,17 +515,25 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 
 	@Override
 	public void updateCompassValue(float value) {
+		//99 in next line used to one-time initalize arrows (with reference vs. fixed-north direction) on non-compass devices
+		float lastHeading = heading != null ? heading : 99;
 		heading = value;
-		if(!uiHandler.hasMessages(COMPASS_REFRESH_MSG_ID)){
-			Message msg = Message.obtain(uiHandler, new Runnable(){
-				@Override
-				public void run() {
-					amenityAdapter.notifyDataSetChanged();
-				}
-			});
-			msg.what = COMPASS_REFRESH_MSG_ID;
-			uiHandler.sendMessageDelayed(msg, 100);
+		if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) {
+			amenityAdapter.notifyDataSetChanged();
+		} else {
+			heading = lastHeading;
 		}
+		//Comment out and use lastHeading above to see if this fixes issues seen on some devices
+		//if(!uiHandler.hasMessages(COMPASS_REFRESH_MSG_ID)){
+		//	Message msg = Message.obtain(uiHandler, new Runnable(){
+		//		@Override
+		//		public void run() {
+		//			amenityAdapter.notifyDataSetChanged();
+		//		}
+		//	});
+		//	msg.what = COMPASS_REFRESH_MSG_ID;
+		//	uiHandler.sendMessageDelayed(msg, 100);
+		//}
 	}
 	
 	
@@ -769,7 +786,34 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 				DirectionDrawable draw = new DirectionDrawable(SearchPOIActivity.this, width, height, false);
 				Float h = heading;
 				float a = h != null ? h : 0;
-				draw.setAngle(mes[1] - a + 180);
+
+				//Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation
+				int screenOrientation = 0;
+				screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
+				switch (screenOrientation)
+				{
+				case ORIENTATION_0:   // Device default (normally portrait)
+					screenOrientation = 0;
+					break;
+				case ORIENTATION_90:  // Landscape right
+					screenOrientation = 90;
+					break;
+				case ORIENTATION_270: // Landscape left
+					screenOrientation = 270;
+					break;
+				case ORIENTATION_180: // Upside down
+					screenOrientation = 180;
+					break;
+				}
+
+				//Looks like screenOrientation correction must not be applied for devices without compass?
+				Sensor compass  = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+				if (compass == null) {
+					screenOrientation = 0;
+				}
+
+				draw.setAngle(mes[1] - a + 180 + screenOrientation);
+
 				draw.setOpenedColor(opened);
 				direction.setImageDrawable(draw);
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
index 3d95ce7375..9af6dc0d5a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
@@ -52,15 +52,13 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
 	public static final String SEARCH_LON = SearchActivity.SEARCH_LON;
 
 	private Button searchTransportLevel;
-	
-	
+
 	private TextView searchArea;
 	
 	private final static int finalZoom = 13;
 	private final static int initialZoom = 17;
 	private int zoom = initialZoom;
 	private ProgressBar progress;
-	
 
 	private LatLon lastKnownMapLocation;
 	private LatLon destinationLocation;
@@ -71,7 +69,6 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
 	private OsmandSettings settings;
 	private View view;
 	private AsyncTask<?, ?, ?> asyncTask;
-	
 
 	private OsmandApplication getApplication() {
 		return (OsmandApplication) getActivity().getApplication();
@@ -140,7 +137,11 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
 			double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
 			double lon = intent.getDoubleExtra(SEARCH_LON, 0);
 			if(lat != 0 || lon != 0){
-				startPoint = new LatLon(lat, lon);
+				// Not commenting out the next line will cause the follwing issue:
+				// (1) When the transport search was called from the dashboard, everything still works: You can change the search origin on the tab, this resets any previous (if any) search results, and any new searches will be centered around the new origin.
+				// (2) But when the tab was called from map screen, changing the search origin on the tab keeps any search results, does not reset anything.
+				// (3) If the search origin had been changed on anoother search tab before switching to this one, new transport searches would still center around the OLD search origin (the last map view)
+				//startPoint = new LatLon(lat, lon);
 			}
 		}
 		if(startPoint == null && getActivity() instanceof SearchActivity){
@@ -220,11 +221,14 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA
 					}
 					@Override
 					protected void onPostExecute(List<RouteInfoLocation> result) {
-						stopsAdapter.setNewModel(result);
-						updateSearchMoreButton();
-						searchArea.setText(getSearchArea());
-						progress.setVisibility(View.INVISIBLE);
-						asyncTask = null;
+						// isAdded() here fixes the "not attached to Activity" FC when rapidly changing screen orientation
+						if (isAdded()) {
+							stopsAdapter.setNewModel(result);
+							updateSearchMoreButton();
+							searchArea.setText(getSearchArea());
+							progress.setVisibility(View.INVISIBLE);
+							asyncTask = null;
+						}
 					}
 				};
 				asyncTask = current;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
index b9a397ef6d..e66df2b3c1 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
@@ -67,10 +67,6 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 
 	public void setupNotes() {
 		View mainView = getView();
-		if (mainView == null) {
-			return;
-		}
-
 		if (plugin == null){
 			mainView.setVisibility(View.GONE);
 			return;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
index e137d983bc..9a4fe6a4b2 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
@@ -9,7 +9,10 @@ import net.osmand.plus.OsmandApplication;
 public class DashBaseFragment extends SherlockFragment {
 
 	public OsmandApplication getMyApplication(){
+		if (getActivity() == null){
+			return null;
+		}
 		return (OsmandApplication) getActivity().getApplication();
 	}
-	
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java
index a34bce2a2e..0f67c08a45 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java
@@ -84,7 +84,8 @@ public class DashDownloadMapsFragment extends DashBaseFragment {
 			}
 
 			protected void updateCount(String s) {
-				if (!DashDownloadMapsFragment.this.isAdded()){
+				if (!DashDownloadMapsFragment.this.isAdded() ||
+						getMyApplication() == null){
 					return;
 				}
 				File ms = getMyApplication().getAppPath(s);
@@ -104,7 +105,8 @@ public class DashDownloadMapsFragment extends DashBaseFragment {
 			@Override
 			protected void onPostExecute(Void result) {
 				super.onPostExecute(result);
-				if (!DashDownloadMapsFragment.this.isAdded()){
+				if (!DashDownloadMapsFragment.this.isAdded()
+						|| getMyApplication() == null){
 					return;
 				}
 				if(countMaps > 0) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 9068facdfe..dd490b8a63 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -1,43 +1,54 @@
 package net.osmand.plus.dashboard;
 
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import net.osmand.Location;
-import net.osmand.data.FavouritePoint;
-import net.osmand.data.LatLon;
-import net.osmand.plus.*;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.search.SearchPOIActivity;
-import net.osmand.plus.base.FavoriteImageDrawable;
-import net.osmand.plus.dialogs.DirectionsDialogs;
-import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.views.DirectionDrawable;
-import net.osmand.util.MapUtils;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import net.osmand.Location;
+import net.osmand.data.FavouritePoint;
+import net.osmand.data.LatLon;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.FavoriteImageDrawable;
+import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.views.DirectionDrawable;
+import net.osmand.util.MapUtils;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
 /**
  * Created by Denis on 24.11.2014.
  */
 public class DashFavoritesFragment extends DashBaseFragment {
 	public static final String TAG = "DASH_FAVORITES_FRAGMENT";
 	private net.osmand.Location location = null;
+	private LatLon loc = null;
 	private Float heading = null;
+
+	private static final int ORIENTATION_0 = 0;
+	private static final int ORIENTATION_90 = 3;
+	private static final int ORIENTATION_270 = 1;
+	private static final int ORIENTATION_180 = 2;
+
 	private List<ImageView> arrows = new ArrayList<ImageView>();
 	List<FavouritePoint> points = new ArrayList<FavouritePoint>();
 
@@ -61,26 +72,32 @@ public class DashFavoritesFragment extends DashBaseFragment {
 		return view;
 	}
 
-
-
 	@Override
 	public void onResume() {
 		super.onResume();
-		if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
-			if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
-				// show first time when application ran
-				location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
-			} else {
-				location = getLocationProvider().getLastKnownLocation();
-			}
-			updateLocation(location);
+
+		//'location' seems actually not needed in this Fragment, as both setupFavorites and updateArrow only reference lastKnownMapLocation
+		//if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
+		//	if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
+		//		// show first time when application ran
+		//		location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
+		//	} else {
+		//		location = getLocationProvider().getLastKnownLocation();
+		//	}
+		//}
+
+		//This is used as origin for both Fav-list and direction arrows
+		if (getMyApplication().getSettings().getLastKnownMapLocation() != null) {
+			loc = getMyApplication().getSettings().getLastKnownMapLocation();
+		} else {
+			loc = new LatLon(0f, 0f);
 		}
 		setupFavorites();
 	}
 
 
 
-	private void setupFavorites(){
+	public void setupFavorites(){
 		View mainView = getView();
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
 		points = new ArrayList<FavouritePoint>(helper.getFavouritePoints());
@@ -91,14 +108,15 @@ public class DashFavoritesFragment extends DashBaseFragment {
 		} else {
 			(mainView.findViewById(R.id.main_fav)).setVisibility(View.VISIBLE);
 		}
+
 		Collections.sort(points, new Comparator<FavouritePoint>() {
 			@Override
 			public int compare(FavouritePoint point, FavouritePoint point2) {
-				LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+				//LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
 				int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
-						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+						loc.getLatitude(), loc.getLongitude()));
 				int dist2 = (int) (MapUtils.getDistance(point2.getLatitude(), point2.getLongitude(),
-						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+						loc.getLatitude(), loc.getLongitude()));
 				return (dist - dist2);
 			}
 		});
@@ -117,16 +135,16 @@ public class DashFavoritesFragment extends DashBaseFragment {
 			ImageView icon = (ImageView) view.findViewById(R.id.icon);
 			ImageView direction = (ImageView) view.findViewById(R.id.direction);
 
-			if(location != null){
+			if(loc != null){
 				direction.setVisibility(View.VISIBLE);
 				updateArrow(point, direction);
 			}
 			arrows.add(direction);
 			name.setText(point.getName());
 			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), point.getColor()));
-			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+			//LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
 			int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
-					lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+					loc.getLatitude(), loc.getLongitude()));
 			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
 			view.findViewById(R.id.navigate_to).setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -146,14 +164,15 @@ public class DashFavoritesFragment extends DashBaseFragment {
 			});
 			favorites.addView(view);
 		}
+		updateLocation(location);
 	}
 
 	private void updateArrows() {
-		if (location == null) {
+		if (loc == null) {
 			return;
 		}
 
-		for(int i =0; i<arrows.size(); i++){
+		for (int i = 0; i < arrows.size(); i++) {
 			arrows.get(i).setVisibility(View.VISIBLE);
 			updateArrow(points.get(i), arrows.get(i));
 		}
@@ -162,28 +181,73 @@ public class DashFavoritesFragment extends DashBaseFragment {
 	private void updateArrow(FavouritePoint point, ImageView direction) {
 		float[] mes = new float[2];
 		LatLon l = new LatLon(point.getLatitude(), point.getLongitude());
-		Location.distanceBetween(l.getLatitude(), l.getLongitude(), location.getLatitude(), location.getLongitude(), mes);
+		Location.distanceBetween(l.getLatitude(), l.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
 		DirectionDrawable draw = new DirectionDrawable(getActivity(), 10, 10, true);
 		Float h = heading;
 		float a = h != null ? h : 0;
-		draw.setAngle(mes[1] - a + 180);
+
+		//Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation
+		int screenOrientation = 0;
+		screenOrientation = ((WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
+		switch (screenOrientation)
+		{
+		case ORIENTATION_0:   // Device default (normally portrait)
+			screenOrientation = 0;
+			break;
+		case ORIENTATION_90:  // Landscape right
+			screenOrientation = 90;
+			break;
+		case ORIENTATION_270: // Landscape left
+			screenOrientation = 270;
+			break;
+		case ORIENTATION_180: // Upside down
+			screenOrientation = 180;
+			break;
+		}
+
+		//Looks like screenOrientation correction must not be applied for devices without compass?
+		Sensor compass  = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+		if (compass == null) {
+			screenOrientation = 0;
+		}
+
+		draw.setAngle(mes[1] - a + 180 + screenOrientation);
+
 		direction.setImageDrawable(draw);
 	}
 
 	public void updateCompassValue(float value) {
+		//heading = value;
+		//updateArrows();
+		//99 in next line used to one-time initalize arrows (with reference vs. fixed-north direction) on non-compass devices
+		float lastHeading = heading != null ? heading : 99;
 		heading = value;
-		updateArrows();
+		if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) {
+			updateArrows();
+		} else {
+			heading = lastHeading;
+		}
 	}
 
 	public void updateLocation(Location location) {
-		if (location == null){
-			return;
+		//'location' seems actually not needed in this Fragment, as both setupFavorites and updateArrow only reference lastKnownMapLocation
+		//if (location != null) {
+			//this.location = location;
+			//Next line commented out so that reference is always lastKnownMapLocation, because this is also always used as reference in setupFavorites
+		//	loc = new LatLon(location.getLatitude(), location.getLongitude());
+		//} else if (getMyApplication().getSettings().getLastKnownMapLocation() != null) {
+		//	loc = getMyApplication().getSettings().getLastKnownMapLocation();
+		//} else {
+		//	return;
+		//}
+
+		//This is used as origin for both Fav-list and direction arrows
+		if (getMyApplication().getSettings().getLastKnownMapLocation() != null) {
+			loc = getMyApplication().getSettings().getLastKnownMapLocation();
+		} else {
+			loc = new LatLon(0f, 0f);
 		}
-		this.location = location;
 		updateArrows();
 	}
 
-	private OsmAndLocationProvider getLocationProvider() {
-		return getMyApplication().getLocationProvider();
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
index a7a5b8b8f5..b4527e4c28 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
@@ -78,10 +78,16 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloaderC
 		if (view == null) {
 			return;
 		}
-		Bitmap image = getMyApplication().getResourceManager().getRenderer().getBitmap();
-		ImageView map = (ImageView) view.findViewById(R.id.map_image);
+		final Bitmap image = getMyApplication().getResourceManager().getRenderer().getBitmap();
+		final ImageView map = (ImageView) view.findViewById(R.id.map_image);
 		if (image != null) {
-			map.setImageBitmap(image);
+			getActivity().runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					map.setImageBitmap(image);
+				}
+			});
+
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index 660bad87d2..ca82f99671 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -143,9 +143,10 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		//needed when rotation is performed and progress can be null
 		if (!updateOnlyProgress) {
 			getProgressIfPossible(basicProgressAsyncTask.getDescription());
-			if (currentProgress == null) {
-				return;
-			}
+		}
+
+		if (currentProgress == null) {
+			return;
 		}
 
 		if (updateOnlyProgress) {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index d54bd655e6..ce90f2517c 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -12,17 +12,17 @@ import net.osmand.AndroidUtils;
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.FavouritePoint;
 import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.util.MapUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.AlertDialog.Builder;
+import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Build;
@@ -203,7 +203,7 @@ public class FavoriteDialogs {
 		builder.setPositiveButton(R.string.default_buttons_add, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				FavouritePoint point = (FavouritePoint) args.getSerializable(KEY_FAVORITE);
+				final FavouritePoint point = (FavouritePoint) args.getSerializable(KEY_FAVORITE);
 				OsmandApplication app = (OsmandApplication) activity.getApplication();
 				String categoryStr = cat.getText().toString().trim();
 				final FavouritesDbHelper helper = app.getFavorites();
@@ -211,6 +211,20 @@ public class FavoriteDialogs {
 				point.setName(editText.getText().toString().trim());
 				point.setDescription(description.getText().toString().trim());
 				point.setCategory(categoryStr);
+				Builder bld = FavouritesDbHelper.checkDublicates(point, helper, activity);
+				if(bld != null) {
+					bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							addFavorite(activity, point, helper);							
+						}
+					});
+				} else {
+					addFavorite(activity, point, helper);
+				}
+			}
+
+			protected void addFavorite(final Activity activity, FavouritePoint point, final FavouritesDbHelper helper) {
 				boolean added = helper.addFavourite(point);
 				if (added) {
 					AccessibleToast.makeText(activity, MessageFormat.format(
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 81be5b7345..adc423a629 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -72,6 +72,12 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 		super.onResume();
 		downloadListIndexThread.setUiActivity(this);
 	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		downloadListIndexThread.setUiActivity(null);
+	}
 
 
 	public void updateDownloadList(List<IndexItem> list) {
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 25788c1686..16fe8de084 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -61,12 +61,6 @@ public class DownloadActivity extends BaseDownloadActivity {
 	public static final String SINGLE_TAB = "SINGLE_TAB";
 
 
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		BaseDownloadActivity.downloadListIndexThread.resetUiActivity(DownloadActivity.class);
-	}
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -177,7 +171,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		getMyApplication().setDownloadActivity(this);
+		getMyApplication().getAppCustomization().resumeActivity(DownloadActivity.class, this);
 	}
 
 
@@ -214,7 +208,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 	@Override
 	public void onPause() {
 		super.onPause();
-		(getMyApplication()).setDownloadActivity(null);
+		getMyApplication().getAppCustomization().pauseActivity(DownloadActivity.class);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index dedae65eb0..1980431664 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -121,15 +121,6 @@ public class DownloadIndexesThread {
 
 	public List<IndexItem> getItemsToUpdate() { return itemsToUpdate;}
 
-	public void resetUiActivity(Class<?> downloadActivityClass) {
-		if (uiActivity== null){
-			return;
-		}
-
-		if (uiActivity.getClass().equals(downloadActivityClass)){
-			uiActivity = null;
-		}
-	}
 
 	public class DownloadIndexesAsyncTask extends BasicProgressAsyncTask<IndexItem, Object, String> implements DownloadFileShowWarning {
 
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 107e5d1ea5..86ebacc93d 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -841,6 +841,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 				}
 			}
 			listAdapter.notifyDataSetChanged();
+			expandAllGroups();
 		}
 
 		public void cancelFilter(){
diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
index ef9f2bdef5..0bacc38e65 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@@ -125,7 +125,7 @@ public class AvoidSpecificRoads {
 			}
 			
 		});
-		bld.setPositiveButton(R.string.default_buttons_ok, null);
+		bld.setPositiveButton(R.string.close, null);
 		bld.show();
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
index 91d08cd075..07f9efdaf7 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
@@ -65,7 +65,8 @@ public class GpxImportHelper {
 
 		if (fileName != null && fileName.endsWith(KML_SUFFIX)) {
 			handleKmlImport(intentUri, fileName, saveFile);
-		} else if (fileName != null && fileName.endsWith("favourites.gpx")) {
+		} else if (fileName != null && (fileName.contains("favourite")|| 
+				fileName.contains("favorite"))) {
 			handleFavouritesImport(intentUri, fileName, saveFile);
 		} else {
 			handleGpxImport(intentUri, fileName, saveFile);
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 10f7665bef..f122b4e893 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -1257,6 +1257,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				float[] mes = new float[2];
 				net.osmand.Location.distanceBetween(location.getLatitude(), location.getLongitude(),
 						mapLocation.getLatitude(), mapLocation.getLongitude(), mes);
+				//TODO: Hardy: Check: The arrow direction below may only be correct for the default display's standard orientation
+				//      i.e. still needs to be corrected for .ROTATION_90/180/170
+				//	Keep in mind: getRotation was introduced from Android 2.2
 				draw.setAngle(mes[1] - lastCompass + 180);
 				long now = System.currentTimeMillis();
 				final boolean recent = Math.abs( now - location.getTime() ) < RECENT_THRESHOLD;
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index a54a64b868..0d4cd6f654 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -333,7 +333,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 	
 	@Override
 	public void registerOptionsMenuItems(final MapActivity mapActivity, ContextMenuAdapter helper) {
-		helper.item(R.string.osmo_groups).icons(R.drawable.ic_action_eye_dark, R.drawable.ic_action_eye_light).position(6)
+		helper.item(R.string.osmo_groups).icons(R.drawable.ic_osmo_dark, R.drawable.ic_osmo_light).position(6)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 1fd10b52c2..99107511a0 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -58,7 +58,7 @@ public class RoutingHelper {
 	
 	private Thread currentRunningJob;
 	private long lastTimeEvaluatedRoute = 0;
-	private int evalWaitInterval = 3000;
+	private int evalWaitInterval = 0;
 	
 	private ApplicationMode mode;
 	private OsmandSettings settings;
@@ -144,7 +144,7 @@ public class RoutingHelper {
 	public synchronized void clearCurrentRoute(LatLon newFinalLocation, List<LatLon> newIntermediatePoints) {
 		route = new RouteCalculationResult("");
 		isDeviatedFromRoute = false;
-		evalWaitInterval = 3000;
+		evalWaitInterval = 0;
 		app.getWaypointHelper().setNewRoute(route);
 		app.runInUIThread(new Runnable() {
 			@Override
@@ -561,9 +561,13 @@ public class RoutingHelper {
 					// This check is valid for Online/GPX services (offline routing is aware of route direction)
 					wrongMovementDirection = checkWrongMovementDirection(start, routeNodes.get(newCurrentRoute + 1));
 					// set/reset evalWaitInterval only if new route is in forward direction
+					
 					if (!wrongMovementDirection) {
 						evalWaitInterval = 3000;
 					} else {
+						if(evalWaitInterval == 0){
+							evalWaitInterval = 3000;
+						}
 						evalWaitInterval = evalWaitInterval * 3 / 2;
 						evalWaitInterval = Math.min(evalWaitInterval, 120000);
 					}
@@ -772,6 +776,8 @@ public class RoutingHelper {
 	}
 	
 	public void recalculateRouteDueToSettingsChange() {
+		//This should fix route-recalculation if settings change during ongoing calculation
+		clearCurrentRoute(finalLocation, intermediatePoints);
 		recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, 
 				true, false);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 65d60e2284..ebf6e7fb03 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -82,6 +83,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 	public static final String TOUR_SERVER = "download.osmand.net";
 	private static final String SAVE_GPX_FOLDER = "save_gpx_folder";
 	private Object originalGlobal;
+	private Map<Class<Object>, Object> activities = new HashMap<Class<Object>, Object>();
 
 	@Override
 	public void setup(OsmandApplication app) {
@@ -205,7 +207,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		}
 		this.tourPresent = tourPresent;
 		if(!suggestToDownloadMap.isEmpty()) {
-			final DownloadActivity da = app.getDownloadActivity();
+			final DownloadActivity da = (DownloadActivity) activities.get(DownloadActivity.class);
 			if (da != null) {
 				app.runInUIThread(new Runnable() {
 
@@ -662,7 +664,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 	}
 	
 	public boolean onDestinationReached() {
-		final MapActivity map = app.getMapActivity();
+		final MapActivity map = (MapActivity) activities.get(MapActivity.class);
 		if(map != null && getSelectedStage() != null) {
 			app.runInUIThread(new Runnable() {
 				
@@ -675,6 +677,17 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		return true;
 	}
 	
+	@Override
+	public <T> void pauseActivity(Class<T> class1) {
+		super.pauseActivity(class1);
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> void resumeActivity(Class<T> class1, T d) {
+		activities.put((Class<Object>) class1, d);
+	}
+	
 	public void runStage(Activity a, TourInformation tour, StageInformation stage, boolean startOver) {
 		WptPt point = null;
 		GPXFile gpx = null;
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
index 80d10268c8..a12b2352c9 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@@ -79,8 +79,16 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 				getTargets().navigateToPoint(latlon, true, -1);
 			} else {
 				getTargets().setStartPoint(latlon, true, null);
+				//TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
 			}
 			contextMenu.setLocation(latlon, null);
+			showDialog();
+				//-Test code only--
+				//Try force resuming route re-caculation if stopped due to Issue2515
+				// interesting: putting one or more of the next lines here destroys the alternating "interrupted route calculation won't re-start" behavior and causes the route calculation to NEVER re-start!
+				//routingHelper.recalculateRouteDueToSettingsChange();
+				//routingHelper.recalculateRouteDueToSettingsChange();
+				//-----------------
 			return true;
 		}
 		return super.onSingleTap(point, tileBox);
@@ -110,7 +118,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 	}
 	
 	private Dialog createDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
+		AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
 		View lmain = mapActivity.getLayoutInflater().inflate(R.layout.plan_route_info, null);
 		boolean addButtons = routingHelper.isRouteCalculated();
 		updateInfo(lmain);
@@ -128,20 +136,20 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 				textView.setVisibility(View.GONE);
 			}
 		}
-        builder.setView(lmain);
-        
-        Dialog dialog = builder.create();
-        dialog.setCanceledOnTouchOutside(true);
-        WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
-        lp.copyFrom(dialog.getWindow().getAttributes());
-        lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.gravity = Gravity.BOTTOM;
+		builder.setView(lmain);
+
+		Dialog dialog = builder.create();
+		dialog.setCanceledOnTouchOutside(true);
+		WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
+		lp.copyFrom(dialog.getWindow().getAttributes());
+		lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
+		lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+		lp.gravity = Gravity.BOTTOM;
 		lp.y = (int) (infoButton.getBottom() - infoButton.getTop() + scaleCoefficient * 5 + getExtraVerticalMargin());
-        dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
-        dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        dialog.getWindow().setAttributes(lp);
-        return dialog;
+		dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+		dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+		dialog.getWindow().setAttributes(lp);
+		return dialog;
 	}
 	
 	private void updateInfo(final View parentView) {
@@ -226,6 +234,9 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 					getTargets().setStartPoint(point, true, name);
 				}
 				favoritesDialog.dismiss();
+				//Next 2 lines ensure Dialog is shown in the right correct position after a selection been made
+				hideDialog();
+				showDialog();
 			}
 		});
 		bld.setView(listView);
@@ -366,20 +377,20 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 	}
 	
 	public String getRoutePointDescription(double lat, double lon) {
-    	return mapActivity.getString(R.string.route_descr_lat_lon, lat, lon);
-    }
+		return mapActivity.getString(R.string.route_descr_lat_lon, lat, lon);
+	}
     
-    public String getRoutePointDescription(LatLon l, String d) {
-    	if(d != null && d.length() > 0) {
-    		return d.replace(':', ' ');
-    	}
-    	if(l != null) {
-    		return mapActivity.getString(R.string.route_descr_lat_lon, l.getLatitude(), l.getLongitude());
-    	}
-    	return "";
-    }
+	public String getRoutePointDescription(LatLon l, String d) {
+		if(d != null && d.length() > 0) {
+			return d.replace(':', ' ');
+		}
+		if(l != null) {
+			return mapActivity.getString(R.string.route_descr_lat_lon, l.getLatitude(), l.getLongitude());
+		}
+		return "";
+	}
     
-    private Spinner setupFromSpinner( View view) {
+	private Spinner setupFromSpinner( View view) {
 		ArrayList<String> fromActions = new ArrayList<String>();
 		fromActions.add(mapActivity.getString(R.string.route_descr_current_location));
 		fromActions.add(mapActivity.getString(R.string.route_descr_favorite));
@@ -409,8 +420,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 		return fromSpinner;
 	}
     
-    private Spinner setupToSpinner(View view) {
-    	final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner));
+	private Spinner setupToSpinner(View view) {
+		final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner));
 		final TargetPointsHelper targets = getTargets();
 		ArrayList<String> toActions = new ArrayList<String>();
 		if (targets.getPointToNavigate() != null) {